ckaczor/azuredatastudio
1
0
Fork 0
mirror of https://github.com/ckaczor/azuredatastudio.git synced 2026-01-16 01:25:36 -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/api/electron-browser/mainThreadTasks.ts
View File

@@ -6,7 +6,6 @@
import { extHostNamedCustomer } from 'vs/workbench/api/electron-browser/extHostCustomers';
import { TaskRegistry, ITaskHandlerDescription } from 'sql/platform/tasks/common/tasks';
import { IDisposable } from 'vs/base/common/lifecycle';
import { TPromise } from 'vs/base/common/winjs.base';
import { IExtHostContext } from 'vs/workbench/api/node/extHost.protocol';
import {
@@ -42,7 +41,7 @@ export class MainThreadTasks implements MainThreadTasksShape {
this._generateCommandsDocumentationRegistration.dispose();
}
$registerTask(id: string): TPromise<any> {
$registerTask(id: string): Promise<any> {
this._disposables.set(
id,
TaskRegistry.registerTask(id, (accessor, profile: IConnectionProfile, ...args) => {
@@ -55,7 +54,7 @@ export class MainThreadTasks implements MainThreadTasksShape {
return undefined;
}
$unregisterTask(id: string): TPromise<any> {
$unregisterTask(id: string): Promise<any> {
if (this._disposables.has(id)) {
this._disposables.get(id).dispose();
this._disposables.delete(id);

5
src/sql/workbench/api/node/extHostAccountManagement.ts
View File

@@ -6,7 +6,6 @@
'use strict';
import * as azdata from 'azdata';
import { TPromise } from 'vs/base/common/winjs.base';
import { Disposable } from 'vs/workbench/api/node/extHostTypes';
import {
ExtHostAccountManagementShape,
@@ -111,7 +110,7 @@ export class ExtHostAccountManagement extends ExtHostAccountManagementShape {
}
public $accountsChanged(handle: number, accounts: azdata.Account[]): Thenable<void> {
return this._onDidChangeAccounts.fire({ accounts: accounts });
return Promise.resolve(this._onDidChangeAccounts.fire({ accounts: accounts }));
}
public $registerAccountProvider(providerMetadata: azdata.AccountProviderMetadata, provider: azdata.AccountProvider): Disposable {
@@ -158,7 +157,7 @@ export class ExtHostAccountManagement extends ExtHostAccountManagementShape {
private _withProvider<R>(handle: number, callback: (provider: azdata.AccountProvider) => Thenable<R>): Thenable<R> {
let provider = this._providers[handle];
if (provider === undefined) {
return TPromise.wrapError(new Error(`Provider ${handle} not found.`));
return Promise.reject(new Error(`Provider ${handle} not found.`));
}
return callback(provider.provider);
}

5
src/sql/workbench/api/node/extHostCredentialManagement.ts
View File

@@ -4,7 +4,6 @@
*--------------------------------------------------------------------------------------------*/
'use strict';
import { TPromise } from 'vs/base/common/winjs.base';
import { IMainContext } from 'vs/workbench/api/node/extHost.protocol';
import { SqlMainContext, MainThreadCredentialManagementShape, ExtHostCredentialManagementShape } from 'sql/workbench/api/node/sqlExtHost.protocol';
import * as vscode from 'vscode';
@@ -71,7 +70,7 @@ export class ExtHostCredentialManagement extends ExtHostCredentialManagementShap
let self = this;
if (!namespaceId) {
return TPromise.wrapError(new Error('A namespace must be provided when retrieving a credential provider'));
return Promise.reject(new Error('A namespace must be provided when retrieving a credential provider'));
}
// When the registration promise has finished successfully,
@@ -139,7 +138,7 @@ export class ExtHostCredentialManagement extends ExtHostCredentialManagementShap
private _withAdapter<A, R>(handle: number, ctor: { new(...args: any[]): A }, callback: (adapter: A) => Thenable<R>): Thenable<R> {
let adapter = this._adapter[handle];
if (!(adapter instanceof ctor)) {
return TPromise.wrapError(new Error('no adapter found'));
return Promise.reject(new Error('no adapter found'));
}
return callback(<any>adapter);
}

2
src/sql/workbench/api/node/extHostDashboardWebview.ts
View File

@@ -77,7 +77,7 @@ export class ExtHostDashboardWebviews implements ExtHostDashboardWebviewsShape {
$onClosed(handle: number): void {
const webview = this._webviews.get(handle);
webview.onClosedEmitter.fire();
webview.onClosedEmitter.fire(undefined);
this._webviews.delete(handle);
}

3
src/sql/workbench/api/node/extHostDataProtocol.ts
View File

@@ -11,7 +11,6 @@ import { IMainContext } from 'vs/workbench/api/node/extHost.protocol';
import { Disposable } from 'vs/workbench/api/node/extHostTypes';
import { SqlMainContext, MainThreadDataProtocolShape, ExtHostDataProtocolShape } from 'sql/workbench/api/node/sqlExtHost.protocol';
import { DataProviderType } from 'sql/workbench/api/common/sqlExtHostTypes';
import { TPromise } from 'vs/base/common/winjs.base';
export class ExtHostDataProtocol extends ExtHostDataProtocolShape {
@@ -203,7 +202,7 @@ export class ExtHostDataProtocol extends ExtHostDataProtocolShape {
if (provider.buildConnectionInfo) {
return provider.buildConnectionInfo(connectionString);
} else {
return TPromise.as(undefined);
return Promise.resolve(undefined);
}
}

2
src/sql/workbench/api/node/extHostModalDialog.ts
View File

@@ -117,6 +117,6 @@ export class ExtHostModalDialogs implements ExtHostModalDialogsShape {
$onClosed(handle: number): void {
const webview = this._webviews.get(handle);
webview.onClosedEmitter.fire();
webview.onClosedEmitter.fire(undefined);
}
}

2
src/sql/workbench/api/node/extHostModelView.ts
View File

@@ -1364,7 +1364,7 @@ export class ExtHostModelView implements ExtHostModelViewShape {
$onClosed(handle: number): void {
const view = this._modelViews.get(handle);
view.onClosedEmitter.fire();
view.onClosedEmitter.fire(undefined);
this._modelViews.delete(handle);
}

5
src/sql/workbench/api/node/extHostModelViewTree.ts
View File

@@ -6,7 +6,6 @@
import { localize } from 'vs/nls';
import * as vscode from 'vscode';
import { TPromise } from 'vs/base/common/winjs.base';
import { SqlMainContext, ExtHostModelViewTreeViewsShape, MainThreadModelViewShape } from 'sql/workbench/api/node/sqlExtHost.protocol';
import { ITreeComponentItem } from 'sql/workbench/common/views';
import { CommandsConverter } from 'vs/workbench/api/node/extHostCommands';
@@ -43,11 +42,11 @@ export class ExtHostModelViewTreeViews implements ExtHostModelViewTreeViewsShape
};
}
$getChildren(treeViewId: string, treeItemHandle?: string): TPromise<ITreeComponentItem[]> {
$getChildren(treeViewId: string, treeItemHandle?: string): Promise<ITreeComponentItem[]> {
const treeView = this.treeViews.get(treeViewId);
if (!treeView) {
return TPromise.wrapError<ITreeComponentItem[]>(new Error(localize('treeView.notRegistered', 'No tree view with id \'{0}\' registered.', treeViewId)));
return Promise.reject(new Error(localize('treeView.notRegistered', 'No tree view with id \'{0}\' registered.', treeViewId)));
}
return treeView.getChildren(treeItemHandle);
}

25
src/sql/workbench/api/node/extHostNotebook.ts
View File

@@ -7,7 +7,6 @@
import * as azdata from 'azdata';
import * as vscode from 'vscode';
import { TPromise } from 'vs/base/common/winjs.base';
import { IMainContext } from 'vs/workbench/api/node/extHost.protocol';
import { Disposable } from 'vs/workbench/api/node/extHostTypes';
import { localize } from 'vs/nls';
@@ -258,20 +257,20 @@ export class ExtHostNotebook implements ExtHostNotebookShape {
return ExtHostNotebook._handlePool++;
}
private _withProvider<R>(handle: number, callback: (provider: azdata.nb.NotebookProvider) => R | PromiseLike<R>): TPromise<R> {
private _withProvider<R>(handle: number, callback: (provider: azdata.nb.NotebookProvider) => R | PromiseLike<R>): Promise<R> {
let provider = this._adapters.get(handle) as azdata.nb.NotebookProvider;
if (provider === undefined) {
return TPromise.wrapError<R>(new Error(localize('errNoProvider', 'no notebook provider found')));
return Promise.reject(new Error(localize('errNoProvider', 'no notebook provider found')));
}
return TPromise.wrap(callback(provider));
return Promise.resolve(callback(provider));
}
private _withNotebookManager<R>(handle: number, callback: (manager: NotebookManagerAdapter) => R | PromiseLike<R>): TPromise<R> {
private _withNotebookManager<R>(handle: number, callback: (manager: NotebookManagerAdapter) => R | PromiseLike<R>): Promise<R> {
let manager = this._adapters.get(handle) as NotebookManagerAdapter;
if (manager === undefined) {
return TPromise.wrapError<R>(new Error(localize('errNoManager', 'No Manager found')));
return Promise.reject(new Error(localize('errNoManager', 'No Manager found')));
}
return TPromise.wrap(this.callbackWithErrorWrap<R>(callback, manager));
return this.callbackWithErrorWrap<R>(callback, manager);
}
private async callbackWithErrorWrap<R>(callback: (manager: NotebookManagerAdapter) => R | PromiseLike<R>, manager: NotebookManagerAdapter): Promise<R> {
@@ -283,31 +282,31 @@ export class ExtHostNotebook implements ExtHostNotebookShape {
}
}
private _withServerManager<R>(handle: number, callback: (manager: azdata.nb.ServerManager) => R | PromiseLike<R>): TPromise<R> {
private _withServerManager<R>(handle: number, callback: (manager: azdata.nb.ServerManager) => R | PromiseLike<R>): Promise<R> {
return this._withNotebookManager(handle, (notebookManager) => {
let serverManager = notebookManager.serverManager;
if (!serverManager) {
return TPromise.wrapError(new Error(localize('noServerManager', 'Notebook Manager for notebook {0} does not have a server manager. Cannot perform operations on it', notebookManager.uriString)));
return Promise.reject(new Error(localize('noServerManager', 'Notebook Manager for notebook {0} does not have a server manager. Cannot perform operations on it', notebookManager.uriString)));
}
return callback(serverManager);
});
}
private _withContentManager<R>(handle: number, callback: (manager: azdata.nb.ContentManager) => R | PromiseLike<R>): TPromise<R> {
private _withContentManager<R>(handle: number, callback: (manager: azdata.nb.ContentManager) => R | PromiseLike<R>): Promise<R> {
return this._withNotebookManager(handle, (notebookManager) => {
let contentManager = notebookManager.contentManager;
if (!contentManager) {
return TPromise.wrapError(new Error(localize('noContentManager', 'Notebook Manager for notebook {0} does not have a content manager. Cannot perform operations on it', notebookManager.uriString)));
return Promise.reject(new Error(localize('noContentManager', 'Notebook Manager for notebook {0} does not have a content manager. Cannot perform operations on it', notebookManager.uriString)));
}
return callback(contentManager);
});
}
private _withSessionManager<R>(handle: number, callback: (manager: azdata.nb.SessionManager) => R | PromiseLike<R>): TPromise<R> {
private _withSessionManager<R>(handle: number, callback: (manager: azdata.nb.SessionManager) => R | PromiseLike<R>): Promise<R> {
return this._withNotebookManager(handle, (notebookManager) => {
let sessionManager = notebookManager.sessionManager;
if (!sessionManager) {
return TPromise.wrapError(new Error(localize('noSessionManager', 'Notebook Manager for notebook {0} does not have a session manager. Cannot perform operations on it', notebookManager.uriString)));
return Promise.reject(new Error(localize('noSessionManager', 'Notebook Manager for notebook {0} does not have a session manager. Cannot perform operations on it', notebookManager.uriString)));
}
return callback(sessionManager);
});

3
src/sql/workbench/api/node/extHostNotebookDocumentData.ts
View File

@@ -10,7 +10,6 @@ import { IDisposable } from 'vs/base/common/lifecycle';
import { URI } from 'vs/base/common/uri';
import { ok } from 'vs/base/common/assert';
import { Schemas } from 'vs/base/common/network';
import { TPromise } from 'vs/base/common/winjs.base';
import { MainThreadNotebookDocumentsAndEditorsShape, INotebookModelChangedData } from 'sql/workbench/api/node/sqlExtHost.protocol';
import { CellRange } from 'sql/workbench/api/common/sqlExtHostTypes';
@@ -60,7 +59,7 @@ export class ExtHostNotebookDocumentData implements IDisposable {
private _save(): Thenable<boolean> {
if (this._isDisposed) {
return TPromise.wrapError<boolean>(new Error('Document has been closed'));
return Promise.reject(new Error('Document has been closed'));
}
return this._proxy.$trySaveDocument(this._uri);

11
src/sql/workbench/api/node/extHostNotebookEditor.ts
View File

@@ -10,7 +10,6 @@ import * as vscode from 'vscode';
import { ok } from 'vs/base/common/assert';
import { IDisposable } from 'vs/base/common/lifecycle';
import { readonly } from 'vs/base/common/errors';
import { TPromise } from 'vs/base/common/winjs.base';
import { MainThreadNotebookDocumentsAndEditorsShape } from 'sql/workbench/api/node/sqlExtHost.protocol';
import { ExtHostNotebookDocumentData } from 'sql/workbench/api/node/extHostNotebookDocumentData';
@@ -159,19 +158,19 @@ export class ExtHostNotebookEditor implements azdata.nb.NotebookEditor, IDisposa
public edit(callback: (editBuilder: azdata.nb.NotebookEditorEdit) => void, options?: { undoStopBefore: boolean; undoStopAfter: boolean; }): Thenable<boolean> {
if (this._disposed) {
return TPromise.wrapError<boolean>(new Error('NotebookEditor#edit not possible on closed editors'));
return Promise.reject(new Error('NotebookEditor#edit not possible on closed editors'));
}
let edit = new NotebookEditorEdit(this._documentData.document, options);
callback(edit);
return this._applyEdit(edit);
}
private _applyEdit(editBuilder: NotebookEditorEdit): TPromise<boolean> {
private _applyEdit(editBuilder: NotebookEditorEdit): Promise<boolean> {
let editData = editBuilder.finalize();
// return when there is nothing to do
if (editData.edits.length === 0) {
return TPromise.wrap(true);
return Promise.resolve(true);
}
// check that the edits are not overlapping (i.e. illegal)
@@ -192,9 +191,7 @@ export class ExtHostNotebookEditor implements azdata.nb.NotebookEditor, IDisposa
if (nextRangeStart < rangeEnd) {
// overlapping ranges
return TPromise.wrapError<boolean>(
new Error('Overlapping ranges are not allowed!')
);
return Promise.reject(new Error('Overlapping ranges are not allowed!'));
}
}

3
src/sql/workbench/api/node/extHostResourceProvider.ts
View File

@@ -6,7 +6,6 @@
'use strict';
import * as azdata from 'azdata';
import { TPromise } from 'vs/base/common/winjs.base';
import { IMainContext } from 'vs/workbench/api/node/extHost.protocol';
import { Disposable } from 'vs/workbench/api/node/extHostTypes';
import {
@@ -79,7 +78,7 @@ export class ExtHostResourceProvider extends ExtHostResourceProviderShape {
private _withProvider<R>(handle: number, callback: (provider: azdata.ResourceProvider) => Thenable<R>): Thenable<R> {
let provider = this._providers[handle];
if (provider === undefined) {
return TPromise.wrapError(new Error(`Provider ${handle} not found.`));
return Promise.reject(new Error(`Provider ${handle} not found.`));
}
return callback(provider.provider);
}

3
src/sql/workbench/api/node/extHostSerializationProvider.ts
View File

@@ -4,7 +4,6 @@
*--------------------------------------------------------------------------------------------*/
'use strict';
import { TPromise } from 'vs/base/common/winjs.base';
import { IMainContext } from 'vs/workbench/api/node/extHost.protocol';
import { SqlMainContext, MainThreadSerializationProviderShape, ExtHostSerializationProviderShape } from 'sql/workbench/api/node/sqlExtHost.protocol';
import * as vscode from 'vscode';
@@ -47,7 +46,7 @@ export class ExtHostSerializationProvider extends ExtHostSerializationProviderSh
private _withAdapter<A, R>(handle: number, ctor: { new(...args: any[]): A }, callback: (adapter: A) => Thenable<R>): Thenable<R> {
let adapter = this._adapter[handle];
if (!(adapter instanceof ctor)) {
return TPromise.wrapError(new Error('no adapter found'));
return Promise.reject(new Error('no adapter found'));
}
return callback(<any>adapter);
}

11
src/sql/workbench/api/node/extHostTasks.ts
View File

@@ -8,7 +8,6 @@ import { validateConstraint } from 'vs/base/common/types';
import { ILogService } from 'vs/platform/log/common/log';
import { IMainContext } from 'vs/workbench/api/node/extHost.protocol';
import * as extHostTypes from 'vs/workbench/api/node/extHostTypes';
import { TPromise } from 'vs/base/common/winjs.base';
import * as azdata from 'azdata';
@@ -56,7 +55,7 @@ export class ExtHostTasks implements ExtHostTasksShape {
$executeContributedTask<T>(id: string, ...args: any[]): Thenable<T> {
let command = this._tasks.get(id);
if (!command) {
return TPromise.wrapError<T>(new Error(`Contributed task '${id}' does not exist.`));
return Promise.reject(new Error(`Contributed task '${id}' does not exist.`));
}
let { callback, thisArg, description } = command;
@@ -66,14 +65,14 @@ export class ExtHostTasks implements ExtHostTasksShape {
try {
validateConstraint(args[i], description.args[i].constraint);
} catch (err) {
return TPromise.wrapError<T>(new Error(`Running the contributed task:'${id}' failed. Illegal argument '${description.args[i].name}' - ${description.args[i].description}`));
return Promise.reject(new Error(`Running the contributed task:'${id}' failed. Illegal argument '${description.args[i].name}' - ${description.args[i].description}`));
}
}
}
try {
let result = callback.apply(thisArg, args);
return TPromise.as(result);
return Promise.resolve(result);
} catch (err) {
// console.log(err);
// try {
@@ -81,11 +80,11 @@ export class ExtHostTasks implements ExtHostTasksShape {
// } catch (err) {
// //
// }
return TPromise.wrapError<T>(new Error(`Running the contributed task:'${id}' failed.`));
return Promise.reject(new Error(`Running the contributed task:'${id}' failed.`));
}
}
$getContributedTaskHandlerDescriptions(): TPromise<{ [id: string]: any; }> {
$getContributedTaskHandlerDescriptions(): Promise<{ [id: string]: any; }> {
throw new Error('Method not implemented.');
}
}

5
src/sql/workbench/api/node/mainThreadAccountManagement.ts
View File

@@ -5,7 +5,6 @@
'use strict';
import * as azdata from 'azdata';
import { TPromise } from 'vs/base/common/winjs.base';
import { IAccountManagementService } from 'sql/platform/accountManagement/common/interfaces';
import { dispose, IDisposable } from 'vs/base/common/lifecycle';
import {
@@ -92,12 +91,12 @@ export class MainThreadAccountManagement implements MainThreadAccountManagementS
this._accountManagementService.registerProvider(providerMetadata, accountProvider);
this._providerMetadata[handle] = providerMetadata;
return TPromise.as(null);
return Promise.resolve(null);
}
public $unregisterAccountProvider(handle: number): Thenable<any> {
this._accountManagementService.unregisterProvider(this._providerMetadata[handle]);
return TPromise.as(null);
return Promise.resolve(null);
}
public dispose(): void {

5
src/sql/workbench/api/node/mainThreadCredentialManagement.ts
View File

@@ -4,7 +4,6 @@
*--------------------------------------------------------------------------------------------*/
'use strict';
import { TPromise } from 'vs/base/common/winjs.base';
import { IDisposable, dispose } from 'vs/base/common/lifecycle';
import {
SqlExtHostContext, ExtHostCredentialManagementShape,
@@ -37,7 +36,7 @@ export class MainThreadCredentialManagement implements MainThreadCredentialManag
this._toDispose = dispose(this._toDispose);
}
public $registerCredentialProvider(handle: number): TPromise<any> {
public $registerCredentialProvider(handle: number): Promise<any> {
let self = this;
this._registrations[handle] = this.credentialService.addEventListener(handle, {
@@ -55,7 +54,7 @@ export class MainThreadCredentialManagement implements MainThreadCredentialManag
return undefined;
}
public $unregisterCredentialProvider(handle: number): TPromise<any> {
public $unregisterCredentialProvider(handle: number): Promise<any> {
let registration = this._registrations[handle];
if (registration) {
registration.dispose();

35
src/sql/workbench/api/node/mainThreadDataProtocol.ts
View File

@@ -4,7 +4,6 @@
*--------------------------------------------------------------------------------------------*/
'use strict';
import { TPromise } from 'vs/base/common/winjs.base';
import { IDisposable, dispose } from 'vs/base/common/lifecycle';
import {
SqlExtHostContext, ExtHostDataProtocolShape,
@@ -71,7 +70,7 @@ export class MainThreadDataProtocol implements MainThreadDataProtocolShape {
this._toDispose = dispose(this._toDispose);
}
public $registerConnectionProvider(providerId: string, handle: number): TPromise<any> {
public $registerConnectionProvider(providerId: string, handle: number): Promise<any> {
const self = this;
this._connectionManagementService.registerProvider(providerId, <azdata.ConnectionProvider>{
connect(connectionUri: string, connectionInfo: azdata.ConnectionInfo): Thenable<boolean> {
@@ -103,7 +102,7 @@ export class MainThreadDataProtocol implements MainThreadDataProtocolShape {
return undefined;
}
public $registerQueryProvider(providerId: string, handle: number): TPromise<any> {
public $registerQueryProvider(providerId: string, handle: number): Promise<any> {
const self = this;
this._queryManagementService.addQueryRequestHandler(providerId, {
cancelQuery(ownerUri: string): Thenable<azdata.QueryCancelResult> {
@@ -174,7 +173,7 @@ export class MainThreadDataProtocol implements MainThreadDataProtocolShape {
return undefined;
}
public $registerBackupProvider(providerId: string, handle: number): TPromise<any> {
public $registerBackupProvider(providerId: string, handle: number): Promise<any> {
const self = this;
this._backupService.registerProvider(providerId, <azdata.BackupProvider>{
backup(connectionUri: string, backupInfo: { [key: string]: any }, taskExecutionMode: azdata.TaskExecutionMode): Thenable<azdata.BackupResponse> {
@@ -188,7 +187,7 @@ export class MainThreadDataProtocol implements MainThreadDataProtocolShape {
return undefined;
}
public $registerRestoreProvider(providerId: string, handle: number): TPromise<any> {
public $registerRestoreProvider(providerId: string, handle: number): Promise<any> {
const self = this;
this._restoreService.registerProvider(providerId, <azdata.RestoreProvider>{
getRestorePlan(connectionUri: string, restoreInfo: azdata.RestoreInfo): Thenable<azdata.RestorePlanResponse> {
@@ -208,7 +207,7 @@ export class MainThreadDataProtocol implements MainThreadDataProtocolShape {
return undefined;
}
public $registerMetadataProvider(providerId: string, handle: number): TPromise<any> {
public $registerMetadataProvider(providerId: string, handle: number): Promise<any> {
const self = this;
this._metadataService.registerProvider(providerId, <azdata.MetadataProvider>{
getMetadata(connectionUri: string): Thenable<azdata.ProviderMetadata> {
@@ -228,7 +227,7 @@ export class MainThreadDataProtocol implements MainThreadDataProtocolShape {
return undefined;
}
public $registerObjectExplorerProvider(providerId: string, handle: number): TPromise<any> {
public $registerObjectExplorerProvider(providerId: string, handle: number): Promise<any> {
const self = this;
this._objectExplorerService.registerProvider(providerId, <azdata.ObjectExplorerProvider>{
providerId: providerId,
@@ -252,7 +251,7 @@ export class MainThreadDataProtocol implements MainThreadDataProtocolShape {
return undefined;
}
public $registerObjectExplorerNodeProvider(providerId: string, supportedProviderId: string, group: string, handle: number): TPromise<any> {
public $registerObjectExplorerNodeProvider(providerId: string, supportedProviderId: string, group: string, handle: number): Promise<any> {
const self = this;
this._objectExplorerService.registerNodeProvider(<azdata.ObjectExplorerNodeProvider> {
supportedProviderId: supportedProviderId,
@@ -278,7 +277,7 @@ export class MainThreadDataProtocol implements MainThreadDataProtocolShape {
return undefined;
}
public $registerTaskServicesProvider(providerId: string, handle: number): TPromise<any> {
public $registerTaskServicesProvider(providerId: string, handle: number): Promise<any> {
const self = this;
this._taskService.registerProvider(providerId, <azdata.TaskServicesProvider>{
getAllTasks(listTasksParams: azdata.ListTasksParams): Thenable<azdata.ListTasksResponse> {
@@ -292,7 +291,7 @@ export class MainThreadDataProtocol implements MainThreadDataProtocolShape {
return undefined;
}
public $registerScriptingProvider(providerId: string, handle: number): TPromise<any> {
public $registerScriptingProvider(providerId: string, handle: number): Promise<any> {
const self = this;
this._scriptingService.registerProvider(providerId, <azdata.ScriptingProvider>{
scriptAsOperation(connectionUri: string, operation: azdata.ScriptOperation, metadata: azdata.ObjectMetadata, paramDetails: azdata.ScriptingParamDetails): Thenable<azdata.ScriptingResult> {
@@ -303,7 +302,7 @@ export class MainThreadDataProtocol implements MainThreadDataProtocolShape {
return undefined;
}
public $registerFileBrowserProvider(providerId: string, handle: number): TPromise<any> {
public $registerFileBrowserProvider(providerId: string, handle: number): Promise<any> {
const self = this;
this._fileBrowserService.registerProvider(providerId, <azdata.FileBrowserProvider>{
openFileBrowser(ownerUri: string, expandPath: string, fileFilters: string[], changeFilter: boolean): Thenable<boolean> {
@@ -323,7 +322,7 @@ export class MainThreadDataProtocol implements MainThreadDataProtocolShape {
return undefined;
}
public $registerProfilerProvider(providerId: string, handle: number): TPromise<any> {
public $registerProfilerProvider(providerId: string, handle: number): Promise<any> {
const self = this;
this._profilerService.registerProvider(providerId, <azdata.ProfilerProvider>{
createSession(sessionId: string, createStatement: string, template: azdata.ProfilerSessionTemplate): Thenable<boolean> {
@@ -342,7 +341,7 @@ export class MainThreadDataProtocol implements MainThreadDataProtocolShape {
return self._proxy.$getXEventSessions(handle, sessionId);
},
connectSession(sessionId: string): Thenable<boolean> {
return TPromise.as(true);
return Promise.resolve(true);
},
disconnectSession(sessionId: string): Thenable<boolean> {
return self._proxy.$disconnectSession(handle, sessionId);
@@ -352,7 +351,7 @@ export class MainThreadDataProtocol implements MainThreadDataProtocolShape {
return undefined;
}
public $registerAdminServicesProvider(providerId: string, handle: number): TPromise<any> {
public $registerAdminServicesProvider(providerId: string, handle: number): Promise<any> {
const self = this;
this._adminService.registerProvider(providerId, <azdata.AdminServicesProvider>{
createDatabase(connectionUri: string, database: azdata.DatabaseInfo): Thenable<azdata.CreateDatabaseResponse> {
@@ -372,7 +371,7 @@ export class MainThreadDataProtocol implements MainThreadDataProtocolShape {
return undefined;
}
public $registerAgentServicesProvider(providerId: string, handle: number): TPromise<any> {
public $registerAgentServicesProvider(providerId: string, handle: number): Promise<any> {
const self = this;
this._jobManagementService.registerProvider(providerId, <azdata.AgentServicesProvider>{
providerId: providerId,
@@ -417,7 +416,7 @@ export class MainThreadDataProtocol implements MainThreadDataProtocolShape {
return undefined;
}
public $registerCapabilitiesServiceProvider(providerId: string, handle: number): TPromise<any> {
public $registerCapabilitiesServiceProvider(providerId: string, handle: number): Promise<any> {
const self = this;
this._capabilitiesService.registerProvider(<azdata.CapabilitiesProvider>{
getServerCapabilities(client: azdata.DataProtocolClientCapabilities): Thenable<azdata.DataProtocolServerCapabilities> {
@@ -428,7 +427,7 @@ export class MainThreadDataProtocol implements MainThreadDataProtocolShape {
return undefined;
}
public $registerDacFxServicesProvider(providerId: string, handle: number): TPromise<any> {
public $registerDacFxServicesProvider(providerId: string, handle: number): Promise<any> {
const self = this;
this._dacFxService.registerProvider(providerId, <azdata.DacFxServicesProvider>{
exportBacpac(databaseName: string, packageFilePath: string, ownerUri: string, taskExecutionMode: azdata.TaskExecutionMode): Thenable<azdata.DacFxResult> {
@@ -549,7 +548,7 @@ export class MainThreadDataProtocol implements MainThreadDataProtocolShape {
this._jobManagementService.fireOnDidChange();
}
public $unregisterProvider(handle: number): TPromise<any> {
public $unregisterProvider(handle: number): Promise<any> {
let capabilitiesRegistration = this._capabilitiesRegistrations[handle];
if (capabilitiesRegistration) {
capabilitiesRegistration.dispose();

11
src/sql/workbench/api/node/mainThreadNotebookDocumentsAndEditors.ts
View File

@@ -24,7 +24,6 @@ import {
} from 'sql/workbench/api/node/sqlExtHost.protocol';
import { NotebookInput } from 'sql/parts/notebook/notebookInput';
import { INotebookService, INotebookEditor, IProviderInfo } from 'sql/workbench/services/notebook/common/notebookService';
import { TPromise } from 'vs/base/common/winjs.base';
import { ISingleNotebookEditOperation } from 'sql/workbench/api/common/sqlExtHostTypes';
import { disposed } from 'vs/base/common/errors';
import { ICellModel, NotebookContentChange, INotebookModel } from 'sql/parts/notebook/models/modelInterfaces';
@@ -323,16 +322,16 @@ export class MainThreadNotebookDocumentsAndEditors extends Disposable implements
}
}
$tryShowNotebookDocument(resource: UriComponents, options: INotebookShowOptions): TPromise<string> {
return TPromise.wrap(this.doOpenEditor(resource, options));
$tryShowNotebookDocument(resource: UriComponents, options: INotebookShowOptions): Promise<string> {
return Promise.resolve(this.doOpenEditor(resource, options));
}
$tryApplyEdits(id: string, modelVersionId: number, edits: ISingleNotebookEditOperation[], opts: IUndoStopOptions): TPromise<boolean> {
$tryApplyEdits(id: string, modelVersionId: number, edits: ISingleNotebookEditOperation[], opts: IUndoStopOptions): Promise<boolean> {
let editor = this.getEditor(id);
if (!editor) {
return TPromise.wrapError<boolean>(disposed(`TextEditor(${id})`));
return Promise.reject(disposed(`TextEditor(${id})`));
}
return TPromise.as(editor.applyEdits(modelVersionId, edits, opts));
return Promise.resolve(editor.applyEdits(modelVersionId, edits, opts));
}
$runCell(id: string, cellUri: UriComponents): Promise<boolean> {

5
src/sql/workbench/api/node/mainThreadResourceProvider.ts
View File

@@ -5,7 +5,6 @@
'use strict';
import * as azdata from 'azdata';
import { TPromise } from 'vs/base/common/winjs.base';
import { IResourceProviderService } from 'sql/workbench/services/resourceProvider/common/resourceProviderService';
import { dispose, IDisposable } from 'vs/base/common/lifecycle';
import {
@@ -50,12 +49,12 @@ export class MainThreadResourceProvider implements MainThreadResourceProviderSha
this._resourceProviderService.registerProvider(providerMetadata.id, resourceProvider);
this._providerMetadata[handle] = providerMetadata;
return TPromise.as(null);
return Promise.resolve(null);
}
public $unregisterResourceProvider(handle: number): Thenable<any> {
this._resourceProviderService.unregisterProvider(this._providerMetadata[handle].id);
return TPromise.as(null);
return Promise.resolve(null);
}
public dispose(): void {

5
src/sql/workbench/api/node/mainThreadSerializationProvider.ts
View File

@@ -4,7 +4,6 @@
*--------------------------------------------------------------------------------------------*/
'use strict';
import { TPromise } from 'vs/base/common/winjs.base';
import { IDisposable, dispose } from 'vs/base/common/lifecycle';
import {
SqlExtHostContext, ExtHostSerializationProviderShape,
@@ -38,7 +37,7 @@ export class MainThreadSerializationProvider implements MainThreadSerializationP
this._toDispose = dispose(this._toDispose);
}
public $registerSerializationProvider(handle: number): TPromise<any> {
public $registerSerializationProvider(handle: number): Promise<any> {
let self = this;
this._registrations[handle] = this.serializationService.addEventListener(handle, {
@@ -50,7 +49,7 @@ export class MainThreadSerializationProvider implements MainThreadSerializationP
return undefined;
}
public $unregisterSerializationProvider(handle: number): TPromise<any> {
public $unregisterSerializationProvider(handle: number): Promise<any> {
let registration = this._registrations[handle];
if (registration) {
registration.dispose();

22
src/sql/workbench/api/node/sqlExtHost.api.impl.ts
View File

@@ -5,7 +5,6 @@
'use strict';
import * as extHostApi from 'vs/workbench/api/node/extHost.api.impl';
import { TPromise } from 'vs/base/common/winjs.base';
import { IInitData, IMainContext } from 'vs/workbench/api/node/extHost.protocol';
import { ExtHostExtensionService } from 'vs/workbench/api/node/extHostExtensionService';
import { IExtensionDescription } from 'vs/workbench/services/extensions/common/extensions';
@@ -23,7 +22,7 @@ import { ExtHostSerializationProvider } from 'sql/workbench/api/node/extHostSeri
import { ExtHostResourceProvider } from 'sql/workbench/api/node/extHostResourceProvider';
import * as sqlExtHostTypes from 'sql/workbench/api/common/sqlExtHostTypes';
import { ExtHostWorkspace } from 'vs/workbench/api/node/extHostWorkspace';
import { ExtHostConfiguration } from 'vs/workbench/api/node/extHostConfiguration';
import { ExtHostConfiguration, ExtHostConfigProvider } from 'vs/workbench/api/node/extHostConfiguration';
import { ExtHostModalDialogs } from 'sql/workbench/api/node/extHostModalDialog';
import { ExtHostTasks } from 'sql/workbench/api/node/extHostTasks';
import { ExtHostDashboardWebviews } from 'sql/workbench/api/node/extHostDashboardWebview';
@@ -41,10 +40,11 @@ import { ExtHostNotebookDocumentsAndEditors } from 'sql/workbench/api/node/extHo
import { ExtHostStorage } from 'vs/workbench/api/node/extHostStorage';
import { ExtensionDescriptionRegistry } from 'vs/workbench/services/extensions/node/extensionDescriptionRegistry';
import { ExtHostExtensionManagement } from 'sql/workbench/api/node/extHostExtensionManagement';
import { ExtensionIdentifier } from 'vs/platform/extensions/common/extensions';
import { TernarySearchTree } from 'vs/base/common/map';
export interface ISqlExtensionApiFactory {
vsCodeFactory(extension: IExtensionDescription, registry: ExtensionDescriptionRegistry): typeof vscode;
vsCodeFactory(extension: IExtensionDescription, registry: ExtensionDescriptionRegistry, configProvider: ExtHostConfigProvider): typeof vscode;
sqlopsFactory(extension: IExtensionDescription): typeof sqlops;
azdataFactory(extension: IExtensionDescription): typeof azdata;
}
@@ -993,11 +993,11 @@ export function createApiFactory(
};
}
export function initializeExtensionApi(extensionService: ExtHostExtensionService, apiFactory: ISqlExtensionApiFactory, extensionRegistry: ExtensionDescriptionRegistry): TPromise<void> {
return extensionService.getExtensionPathIndex().then(trie => defineAPI(apiFactory, trie, extensionRegistry));
export function initializeExtensionApi(extensionService: ExtHostExtensionService, apiFactory: ISqlExtensionApiFactory, extensionRegistry: ExtensionDescriptionRegistry, configProvider: ExtHostConfigProvider): Promise<void> {
return extensionService.getExtensionPathIndex().then(trie => defineAPI(apiFactory, trie, extensionRegistry, configProvider));
}
function defineAPI(factory: ISqlExtensionApiFactory, extensionPaths: TernarySearchTree<IExtensionDescription>, extensionRegistry: ExtensionDescriptionRegistry): void {
function defineAPI(factory: ISqlExtensionApiFactory, extensionPaths: TernarySearchTree<IExtensionDescription>, extensionRegistry: ExtensionDescriptionRegistry, configProvider: ExtHostConfigProvider): void {
type ApiImpl = typeof vscode | typeof azdata | typeof sqlops;
// each extension is meant to get its own api implementation
@@ -1018,10 +1018,10 @@ function defineAPI(factory: ISqlExtensionApiFactory, extensionPaths: TernarySear
// get extension id from filename and api for extension
const ext = extensionPaths.findSubstr(URI.file(parent.filename).fsPath);
if (ext) {
let apiImpl = apiMap.get(ext.id);
let apiImpl = apiMap.get(ext.identifier.value);
if (!apiImpl) {
apiImpl = createApi(ext);
apiMap.set(ext.id, apiImpl);
apiMap.set(ext.identifier.value, apiImpl);
}
return apiImpl;
}
@@ -1041,14 +1041,14 @@ function defineAPI(factory: ISqlExtensionApiFactory, extensionPaths: TernarySear
// TODO look into de-duplicating this code
node_module._load = function load(request, parent, isMain) {
if (request === 'vscode') {
return getModuleFactory(extApiImpl, (ext) => factory.vsCodeFactory(ext, extensionRegistry),
return getModuleFactory(extApiImpl, (ext) => factory.vsCodeFactory(ext, extensionRegistry, configProvider),
defaultApiImpl,
(impl) => defaultApiImpl = <typeof vscode>impl,
parent);
} else if (request === 'azdata') {
return getModuleFactory(azDataExtApiImpl,
(ext) => factory.azdataFactory(ext),
defaultDataApiImpl,
defaultAzDataApiImpl,
(impl) => defaultAzDataApiImpl = <typeof azdata>impl,
parent);
} else if (request === 'sqlops') {
@@ -1066,7 +1066,7 @@ function defineAPI(factory: ISqlExtensionApiFactory, extensionPaths: TernarySear
const nullExtensionDescription: IExtensionDescription = {
id: 'nullExtensionDescription',
identifier: new ExtensionIdentifier('nullExtensionDescription'),
name: 'Null Extension Description',
publisher: 'vscode',
activationEvents: undefined,

55
src/sql/workbench/api/node/sqlExtHost.protocol.ts
View File

@@ -11,7 +11,6 @@ import {
} from 'vs/workbench/services/extensions/node/proxyIdentifier';
import { UriComponents } from 'vs/base/common/uri';
import { TPromise } from 'vs/base/common/winjs.base';
import { IDisposable } from 'vs/base/common/lifecycle';
import * as azdata from 'azdata';
@@ -510,22 +509,22 @@ export interface MainThreadResourceProviderShape extends IDisposable {
}
export interface MainThreadDataProtocolShape extends IDisposable {
$registerConnectionProvider(providerId: string, handle: number): TPromise<any>;
$registerBackupProvider(providerId: string, handle: number): TPromise<any>;
$registerRestoreProvider(providerId: string, handle: number): TPromise<any>;
$registerScriptingProvider(providerId: string, handle: number): TPromise<any>;
$registerQueryProvider(providerId: string, handle: number): TPromise<any>;
$registerProfilerProvider(providerId: string, handle: number): TPromise<any>;
$registerObjectExplorerProvider(providerId: string, handle: number): TPromise<any>;
$registerObjectExplorerNodeProvider(providerId: string, supportedProviderId: string, group: string, handle: number): TPromise<any>;
$registerMetadataProvider(providerId: string, handle: number): TPromise<any>;
$registerTaskServicesProvider(providerId: string, handle: number): TPromise<any>;
$registerFileBrowserProvider(providerId: string, handle: number): TPromise<any>;
$registerCapabilitiesServiceProvider(providerId: string, handle: number): TPromise<any>;
$registerAdminServicesProvider(providerId: string, handle: number): TPromise<any>;
$registerAgentServicesProvider(providerId: string, handle: number): TPromise<any>;
$registerDacFxServicesProvider(providerId: string, handle: number): TPromise<any>;
$unregisterProvider(handle: number): TPromise<any>;
$registerConnectionProvider(providerId: string, handle: number): Promise<any>;
$registerBackupProvider(providerId: string, handle: number): Promise<any>;
$registerRestoreProvider(providerId: string, handle: number): Promise<any>;
$registerScriptingProvider(providerId: string, handle: number): Promise<any>;
$registerQueryProvider(providerId: string, handle: number): Promise<any>;
$registerProfilerProvider(providerId: string, handle: number): Promise<any>;
$registerObjectExplorerProvider(providerId: string, handle: number): Promise<any>;
$registerObjectExplorerNodeProvider(providerId: string, supportedProviderId: string, group: string, handle: number): Promise<any>;
$registerMetadataProvider(providerId: string, handle: number): Promise<any>;
$registerTaskServicesProvider(providerId: string, handle: number): Promise<any>;
$registerFileBrowserProvider(providerId: string, handle: number): Promise<any>;
$registerCapabilitiesServiceProvider(providerId: string, handle: number): Promise<any>;
$registerAdminServicesProvider(providerId: string, handle: number): Promise<any>;
$registerAgentServicesProvider(providerId: string, handle: number): Promise<any>;
$registerDacFxServicesProvider(providerId: string, handle: number): Promise<any>;
$unregisterProvider(handle: number): Promise<any>;
$onConnectionComplete(handle: number, connectionInfoSummary: azdata.ConnectionInfoSummary): void;
$onIntelliSenseCacheComplete(handle: number, connectionUri: string): void;
$onConnectionChangeNotification(handle: number, changedConnInfo: azdata.ChangedConnectionInfo): void;
@@ -568,13 +567,13 @@ export interface MainThreadConnectionManagementShape extends IDisposable {
}
export interface MainThreadCredentialManagementShape extends IDisposable {
$registerCredentialProvider(handle: number): TPromise<any>;
$unregisterCredentialProvider(handle: number): TPromise<any>;
$registerCredentialProvider(handle: number): Promise<any>;
$unregisterCredentialProvider(handle: number): Promise<any>;
}
export interface MainThreadSerializationProviderShape extends IDisposable {
$registerSerializationProvider(handle: number): TPromise<any>;
$unregisterSerializationProvider(handle: number): TPromise<any>;
$registerSerializationProvider(handle: number): Promise<any>;
$unregisterSerializationProvider(handle: number): Promise<any>;
}
function ni() { return new Error('Not implemented'); }
@@ -650,12 +649,12 @@ export interface ExtHostModalDialogsShape {
export interface ExtHostTasksShape {
$executeContributedTask<T>(id: string, ...args: any[]): Thenable<T>;
$getContributedTaskHandlerDescriptions(): TPromise<{ [id: string]: string | ITaskHandlerDescription }>;
$getContributedTaskHandlerDescriptions(): Promise<{ [id: string]: string | ITaskHandlerDescription }>;
}
export interface MainThreadTasksShape extends IDisposable {
$registerTask(id: string): TPromise<any>;
$unregisterTask(id: string): TPromise<any>;
$registerTask(id: string): Promise<any>;
$unregisterTask(id: string): Promise<any>;
}
export interface ExtHostDashboardWebviewsShape {
@@ -680,7 +679,7 @@ export interface ExtHostModelViewShape {
}
export interface ExtHostModelViewTreeViewsShape {
$getChildren(treeViewId: string, treeItemHandle?: string): TPromise<ITreeComponentItem[]>;
$getChildren(treeViewId: string, treeItemHandle?: string): Promise<ITreeComponentItem[]>;
$createTreeView(handle: number, componentId: string, options: { treeDataProvider: vscode.TreeDataProvider<any> }, extension: IExtensionDescription): azdata.TreeComponentView<any>;
$onNodeCheckedChanged(treeViewId: string, treeItemHandle?: string, checked?: boolean): void;
$onNodeSelected(treeViewId: string, nodes: string[]): void;
@@ -861,9 +860,9 @@ export interface ExtHostNotebookDocumentsAndEditorsShape {
export interface MainThreadNotebookDocumentsAndEditorsShape extends IDisposable {
$trySaveDocument(uri: UriComponents): Thenable<boolean>;
$tryShowNotebookDocument(resource: UriComponents, options: INotebookShowOptions): TPromise<string>;
$tryApplyEdits(id: string, modelVersionId: number, edits: ISingleNotebookEditOperation[], opts: IUndoStopOptions): TPromise<boolean>;
$runCell(id: string, cellUri: UriComponents): TPromise<boolean>;
$tryShowNotebookDocument(resource: UriComponents, options: INotebookShowOptions): Promise<string>;
$tryApplyEdits(id: string, modelVersionId: number, edits: ISingleNotebookEditOperation[], opts: IUndoStopOptions): Promise<boolean>;
$runCell(id: string, cellUri: UriComponents): Promise<boolean>;
}
export interface ExtHostExtensionManagementShape {