ckaczor/azuredatastudio
1
0
Fork 0
mirror of https://github.com/ckaczor/azuredatastudio.git synced 2026-01-19 09:35: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

3
src/sql/base/browser/ui/taskbar/actionbar.ts
View File

@@ -7,7 +7,6 @@
import 'vs/css!vs/base/browser/ui/actionbar/actionbar';
import { Promise } from 'vs/base/common/winjs.base';
import { Builder, $ } from 'sql/base/browser/builder';
import { IAction, IActionRunner, ActionRunner } from 'vs/base/common/actions';
import { EventEmitter } from 'sql/base/common/eventEmitter';
@@ -363,7 +362,7 @@ export class ActionBar extends ActionRunner implements IActionRunner {
//this.emit('cancel');
}
public run(action: IAction, context?: any): Promise {
public run(action: IAction, context?: any): Promise<any> {
return this._actionRunner.run(action, context);
}