Merge VS Code 1.31.1 (#4283)

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

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