Update model correctly with multiple results in one file - #47058

microsoft · Apr 20, 2018 · db42c90 · db42c90
1 parent 1fa023b
commit db42c90
Showing 1 changed file with 8 additions and 6 deletions.
diff --git a/src/vs/workbench/parts/search/common/searchModel.ts b/src/vs/workbench/parts/search/common/searchModel.ts
@@ -394,13 +394,15 @@ export class FolderMatch extends Disposable {
 	public add(raw: IFileMatch[], silent: boolean): void {
 		let changed: FileMatch[] = [];
 		raw.forEach((rawFileMatch) => {
-			if (!this._fileMatches.has(rawFileMatch.resource)) {
-				let fileMatch = this.instantiationService.createInstance(FileMatch, this._query.contentPattern, this._query.maxResults, this, rawFileMatch);
-				this.doAdd(fileMatch);
-				changed.push(fileMatch);
-				let disposable = fileMatch.onChange(() => this.onFileChange(fileMatch));
-				fileMatch.onDispose(() => disposable.dispose());
+			if (this._fileMatches.has(rawFileMatch.resource)) {
+				this._fileMatches.get(rawFileMatch.resource).dispose();
 			}
+
+			let fileMatch = this.instantiationService.createInstance(FileMatch, this._query.contentPattern, this._query.maxResults, this, rawFileMatch);
+			this.doAdd(fileMatch);
+			changed.push(fileMatch);
+			let disposable = fileMatch.onChange(() => this.onFileChange(fileMatch));
+			fileMatch.onDispose(() => disposable.dispose());
 		});
 		if (!silent && changed.length) {
 			this._onChange.fire({ elements: changed, added: true });