Merge VS Code 1.23.1 (#1520)

This commit is contained in:
Matt Irvine
2018-06-05 11:24:51 -07:00
committed by GitHub
parent e3baf5c443
commit 0c58f09e59
3651 changed files with 74249 additions and 48599 deletions

View File

@@ -6,7 +6,7 @@
import 'vs/css!sql/parts/query/editor/media/queryEditor';
import { TPromise } from 'vs/base/common/winjs.base';
import { Dimension, Builder } from 'vs/base/browser/builder';
import { Dimension } from 'vs/base/browser/dom';
import { EditorOptions } from 'vs/workbench/common/editor';
import { BaseEditor } from 'vs/workbench/browser/parts/editor/baseEditor';
import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
@@ -32,9 +32,9 @@ export class TaskDialogEditor extends BaseEditor {
}
/**
* Called to create the editor in the parent builder.
* Called to create the editor in the parent element.
*/
public createEditor(parent: Builder): void {
public createEditor(parent: HTMLElement): void {
}
/**
@@ -58,7 +58,7 @@ export class TaskDialogEditor extends BaseEditor {
if (!input.hasInitialized) {
this.bootstrapAngular(input);
}
this.revealElementWithTagName(input.uniqueSelector, this.getContainer().getHTMLElement());
this.revealElementWithTagName(input.uniqueSelector, this.getContainer());
return super.setInput(input, options);
}
@@ -94,7 +94,7 @@ export class TaskDialogEditor extends BaseEditor {
};
let uniqueSelector = this.instantiationService.invokeFunction(bootstrapAngular,
TaskDialogModule,
this.getContainer().getHTMLElement(),
this.getContainer(),
TASKDIALOG_SELECTOR,
params);
input.setUniqueSelector(uniqueSelector);