use error state from working copy

Author: amunger

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

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

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

@@ -157,8 +157,9 @@ export class NotebookEditorInput extends AbstractResourceEditorInput {
 	}
 
 	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
+		const model = this._editorModelReference?.object;
+		if (!model || !model.isDirty() || model.hasErrorState || model.hasConflictState) {
+			return false; // require the model to be dirty and not in error of conflict state
 		}
 
 		// if a short auto save is configured, treat this as being saved

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

@@ -46,7 +46,6 @@ 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,
@@ -110,7 +109,19 @@ export class SimpleNotebookEditorModel extends EditorModel implements INotebookE
 	}
 
 	get hasErrorState(): boolean {
-		return this._hasErrorState;
+		if (this._workingCopy && 'hasState' in this._workingCopy) {
+			return this._workingCopy.hasState(StoredFileWorkingCopyState.ERROR);
+		}
+
+		return false;
+	}
+
+	get hasConflictState(): boolean {
+		if (this._workingCopy && 'hasState' in this._workingCopy) {
+			return this._workingCopy.hasState(StoredFileWorkingCopyState.CONFLICT);
+		}
+
+		return false;
 	}
 
 	revert(options?: IRevertOptions): Promise<void> {
@@ -123,13 +134,6 @@ 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) {
@@ -144,9 +148,8 @@ 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._workingCopyListeners.add(this._workingCopy.onDidChangeDirty(this.onDidChangeDirtyHandler.bind(this), undefined, this._workingCopyListeners));
+			this._workingCopyListeners.add(this._workingCopy.onDidChangeDirty(() => this._onDidChangeDirty.fire(), undefined, this._workingCopyListeners));
 
 			this._workingCopyListeners.add(this._workingCopy.onWillDispose(() => {
 				this._workingCopyListeners.clear();

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

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