Merge VS Code 1.31.1 (#4283)

src/sql/parts/notebook/cellViews/code.component.ts

@@ -27,7 +27,7 @@ import { IModeService } from 'vs/editor/common/services/modeService';
 import { IModelService } from 'vs/editor/common/services/modelService';
 import { IContextMenuService } from 'vs/platform/contextview/browser/contextView';
 import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { Emitter, debounceEvent } from 'vs/base/common/event';
+import { Event, Emitter } from 'vs/base/common/event';
 import { CellTypes } from 'sql/parts/notebook/models/contracts';
 import { OVERRIDE_EDITOR_THEMING_SETTING } from 'sql/workbench/services/notebook/common/notebookService';
 import * as notebookUtils from 'sql/parts/notebook/notebookUtils';
@@ -107,7 +107,7 @@ export class CodeComponent extends AngularDisposable implements OnInit, OnChange
 	) {
 		super();
 		this._cellToggleMoreActions = this._instantiationService.createInstance(CellToggleMoreActions);
-		this._register(debounceEvent(this._layoutEmitter.event, (l, e) => e, 250, /*leading=*/false)
+		this._register(Event.debounce(this._layoutEmitter.event, (l, e) => e, 250, /*leading=*/false)
 		(() => this.layout()));
 		// Handle disconnect on removal of the cell, if it was the active cell
 		this._register({ dispose: () => this.updateConnectionState(false) });

src/sql/parts/notebook/cellViews/codeActions.ts

@@ -6,7 +6,6 @@
 import { nb } from 'azdata';
 
 import { Action } from 'vs/base/common/actions';
-import { TPromise } from 'vs/base/common/winjs.base';
 import { localize } from 'vs/nls';
 import { IDisposable } from 'vs/base/common/lifecycle';
 import * as types from 'vs/base/common/types';
@@ -54,11 +53,11 @@ export abstract class CellActionBase extends Action {
 		return true;
 	}
 
-	public run(context: CellContext): TPromise<boolean> {
+	public run(context: CellContext): Promise<boolean> {
 		if (hasModelAndCell(context, this.notificationService)) {
-			return TPromise.wrap(this.doRun(context).then(() => true));
+			return this.doRun(context).then(() => true);
 		}
-		return TPromise.as(true);
+		return Promise.resolve(true);
 	}
 
 	abstract doRun(context: CellContext): Promise<void>;
@@ -80,8 +79,8 @@ export class RunCellAction extends MultiStateAction<CellExecutionState> {
 		this.ensureContextIsUpdated(context);
 	}
 
-	public run(context?: CellContext): TPromise<boolean> {
-		return TPromise.wrap(this.doRun(context).then(() => true));
+	public run(context?: CellContext): Promise<boolean> {
+		return this.doRun(context).then(() => true);
 	}
 
 	public async doRun(context: CellContext): Promise<void> {

src/sql/parts/notebook/notebookActions.ts

@@ -6,7 +6,6 @@
 import * as azdata from 'azdata';
 
 import { Action } from 'vs/base/common/actions';
-import { TPromise } from 'vs/base/common/winjs.base';
 import { localize } from 'vs/nls';
 import { IContextViewProvider } from 'vs/base/browser/ui/contextview/contextview';
 import { INotificationService, Severity, INotificationActions } from 'vs/platform/notification/common/notification';
@@ -42,8 +41,8 @@ export class AddCellAction extends Action {
 	) {
 		super(id, label, cssClass);
 	}
-	public run(context: NotebookComponent): TPromise<boolean> {
-		return new TPromise<boolean>((resolve, reject) => {
+	public run(context: NotebookComponent): Promise<boolean> {
+		return new Promise<boolean>((resolve, reject) => {
 			try {
 				context.addCell(this.cellType);
 				resolve(true);
@@ -194,9 +193,9 @@ export class TrustedAction extends ToggleableAction {
 		this.toggle(value);
 	}
 
-	public run(context: NotebookComponent): TPromise<boolean> {
+	public run(context: NotebookComponent): Promise<boolean> {
 		let self = this;
-		return new TPromise<boolean>((resolve, reject) => {
+		return new Promise<boolean>((resolve, reject) => {
 			try {
 				if (self.trusted) {
 					const actions: INotificationActions = { primary: [] };

src/sql/parts/notebook/notebookEditor.ts

@@ -2,7 +2,6 @@
  *  Copyright (c) Microsoft Corporation. All rights reserved.
  *  Licensed under the Source EULA. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
-import { TPromise } from 'vs/base/common/winjs.base';
 import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
 import { IThemeService } from 'vs/platform/theme/common/themeService';
 import { BaseEditor } from 'vs/workbench/browser/parts/editor/baseEditor';
@@ -59,9 +58,9 @@ export class NotebookEditor extends BaseEditor {
 		}
 	}
 
-	public setInput(input: NotebookInput, options: EditorOptions): TPromise<void> {
+	public setInput(input: NotebookInput, options: EditorOptions): Promise<void> {
 		if (this.input && this.input.matches(input)) {
-			return TPromise.as(undefined);
+			return Promise.resolve(undefined);
 		}
 
 		const parentElement = this.getContainer();
@@ -75,11 +74,11 @@ export class NotebookEditor extends BaseEditor {
 			container.style.height = '100%';
 			this._notebookContainer = DOM.append(parentElement, container);
 			input.container = this._notebookContainer;
-			return TPromise.wrap<void>(this.bootstrapAngular(input));
+			return Promise.resolve(this.bootstrapAngular(input));
 		} else {
 			this._notebookContainer = DOM.append(parentElement, input.container);
 			input.doChangeLayout();
-			return TPromise.wrap<void>(null);
+			return Promise.resolve(null);
 		}
 	}
 

src/sql/parts/notebook/notebookInput.ts

@@ -6,7 +6,6 @@
 'use strict';
 
 import * as nls from 'vs/nls';
-import { TPromise } from 'vs/base/common/winjs.base';
 import { IEditorModel } from 'vs/platform/editor/common/editor';
 import { EditorInput, EditorModel, ConfirmResult } from 'vs/workbench/common/editor';
 import { Emitter, Event } from 'vs/base/common/event';
@@ -33,7 +32,6 @@ import { IExtensionService } from 'vs/workbench/services/extensions/common/exten
 
 export type ModeViewSaveHandler = (handle: number) => Thenable<boolean>;
 
-
 export class NotebookEditorModel extends EditorModel {
 	private dirty: boolean;
 	private readonly _onDidChangeDirty: Emitter<void> = this._register(new Emitter<void>());
@@ -77,7 +75,7 @@ export class NotebookEditorModel extends EditorModel {
 		this._onDidChangeDirty.fire();
 	}
 
-	public confirmSave(): TPromise<ConfirmResult> {
+	public confirmSave(): Promise<ConfirmResult> {
 		return this.textFileService.confirmSave([this.notebookUri]);
 	}
 
@@ -85,10 +83,10 @@ export class NotebookEditorModel extends EditorModel {
 	 * UntitledEditor uses TextFileService to save data from UntitledEditorInput
 	 * Titled editor uses TextFileEditorModel to save existing notebook
 	*/
-	save(options: ISaveOptions): TPromise<boolean> {
+	save(options: ISaveOptions): Promise<boolean> {
 		if (this.textEditorModel instanceof TextFileEditorModel) {
 			this.textEditorModel.save(options);
-			return TPromise.as(true);
+			return Promise.resolve(true);
 		}
 		else {
 			return this.textFileService.save(this.notebookUri, options);
@@ -163,11 +161,11 @@ export class NotebookInput extends EditorInput {
 		return this._textInput;
 	}
 
-	public confirmSave(): TPromise<ConfirmResult> {
+	public confirmSave(): Promise<ConfirmResult> {
 		return this._model.confirmSave();
 	}
 
-	public revert(): TPromise<boolean> {
+	public revert(): Promise<boolean> {
 		return this._textInput.revert();
 	}
 
@@ -216,7 +214,7 @@ export class NotebookInput extends EditorInput {
 		return this._standardKernels;
 	}
 
-	public save(): TPromise<boolean> {
+	public save(): Promise<boolean> {
 		let options: ISaveOptions = { force: false };
 		return this._model.save(options);
 	}
@@ -256,9 +254,9 @@ export class NotebookInput extends EditorInput {
 		return this.resource;
 	}
 
-	async resolve(): TPromise<NotebookEditorModel> {
+	async resolve(): Promise<NotebookEditorModel> {
 		if (this._model && this._model.isModelCreated()) {
-			return TPromise.as(this._model);
+			return Promise.resolve(this._model);
 		} else {
 			let textOrUntitledEditorModel: UntitledEditorModel | IEditorModel;
 			if (this.resource.scheme === Schemas.untitled) {