Merge from vscode 64980ea1f3f532c82bb6c28d27bba9ef2c5b4463 (#7206)

* 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

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;

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);

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 } = {};

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

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];

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
*/

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> {

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;
}

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 => {

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;

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;
}
}
}

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(

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")
});
}
/**

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
*/

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();
}

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;

View File

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

View File

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

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;

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;

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
}
}

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>();

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);

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',

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>;

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;

View File

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

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 {

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;