ckaczor/azuredatastudio
1
0
Fork 0
mirror of https://github.com/ckaczor/azuredatastudio.git synced 2026-02-16 10:58:30 -05:00
Code Issues Packages Projects Releases Wiki Activity

Remove diff (#7368)

Browse Source 
* remove diff

* gulpfile changes (#7370)

* gulpfile changes

* Remove examples

* move require statements to the top of the file

* add await
This commit is contained in:
Anthony Dresser
2019-09-26 11:55:42 -07:00
committed by GitHub
parent f971417746
commit 2a15768a25
15 changed files with 231 additions and 81 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/sql/base/browser/ui/table/plugins/cellRangeSelector.ts
View File

@@ -49,7 +49,6 @@ export class CellRangeSelector<T> implements ICellRangeSelector<T> {
public onAppendCellRangeSelected = new Slick.Event<Slick.Range>();
constructor(private options: ICellRangeSelectorOptions) {
require.__$__nodeRequire('slickgrid/plugins/slick.cellrangedecorator');
this.options = mixin(this.options, defaultOptions, false);
}

1
src/sql/setup.js
View File

@@ -16,6 +16,7 @@ define(["require", "exports"], function (require) {
require.__$__nodeRequire('slickgrid/slick.grid');
require.__$__nodeRequire('slickgrid/slick.editors');
require.__$__nodeRequire('slickgrid/slick.dataview');
require.__$__nodeRequire('slickgrid/plugins/slick.cellrangedecorator');
require.__$__nodeRequire('reflect-metadata');
require.__$__nodeRequire('zone.js');
require.__$__nodeRequire('chart.js');

0
src/sql/workbench/api/browser/extensionHost.contribution.common.ts → src/sql/workbench/api/browser/extensionHost.contribution.ts
View File

0
src/sql/workbench/api/electron-browser/mainThreadModelViewDialog.ts → src/sql/workbench/api/browser/mainThreadModelViewDialog.ts
View File

22
src/sql/workbench/api/electron-browser/extensionHost.contribution.ts
View File

@@ -1,22 +0,0 @@
/*---------------------------------------------------------------------------------------------
* Copyright (c) Microsoft Corporation. All rights reserved.
* Licensed under the Source EULA. See License.txt in the project root for license information.
*--------------------------------------------------------------------------------------------*/
// --- SQL contributions
import 'sql/workbench/api/browser/mainThreadConnectionManagement';
import 'sql/workbench/api/browser/mainThreadCredentialManagement';
import 'sql/workbench/api/browser/mainThreadDataProtocol';
import 'sql/workbench/api/browser/mainThreadObjectExplorer';
import 'sql/workbench/api/browser/mainThreadBackgroundTaskManagement';
import 'sql/workbench/api/browser/mainThreadResourceProvider';
import 'sql/workbench/api/browser/mainThreadTasks';
import 'sql/workbench/api/browser/mainThreadDashboard';
import 'sql/workbench/api/browser/mainThreadDashboardWebview';
import 'sql/workbench/api/browser/mainThreadQueryEditor';
import 'sql/workbench/api/browser/mainThreadModelView';
import 'sql/workbench/api/electron-browser/mainThreadModelViewDialog';
import 'sql/workbench/api/browser/mainThreadNotebook';
import 'sql/workbench/api/browser/mainThreadNotebookDocumentsAndEditors';
import 'sql/workbench/api/browser/mainThreadAccountManagement';
import 'sql/workbench/api/browser/mainThreadExtensionManagement';

8
src/sql/workbench/parts/notebook/browser/outputs/gridOutput.component.ts
View File

@@ -138,7 +138,7 @@ class DataResourceTable extends GridTableBase<any> {
@IEditorService editorService: IEditorService,
@IUntitledEditorService untitledEditorService: IUntitledEditorService,
@IConfigurationService configurationService: IConfigurationService,
@optional(ISerializationService) private _serializationService: ISerializationService
@ISerializationService private _serializationService: ISerializationService
) {
super(state, createResultSet(source), contextMenuService, instantiationService, editorService, untitledEditorService, configurationService);
this._gridDataProvider = this.instantiationService.createInstance(DataResourceDataProvider, source, this.resultSet, documentUri);
@@ -153,7 +153,7 @@ class DataResourceTable extends GridTableBase<any> {
}
protected getContextActions(): IAction[] {
if (!this._serializationService || !this._serializationService.hasProvider()) {
if (!this._serializationService.hasProvider()) {
return [];
}
return [
@@ -180,7 +180,7 @@ class DataResourceDataProvider implements IGridDataProvider {
@IClipboardService private _clipboardService: IClipboardService,
@IConfigurationService private _configurationService: IConfigurationService,
@ITextResourcePropertiesService private _textResourcePropertiesService: ITextResourcePropertiesService,
@optional(ISerializationService) private _serializationService: ISerializationService,
@ISerializationService private _serializationService: ISerializationService,
@IInstantiationService private _instantiationService: IInstantiationService
) {
this.transformSource(source);
@@ -248,7 +248,7 @@ class DataResourceDataProvider implements IGridDataProvider {
}
get canSerialize(): boolean {
return this._serializationService && this._serializationService.hasProvider();
return this._serializationService.hasProvider();
}

2
src/sql/workbench/test/electron-browser/api/mainThreadModelViewDialog.test.ts
View File

@@ -5,7 +5,7 @@
import * as assert from 'assert';
import { Mock, It, Times } from 'typemoq';
import { MainThreadModelViewDialog } from 'sql/workbench/api/electron-browser/mainThreadModelViewDialog';
import { MainThreadModelViewDialog } from 'sql/workbench/api/browser/mainThreadModelViewDialog';
import { IExtHostContext } from 'vs/workbench/api/common/extHost.protocol';
import { IModelViewButtonDetails, IModelViewTabDetails, IModelViewDialogDetails, IModelViewWizardPageDetails, IModelViewWizardDetails, DialogMessage, MessageLevel } from 'sql/workbench/api/common/sqlExtHostTypes';
import { CustomDialogService } from 'sql/platform/dialog/browser/customDialogService';

1
src/vs/platform/product/common/product.ts
View File

@@ -22,6 +22,7 @@ if (isWeb) {
if (Object.keys(product).length === 0) {
assign(product, {
version: '1.39.0-dev',
vscodeVersion: '1.39.0-dev',
nameLong: 'Visual Studio Code Web Dev',
nameShort: 'VSCode Web Dev'
});

2
src/vs/workbench/api/node/extHost.services.ts
View File

@@ -37,7 +37,7 @@ registerSingleton(IExtHostCommands, ExtHostCommands);
registerSingleton(IExtHostDocumentsAndEditors, ExtHostDocumentsAndEditors);
registerSingleton(IExtHostTerminalService, ExtHostTerminalService);
registerSingleton(IExtHostTask, ExtHostTask);
registerSingleton(IExtHostDebugService, ExtHostDebugService);
// registerSingleton(IExtHostDebugService, ExtHostDebugService); {{SQL CARBON EDIT}} remove debug service
registerSingleton(IExtHostSearch, ExtHostSearch);
registerSingleton(IExtensionStoragePaths, ExtensionStoragePaths);
registerSingleton(IExtHostExtensionService, ExtHostExtensionService);

2
src/vs/workbench/services/environment/browser/environmentService.ts
View File

@@ -78,7 +78,7 @@ export class BrowserWorkbenchEnvironmentService implements IWorkbenchEnvironment
this.logsPath = options.logsPath.path;
this.logFile = joinPath(options.logsPath, 'window.log');
this.appRoot = '/web/';
this.appNameLong = 'Visual Studio Code - Web';
this.appNameLong = 'Azure Data Studio - Web'; // {{SQL CARBON EDIT}} vscode to ads
this.configuration.remoteAuthority = options.remoteAuthority;
this.configuration.machineId = generateUuid();

2
src/vs/workbench/services/extensions/worker/extHost.services.ts
View File

@@ -50,7 +50,7 @@ function NotImplementedProxy<T>(name: ServiceIdentifier<T>): { new(): T } {
}
registerSingleton(IExtHostTerminalService, WorkerExtHostTerminalService);
registerSingleton(IExtHostTask, WorkerExtHostTask);
registerSingleton(IExtHostDebugService, class extends NotImplementedProxy(IExtHostDebugService) { });
// registerSingleton(IExtHostDebugService, class extends NotImplementedProxy(IExtHostDebugService) { }); {{SQL CARBON EDIT}} remove debug service
registerSingleton(IExtHostSearch, class extends NotImplementedProxy(IExtHostSearch) { });
registerSingleton(IExtensionStoragePaths, class extends NotImplementedProxy(IExtensionStoragePaths) {
whenReady = Promise.resolve();

2
src/vs/workbench/workbench.common.main.ts
View File

@@ -8,7 +8,7 @@
import 'vs/editor/editor.all';
import 'vs/workbench/api/browser/extensionHost.contribution';
import 'sql/workbench/api/electron-browser/extensionHost.contribution'; // {{SQL CARBON EDIT}} @anthonydresser add our extension contributions
import 'sql/workbench/api/browser/extensionHost.contribution'; // {{SQL CARBON EDIT}} @anthonydresser add our extension contributions
import 'vs/workbench/browser/workbench.contribution';
//#endregion