ckaczor/azuredatastudio
1
0
Fork 0
mirror of https://github.com/ckaczor/azuredatastudio.git synced 2026-02-05 01:25:38 -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

5
src/sql/parts/tasks/dialog/taskDialogEditor.ts
View File

@@ -5,7 +5,6 @@
import 'vs/css!sql/parts/query/editor/media/queryEditor';
import { TPromise } from 'vs/base/common/winjs.base';
import { Dimension } from 'vs/base/browser/dom';
import { EditorOptions } from 'vs/workbench/common/editor';
import { BaseEditor } from 'vs/workbench/browser/parts/editor/baseEditor';
@@ -53,9 +52,9 @@ export class TaskDialogEditor extends BaseEditor {
public layout(dimension: Dimension): void {
}
public setInput(input: TaskDialogInput, options: EditorOptions): Thenable<void> {
public setInput(input: TaskDialogInput, options: EditorOptions): Promise<void> {
if (this.input instanceof TaskDialogInput && this.input.matches(input)) {
return TPromise.as(undefined);
return Promise.resolve(undefined);
}
if (!input.hasInitialized) {