Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Disable auto saving of untitled notebooks #100256

Merged
merged 1 commit into from Jun 17, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
Expand Up @@ -70,6 +70,10 @@ export class NotebookEditorInput extends EditorInput {
return this.textModel?.isDirty() || false;
}

isUntitled(): boolean {
return this.textModel?.isUntitled() || false;
}

isReadonly() {
return false;
}
Expand Down
1 change: 1 addition & 0 deletions src/vs/workbench/contrib/notebook/common/notebookCommon.ts
Expand Up @@ -568,6 +568,7 @@ export interface INotebookEditorModel extends IEditorModel {
readonly viewType: string;
readonly notebook: NotebookTextModel;
isDirty(): boolean;
isUntitled(): boolean;
save(): Promise<boolean>;
saveAs(target: URI): Promise<boolean>;
revert(options?: IRevertOptions | undefined): Promise<void>;
Expand Down
Expand Up @@ -12,7 +12,7 @@ import { ResourceMap } from 'vs/base/common/map';
import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
import { INotebookService } from 'vs/workbench/contrib/notebook/common/notebookService';
import { URI } from 'vs/base/common/uri';
import { IWorkingCopyService, IWorkingCopy, IWorkingCopyBackup } from 'vs/workbench/services/workingCopy/common/workingCopyService';
import { IWorkingCopyService, IWorkingCopy, IWorkingCopyBackup, WorkingCopyCapabilities } from 'vs/workbench/services/workingCopy/common/workingCopyService';
import { basename } from 'vs/base/common/resources';
import { CancellationTokenSource } from 'vs/base/common/cancellation';
import { IBackupFileService } from 'vs/workbench/services/backup/common/backup';
Expand Down Expand Up @@ -71,7 +71,7 @@ export class NotebookEditorModel extends EditorModel implements IWorkingCopy, IN
const workingCopyAdapter = new class implements IWorkingCopy {
readonly resource = input._workingCopyResource;
get name() { return input.name; }
readonly capabilities = input.capabilities;
readonly capabilities = input.isUntitled() ? WorkingCopyCapabilities.Untitled : input.capabilities;
readonly onDidChangeDirty = input.onDidChangeDirty;
readonly onDidChangeContent = input.onDidChangeContent;
isDirty(): boolean { return input.isDirty(); }
Expand Down Expand Up @@ -211,6 +211,10 @@ export class NotebookEditorModel extends EditorModel implements IWorkingCopy, IN
return this._dirty;
}

isUntitled() {
return this.resource.scheme === Schemas.untitled;
}

async save(): Promise<boolean> {
const tokenSource = new CancellationTokenSource();
await this.notebookService.save(this.notebook.viewType, this.notebook.uri, tokenSource.token);
Expand Down
5 changes: 5 additions & 0 deletions src/vs/workbench/contrib/notebook/test/testNotebookEditor.ts
Expand Up @@ -23,6 +23,7 @@ import { CellKind, CellUri, INotebookEditorModel, IProcessedOutput, NotebookCell
import { Webview } from 'vs/workbench/contrib/webview/browser/webview';
import { ICompositeCodeEditor, IEditor } from 'vs/editor/common/editorCommon';
import { NotImplementedError } from 'vs/base/common/errors';
import { Schemas } from 'vs/base/common/network';

export class TestCell extends NotebookCellTextModel {
constructor(
Expand Down Expand Up @@ -273,6 +274,10 @@ export class NotebookEditorTestModel extends EditorModel implements INotebookEdi
return this._dirty;
}

isUntitled() {
return this._notebook.uri.scheme === Schemas.untitled;
}

getNotebook(): NotebookTextModel {
return this._notebook;
}
Expand Down