ckaczor/azuredatastudio
1
0
Fork 0
mirror of https://github.com/ckaczor/azuredatastudio.git synced 2026-03-26 14:50:31 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge VS Code 1.31.1 (#4283)

Browse Source
This commit is contained in:
Matt Irvine
2019-03-15 13:09:45 -07:00
committed by GitHub
parent 7d31575149
commit 86bac90001
1716 changed files with 53308 additions and 48375 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/sqltest/stubs/accountManagementStubs.ts
View File

@@ -9,7 +9,6 @@ import * as azdata from 'azdata';
import { Event } from 'vs/base/common/event';
import { IAccountManagementService } from 'sql/platform/accountManagement/common/interfaces';
import { AccountProviderAddedEventParams, UpdateAccountListEventParams } from 'sql/platform/accountManagement/common/eventTypes';
import { TPromise } from 'vs/base/common/winjs.base';
export class AccountManagementTestService implements IAccountManagementService {
_serviceBrand: any;
@@ -62,7 +61,7 @@ export class AccountManagementTestService implements IAccountManagementService {
return undefined;
}
openAccountListDialog(): TPromise<any> {
openAccountListDialog(): Promise<any> {
return undefined;
}

13
src/sqltest/stubs/connectionDialogTestService.ts
View File

@@ -5,7 +5,6 @@
'use strict';
import { INewConnectionParams, IConnectionResult, IConnectionManagementService } from 'sql/platform/connection/common/connectionManagement';
import { TPromise } from 'vs/base/common/winjs.base';
import { IConnectionProfile } from 'sql/platform/connection/common/interfaces';
import { IConnectionDialogService } from 'sql/workbench/services/connection/common/connectionDialogService';
@@ -14,19 +13,19 @@ export class ConnectionDialogTestService implements IConnectionDialogService {
public showDialog(
connectionManagementService: IConnectionManagementService,
params: INewConnectionParams, model: IConnectionProfile, connectionResult?: IConnectionResult): TPromise<void> {
params: INewConnectionParams, model: IConnectionProfile, connectionResult?: IConnectionResult): Promise<void> {
let none: void;
return TPromise.as(none);
return Promise.resolve(none);
}
public openDialogAndWait(
connectionManagementService: IConnectionManagementService,
params?: INewConnectionParams, model?: IConnectionProfile, connectionResult?: IConnectionResult): TPromise<IConnectionProfile> {
return TPromise.as(undefined);
params?: INewConnectionParams, model?: IConnectionProfile, connectionResult?: IConnectionResult): Promise<IConnectionProfile> {
return Promise.resolve(undefined);
}
public openDialogAndWaitButDontConnect(connectionManagementService: IConnectionManagementService,
params?: INewConnectionParams, model?: IConnectionProfile, connectionResult?: IConnectionResult): TPromise<IConnectionProfile> {
return TPromise.as(undefined);
params?: INewConnectionParams, model?: IConnectionProfile, connectionResult?: IConnectionResult): Promise<IConnectionProfile> {
return Promise.resolve(undefined);
}
}

7
src/sqltest/stubs/credentialsTestStubs.ts
View File

@@ -6,7 +6,6 @@
'use strict';
import * as azdata from 'azdata';
import { TPromise } from 'vs/base/common/winjs.base';
import { CredentialManagementEvents, ICredentialsService } from 'sql/platform/credentials/common/credentialsService';
import { IDisposable } from 'vs/base/common/lifecycle';
@@ -20,17 +19,17 @@ export class CredentialsTestProvider implements azdata.CredentialProvider {
credentialId: credentialId,
password: password
};
return TPromise.as(true);
return Promise.resolve(true);
}
readCredential(credentialId: string): Thenable<azdata.Credential> {
return TPromise.as(this.storedCredentials[credentialId]);
return Promise.resolve(this.storedCredentials[credentialId]);
}
deleteCredential(credentialId: string): Thenable<boolean> {
let exists = this.storedCredentials[credentialId] !== undefined;
delete this.storedCredentials[credentialId];
return TPromise.as(exists);
return Promise.resolve(exists);
}
}

3
src/sqltest/stubs/messageServiceStub.ts
View File

