ckaczor/azuredatastudio
1
0
Fork 0
mirror of https://github.com/ckaczor/azuredatastudio.git synced 2026-01-20 09:35:38 -05: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

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

@@ -13,7 +13,6 @@ import { IConnectionManagementService } from 'sql/platform/connection/common/con
import { CreateLoginInput } from 'sql/parts/admin/security/createLoginInput';
import { TaskDialogInput } from 'sql/parts/tasks/dialog/taskDialogInput';
import { TPromise } from 'vs/base/common/winjs.base';
import { IEditorService, ACTIVE_GROUP } from 'vs/workbench/services/editor/common/editorService';
import { IConnectionProfile } from 'sql/platform/connection/common/interfaces';
@@ -53,13 +52,13 @@ export class AdminService implements IAdminService {
let providerId: string = this._connectionService.getProviderIdFromUri(uri);
if (!providerId) {
return TPromise.wrapError(new Error(localize('adminService.providerIdNotValidError', 'Connection is required in order to interact with adminservice')));
return Promise.reject(new Error(localize('adminService.providerIdNotValidError', 'Connection is required in order to interact with adminservice')));
}
let handler = this._providers[providerId];
if (handler) {
return action(handler);
} else {
return TPromise.wrapError(new Error(localize('adminService.noHandlerRegistered', 'No Handler Registered')));
return Promise.reject(new Error(localize('adminService.noHandlerRegistered', 'No Handler Registered')));
}
}

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

