not dirty if auto-save soon without any save error state

Author: amunger

src/vs/workbench/contrib/notebook/common/notebookCommon.ts

@@ -796,6 +796,7 @@ export interface INotebookEditorModel extends IEditorModel {
 	readonly resource: URI;
 	readonly viewType: string;
 	readonly notebook: INotebookTextModel | undefined;
+	readonly hasErrorState: boolean;
 	isResolved(): this is IResolvedNotebookEditorModel;
 	isDirty(): boolean;
 	isModified(): boolean;

src/vs/workbench/contrib/notebook/common/notebookEditorInput.ts

@@ -24,7 +24,7 @@ import { VSBuffer } from 'vs/base/common/buffer';
 import { IWorkingCopyIdentifier } from 'vs/workbench/services/workingCopy/common/workingCopy';
 import { NotebookProviderInfo } from 'vs/workbench/contrib/notebook/common/notebookProvider';
 import { NotebookPerfMarks } from 'vs/workbench/contrib/notebook/common/notebookPerformance';
-import { IFilesConfigurationService } from 'vs/workbench/services/filesConfiguration/common/filesConfigurationService';
+import { AutoSaveMode, IFilesConfigurationService } from 'vs/workbench/services/filesConfiguration/common/filesConfigurationService';
 import { IExtensionService } from 'vs/workbench/services/extensions/common/extensions';
 import { localize } from 'vs/nls';
 import { IEditorService } from 'vs/workbench/services/editor/common/editorService';
@@ -156,6 +156,15 @@ export class NotebookEditorInput extends AbstractResourceEditorInput {
 		return this._editorModelReference.object.isDirty();
 	}
 
+	override isSaving(): boolean {
+		if (!this._editorModelReference || !this._editorModelReference.object.isDirty() || this._editorModelReference.object.hasErrorState) {
+			return false; // require the model to be dirty and not in error state
+		}
+
+		// if a short auto save is configured, treat this as being saved
+		return this.filesConfigurationService.getAutoSaveMode() === AutoSaveMode.AFTER_SHORT_DELAY;
+	}
+
 	override async save(group: GroupIdentifier, options?: ISaveOptions): Promise<EditorInput | IUntypedEditorInput | undefined> {
 		if (this._editorModelReference) {
 

src/vs/workbench/contrib/notebook/common/notebookEditorModel.ts

@@ -46,6 +46,7 @@ export class SimpleNotebookEditorModel extends EditorModel implements INotebookE
 	private _workingCopy?: IStoredFileWorkingCopy<NotebookFileWorkingCopyModel> | IUntitledFileWorkingCopy<NotebookFileWorkingCopyModel>;
 	private readonly _workingCopyListeners = this._register(new DisposableStore());
 	private readonly scratchPad: boolean;
+	private _hasErrorState: boolean = false;
 
 	constructor(
 		readonly resource: URI,
@@ -108,6 +109,10 @@ export class SimpleNotebookEditorModel extends EditorModel implements INotebookE
 		}
 	}
 
+	get hasErrorState(): boolean {
+		return this._hasErrorState;
+	}
+
 	revert(options?: IRevertOptions): Promise<void> {
 		assertType(this.isResolved());
 		return this._workingCopy!.revert(options);
@@ -118,6 +123,13 @@ export class SimpleNotebookEditorModel extends EditorModel implements INotebookE
 		return this._workingCopy!.save(options);
 	}
 
+	private onDidChangeDirtyHandler() {
+		if (!this._workingCopy?.isDirty()) {
+			this._hasErrorState = false;
+		}
+		this._onDidChangeDirty.fire();
+	}
+
 	async load(options?: INotebookLoadOptions): Promise<IResolvedNotebookEditorModel> {
 		if (!this._workingCopy || !this._workingCopy.model) {
 			if (this.resource.scheme === Schemas.untitled) {
@@ -132,8 +144,9 @@ export class SimpleNotebookEditorModel extends EditorModel implements INotebookE
 				this._workingCopyListeners.add(this._workingCopy.onDidSave(e => this._onDidSave.fire(e)));
 				this._workingCopyListeners.add(this._workingCopy.onDidChangeOrphaned(() => this._onDidChangeOrphaned.fire()));
 				this._workingCopyListeners.add(this._workingCopy.onDidChangeReadonly(() => this._onDidChangeReadonly.fire()));
+				this._workingCopyListeners.add(this._workingCopy.onDidSaveError(() => { this._hasErrorState = true; }));
 			}
-			this._workingCopy.onDidChangeDirty(() => this._onDidChangeDirty.fire(), undefined, this._workingCopyListeners);
+			this._workingCopyListeners.add(this._workingCopy.onDidChangeDirty(this.onDidChangeDirtyHandler.bind(this), undefined, this._workingCopyListeners));
 
 			this._workingCopyListeners.add(this._workingCopy.onWillDispose(() => {
 				this._workingCopyListeners.clear();

src/vs/workbench/contrib/notebook/test/browser/testNotebookEditor.ts

@@ -135,6 +135,10 @@ export class NotebookEditorTestModel extends EditorModel implements INotebookEdi
 		return this._dirty;
 	}
 
+	get hasErrorState() {
+		return false;
+	}
+
 	isModified(): boolean {
 		return this._dirty;
 	}