Fix microsoft#98766 - Reloading a dirty saved search editor causes a phantom tab to appear

Jackson Kearl · Jackson Kearl · commit 028241b16005 · 2020-05-28T16:58:04.000-07:00
diff --git a/src/vs/workbench/contrib/searchEditor/browser/searchEditorInput.ts b/src/vs/workbench/contrib/searchEditor/browser/searchEditorInput.ts
@@ -108,7 +108,7 @@ export class SearchEditorInput extends EditorInput {
 
 		const input = this;
 		const workingCopyAdapter = new class implements IWorkingCopy {
-			readonly resource = input.modelUri;
+			readonly resource = input.backingUri ?? input.modelUri;
 			get name() { return input.getName(); }
 			readonly capabilities = input.isUntitled() ? WorkingCopyCapabilities.Untitled : 0;
 			readonly onDidChangeDirty = input.onDidChangeDirty;
diff --git a/src/vs/workbench/contrib/searchEditor/browser/searchEditorModel.ts b/src/vs/workbench/contrib/searchEditor/browser/searchEditorModel.ts
@@ -34,7 +34,7 @@ export class SearchEditorModel {
 		@IModeService private readonly modeService: IModeService) {
 		this.onModelResolved = new Promise<ITextModel>(resolve => this.resolveContents = resolve);
 		this.onModelResolved.then(model => this.cachedContentsModel = model);
-		this.ongoingResolve = backupService.resolve(modelUri)
+		this.ongoingResolve = backupService.resolve(existingData.backingUri ?? modelUri)
 			.then(backup => modelService.getModel(modelUri) ?? (backup ? modelService.createModel(backup.value, modeService.create('search-result'), modelUri) : undefined))
 			.then(model => { if (model) { this.resolveContents(model); } });
 	}

Original file line number	Diff line number	Diff line change
`@@ -34,7 +34,7 @@ export class SearchEditorModel {`
`34`	`34`	`@IModeService private readonly modeService: IModeService) {`
`35`	`35`	`this.onModelResolved = new Promise<ITextModel>(resolve => this.resolveContents = resolve);`
`36`	`36`	`this.onModelResolved.then(model => this.cachedContentsModel = model);`
`37`		`- this.ongoingResolve = backupService.resolve(modelUri)`
	`37`	`+ this.ongoingResolve = backupService.resolve(existingData.backingUri ?? modelUri)`
`38`	`38`	`.then(backup => modelService.getModel(modelUri) ?? (backup ? modelService.createModel(backup.value, modeService.create('search-result'), modelUri) : undefined))`
`39`	`39`	`.then(model => { if (model) { this.resolveContents(model); } });`
`40`	`40`	`}`