ckaczor/azuredatastudio
1
0
Fork 0
mirror of https://github.com/ckaczor/azuredatastudio.git synced 2026-01-19 01:25:36 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge from vscode 64980ea1f3f532c82bb6c28d27bba9ef2c5b4463 (#7206)

Browse Source 
* Merge from vscode 64980ea1f3f532c82bb6c28d27bba9ef2c5b4463

* fix config changes

* fix strictnull checks
This commit is contained in:
Anthony Dresser
2019-09-15 22:38:26 -07:00
committed by GitHub
parent fa6c52699e
commit ea0f9e6ce9
1226 changed files with 21541 additions and 17633 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/sql/workbench/api/common/extHostNotebook.ts
View File

@@ -285,7 +285,7 @@ export class ExtHostNotebook implements ExtHostNotebookShape {
}
}
private _withServerManager<R>(handle: number, callback: (manager: azdata.nb.ServerManager) => R | PromiseLike<R>): Promise<R> {
private _withServerManager<R>(handle: number, callback: (manager: azdata.nb.ServerManager) => PromiseLike<R>): Promise<R> {
return this._withNotebookManager(handle, (notebookManager) => {
let serverManager = notebookManager.serverManager;
if (!serverManager) {
@@ -295,7 +295,7 @@ export class ExtHostNotebook implements ExtHostNotebookShape {
});
}
private _withContentManager<R>(handle: number, callback: (manager: azdata.nb.ContentManager) => R | PromiseLike<R>): Promise<R> {
private _withContentManager<R>(handle: number, callback: (manager: azdata.nb.ContentManager) => PromiseLike<R>): Promise<R> {
return this._withNotebookManager(handle, (notebookManager) => {
let contentManager = notebookManager.contentManager;
if (!contentManager) {
@@ -305,7 +305,7 @@ export class ExtHostNotebook implements ExtHostNotebookShape {
});
}
private _withSessionManager<R>(handle: number, callback: (manager: azdata.nb.SessionManager) => R | PromiseLike<R>): Promise<R> {
private _withSessionManager<R>(handle: number, callback: (manager: azdata.nb.SessionManager) => PromiseLike<R>): Promise<R> {
return this._withNotebookManager(handle, (notebookManager) => {
let sessionManager = notebookManager.sessionManager;
if (!sessionManager) {

3
src/sql/workbench/browser/modelComponents/queryTextEditor.ts
View File

@@ -22,7 +22,6 @@ import { StandaloneCodeEditor } from 'vs/editor/standalone/browser/standaloneCod
import { CancellationToken } from 'vs/base/common/cancellation';
import { IEditorService } from 'vs/workbench/services/editor/common/editorService';
import { ICodeEditor } from 'vs/editor/browser/editorBrowser';
import { Configuration } from 'vs/editor/browser/config/configuration';
import { IWindowService } from 'vs/platform/windows/common/windows';
import { IEditorGroupsService } from 'vs/workbench/services/editor/common/editorGroupsService';
import { IAccessibilityService } from 'vs/platform/accessibility/common/accessibility';
@@ -151,7 +150,7 @@ export class QueryTextEditor extends BaseTextEditor {
let shouldAddHorizontalScrollbarHeight = false;
if (!this._editorWorkspaceConfig || configChanged) {
this._editorWorkspaceConfig = this.workspaceConfigurationService.getValue('editor');
this._lineHeight = editorWidget.getConfiguration().lineHeight;
this._lineHeight = editorWidget.getRawOptions().lineHeight;
}
let wordWrapEnabled: boolean = this._editorWorkspaceConfig && this._editorWorkspaceConfig['wordWrap'] && this._editorWorkspaceConfig['wordWrap'] === 'on' ? true : false;
if (wordWrapEnabled) {

53
src/sql/workbench/browser/parts/views/customView.ts
View File

@@ -65,6 +65,7 @@ export class CustomTreeViewPanel extends ViewletPanel {
const { treeView } = (<ITreeViewDescriptor>Registry.as<IViewsRegistry>(Extensions.ViewsRegistry).getView(options.id));
this.treeView = treeView as ITreeView;
this._register(this.treeView.onDidChangeActions(() => this.updateActions(), this));
this._register(this.treeView.onDidChangeTitle((newTitle) => this.updateTitle(newTitle)));
this._register(toDisposable(() => this.treeView.setVisibility(false)));
this._register(this.onDidChangeBodyVisibility(() => this.updateTreeVisibility()));
this.updateTreeVisibility();
@@ -200,11 +201,14 @@ export class CustomTreeView extends Disposable implements ITreeView {
private readonly _onDidChangeActions: Emitter<void> = this._register(new Emitter<void>());
readonly onDidChangeActions: Event<void> = this._onDidChangeActions.event;
private readonly _onDidChangeTitle: Emitter<string> = this._register(new Emitter<string>());
readonly onDidChangeTitle: Event<string> = this._onDidChangeTitle.event;
private nodeContext: NodeContextKey;
constructor(
private id: string,
private title: string,
private _title: string,
private viewContainer: ViewContainer,
@IExtensionService private readonly extensionService: IExtensionService,
@IWorkbenchThemeService private readonly themeService: IWorkbenchThemeService,
@@ -277,6 +281,15 @@ export class CustomTreeView extends Disposable implements ITreeView {
this.updateMessage();
}
get title(): string {
return this._title;
}
set title(name: string) {
this._title = name;
this._onDidChangeTitle.fire(this._title);
}
get canSelectMany(): boolean {
return this._canSelectMany;
}
@@ -386,26 +399,26 @@ export class CustomTreeView extends Disposable implements ITreeView {
const aligner = new Aligner(this.themeService);
const renderer = this.instantiationService.createInstance(TreeRenderer, this.id, treeMenus, this.treeLabels, actionViewItemProvider, aligner);
this.tree = this._register(this.instantiationService.createInstance(WorkbenchAsyncDataTree, this.treeContainer, new CustomTreeDelegate(), [renderer],
this.tree = this._register(this.instantiationService.createInstance(WorkbenchAsyncDataTree, 'SqlCustomView', this.treeContainer, new CustomTreeDelegate(), [renderer],
dataSource, {
identityProvider: new CustomViewIdentityProvider(),
accessibilityProvider: {
getAriaLabel(element: ITreeItem): string {
return element.label ? element.label.label : '';
}
},
ariaLabel: this.title,
keyboardNavigationLabelProvider: {
getKeyboardNavigationLabel: (item: ITreeItem) => {
return item.label ? item.label.label : (item.resourceUri ? basename(URI.revive(item.resourceUri)) : undefined);
}
},
expandOnlyOnTwistieClick: (e: ITreeItem) => !!e.command,
collapseByDefault: (e: ITreeItem): boolean => {
return e.collapsibleState !== TreeItemCollapsibleState.Expanded;
},
multipleSelectionSupport: this.canSelectMany,
}) as WorkbenchAsyncDataTree<ITreeItem, ITreeItem, FuzzyScore>);
identityProvider: new CustomViewIdentityProvider(),
accessibilityProvider: {
getAriaLabel(element: ITreeItem): string {
return element.label ? element.label.label : '';
}
},
ariaLabel: this.title,
keyboardNavigationLabelProvider: {
getKeyboardNavigationLabel: (item: ITreeItem) => {
return item.label ? item.label.label : (item.resourceUri ? basename(URI.revive(item.resourceUri)) : undefined);
}
},
expandOnlyOnTwistieClick: (e: ITreeItem) => !!e.command,
collapseByDefault: (e: ITreeItem): boolean => {
return e.collapsibleState !== TreeItemCollapsibleState.Expanded;
},
multipleSelectionSupport: this.canSelectMany,
}) as WorkbenchAsyncDataTree<ITreeItem, ITreeItem, FuzzyScore>);
aligner.tree = this.tree;
const actionRunner = new MultipleSelectionActionRunner(() => this.tree!.getSelection());
renderer.actionRunner = actionRunner;

2
src/sql/workbench/parts/charts/browser/interfaces.ts
View File

@@ -47,6 +47,6 @@ export interface IInsight {
}
export interface IInsightCtor {
new(container: HTMLElement, options: IInsightOptions, ...services: { _serviceBrand: any; }[]): IInsight;
new(container: HTMLElement, options: IInsightOptions, ...services: { _serviceBrand: undefined; }[]): IInsight;
readonly types: Array<InsightType | ChartType>;
}

18
src/sql/workbench/parts/commandLine/test/electron-browser/commandLine.test.ts
View File

@@ -43,24 +43,24 @@ class TestParsedArgs implements ParsedArgs {
debugPluginHost?: string;
debugSearch?: string;
diff?: boolean;
'disable-crash-reporter'?: string;
'disable-extension'?: string | string[];
'disable-crash-reporter'?: boolean;
'disable-extension'?: string[]; // undefined or array of 1 or more
'disable-extensions'?: boolean;
'disable-restore-windows'?: boolean;
'disable-telemetry'?: boolean;
'disable-updates'?: string;
'disable-updates'?: boolean;
'driver'?: string;
'enable-proposed-api'?: string | string[];
'enable-proposed-api'?: string[];
'export-default-configuration'?: string;
'extensions-dir'?: string;
extensionDevelopmentPath?: string;
extensionDevelopmentPath?: string[];
extensionTestsPath?: string;
'file-chmod'?: boolean;
'file-write'?: boolean;
'folder-uri'?: string | string[];
'folder-uri'?: string[];
goto?: boolean;
help?: boolean;
'install-extension'?: string | string[];
'install-extension'?: string[];
'install-source'?: string;
integrated?: boolean;
'list-extensions'?: boolean;
@@ -72,7 +72,7 @@ class TestParsedArgs implements ParsedArgs {
'open-url'?: boolean;
performance?: boolean;
'prof-append-timers'?: string;
'prof-startup'?: string;
'prof-startup'?: boolean;
'prof-startup-prefix'?: string;
'reuse-window'?: boolean;
server?: string;
@@ -82,7 +82,7 @@ class TestParsedArgs implements ParsedArgs {
'skip-release-notes'?: boolean;
status?: boolean;
'sticky-quickopen'?: boolean;
'uninstall-extension'?: string | string[];
'uninstall-extension'?: string[];
'unity-launch'?: boolean; // Always open a new window, except if opening the first window or opening a file or folder as part of the launch.
'upload-logs'?: string;
user?: string;

14
src/sql/workbench/parts/notebook/test/electron-browser/cell.test.ts
View File

@@ -269,13 +269,13 @@ suite('Cell Model', function (): void {
metadata: { language: 'python' },
execution_count: 1
}, {
notebook: new NotebookModelStub({
name: '',
version: '',
mimetype: 'x-scala'
}),
isTrusted: false
});
notebook: new NotebookModelStub({
name: '',
version: '',
mimetype: 'x-scala'
}),
isTrusted: false
});
});
test('should send and handle incoming messages', async () => {

4
src/sql/workbench/parts/objectExplorer/browser/objectExplorerViewTreeShim.ts
View File

@@ -23,7 +23,7 @@ export const SERVICE_ID = 'oeShimService';
export const IOEShimService = createDecorator<IOEShimService>(SERVICE_ID);
export interface IOEShimService {
_serviceBrand: any;
_serviceBrand: undefined;
getChildren(node: ITreeItem, viewId: string): Promise<ITreeItem[]>;
disconnectNode(viewId: string, node: ITreeItem): Promise<boolean>;
providerExists(providerId: string): boolean;
@@ -32,7 +32,7 @@ export interface IOEShimService {
}
export class OEShimService extends Disposable implements IOEShimService {
_serviceBrand: any;
_serviceBrand: undefined;
private sessionMap = new Map<number, string>();
private nodeHandleMap = new Map<number, string>();

2
src/sql/workbench/parts/objectExplorer/test/browser/connectionTreeActions.test.ts
View File

@@ -107,7 +107,7 @@ suite('SQL Connection Tree Action tests', () => {
});
const viewsService = new class implements IViewsService {
_serviceBrand: ServiceIdentifier<any>;
_serviceBrand: undefined;
openView(id: string, focus?: boolean): Promise<IView> {
return Promise.resolve({
id: '',

6
src/sql/workbench/parts/profiler/browser/profilerEditor.ts
View File

@@ -382,9 +382,9 @@ export class ProfilerEditor extends BaseEditor {
}
]
}, {
forceFitColumns: true,
dataItemColumnValueExtractor: slickGridDataItemColumnValueExtractor
});
forceFitColumns: true,
dataItemColumnValueExtractor: slickGridDataItemColumnValueExtractor
});
this._detailTableData.onRowCountChange(() => {
this._detailTable.updateRowCount();

8
src/sql/workbench/parts/profiler/browser/profilerInput.ts
View File

@@ -17,7 +17,7 @@ import { IInstantiationService } from 'vs/platform/instantiation/common/instanti
import { INotificationService } from 'vs/platform/notification/common/notification';
import { Event, Emitter } from 'vs/base/common/event';
import { generateUuid } from 'vs/base/common/uuid';
import { IDialogService } from 'vs/platform/dialogs/common/dialogs';
import { IDialogService, IShowResult } from 'vs/platform/dialogs/common/dialogs';
import * as types from 'vs/base/common/types';
import { URI } from 'vs/base/common/uri';
import Severity from 'vs/base/common/severity';
@@ -291,11 +291,11 @@ export class ProfilerInput extends EditorInput implements IProfilerSession {
nls.localize('profilerClosingActions.yes', "Yes"),
nls.localize('profilerClosingActions.no', "No"),
nls.localize('profilerClosingActions.cancel', "Cancel")
]).then((selection: number) => {
if (selection === 0) {
]).then((selection: IShowResult) => {
if (selection.choice === 0) {
this._profilerService.stopSession(this.id);
return ConfirmResult.DONT_SAVE;
} else if (selection === 1) {
} else if (selection.choice === 1) {
return ConfirmResult.DONT_SAVE;
} else {
return ConfirmResult.CANCEL;

4
src/sql/workbench/parts/profiler/browser/profilerTableEditor.ts
View File

@@ -92,8 +92,8 @@ export class ProfilerTableEditor extends BaseEditor implements IProfilerControll
}
}
}, {
dataItemColumnValueExtractor: slickGridDataItemColumnValueExtractor
});
dataItemColumnValueExtractor: slickGridDataItemColumnValueExtractor
});
this._profilerTable.setSelectionModel(new RowSelectionModel());
const copyKeybind = new CopyKeybind();
copyKeybind.onCopy((e) => {

6
src/sql/workbench/parts/query/browser/queryResultsEditor.ts
View File

@@ -28,9 +28,9 @@ export class BareResultsGridInfo extends BareFontInfo {
public static createFromRawSettings(opts: {
fontFamily?: string;
fontWeight?: string;
fontSize?: number | string;
lineHeight?: number | string;
letterSpacing?: number | string;
fontSize?: number;
lineHeight?: number;
letterSpacing?: number;
cellPadding?: number | number[];
}, zoomLevel: number): BareResultsGridInfo {
let cellPadding = !types.isUndefinedOrNull(opts.cellPadding) ? opts.cellPadding : RESULTS_GRID_DEFAULTS.cellPadding;

8
src/sql/workbench/parts/queryHistory/browser/queryHistoryView.ts
View File

@@ -75,10 +75,10 @@ export class QueryHistoryView extends Disposable {
return new Tree(treeContainer, {
dataSource, renderer, controller, dnd, filter, sorter, accessibilityProvider
}, {
indentPixels: 10,
twistiePixels: 20,
ariaLabel: localize({ key: 'queryHistory.regTreeAriaLabel', comment: ['QueryHistory'] }, "Query History")
});
indentPixels: 10,
twistiePixels: 20,
ariaLabel: localize({ key: 'queryHistory.regTreeAriaLabel', comment: ['QueryHistory'] }, "Query History")
});
}
public refreshTree(): void {

8
src/sql/workbench/parts/tasks/browser/tasksView.ts
View File

@@ -90,10 +90,10 @@ export class TaskHistoryView extends Disposable {
return new Tree(treeContainer, {
dataSource, renderer, controller, dnd, filter, sorter, accessibilityProvider
}, {
indentPixels: 10,
twistiePixels: 20,
ariaLabel: localize({ key: 'taskHistory.regTreeAriaLabel', comment: ['TaskHistory'] }, "Task history")
});
indentPixels: 10,
twistiePixels: 20,
ariaLabel: localize({ key: 'taskHistory.regTreeAriaLabel', comment: ['TaskHistory'] }, "Task history")
});
}
private updateTask(task: TaskNode): void {

2
src/sql/workbench/services/accountManagement/browser/accountManagementService.ts
View File

@@ -27,7 +27,7 @@ export class AccountManagementService implements IAccountManagementService {
// MEMBER VARIABLES ////////////////////////////////////////////////////
public _providers: { [id: string]: AccountProviderWithMetadata } = {};
public _serviceBrand: any;
public _serviceBrand: undefined;
private _accountStore: AccountStore;
private _accountDialogController: AccountDialogController;
private _autoOAuthDialogController: AutoOAuthDialogController;

4
src/sql/workbench/services/admin/common/adminService.ts
View File

@@ -15,7 +15,7 @@ import * as azdata from 'azdata';
export const IAdminService = createDecorator<IAdminService>(SERVICE_ID);
export interface IAdminService {
_serviceBrand: any;
_serviceBrand: undefined;
registerProvider(providerId: string, provider: azdata.AdminServicesProvider): void;
@@ -25,7 +25,7 @@ export interface IAdminService {
}
export class AdminService implements IAdminService {
_serviceBrand: any;
_serviceBrand: undefined;
private _providers: { [handle: string]: azdata.AdminServicesProvider; } = Object.create(null);

2
src/sql/workbench/services/backup/browser/backupUiService.ts
View File

@@ -19,7 +19,7 @@ import { IBackupService, TaskExecutionMode } from 'sql/platform/backup/common/ba
import { IBackupUiService } from 'sql/workbench/services/backup/common/backupUiService';
export class BackupUiService implements IBackupUiService {
public _serviceBrand: any;
public _serviceBrand: undefined;
private _backupDialogs: { [providerName: string]: BackupDialog | OptionsDialog } = {};
private _currentProvider: string;
private _optionValues: { [optionName: string]: any } = {};

2
src/sql/workbench/services/backup/common/backupUiService.ts
View File

@@ -11,7 +11,7 @@ export const UI_SERVICE_ID = 'backupUiService';
export const IBackupUiService = createDecorator<IBackupUiService>(UI_SERVICE_ID);
export interface IBackupUiService {
_serviceBrand: any;
_serviceBrand: undefined;
/**
* Show backup wizard

10
src/sql/workbench/services/connection/browser/connectionDialogService.ts
View File

@@ -58,7 +58,7 @@ export interface IConnectionComponentController {
export class ConnectionDialogService implements IConnectionDialogService {
_serviceBrand: any;
_serviceBrand: undefined;
private _connectionDialog: ConnectionDialogWidget;
private _connectionControllerMap: { [providerName: string]: IConnectionComponentController } = {};
@@ -277,14 +277,14 @@ export class ConnectionDialogService implements IConnectionDialogService {
this._connectionControllerMap[providerName] =
this._instantiationService.createInstance(CmsConnectionController,
this._capabilitiesService.getCapabilities(providerName).connection, {
onSetConnectButton: (enable: boolean) => this.handleSetConnectButtonEnable(enable)
}, providerName);
onSetConnectButton: (enable: boolean) => this.handleSetConnectButtonEnable(enable)
}, providerName);
} else {
this._connectionControllerMap[providerName] =
this._instantiationService.createInstance(ConnectionController,
this._capabilitiesService.getCapabilities(providerName).connection, {
onSetConnectButton: (enable: boolean) => this.handleSetConnectButtonEnable(enable)
}, providerName);
onSetConnectButton: (enable: boolean) => this.handleSetConnectButtonEnable(enable)
}, providerName);
}
}
return this._connectionControllerMap[providerName];

2
src/sql/workbench/services/connection/common/connectionDialogService.ts
View File

@@ -9,7 +9,7 @@ import { IConnectionProfile } from 'sql/platform/connection/common/interfaces';
export const IConnectionDialogService = createDecorator<IConnectionDialogService>('connectionDialogService');
export interface IConnectionDialogService {
_serviceBrand: any;
_serviceBrand: undefined;
/**
* Opens the connection dialog and returns the promise for successfully opening the dialog
*/

2
src/sql/workbench/services/connection/test/common/testConnectionDialogService.ts
View File

@@ -8,7 +8,7 @@ import { IConnectionProfile } from 'sql/platform/connection/common/interfaces';
import { IConnectionDialogService } from 'sql/workbench/services/connection/common/connectionDialogService';
export class TestConnectionDialogService implements IConnectionDialogService {
_serviceBrand: any;
_serviceBrand: undefined;
public showDialog(connectionManagementService: IConnectionManagementService,
params: INewConnectionParams, model: IConnectionProfile, connectionResult?: IConnectionResult, connectionOptions?: IConnectionCompletionOptions): Promise<void> {

2
src/sql/workbench/services/dashboard/browser/newDashboardTabDialog.ts
View File

@@ -8,6 +8,6 @@ import { IDashboardTab } from 'sql/platform/dashboard/browser/dashboardRegistry'
export const INewDashboardTabDialogService = createDecorator<INewDashboardTabDialogService>('addNewDashboardTabService');
export interface INewDashboardTabDialogService {
_serviceBrand: any;
_serviceBrand: undefined;
showDialog(dashboardTabs: Array<IDashboardTab>, openedTabs: Array<IDashboardTab>, uri: string): void;
}

2
src/sql/workbench/services/dashboard/browser/newDashboardTabDialogImpl.ts
View File

@@ -169,7 +169,7 @@ export class NewDashboardTabDialog extends Modal {
let extensionTabViewContainer = DOM.$('.extensionTab-view');
let delegate = new ExtensionListDelegate();
let extensionTabRenderer = new ExtensionListRenderer();
this._extensionList = new List<IDashboardUITab>(extensionTabViewContainer, delegate, [extensionTabRenderer]);
this._extensionList = new List<IDashboardUITab>('NewDashboardTabExtentionList', extensionTabViewContainer, delegate, [extensionTabRenderer]);
this._extensionList.onMouseDblClick(e => this.onAccept());
this._extensionList.onKeyDown(e => {

2
src/sql/workbench/services/dashboard/browser/newDashboardTabDialogService.ts
View File

@@ -12,7 +12,7 @@ import { IDashboardUITab } from 'sql/workbench/services/dashboard/browser/newDas
import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
export class NewDashboardTabDialogService implements INewDashboardTabDialogService {
_serviceBrand: any;
_serviceBrand: undefined;
// MEMBER VARIABLES ////////////////////////////////////////////////////
private _addNewTabDialog: NewDashboardTabDialog;

4
src/sql/workbench/services/errorMessage/browser/errorMessageService.ts
View File

@@ -13,7 +13,7 @@ import { IErrorMessageService } from 'sql/platform/errorMessage/common/errorMess
export class ErrorMessageService implements IErrorMessageService {
_serviceBrand: any;
_serviceBrand: undefined;
private _errorDialog: ErrorMessageDialog;
@@ -53,4 +53,4 @@ export class ErrorMessageService implements IErrorMessageService {
}
return defaultTitle;
}
}
}

2
src/sql/workbench/services/fileBrowser/browser/fileBrowserDialogController.ts
View File

@@ -12,7 +12,7 @@ import { IInstantiationService } from 'vs/platform/instantiation/common/instanti
* File browser dialog service
*/
export class FileBrowserDialogController implements IFileBrowserDialogController {
_serviceBrand: any;
_serviceBrand: undefined;
private _fileBrowserDialog: FileBrowserDialog;
constructor(

8
src/sql/workbench/services/fileBrowser/browser/fileBrowserTreeView.ts
View File

@@ -76,10 +76,10 @@ export class FileBrowserTreeView extends Disposable implements IDisposable {
return new Tree(treeContainer, {
dataSource, renderer, controller, dnd, filter, sorter, accessibilityProvider
}, {
indentPixels: 10,
twistiePixels: 12,
ariaLabel: nls.localize({ key: 'fileBrowser.regTreeAriaLabel', comment: ['FileBrowserTree'] }, "File browser tree")
});
indentPixels: 10,
twistiePixels: 12,
ariaLabel: nls.localize({ key: 'fileBrowser.regTreeAriaLabel', comment: ['FileBrowserTree'] }, "File browser tree")
});
}
/**

2
src/sql/workbench/services/fileBrowser/common/fileBrowserDialogController.ts
View File

@@ -7,7 +7,7 @@ import { createDecorator } from 'vs/platform/instantiation/common/instantiation'
export const IFileBrowserDialogController = createDecorator<IFileBrowserDialogController>('fileBrowserDialogService');
export interface IFileBrowserDialogController {
_serviceBrand: any;
_serviceBrand: undefined;
/**
* Show file browser dialog
*/

2
src/sql/workbench/services/insights/browser/insightsDialogService.ts
View File

@@ -30,7 +30,7 @@ export interface ListResource {
export const IInsightsDialogService = createDecorator<IInsightsDialogService>('insightsDialogService');
export interface IInsightsDialogService {
_serviceBrand: any;
_serviceBrand: undefined;
show(input: IInsightsConfig, connectionProfile: IConnectionProfile): void;
close();
}

2
src/sql/workbench/services/insights/browser/insightsDialogServiceImpl.ts
View File

@@ -12,7 +12,7 @@ import { IInsightsConfig } from 'sql/platform/dashboard/browser/insightRegistry'
import { InsightsDialogController } from 'sql/workbench/services/insights/browser/insightsDialogController';
export class InsightsDialogService implements IInsightsDialogService {
_serviceBrand: any;
_serviceBrand: undefined;
private _insightsDialogController: InsightsDialogController;
private _insightsDialogView: InsightsDialogView;
private _insightsDialogModel: IInsightsDialogModel;

2
src/sql/workbench/services/insights/test/electron-browser/insightsUtils.test.ts
View File

@@ -51,7 +51,7 @@ class TestEnvironmentService implements IWorkbenchEnvironmentService {
} as IWindowConfiguration;
}
_serviceBrand: any;
_serviceBrand: undefined;
args: ParsedArgs;
execPath: string;
cliPath: string;

2
src/sql/workbench/services/notebook/browser/notebookService.ts
View File

@@ -33,7 +33,7 @@ export interface ILanguageMagic {
}
export interface INotebookService {
_serviceBrand: any;
_serviceBrand: undefined;
readonly onNotebookEditorAdd: Event<INotebookEditor>;
readonly onNotebookEditorRemove: Event<INotebookEditor>;

2
src/sql/workbench/services/notebook/browser/notebookServiceImpl.ts
View File

@@ -92,7 +92,7 @@ class ProviderDescriptor {
}
export class NotebookService extends Disposable implements INotebookService {
_serviceBrand: any;
_serviceBrand: undefined;
private _providersMemento: Memento;
private _trustedNotebooksMemento: Memento;

14
src/sql/workbench/services/objectExplorer/browser/objectExplorerService.ts
View File

@@ -30,7 +30,7 @@ export interface NodeExpandInfoWithProviderId extends azdata.ObjectExplorerExpan
}
export interface IObjectExplorerService {
_serviceBrand: any;
_serviceBrand: undefined;
createNewSession(providerId: string, connection: ConnectionProfile): Thenable<azdata.ObjectExplorerSessionResponse>;
@@ -127,7 +127,7 @@ const errSessionCreateFailed = nls.localize('OeSessionFailedError', "Failed to c
export class ObjectExplorerService implements IObjectExplorerService {
public _serviceBrand: any;
public _serviceBrand: undefined;
private _providers: { [handle: string]: azdata.ObjectExplorerProvider; } = Object.create(null);
@@ -595,11 +595,11 @@ export class ObjectExplorerService implements IObjectExplorerService {
let node = new TreeNode(nodeInfo.nodeType, nodeInfo.label, isLeaf, nodeInfo.nodePath,
nodeInfo.nodeSubType, nodeInfo.nodeStatus, parent, nodeInfo.metadata, nodeInfo.iconType, {
getChildren: treeNode => this.getChildren(treeNode),
isExpanded: treeNode => this.isExpanded(treeNode),
setNodeExpandedState: async (treeNode, expandedState) => await this.setNodeExpandedState(treeNode, expandedState),
setNodeSelected: (treeNode, selected, clearOtherSelections: boolean = undefined) => this.setNodeSelected(treeNode, selected, clearOtherSelections)
});
getChildren: treeNode => this.getChildren(treeNode),
isExpanded: treeNode => this.isExpanded(treeNode),
setNodeExpandedState: async (treeNode, expandedState) => await this.setNodeExpandedState(treeNode, expandedState),
setNodeSelected: (treeNode, selected, clearOtherSelections: boolean = undefined) => this.setNodeSelected(treeNode, selected, clearOtherSelections)
});
node.childProvider = nodeInfo.childProvider;
node.payload = nodeInfo.payload;
return node;

4
src/sql/workbench/services/profiler/browser/interfaces.ts
View File

@@ -46,7 +46,7 @@ export interface IProfilerSession {
* A Profiler Service that handles session communication between the backends and frontends
*/
export interface IProfilerService {
_serviceBrand: any;
_serviceBrand: undefined;
/**
* Registers a backend provider for profiler session. ex: mssql
*/
@@ -194,4 +194,4 @@ export enum ProfilerFilterClauseOperator {
NotContains,
StartsWith,
NotStartsWith
}
}

2
src/sql/workbench/services/profiler/browser/profilerService.ts
View File

@@ -46,7 +46,7 @@ class TwoWayMap<T, K> {
export class ProfilerService implements IProfilerService {
private static readonly PROFILER_SERVICE_UI_STATE_STORAGE_KEY = 'profileservice.uiState';
public _serviceBrand: any;
public _serviceBrand: undefined;
private _providers = new Map<string, azdata.ProfilerProvider>();
private _idMap = new TwoWayMap<ProfilerSessionID, string>();
private _sessionMap = new Map<ProfilerSessionID, IProfilerSession>();

6
src/sql/workbench/services/queryEditor/browser/editorDescriptorService.ts
View File

@@ -10,13 +10,13 @@ import { Registry } from 'vs/platform/registry/common/platform';
import { createDecorator } from 'vs/platform/instantiation/common/instantiation';
export interface IEditorDescriptorService {
_serviceBrand: any;
_serviceBrand: undefined;
getEditor(input: EditorInput): IEditorDescriptor;
}
export class EditorDescriptorService implements IEditorDescriptorService {
public _serviceBrand: any;
public _serviceBrand: undefined;
constructor() {
}
@@ -28,4 +28,4 @@ export class EditorDescriptorService implements IEditorDescriptorService {
export const SERVICE_ID = 'editorDescriptorService';
export const IEditorDescriptorService = createDecorator<IEditorDescriptorService>(SERVICE_ID);
export const IEditorDescriptorService = createDecorator<IEditorDescriptorService>(SERVICE_ID);

2
src/sql/workbench/services/queryEditor/browser/queryEditorService.ts
View File

@@ -36,7 +36,7 @@ import { FileEditorInput } from 'vs/workbench/contrib/files/common/editors/fileE
*/
export class QueryEditorService implements IQueryEditorService {
public _serviceBrand: any;
public _serviceBrand: undefined;
private static CHANGE_UNSUPPORTED_ERROR_MESSAGE = nls.localize(
'queryEditorServiceChangeUnsupportedError',

2
src/sql/workbench/services/queryEditor/common/queryEditorService.ts
View File

@@ -23,7 +23,7 @@ export const IQueryEditorService = createDecorator<IQueryEditorService>('QueryEd
export interface IQueryEditorService {
_serviceBrand: any;
_serviceBrand: undefined;
// Creates new untitled document for SQL queries and opens it in a new editor tab
newSqlEditor(sqlContent?: string, connectionProviderName?: string, isDirty?: boolean, objectName?: string): Promise<IConnectableInput>;

2
src/sql/workbench/services/resourceProvider/browser/resourceProviderService.ts
View File

@@ -18,7 +18,7 @@ import { ILogService } from 'vs/platform/log/common/log';
export class ResourceProviderService implements IResourceProviderService {
public _serviceBrand: any;
public _serviceBrand: undefined;
private _providers: { [handle: string]: azdata.ResourceProvider; } = Object.create(null);
private _firewallRuleDialogController: FirewallRuleDialogController;

2
src/sql/workbench/services/resourceProvider/common/resourceProviderService.ts
View File

@@ -19,7 +19,7 @@ export interface IHandleFirewallRuleResult {
}
export interface IResourceProviderService {
_serviceBrand: any;
_serviceBrand: undefined;
/**
* Register a resource provider

2
src/sql/workbench/services/resourceProvider/test/common/testResourceProviderService.ts
View File

@@ -8,7 +8,7 @@ import { IHandleFirewallRuleResult, IResourceProviderService } from 'sql/workben
import { IConnectionProfile } from 'sql/platform/connection/common/interfaces';
export class TestResourceProvider implements IResourceProviderService {
_serviceBrand: any;
_serviceBrand: undefined;
registerProvider(providerId: string, provider: azdata.ResourceProvider): void {

2
src/sql/workbench/services/serverGroup/browser/serverGroupController.ts
View File

@@ -16,7 +16,7 @@ import { ServerGroupViewModel } from 'sql/workbench/parts/objectExplorer/common/
import { ConnectionProfileGroup, IConnectionProfileGroup } from 'sql/platform/connection/common/connectionProfileGroup';
export class ServerGroupController implements IServerGroupController {
_serviceBrand: any;
_serviceBrand: undefined;
private _serverGroupDialog: ServerGroupDialog;
private _callbacks: IServerGroupDialogCallbacks;

2
src/sql/workbench/update/electron-browser/releaseNotes.ts
View File

@@ -11,7 +11,7 @@ import { IInstantiationService } from 'vs/platform/instantiation/common/instanti
import { URI } from 'vs/base/common/uri';
import { IOpenerService } from 'vs/platform/opener/common/opener';
import { MenuRegistry, MenuId } from 'vs/platform/actions/common/actions';
import { AbstractShowReleaseNotesAction } from 'vs/workbench/contrib/update/electron-browser/update';
import { AbstractShowReleaseNotesAction } from 'vs/workbench/contrib/update/browser/update';
export class OpenGettingStartedInBrowserAction extends Action {