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

4
src/sql/platform/capabilities/common/capabilitiesService.ts
View File

@@ -21,7 +21,6 @@ import { IStorageService, StorageScope } from 'vs/platform/storage/common/storag
import { Registry } from 'vs/platform/registry/common/platform';
import { IExtensionManagementService } from 'vs/platform/extensionManagement/common/extensionManagement';
import { IExtensionService } from 'vs/workbench/services/extensions/common/extensions';
import { getIdFromLocalExtensionId } from 'vs/platform/extensionManagement/common/extensionManagementUtil';
export const SERVICE_ID = 'capabilitiesService';
export const HOST_NAME = 'azdata';
@@ -135,9 +134,8 @@ export class CapabilitiesService extends Disposable implements ICapabilitiesServ
this._register(extentionManagementService.onDidUninstallExtension(({ identifier }) => {
const connectionProvider = 'connectionProvider';
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[connectionProvider]
&& extension.contributes[connectionProvider].providerId) {

4
src/sql/platform/connection/common/connectionManagementService.ts
View File

@@ -651,7 +651,7 @@ export class ConnectionManagementService extends Disposable implements IConnecti
TelemetryUtils.addTelemetry(this._telemetryService, TelemetryKeys.AddServerGroup);
return new Promise<string>((resolve, reject) => {
this._connectionStore.saveProfileGroup(profile).then(groupId => {
this._onAddConnectionProfile.fire();
this._onAddConnectionProfile.fire(undefined);
resolve(groupId);
}).catch(err => {
reject(err);
@@ -1220,7 +1220,7 @@ export class ConnectionManagementService extends Disposable implements IConnecti
return new Promise<string>((resolve, reject) => {
this._connectionStore.editGroup(group).then(groupId => {
this.refreshEditorTitles();
this._onAddConnectionProfile.fire();
this._onAddConnectionProfile.fire(undefined);
resolve(null);
}).catch(err => {
reject(err);

5
src/sql/platform/dacfx/common/dacFxService.ts
View File

@@ -8,7 +8,6 @@
import * as azdata from 'azdata';
import { createDecorator } from 'vs/platform/instantiation/common/instantiation';
import { IConnectionManagementService } from 'sql/platform/connection/common/connectionManagement';
import { TPromise } from 'vs/base/common/winjs.base';
import { localize } from 'vs/nls';
export const SERVICE_ID = 'dacFxService';
@@ -79,13 +78,13 @@ export class DacFxService implements IDacFxService {
let providerId: string = this._connectionService.getProviderIdFromUri(uri);
if (!providerId) {
return TPromise.wrapError(new Error(localize('providerIdNotValidError', "Connection is required in order to interact with DacFxService")));
return Promise.reject(new Error(localize('providerIdNotValidError', "Connection is required in order to interact with DacFxService")));
}
let handler = this._providers[providerId];
if (handler) {
return action(handler);
} else {
return TPromise.wrapError(new Error(localize('noHandlerRegistered', "No Handler Registered")));
return Promise.reject(new Error(localize('noHandlerRegistered', "No Handler Registered")));
}
}
}

2
src/sql/platform/dashboard/common/dashboardRegistry.ts
View File

@@ -164,7 +164,7 @@ const dashboardContrib: IJSONSchema = {
}
};
ExtensionsRegistry.registerExtensionPoint<ProviderProperties | ProviderProperties[]>('dashboard', [], dashboardContrib).setHandler(extensions => {
ExtensionsRegistry.registerExtensionPoint<ProviderProperties | ProviderProperties[]>({ extensionPoint: 'dashboard', jsonSchema: dashboardContrib }).setHandler(extensions => {
function handleCommand(contrib: ProviderProperties, extension: IExtensionPointUser<any>) {
dashboardRegistry.registerDashboardProvider(contrib.provider, contrib);

69
src/sql/platform/jobManagement/common/jobActions.ts
View File

@@ -3,7 +3,6 @@
* Licensed under the Source EULA. See License.txt in the project root for license information.
*--------------------------------------------------------------------------------------------*/
import { TPromise } from 'vs/base/common/winjs.base';
import { Action } from 'vs/base/common/actions';
import * as nls from 'vs/nls';
import * as azdata from 'azdata';
@@ -47,8 +46,8 @@ export class JobsRefreshAction extends Action {
super(JobsRefreshAction.ID, JobsRefreshAction.LABEL, 'refreshIcon');
}
public run(context: IJobActionInfo): TPromise<boolean> {
return new TPromise<boolean>((resolve, reject) => {
public run(context: IJobActionInfo): Promise<boolean> {
return new Promise<boolean>((resolve, reject) => {
if (context) {
context.jobHistoryComponent.refreshJobs();
resolve(true);
@@ -68,8 +67,8 @@ export class NewJobAction extends Action {
super(NewJobAction.ID, NewJobAction.LABEL, 'newStepIcon');
}
public run(context: JobsViewComponent): TPromise<boolean> {
return new TPromise<boolean>((resolve, reject) => {
public run(context: JobsViewComponent): Promise<boolean> {
return new Promise<boolean>((resolve, reject) => {
try {
context.openCreateJobDialog();
resolve(true);
@@ -94,12 +93,12 @@ export class RunJobAction extends Action {
super(RunJobAction.ID, RunJobAction.LABEL, 'start');
}
public run(context: IJobActionInfo): TPromise<boolean> {
public run(context: IJobActionInfo): Promise<boolean> {
let jobName = context.targetObject.name;
let ownerUri = context.ownerUri;
let refreshAction = this.instantationService.createInstance(JobsRefreshAction);
this.telemetryService.publicLog(TelemetryKeys.RunAgentJob);
return new TPromise<boolean>((resolve, reject) => {
return new Promise<boolean>((resolve, reject) => {
this.jobManagementService.jobAction(ownerUri, jobName, JobActions.Run).then(result => {
if (result.success) {
var startMsg = nls.localize('jobSuccessfullyStarted', ': The job was successfully started.');
@@ -129,12 +128,12 @@ export class StopJobAction extends Action {
super(StopJobAction.ID, StopJobAction.LABEL, 'stop');
}
public run(context: IJobActionInfo): TPromise<boolean> {
public run(context: IJobActionInfo): Promise<boolean> {
let jobName = context.targetObject.name;
let ownerUri = context.ownerUri;
let refreshAction = this.instantationService.createInstance(JobsRefreshAction);
this.telemetryService.publicLog(TelemetryKeys.StopAgentJob);
return new TPromise<boolean>((resolve, reject) => {
return new Promise<boolean>((resolve, reject) => {
this.jobManagementService.jobAction(ownerUri, jobName, JobActions.Stop).then(result => {
if (result.success) {
refreshAction.run(context);
@@ -160,12 +159,12 @@ export class EditJobAction extends Action {
super(EditJobAction.ID, EditJobAction.LABEL, 'edit');
}
public run(actionInfo: IJobActionInfo): TPromise<boolean> {
public run(actionInfo: IJobActionInfo): Promise<boolean> {
this._commandService.executeCommand(
'agent.openJobDialog',
actionInfo.ownerUri,
actionInfo.targetObject);
return TPromise.as(true);
return Promise.resolve(true);
}
}
@@ -182,7 +181,7 @@ export class DeleteJobAction extends Action {
super(DeleteJobAction.ID, DeleteJobAction.LABEL);
}
public run(actionInfo: IJobActionInfo): TPromise<boolean> {
public run(actionInfo: IJobActionInfo): Promise<boolean> {
let self = this;
let job = actionInfo.targetObject as azdata.AgentJobInfo;
self._notificationService.prompt(
@@ -208,7 +207,7 @@ export class DeleteJobAction extends Action {
run: () => { }
}]
);
return TPromise.as(true);
return Promise.resolve(true);
}
}
@@ -224,11 +223,11 @@ export class NewStepAction extends Action {
super(NewStepAction.ID, NewStepAction.LABEL, 'newStepIcon');
}
public run(context: JobHistoryComponent): TPromise<boolean> {
public run(context: JobHistoryComponent): Promise<boolean> {
let ownerUri = context.ownerUri;
let server = context.serverName;
let jobInfo = context.agentJobInfo;
return new TPromise<boolean>((resolve, reject) => {
return new Promise<boolean>((resolve, reject) => {
resolve(this._commandService.executeCommand('agent.openNewStepDialog', ownerUri, server, jobInfo, null));
});
}
@@ -248,7 +247,7 @@ export class DeleteStepAction extends Action {
super(DeleteStepAction.ID, DeleteStepAction.LABEL);
}
public run(actionInfo: IJobActionInfo): TPromise<boolean> {
public run(actionInfo: IJobActionInfo): Promise<boolean> {
let self = this;
let step = actionInfo.targetObject as azdata.AgentJobStepInfo;
let refreshAction = this.instantationService.createInstance(JobsRefreshAction);
@@ -276,7 +275,7 @@ export class DeleteStepAction extends Action {
run: () => { }
}]
);
return TPromise.as(true);
return Promise.resolve(true);
}
}
@@ -292,8 +291,8 @@ export class NewAlertAction extends Action {
super(NewAlertAction.ID, NewAlertAction.LABEL, 'newStepIcon');
}
public run(context: AlertsViewComponent): TPromise<boolean> {
return new TPromise<boolean>((resolve, reject) => {
public run(context: AlertsViewComponent): Promise<boolean> {
return new Promise<boolean>((resolve, reject) => {
try {
context.openCreateAlertDialog();
resolve(true);
@@ -314,12 +313,12 @@ export class EditAlertAction extends Action {
super(EditAlertAction.ID, EditAlertAction.LABEL);
}
public run(actionInfo: IJobActionInfo): TPromise<boolean> {
public run(actionInfo: IJobActionInfo): Promise<boolean> {
this._commandService.executeCommand(
'agent.openAlertDialog',
actionInfo.ownerUri,
actionInfo.targetObject);
return TPromise.as(true);
return Promise.resolve(true);
}
}
@@ -337,7 +336,7 @@ export class DeleteAlertAction extends Action {
super(DeleteAlertAction.ID, DeleteAlertAction.LABEL);
}
public run(actionInfo: IJobActionInfo): TPromise<boolean> {
public run(actionInfo: IJobActionInfo): Promise<boolean> {
let self = this;
let alert = actionInfo.targetObject as azdata.AgentAlertInfo;
self._notificationService.prompt(
@@ -363,7 +362,7 @@ export class DeleteAlertAction extends Action {
run: () => { }
}]
);
return TPromise.as(true);
return Promise.resolve(true);
}
}
@@ -378,8 +377,8 @@ export class NewOperatorAction extends Action {
super(NewOperatorAction.ID, NewOperatorAction.LABEL, 'newStepIcon');
}
public run(context: OperatorsViewComponent): TPromise<boolean> {
return new TPromise<boolean>((resolve, reject) => {
public run(context: OperatorsViewComponent): Promise<boolean> {
return new Promise<boolean>((resolve, reject) => {
try {
context.openCreateOperatorDialog();
resolve(true);
@@ -400,12 +399,12 @@ export class EditOperatorAction extends Action {
super(EditOperatorAction.ID, EditOperatorAction.LABEL);
}
public run(actionInfo: IJobActionInfo): TPromise<boolean> {
public run(actionInfo: IJobActionInfo): Promise<boolean> {
this._commandService.executeCommand(
'agent.openOperatorDialog',
actionInfo.ownerUri,
actionInfo.targetObject);
return TPromise.as(true);
return Promise.resolve(true);
}
}
@@ -422,7 +421,7 @@ export class DeleteOperatorAction extends Action {
super(DeleteOperatorAction.ID, DeleteOperatorAction.LABEL);
}
public run(actionInfo: IJobActionInfo): TPromise<boolean> {
public run(actionInfo: IJobActionInfo): Promise<boolean> {
const self = this;
let operator = actionInfo.targetObject as azdata.AgentOperatorInfo;
self._notificationService.prompt(
@@ -448,7 +447,7 @@ export class DeleteOperatorAction extends Action {
run: () => { }
}]
);
return TPromise.as(true);
return Promise.resolve(true);
}
}
@@ -464,8 +463,8 @@ export class NewProxyAction extends Action {
super(NewProxyAction.ID, NewProxyAction.LABEL, 'newStepIcon');
}
public run(context: ProxiesViewComponent): TPromise<boolean> {
return new TPromise<boolean>((resolve, reject) => {
public run(context: ProxiesViewComponent): Promise<boolean> {
return new Promise<boolean>((resolve, reject) => {
try {
context.openCreateProxyDialog();
resolve(true);
@@ -486,12 +485,12 @@ export class EditProxyAction extends Action {
super(EditProxyAction.ID, EditProxyAction.LABEL);
}
public run(actionInfo: IJobActionInfo): TPromise<boolean> {
public run(actionInfo: IJobActionInfo): Promise<boolean> {
this._commandService.executeCommand(
'agent.openProxyDialog',
actionInfo.ownerUri,
actionInfo.targetObject);
return TPromise.as(true);
return Promise.resolve(true);
}
}
@@ -508,7 +507,7 @@ export class DeleteProxyAction extends Action {
super(DeleteProxyAction.ID, DeleteProxyAction.LABEL);
}
public run(actionInfo: IJobActionInfo): TPromise<boolean> {
public run(actionInfo: IJobActionInfo): Promise<boolean> {
let self = this;
let proxy = actionInfo.targetObject as azdata.AgentProxyInfo;
self._notificationService.prompt(
@@ -534,6 +533,6 @@ export class DeleteProxyAction extends Action {
run: () => { }
}]
);
return TPromise.as(true);
return Promise.resolve(true);
}
}

5
src/sql/platform/jobManagement/common/jobManagementService.ts
View File

@@ -7,7 +7,6 @@
import { localize } from 'vs/nls';
import * as azdata from 'azdata';
import { TPromise } from 'vs/base/common/winjs.base';
import { IJobManagementService } from 'sql/platform/jobManagement/common/interfaces';
import { IConnectionManagementService } from 'sql/platform/connection/common/connectionManagement';
import { Event, Emitter } from 'vs/base/common/event';
@@ -115,13 +114,13 @@ export class JobManagementService implements IJobManagementService {
let providerId: string = this._connectionService.getProviderIdFromUri(uri);
if (!providerId) {
return TPromise.wrapError(new Error(localize('providerIdNotValidError', "Connection is required in order to interact with JobManagementService")));
return Promise.reject(new Error(localize('providerIdNotValidError', "Connection is required in order to interact with JobManagementService")));
}
let handler = this._providers[providerId];
if (handler) {
return action(handler);
} else {
return TPromise.wrapError(new Error(localize('noHandlerRegistered', "No Handler Registered")));
return Promise.reject(new Error(localize('noHandlerRegistered', "No Handler Registered")));
}
}

5
src/sql/platform/query/common/queryManagement.ts
View File

@@ -8,7 +8,6 @@ import { IConnectionManagementService } from 'sql/platform/connection/common/con
import { createDecorator } from 'vs/platform/instantiation/common/instantiation';
import { IDisposable } from 'vs/base/common/lifecycle';
import * as azdata from 'azdata';
import { TPromise } from 'vs/base/common/winjs.base';
import * as TelemetryKeys from 'sql/common/telemetryKeys';
import * as TelemetryUtils from 'sql/common/telemetryUtilities';
import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
@@ -179,13 +178,13 @@ export class QueryManagementService implements IQueryManagementService {
let providerId: string = this._connectionService.getProviderIdFromUri(uri);
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._requestHandlers.get(providerId);
if (handler) {
return action(handler);
} else {
return TPromise.wrapError(new Error('No Handler Registered'));
return Promise.reject(new Error('No Handler Registered'));
}
}

15
src/sql/platform/query/common/queryModelService.ts
View File

@@ -23,7 +23,6 @@ import * as statusbar from 'vs/workbench/browser/parts/statusbar/statusbar';
import * as platform from 'vs/platform/registry/common/platform';
import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
import { Event, Emitter } from 'vs/base/common/event';
import { TPromise } from 'vs/base/common/winjs.base';
import * as strings from 'vs/base/common/strings';
import * as types from 'vs/base/common/types';
import { INotificationService } from 'vs/platform/notification/common/notification';
@@ -460,7 +459,7 @@ export class QueryModelService implements IQueryModelService {
if (queryRunner) {
return queryRunner.disposeEdit(ownerUri);
}
return TPromise.as(null);
return Promise.resolve(null);
}
public updateCell(ownerUri: string, rowId: number, columnId: number, newValue: string): Thenable<azdata.EditUpdateCellResult> {
@@ -475,7 +474,7 @@ export class QueryModelService implements IQueryModelService {
return Promise.reject(error);
});
}
return TPromise.as(null);
return Promise.resolve(null);
}
public commitEdit(ownerUri): Thenable<void> {
@@ -490,7 +489,7 @@ export class QueryModelService implements IQueryModelService {
return Promise.reject(error);
});
}
return TPromise.as(null);
return Promise.resolve(null);
}
public createRow(ownerUri: string): Thenable<azdata.EditCreateRowResult> {
@@ -499,7 +498,7 @@ export class QueryModelService implements IQueryModelService {
if (queryRunner) {
return queryRunner.createRow(ownerUri);
}
return TPromise.as(null);
return Promise.resolve(null);
}
public deleteRow(ownerUri: string, rowId: number): Thenable<void> {
@@ -508,7 +507,7 @@ export class QueryModelService implements IQueryModelService {
if (queryRunner) {
return queryRunner.deleteRow(ownerUri, rowId);
}
return TPromise.as(null);
return Promise.resolve(null);
}
public revertCell(ownerUri: string, rowId: number, columnId: number): Thenable<azdata.EditRevertCellResult> {
@@ -517,7 +516,7 @@ export class QueryModelService implements IQueryModelService {
if (queryRunner) {
return queryRunner.revertCell(ownerUri, rowId, columnId);
}
return TPromise.as(null);
return Promise.resolve(null);
}
public revertRow(ownerUri: string, rowId: number): Thenable<void> {
@@ -526,7 +525,7 @@ export class QueryModelService implements IQueryModelService {
if (queryRunner) {
return queryRunner.revertRow(ownerUri, rowId);
}
return TPromise.as(null);
return Promise.resolve(null);
}
public getQueryRunner(ownerUri): QueryRunner {

3
src/sql/platform/query/common/queryRunner.ts
View File

@@ -24,7 +24,6 @@ import { INotificationService } from 'vs/platform/notification/common/notificati
import { Emitter, Event } from 'vs/base/common/event';
import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
import { ResultSerializer } from 'sql/platform/node/resultSerializer';
import { TPromise } from 'vs/base/common/winjs.base';
import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
import { ITextResourcePropertiesService } from 'vs/editor/common/services/resourceConfiguration';
import { URI } from 'vs/base/common/uri';
@@ -187,7 +186,7 @@ export default class QueryRunner extends Disposable {
private doRunQuery(input: azdata.ISelectionData, runCurrentStatement: boolean, runOptions?: azdata.ExecutionPlanOptions): Thenable<void>;
private doRunQuery(input, runCurrentStatement: boolean, runOptions?: azdata.ExecutionPlanOptions): Thenable<void> {
if (this.isExecuting) {
return TPromise.as(undefined);
return Promise.resolve(undefined);
}
this._planXml = new Deferred<string>();
this._batchSets = [];

3
src/sql/platform/restore/common/restoreService.ts
View File

@@ -5,7 +5,6 @@
'use strict';
import { TPromise } from 'vs/base/common/winjs.base';
import { createDecorator } from 'vs/platform/instantiation/common/instantiation';
import * as azdata from 'azdata';
@@ -47,5 +46,5 @@ export interface IRestoreService {
export const IRestoreDialogController = createDecorator<IRestoreDialogController>('restoreDialogService');
export interface IRestoreDialogController {
_serviceBrand: any;
showDialog(connection: IConnectionProfile): TPromise<void>;
showDialog(connection: IConnectionProfile): Promise<void>;
}

5
src/sql/platform/restore/common/restoreServiceImpl.ts
View File

@@ -4,7 +4,6 @@
*--------------------------------------------------------------------------------------------*/
'use strict';
import { TPromise } from 'vs/base/common/winjs.base';
import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
import * as types from 'vs/base/common/types';
@@ -290,8 +289,8 @@ export class RestoreDialogController implements IRestoreDialogController {
});
}
public showDialog(connection: IConnectionProfile): TPromise<void> {
return new TPromise<void>((resolve, reject) => {
public showDialog(connection: IConnectionProfile): Promise<void> {
return new Promise<void>((resolve, reject) => {
let result: void;
this._ownerUri = this._connectionService.getConnectionUri(connection)

5
src/sql/platform/serverGroup/common/serverGroupController.ts
View File

@@ -6,7 +6,6 @@
'use strict';
import { createDecorator } from 'vs/platform/instantiation/common/instantiation';
import { TPromise } from 'vs/base/common/winjs.base';
import { IConnectionManagementService } from 'sql/platform/connection/common/connectionManagement';
import { ConnectionProfileGroup } from 'sql/platform/connection/common/connectionProfileGroup';
@@ -18,6 +17,6 @@ export interface IServerGroupDialogCallbacks {
export const IServerGroupController = createDecorator<IServerGroupController>('serverGroupController');
export interface IServerGroupController {
_serviceBrand: any;
showCreateGroupDialog(connectionManagementService: IConnectionManagementService, callbacks?: IServerGroupDialogCallbacks): TPromise<void>;
showEditGroupDialog(connectionManagementService: IConnectionManagementService, group: ConnectionProfileGroup): TPromise<void>;
showCreateGroupDialog(connectionManagementService: IConnectionManagementService, callbacks?: IServerGroupDialogCallbacks): Promise<void>;
showEditGroupDialog(connectionManagementService: IConnectionManagementService, group: ConnectionProfileGroup): Promise<void>;
}

7
src/sql/platform/taskHistory/common/taskService.ts
View File

@@ -12,7 +12,6 @@ import { Event, Emitter } from 'vs/base/common/event';
import { ILifecycleService } from 'vs/platform/lifecycle/common/lifecycle';
import { localize } from 'vs/nls';
import Severity from 'vs/base/common/severity';
import { TPromise } from 'vs/base/common/winjs.base';
import { IDialogService } from 'vs/platform/dialogs/common/dialogs';
import { IConnectionManagementService } from 'sql/platform/connection/common/connectionManagement';
@@ -125,7 +124,7 @@ export class TaskService implements ITaskService {
}
private cancelAllTasks(): Thenable<void> {
return new TPromise<void>((resolve, reject) => {
return new Promise<void>((resolve, reject) => {
let promises = this._taskQueue.children.map(task => {
if (task.status === TaskStatus.InProgress || task.status === TaskStatus.NotStarted) {
return this.cancelTask(task.providerName, task.id);
@@ -151,14 +150,14 @@ export class TaskService implements ITaskService {
this._onAddNewTask.fire(task);
}
public beforeShutdown(): TPromise<boolean> {
public beforeShutdown(): Promise<boolean> {
const message = localize('InProgressWarning', '1 or more tasks are in progress. Are you sure you want to quit?');
const options = [
localize('taskService.yes', "Yes"),
localize('taskService.no', "No")
];
return new TPromise<boolean>((resolve, reject) => {
return new Promise<boolean>((resolve, reject) => {
let numOfInprogressTasks = this.getNumberOfInProgressTasks();
if (numOfInprogressTasks > 0) {
this.dialogService.show(Severity.Warning, message, options).then(choice => {

3
src/sql/platform/tasks/common/tasks.ts
View File

@@ -5,7 +5,6 @@
import { IConnectionProfile } from 'sql/platform/connection/common/interfaces';
import * as types from 'vs/base/common/types';
import { TPromise } from 'vs/base/common/winjs.base';
import { ILocalizedString, MenuRegistry, ICommandAction } from 'vs/platform/actions/common/actions';
import { Event, Emitter } from 'vs/base/common/event';
import { IDisposable } from 'vs/base/common/lifecycle';
@@ -65,7 +64,7 @@ export abstract class Task {
return TaskRegistry.registerTask(this.toITask());
}
public abstract runTask(accessor: ServicesAccessor, profile: IConnectionProfile, args: any): void | TPromise<void>;
public abstract runTask(accessor: ServicesAccessor, profile: IConnectionProfile, args: any): void | Promise<void>;
}
export interface ITaskHandlerDescription {