Solved bug regarding different substrings as search results.

Fixes #7282
eclipse-theia · Jun 10, 2020 · ef36e65 · ef36e65
1 parent 309b218
commit ef36e65
Showing 1 changed file with 6 additions and 8 deletions.
diff --git a/packages/search-in-workspace/src/browser/search-in-workspace-result-tree-widget.tsx b/packages/search-in-workspace/src/browser/search-in-workspace-result-tree-widget.tsx
@@ -212,10 +212,15 @@ export class SearchInWorkspaceResultTreeWidget extends TreeWidget {
         this.cancelIndicator = new CancellationTokenSource();
         const cancelIndicator = this.cancelIndicator;
         const token = this.cancelIndicator.token;
+        const progress = await this.progressService.showProgress({ text: `search: ${searchTerm}`, options: { location: 'search' } });
         token.onCancellationRequested(() => {
             this.changeEmitter.fire(this.resultTree);
+            progress.cancel();
+            if (searchId) {
+                this.searchService.cancel(searchId);
+            }
+            this.cancelIndicator = undefined;
         });
-        const progress = await this.progressService.showProgress({ text: `search: ${searchTerm}`, options: { location: 'search' } });
         // eslint-disable-next-line @typescript-eslint/no-explicit-any
         let pendingRefreshTimeout: any;
         const searchId = await this.searchService.search(searchTerm, {
@@ -260,13 +265,6 @@ export class SearchInWorkspaceResultTreeWidget extends TreeWidget {
                 this.refreshModelChildren();
             }
         }, searchOptions).catch(() => undefined);
-        token.onCancellationRequested(() => {
-            progress.cancel();
-            if (searchId) {
-                this.searchService.cancel(searchId);
-            }
-            this.cancelIndicator = undefined;
-        });
     }
 
     focusFirstResult(): void {