Fix microsoft#145749

Author: Jackson Kearl

src/vs/workbench/contrib/searchEditor/browser/searchEditor.ts

@@ -92,6 +92,7 @@ export class SearchEditor extends BaseTextEditor<SearchEditorViewState> {
 	private container: HTMLElement;
 	private searchModel: SearchModel;
 	private ongoingOperations: number = 0;
+	private updatingModelForSearch: boolean = false;
 
 	constructor(
 		@ITelemetryService telemetryService: ITelemetryService,
@@ -252,8 +253,11 @@ export class SearchEditor extends BaseTextEditor<SearchEditorViewState> {
 				}
 			}
 		});
-
-		this._register(this.searchResultEditor.onDidChangeModelContent(() => this.getInput()?.setDirty(true)));
+		this._register(this.searchResultEditor.onDidChangeModelContent(() => {
+			if (!this.updatingModelForSearch) {
+				this.getInput()?.setDirty(true);
+			}
+		}));
 	}
 
 	override getControl() {
@@ -528,7 +532,7 @@ export class SearchEditor extends BaseTextEditor<SearchEditorViewState> {
 		this.searchOperation.start(500);
 		this.ongoingOperations++;
 
-		const { configurationModel } = await startInput.getModels();
+		const { configurationModel } = await startInput.resolveModels();
 		configurationModel.updateConfig(config);
 
 		startInput.ongoingSearchOperation = this.searchModel.search(query).finally(() => {
@@ -561,8 +565,10 @@ export class SearchEditor extends BaseTextEditor<SearchEditorViewState> {
 		controller?.closeWidget(false);
 		const labelFormatter = (uri: URI): string => this.labelService.getUriLabel(uri, { relative: true });
 		const results = serializeSearchResultForEditor(this.searchModel.searchResult, startConfig.filesToInclude, startConfig.filesToExclude, startConfig.contextLines, labelFormatter, sortOrder, searchOperation?.limitHit);
-		const { resultsModel } = await input.getModels();
+		const { resultsModel } = await input.resolveModels();
+		this.updatingModelForSearch = true;
 		this.modelService.updateModel(resultsModel, results.text);
+		this.updatingModelForSearch = false;
 
 		if (searchOperation && searchOperation.messages) {
 			for (const message of searchOperation.messages) {
@@ -638,7 +644,7 @@ export class SearchEditor extends BaseTextEditor<SearchEditorViewState> {
 			return;
 		}
 
-		const { configurationModel, resultsModel } = await newInput.getModels();
+		const { configurationModel, resultsModel } = await newInput.resolveModels();
 		if (token.isCancellationRequested) { return; }
 
 		this.searchResultEditor.setModel(resultsModel);

src/vs/workbench/contrib/searchEditor/browser/searchEditorInput.ts

@@ -132,7 +132,7 @@ export class SearchEditorInput extends EditorInput {
 	}
 
 	override async save(group: GroupIdentifier, options?: ITextFileSaveOptions): Promise<EditorInput | undefined> {
-		if (((await this.getModels()).resultsModel).isDisposed()) { return; }
+		if (((await this.resolveModels()).resultsModel).isDisposed()) { return; }
 
 		if (this.backingUri) {
 			await this.textFileService.write(this.backingUri, await this.serializeForDisk(), options);
@@ -149,29 +149,33 @@ export class SearchEditorInput extends EditorInput {
 	}
 
 	private async serializeForDisk() {
-		const { configurationModel, resultsModel } = await this.getModels();
+		const { configurationModel, resultsModel } = await this.resolveModels();
 		return serializeSearchConfiguration(configurationModel.config) + '\n' + resultsModel.getValue();
 	}
 
 	private configChangeListenerDisposable: IDisposable | undefined;
 	private registerConfigChangeListeners(model: SearchConfigurationModel) {
 		this.configChangeListenerDisposable?.dispose();
-
 		if (!this.isDisposed()) {
 			this.configChangeListenerDisposable = model.onConfigDidUpdate(() => {
-				this._onDidChangeLabel.fire();
+				const oldName = this.getName();
+				if (oldName !== this.getName()) {
+					this._onDidChangeLabel.fire();
+				}
 				this.memento.getMemento(StorageScope.WORKSPACE, StorageTarget.MACHINE).searchConfig = model.config;
 			});
-
 			this._register(this.configChangeListenerDisposable);
 		}
 	}
 
-	async getModels() {
+	async resolveModels() {
 		return this.model.resolve().then(data => {
+			const oldName = this.getName();
 			this._cachedResultsModel = data.resultsModel;
 			this._cachedConfigurationModel = data.configurationModel;
-			this._onDidChangeLabel.fire();
+			if (oldName !== this.getName()) {
+				this._onDidChangeLabel.fire();
+			}
 			this.registerConfigChangeListeners(data.configurationModel);
 			return data;
 		});
@@ -211,8 +215,11 @@ export class SearchEditorInput extends EditorInput {
 	}
 
 	setDirty(dirty: boolean) {
+		const wasDirty = this.dirty;
 		this.dirty = dirty;
-		this._onDidChangeDirty.fire();
+		if (wasDirty !== dirty) {
+			this._onDidChangeDirty.fire();
+		}
 	}
 
 	override isDirty() {
@@ -253,7 +260,7 @@ export class SearchEditorInput extends EditorInput {
 	}
 
 	async setMatchRanges(ranges: Range[]) {
-		this.oldDecorationsIDs = (await this.getModels()).resultsModel.deltaDecorations(this.oldDecorationsIDs, ranges.map(range =>
+		this.oldDecorationsIDs = (await this.resolveModels()).resultsModel.deltaDecorations(this.oldDecorationsIDs, ranges.map(range =>
 			({ range, options: { description: 'search-editor-find-match', className: SearchEditorFindMatchClass, stickiness: TrackedRangeStickiness.NeverGrowsWhenTypingAtEdges } })));
 	}
 
@@ -265,11 +272,11 @@ export class SearchEditorInput extends EditorInput {
 
 		if (this.backingUri) {
 			const { config, text } = await this.instantiationService.invokeFunction(parseSavedSearchEditor, this.backingUri);
-			const { resultsModel, configurationModel } = await this.getModels();
+			const { resultsModel, configurationModel } = await this.resolveModels();
 			resultsModel.setValue(text);
 			configurationModel.updateConfig(config);
 		} else {
-			(await this.getModels()).resultsModel.setValue('');
+			(await this.resolveModels()).resultsModel.setValue('');
 		}
 		super.revert(group, options);
 		this.setDirty(false);
@@ -287,7 +294,7 @@ export class SearchEditorInput extends EditorInput {
 	}
 
 	private async suggestFileName(): Promise<URI> {
-		const query = (await this.getModels()).configurationModel.config.query;
+		const query = (await this.resolveModels()).configurationModel.config.query;
 		const searchFileName = (query.replace(/[^\w \-_]+/g, '_') || 'Search') + SEARCH_EDITOR_EXT;
 		return joinPath(await this.fileDialogService.defaultFilePath(this.pathService.defaultUriScheme), searchFileName);
 	}