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

18
src/sql/parts/notebook/notebookInput.ts
View File

@@ -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) {