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

@@ -4,7 +4,6 @@
*--------------------------------------------------------------------------------------------*/
import { Action } from 'vs/base/common/actions';
import * as nls from 'vs/nls';
import { TPromise } from 'vs/base/common/winjs.base';
export class CloseTabAction extends Action {
private static readonly ID = 'closeTab';
@@ -18,12 +17,12 @@ export class CloseTabAction extends Action {
super(CloseTabAction.ID, CloseTabAction.LABEL, CloseTabAction.ICON);
}
run(): TPromise<boolean> {
run(): Promise<boolean> {
try {
this.closeFn.apply(this.context);
return TPromise.as(true);
return Promise.resolve(true);
} catch (e) {
return TPromise.as(false);
return Promise.resolve(false);
}
}
}