Merge pull request microsoft#189411 from microsoft/aamunger/cleanup

removed redundant conflict check, cleanup disposable handling

Author: amunger

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

@@ -797,7 +797,6 @@ 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

@@ -158,8 +158,8 @@ export class NotebookEditorInput extends AbstractResourceEditorInput {
 
 	override isSaving(): boolean {
 		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 or conflict state
+		if (!model || !model.isDirty() || model.hasErrorState) {
+			return false; // require the model to be dirty and not in an error state
 		}
 
 		// if a short auto save is configured, treat this as being saved

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

@@ -116,14 +116,6 @@ export class SimpleNotebookEditorModel extends EditorModel implements INotebookE
 		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> {
 		assertType(this.isResolved());
 		return this._workingCopy!.revert(options);
@@ -149,7 +141,7 @@ export class SimpleNotebookEditorModel extends EditorModel implements INotebookE
 				this._workingCopyListeners.add(this._workingCopy.onDidChangeOrphaned(() => this._onDidChangeOrphaned.fire()));
 				this._workingCopyListeners.add(this._workingCopy.onDidChangeReadonly(() => this._onDidChangeReadonly.fire()));
 			}
-			this._workingCopyListeners.add(this._workingCopy.onDidChangeDirty(() => this._onDidChangeDirty.fire(), undefined, this._workingCopyListeners));
+			this._workingCopyListeners.add(this._workingCopy.onDidChangeDirty(() => this._onDidChangeDirty.fire(), undefined));
 
 			this._workingCopyListeners.add(this._workingCopy.onWillDispose(() => {
 				this._workingCopyListeners.clear();

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

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