ckaczor/azuredatastudio
1
0
Fork 0
mirror of https://github.com/ckaczor/azuredatastudio.git synced 2026-03-25 06:10:30 -04: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

14
src/vs/base/common/actions.ts
View File

@@ -20,11 +20,11 @@ export interface IAction extends IDisposable {
enabled: boolean;
checked: boolean;
radio: boolean;
run(event?: any): Thenable<any>;
run(event?: any): Promise<any>;
}
export interface IActionRunner extends IDisposable {
run(action: IAction, context?: any): Thenable<any>;
run(action: IAction, context?: any): Promise<any>;
onDidRun: Event<IRunEvent>;
onDidBeforeRun: Event<IRunEvent>;
}
@@ -60,9 +60,9 @@ export class Action implements IAction {
protected _enabled: boolean;
protected _checked: boolean;
protected _radio: boolean;
protected _actionCallback?: (event?: any) => Thenable<any>;
protected _actionCallback?: (event?: any) => Promise<any>;
constructor(id: string, label: string = '', cssClass: string = '', enabled: boolean = true, actionCallback?: (event?: any) => Thenable<any>) {
constructor(id: string, label: string = '', cssClass: string = '', enabled: boolean = true, actionCallback?: (event?: any) => Promise<any>) {
this._id = id;
this._label = label;
this._cssClass = cssClass;
@@ -164,7 +164,7 @@ export class Action implements IAction {
}
}
run(event?: any, _data?: ITelemetryData): Thenable<any> {
run(event?: any, _data?: ITelemetryData): Promise<any> {
if (this._actionCallback) {
return this._actionCallback(event);
}
@@ -191,7 +191,7 @@ export class ActionRunner extends Disposable implements IActionRunner {
private _onDidRun = this._register(new Emitter<IRunEvent>());
readonly onDidRun: Event<IRunEvent> = this._onDidRun.event;
run(action: IAction, context?: any): Thenable<any> {
run(action: IAction, context?: any): Promise<any> {
if (!action.enabled) {
return Promise.resolve(null);
}
@@ -205,7 +205,7 @@ export class ActionRunner extends Disposable implements IActionRunner {
});
}
protected runAction(action: IAction, context?: any): Thenable<any> {
protected runAction(action: IAction, context?: any): Promise<any> {
const res = context ? action.run(context) : action.run();
return Promise.resolve(res);
}