@@ -8,7 +8,6 @@
/*
import Severity from 'vs/base/common/severity';
import { IConfirmation, IMessageService, IMessageWithAction, IConfirmationResult } from 'vs/platform/message/common/message';
import { TPromise } from 'vs/base/common/winjs.base';
export class MessageServiceStub implements IMessageService {
_serviceBrand: any;
@@ -35,7 +34,7 @@ export class MessageServiceStub implements IMessageService {
}
confirmWithCheckbox(confirmation: IConfirmation): TPromise<IConfirmationResult> {
confirmWithCheckbox(confirmation: IConfirmation): Promise<IConfirmationResult> {
return undefined;
}
}

5
src/sqltest/stubs/telemetryServiceStub.ts
View File

@@ -3,7 +3,6 @@
* Licensed under the Source EULA. See License.txt in the project root for license information.
*--------------------------------------------------------------------------------------------*/
import { ITelemetryService, ITelemetryData, ITelemetryInfo } from 'vs/platform/telemetry/common/telemetry';
import { TPromise } from 'vs/base/common/winjs.base';
// Test stubs for commonly used objects
@@ -15,11 +14,11 @@ export class TelemetryServiceStub implements ITelemetryService {
* Sends a telemetry event that has been privacy approved.
* Do not call this unless you have been given approval.
*/
publicLog(eventName: string, data?: ITelemetryData): TPromise<void> {
publicLog(eventName: string, data?: ITelemetryData): Promise<void> {
return undefined;
}
getTelemetryInfo(): TPromise<ITelemetryInfo> {
getTelemetryInfo(): Promise<ITelemetryInfo> {
return undefined;
}

29
src/sqltest/stubs/workbenchEditorTestService.ts
View File

@@ -7,7 +7,6 @@ import { IEditorService, SIDE_GROUP_TYPE, ACTIVE_GROUP_TYPE, IResourceEditor, IR
import { ServiceIdentifier, ServicesAccessor } from 'vs/platform/instantiation/common/instantiation';
import { IEditorOptions, IResourceInput, ITextEditorOptions } from 'vs/platform/editor/common/editor';
import { IEditor, IEditorInput, IResourceDiffInput, IResourceSideBySideInput, GroupIdentifier, ITextEditor, IUntitledResourceInput, ITextDiffEditor, ITextSideBySideEditor, IEditorInputWithOptions } from 'vs/workbench/common/editor';
import { TPromise } from 'vs/base/common/winjs.base';
import { Event } from 'vs/base/common/event';
import { Position } from 'vs/editor/common/core/position';
import { IEditorGroup, IEditorReplacement } from 'vs/workbench/services/group/common/editorGroupsService';
@@ -46,30 +45,30 @@ export class WorkbenchEditorTestService implements IEditorService {
return undefined;
}
public openEditor(editor: IEditorInput, options?: IEditorOptions | ITextEditorOptions, group?: IEditorGroup | GroupIdentifier | SIDE_GROUP_TYPE | ACTIVE_GROUP_TYPE): TPromise<IEditor>;
public openEditor(editor: IResourceInput | IUntitledResourceInput, group?: IEditorGroup | GroupIdentifier | SIDE_GROUP_TYPE | ACTIVE_GROUP_TYPE): TPromise<ITextEditor>;
public openEditor(editor: IResourceDiffInput, group?: IEditorGroup | GroupIdentifier | SIDE_GROUP_TYPE | ACTIVE_GROUP_TYPE): TPromise<ITextDiffEditor>;
public openEditor(editor: IResourceSideBySideInput, group?: IEditorGroup | GroupIdentifier | SIDE_GROUP_TYPE | ACTIVE_GROUP_TYPE): TPromise<ITextSideBySideEditor>;
public openEditor(input: any, arg2?: any, arg3?: any): TPromise<IEditor> {
public openEditor(editor: IEditorInput, options?: IEditorOptions | ITextEditorOptions, group?: IEditorGroup | GroupIdentifier | SIDE_GROUP_TYPE | ACTIVE_GROUP_TYPE): Promise<IEditor>;
public openEditor(editor: IResourceInput | IUntitledResourceInput, group?: IEditorGroup | GroupIdentifier | SIDE_GROUP_TYPE | ACTIVE_GROUP_TYPE): Promise<ITextEditor>;
public openEditor(editor: IResourceDiffInput, group?: IEditorGroup | GroupIdentifier | SIDE_GROUP_TYPE | ACTIVE_GROUP_TYPE): Promise<ITextDiffEditor>;
public openEditor(editor: IResourceSideBySideInput, group?: IEditorGroup | GroupIdentifier | SIDE_GROUP_TYPE | ACTIVE_GROUP_TYPE): Promise<ITextSideBySideEditor>;
public openEditor(input: any, arg2?: any, arg3?: any): Promise<IEditor> {
return undefined;
}
public openEditors(editors: IEditorInputWithOptions[], group?: IEditorGroup | GroupIdentifier | SIDE_GROUP_TYPE | ACTIVE_GROUP_TYPE): TPromise<ReadonlyArray<IEditor>>;
public openEditors(editors: IResourceEditor[], group?: IEditorGroup | GroupIdentifier | SIDE_GROUP_TYPE | ACTIVE_GROUP_TYPE): TPromise<ReadonlyArray<IEditor>>;
public openEditors(editors: any[]): TPromise<IEditor[]> {
public openEditors(editors: IEditorInputWithOptions[], group?: IEditorGroup | GroupIdentifier | SIDE_GROUP_TYPE | ACTIVE_GROUP_TYPE): Promise<ReadonlyArray<IEditor>>;
public openEditors(editors: IResourceEditor[], group?: IEditorGroup | GroupIdentifier | SIDE_GROUP_TYPE | ACTIVE_GROUP_TYPE): Promise<ReadonlyArray<IEditor>>;
public openEditors(editors: any[]): Promise<IEditor[]> {
return undefined;
}
public replaceEditors(editors: IResourceEditorReplacement[], group: IEditorGroup | GroupIdentifier): TPromise<void>;
public replaceEditors(editors: IEditorReplacement[], group: IEditorGroup | GroupIdentifier): TPromise<void>;
public replaceEditors(editors: any[], group: any): TPromise<void> {
public replaceEditors(editors: IResourceEditorReplacement[], group: IEditorGroup | GroupIdentifier): Promise<void>;
public replaceEditors(editors: IEditorReplacement[], group: IEditorGroup | GroupIdentifier): Promise<void>;
public replaceEditors(editors: any[], group: any): Promise<void> {
return undefined;
}
/**
* Closes the editor at the provided position.
*/
closeEditor(position: Position, input: IEditorInput): TPromise<void> {
closeEditor(position: Position, input: IEditorInput): Promise<void> {
return undefined;
}
@@ -78,14 +77,14 @@ export class WorkbenchEditorTestService implements IEditorService {
* will not be closed. The direction can be used in that case to control if all other editors should get closed,
* or towards a specific direction.
*/
closeEditors(p1?: any, p2?: any, p3?: any): TPromise<void> {
closeEditors(p1?: any, p2?: any, p3?: any): Promise<void> {
return undefined;
}
/**
* Closes all editors across all groups. The optional position allows to keep one group alive.
*/
closeAllEditors(except?: Position): TPromise<void> {
closeAllEditors(except?: Position): Promise<void> {
return undefined;
}