@@ -7,7 +7,6 @@
import { Event, Emitter } from 'vs/base/common/event';
import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
import { TPromise } from 'vs/base/common/winjs.base';
import * as azdata from 'azdata';
@@ -61,7 +60,7 @@ export class BackupUiService implements IBackupUiService {
}
}
public showBackupDialog(connection: IConnectionProfile): TPromise<void> {
public showBackupDialog(connection: IConnectionProfile): Promise<void> {
let self = this;
self._connectionUri = ConnectionUtils.generateUri(connection);
self._currentProvider = connection.providerName;
@@ -81,7 +80,7 @@ export class BackupUiService implements IBackupUiService {
}
let backupOptions = this.getOptions(this._currentProvider);
return new TPromise<void>((resolve) => {
return new Promise<void>((resolve) => {
let uri = this._connectionManagementService.getConnectionUri(connection)
+ ProviderConnectionInfo.idSeparator
+ ConnectionUtils.ConnectionUriBackupIdAttributeName

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

@@ -22,7 +22,6 @@ import { IErrorMessageService } from 'sql/platform/errorMessage/common/errorMess
import { IConnectionDialogService } from 'sql/workbench/services/connection/common/connectionDialogService';
import { IPartService } from 'vs/workbench/services/part/common/partService';
import { TPromise } from 'vs/base/common/winjs.base';
import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
import * as platform from 'vs/base/common/platform';
import Severity from 'vs/base/common/severity';
@@ -311,8 +310,8 @@ export class ConnectionDialogService implements IConnectionDialogService {
return newProfile;
}
private showDialogWithModel(): TPromise<void> {
return new TPromise<void>((resolve, reject) => {
private showDialogWithModel(): Promise<void> {
return new Promise<void>((resolve, reject) => {
this.updateModelServerCapabilities(this._inputModel);
this.doShowDialog(this._params);
resolve(null);
@@ -373,7 +372,7 @@ export class ConnectionDialogService implements IConnectionDialogService {
}
private doShowDialog(params: INewConnectionParams): TPromise<void> {
private doShowDialog(params: INewConnectionParams): Promise<void> {
if (!this._connectionDialog) {
let container = this._partService.getWorkbenchElement().parentElement;
this._container = container;
@@ -391,7 +390,7 @@ export class ConnectionDialogService implements IConnectionDialogService {
}
this._connectionDialog.newConnectionParams = params;
return new TPromise<void>(() => {
return new Promise<void>(() => {
this._connectionDialog.open(this._connectionManagementService.getRecentConnections(params.providers).length > 0);
this.uiController.focusOnOpen();
});

26
src/sql/workbench/services/connection/browser/connectionDialogWidget.ts
View File

@@ -166,19 +166,19 @@ export class ConnectionDialogWidget extends Modal {
}
});
this._panel.onTabChange(c => {
this._panel.onTabChange(async c => {
if (c === savedConnectionTabId && this._savedConnectionTree.getContentHeight() === 0) {
// Update saved connection tree
TreeUpdateUtils.structuralTreeUpdate(this._savedConnectionTree, 'saved', this._connectionManagementService, this._providers).then(() => {
if (this._savedConnectionTree.getContentHeight() > 0) {
this._noSavedConnectionBuilder.hide();
this._savedConnectionBuilder.show();
} else {
this._noSavedConnectionBuilder.show();
this._savedConnectionBuilder.hide();
}
this._savedConnectionTree.layout(DOM.getTotalHeight(this._savedConnectionTree.getHTMLElement()));
});
await TreeUpdateUtils.structuralTreeUpdate(this._savedConnectionTree, 'saved', this._connectionManagementService, this._providers);
if (this._savedConnectionTree.getContentHeight() > 0) {
this._noSavedConnectionBuilder.hide();
this._savedConnectionBuilder.show();
} else {
this._noSavedConnectionBuilder.show();
this._savedConnectionBuilder.hide();
}
this._savedConnectionTree.layout(DOM.getTotalHeight(this._savedConnectionTree.getHTMLElement()));
}
});
@@ -378,7 +378,7 @@ export class ConnectionDialogWidget extends Modal {
* Open the flyout dialog
* @param recentConnections Are there recent connections that should be shown
*/
public open(recentConnections: boolean) {
public async open(recentConnections: boolean): Promise<void> {
this._panel.showTab(this._recentConnectionTabId);
this.show();
@@ -389,7 +389,7 @@ export class ConnectionDialogWidget extends Modal {
this._recentConnectionBuilder.hide();
this._noRecentConnectionBuilder.show();
}
TreeUpdateUtils.structuralTreeUpdate(this._recentConnectionTree, 'recent', this._connectionManagementService, this._providers);
await TreeUpdateUtils.structuralTreeUpdate(this._recentConnectionTree, 'recent', this._connectionManagementService, this._providers);
// reset saved connection tree
this._savedConnectionTree.setInput([]);

9
src/sql/workbench/services/fileBrowser/browser/fileBrowserDataSource.ts
View File

@@ -7,7 +7,6 @@
import { IFileBrowserService } from 'sql/platform/fileBrowser/common/interfaces';
import { FileNode } from 'sql/workbench/services/fileBrowser/common/fileNode';
import { TPromise } from 'vs/base/common/winjs.base';
import { ITree, IDataSource } from 'vs/base/parts/tree/browser/tree';
/**
@@ -45,8 +44,8 @@ export class FileBrowserDataSource implements IDataSource {
/**
* Returns the element's children as an array in a promise.
*/
public getChildren(tree: ITree, element: any): TPromise<any> {
return new TPromise<any>((resolve) => {
public getChildren(tree: ITree, element: any): Promise<any> {
return new Promise<any>((resolve) => {
if (element instanceof FileNode) {
var node = <FileNode>element;
if (node.children) {
@@ -67,7 +66,7 @@ export class FileBrowserDataSource implements IDataSource {
/**
* Returns the element's parent in a promise.
*/
public getParent(tree: ITree, element: any): TPromise<any> {
return TPromise.as(null);
public getParent(tree: ITree, element: any): Promise<any> {
return Promise.resolve(null);
}
}

6
src/sql/workbench/services/fileBrowser/browser/fileBrowserRenderer.ts
View File

@@ -9,9 +9,9 @@ import { ITree, IRenderer } from 'vs/base/parts/tree/browser/tree';
import { FileKind } from 'vs/platform/files/common/files';
import { URI } from 'vs/base/common/uri';
import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
import { FileLabel } from 'vs/workbench/browser/labels';
import { IFileTemplateData } from 'vs/workbench/parts/files/electron-browser/views/explorerViewer';
import { toDisposable } from 'vs/base/common/lifecycle';
import { ResourceLabels, DEFAULT_LABELS_CONTAINER } from 'vs/workbench/browser/labels';
const EmptyDisposable = toDisposable(() => null);
@@ -22,10 +22,12 @@ const EmptyDisposable = toDisposable(() => null);
export class FileBrowserRenderer implements IRenderer {
public static readonly FILE_HEIGHT = 22;
private static readonly FILE_TEMPLATE_ID = 'carbonFileBrowser';
private resourceLabels: ResourceLabels;
constructor(
@IInstantiationService private instantiationService: IInstantiationService
) {
this.resourceLabels = this.instantiationService.createInstance(ResourceLabels, DEFAULT_LABELS_CONTAINER);
}
/**
@@ -46,8 +48,8 @@ export class FileBrowserRenderer implements IRenderer {
* Render template in a dom element based on template id
*/
public renderTemplate(tree: ITree, templateId: string, container: HTMLElement): IFileTemplateData {
const label = this.resourceLabels.create(container);
const elementDisposable = EmptyDisposable;
const label = this.instantiationService.createInstance(FileLabel, container, void 0);
return { elementDisposable, label, container };
}

1
src/sql/workbench/services/insights/browser/insightsDialogView.ts
View File

@@ -30,7 +30,6 @@ import { IThemeService } from 'vs/platform/theme/common/themeService';
import * as nls from 'vs/nls';
import { IContextMenuService } from 'vs/platform/contextview/browser/contextView';
import { IAction } from 'vs/base/common/actions';
import { TPromise } from 'vs/base/common/winjs.base';
import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
import * as types from 'vs/base/common/types';
import { IContextKeyService } from 'vs/platform/contextkey/common/contextkey';

5
src/sql/workbench/services/insights/common/insightDialogActions.ts
View File

@@ -7,7 +7,6 @@ import { IInsightDialogActionContext } from 'sql/workbench/services/insights/com
import { Action } from 'vs/base/common/actions';
import * as nls from 'vs/nls';
import { TPromise } from 'vs/base/common/winjs.base';
import { IClipboardService } from 'vs/platform/clipboard/common/clipboardService';
export class CopyInsightDialogSelectionAction extends Action {
@@ -21,8 +20,8 @@ export class CopyInsightDialogSelectionAction extends Action {
super(id, label);
}
public run(event?: IInsightDialogActionContext): TPromise<any> {
public run(event?: IInsightDialogActionContext): Promise<any> {
this._clipboardService.writeText(event.cellData);
return TPromise.as(void 0);
return Promise.resolve(void 0);
}
}

4
src/sql/workbench/services/insights/common/insightsDialogModel.ts
View File

@@ -7,7 +7,7 @@ import { IInsightsDialogModel, ListResource } from 'sql/workbench/services/insig
import { IInsightsConfigDetails, IInsightsLabel } from 'sql/parts/dashboard/widgets/insights/interfaces';
import { Conditional } from 'sql/parts/dashboard/common/interfaces';
import { Event, Emitter, debounceEvent } from 'vs/base/common/event';
import { Event, Emitter } from 'vs/base/common/event';
export class InsightsDialogModel implements IInsightsDialogModel {
private _rows: string[][];
@@ -16,7 +16,7 @@ export class InsightsDialogModel implements IInsightsDialogModel {
private _onDataChangeEmitter: Emitter<void> = new Emitter<void>();
private _onDataChangeEvent: Event<void> = this._onDataChangeEmitter.event;
public onDataChange: Event<void> = debounceEvent(this._onDataChangeEvent, (last, event) => event, 75, false);
public onDataChange: Event<void> = Event.debounce(this._onDataChangeEvent, (last, event) => event, 75, false);
public set insight(insight: IInsightsConfigDetails) {
this._insight = insight;

4
src/sql/workbench/services/notebook/common/notebookRegistry.ts
View File

@@ -191,7 +191,7 @@ const notebookProviderRegistry = new NotebookProviderRegistry();
platform.Registry.add(Extensions.NotebookProviderContribution, notebookProviderRegistry);
ExtensionsRegistry.registerExtensionPoint<NotebookProviderRegistration | NotebookProviderRegistration[]>(Extensions.NotebookProviderContribution, [], notebookContrib).setHandler(extensions => {
ExtensionsRegistry.registerExtensionPoint<NotebookProviderRegistration | NotebookProviderRegistration[]>({ extensionPoint: Extensions.NotebookProviderContribution, jsonSchema: notebookContrib }).setHandler(extensions => {
function handleExtension(contrib: NotebookProviderRegistration, extension: IExtensionPointUser<any>) {
notebookProviderRegistry.registerNotebookProvider(contrib);
@@ -209,7 +209,7 @@ ExtensionsRegistry.registerExtensionPoint<NotebookProviderRegistration | Noteboo
}
});
ExtensionsRegistry.registerExtensionPoint<NotebookLanguageMagicRegistration | NotebookLanguageMagicRegistration[]>(Extensions.NotebookLanguageMagicContribution, [], languageMagicContrib).setHandler(extensions => {
ExtensionsRegistry.registerExtensionPoint<NotebookLanguageMagicRegistration | NotebookLanguageMagicRegistration[]>({ extensionPoint: Extensions.NotebookLanguageMagicContribution, jsonSchema: languageMagicContrib }).setHandler(extensions => {
function handleExtension(contrib: NotebookLanguageMagicRegistration, extension: IExtensionPointUser<any>) {
notebookProviderRegistry.registerNotebookLanguageMagic(contrib);

4
src/sql/workbench/services/notebook/common/notebookServiceImpl.ts
View File

@@ -23,7 +23,6 @@ import { IStorageService, StorageScope } from 'vs/platform/storage/common/storag
import { IExtensionService } from 'vs/workbench/services/extensions/common/extensions';
import { IExtensionManagementService, IExtensionIdentifier } from 'vs/platform/extensionManagement/common/extensionManagement';
import { Disposable, IDisposable } from 'vs/base/common/lifecycle';
import { getIdFromLocalExtensionId } from 'vs/platform/extensionManagement/common/extensionManagementUtil';
import { Deferred } from 'sql/base/common/promise';
import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
import { IContextKeyService, IContextKey } from 'vs/platform/contextkey/common/contextkey';
@@ -460,9 +459,8 @@ export class NotebookService extends Disposable implements INotebookService {
private removeContributedProvidersFromCache(identifier: IExtensionIdentifier, extensionService: IExtensionService) {
const notebookProvider = 'notebookProvider';
let extensionid = getIdFromLocalExtensionId(identifier.id);
extensionService.getExtensions().then(i => {
let extension = i.find(c => c.id === extensionid);
let extension = i.find(c => c.identifier.value.toLowerCase() === identifier.id.toLowerCase());
if (extension && extension.contributes
&& extension.contributes[notebookProvider]
&& extension.contributes[notebookProvider].providerId) {

9
src/sql/workbench/services/profiler/common/profilerService.ts
View File

@@ -14,7 +14,6 @@ import { ProfilerColumnEditorDialog } from 'sql/parts/profiler/dialog/profilerCo
import * as azdata from 'azdata';
import { TPromise } from 'vs/base/common/winjs.base';
import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
import { INotificationService } from 'vs/platform/notification/common/notification';
@@ -90,7 +89,7 @@ export class ProfilerService implements IProfilerService {
this._sessionMap.set(uri, session);
this._connectionMap.set(uri, connectionProfile);
this._idMap.set(uri, uri);
return TPromise.wrap(uri);
return Promise.resolve(uri);
}
public onMoreRows(params: azdata.ProfilerSessionEvents): void {
@@ -162,13 +161,13 @@ export class ProfilerService implements IProfilerService {
let providerId = 'MSSQL';
if (!providerId) {
return TPromise.wrapError(new Error('Connection is required in order to interact with queries'));
return Promise.reject(new Error('Connection is required in order to interact with queries'));
}
let handler = this._providers.get(providerId);
if (handler) {
return action(handler);
} else {
return TPromise.wrapError(new Error('No Handler Registered'));
return Promise.reject(new Error('No Handler Registered'));
}
}
@@ -228,7 +227,7 @@ export class ProfilerService implements IProfilerService {
}
this._editColumnDialog.open(input);
return TPromise.as(null);
return Promise.resolve(null);
}
public launchCreateSessionDialog(input?: ProfilerInput): Thenable<void> {

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

@@ -4,7 +4,6 @@
*--------------------------------------------------------------------------------------------*/
'use strict';
import { TPromise } from 'vs/base/common/winjs.base';
import Severity from 'vs/base/common/severity';
import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
@@ -77,7 +76,7 @@ export class ServerGroupController implements IServerGroupController {
}
public showCreateGroupDialog(connectionManagementService: IConnectionManagementService, callbacks?: IServerGroupDialogCallbacks): TPromise<void> {
public showCreateGroupDialog(connectionManagementService: IConnectionManagementService, callbacks?: IServerGroupDialogCallbacks): Promise<void> {
this._connectionManagementService = connectionManagementService;
this._group = null;
this._viewModel = new ServerGroupViewModel(undefined, this._configurationService.getValue(SERVER_GROUP_CONFIG)[SERVER_GROUP_COLORS_CONFIG]);
@@ -85,14 +84,14 @@ export class ServerGroupController implements IServerGroupController {
return this.openServerGroupDialog();
}
public showEditGroupDialog(connectionManagementService: IConnectionManagementService, group: ConnectionProfileGroup): TPromise<void> {
public showEditGroupDialog(connectionManagementService: IConnectionManagementService, group: ConnectionProfileGroup): Promise<void> {
this._connectionManagementService = connectionManagementService;
this._group = group;
this._viewModel = new ServerGroupViewModel(group, this._configurationService.getValue(SERVER_GROUP_CONFIG)[SERVER_GROUP_COLORS_CONFIG]);
return this.openServerGroupDialog();
}
private openServerGroupDialog(): TPromise<void> {
private openServerGroupDialog(): Promise<void> {
if (!this._serverGroupDialog) {
this._serverGroupDialog = this._instantiationService.createInstance(ServerGroupDialog);
this._serverGroupDialog.viewModel = this._viewModel;
@@ -105,7 +104,7 @@ export class ServerGroupController implements IServerGroupController {
this._serverGroupDialog.viewModel = this._viewModel;
}
return new TPromise<void>(() => {
return new Promise<void>(() => {
this._serverGroupDialog.open();
});
}

7
src/sql/workbench/services/telemetry/node/fileTelemetryService.ts
View File

@@ -4,7 +4,6 @@
*--------------------------------------------------------------------------------------------*/
'use strict';
import { TPromise } from 'vs/base/common/winjs.base';
import { ITelemetryService, ITelemetryInfo, ITelemetryData } from 'vs/platform/telemetry/common/telemetry';
const fs = require('fs');
@@ -30,11 +29,11 @@ export class FileTelemetryService implements ITelemetryService {
fs.appendFileSync(this._outputFile, telemetryData + '\n');
}
}
return TPromise.wrap<void>(null);
return Promise.resolve<void>(null);
}
isOptedIn: true;
getTelemetryInfo(): TPromise<ITelemetryInfo> {
return TPromise.wrap({
getTelemetryInfo(): Promise<ITelemetryInfo> {
return Promise.resolve({
instanceId: 'someValue.instanceId',
sessionId: 'someValue.sessionId',
machineId: 'someValue.machineId'