Implement search.quickOpen.includeHistory preference (#12913)

Signed-off-by: Christian Radke <[email protected]>
eclipse-theia · Oct 18, 2023 · 30d166e · 30d166e
1 parent e0c82d1
commit 30d166e
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 14 deletions.
diff --git a/packages/file-search/src/browser/quick-file-open.ts b/packages/file-search/src/browser/quick-file-open.ts
@@ -15,7 +15,7 @@
 // *****************************************************************************
 
 import { inject, injectable, optional, postConstruct } from '@theia/core/shared/inversify';
-import { OpenerService, KeybindingRegistry, QuickAccessRegistry, QuickAccessProvider, CommonCommands } from '@theia/core/lib/browser';
+import { OpenerService, KeybindingRegistry, QuickAccessRegistry, QuickAccessProvider, CommonCommands, PreferenceService } from '@theia/core/lib/browser';
 import { WorkspaceService } from '@theia/workspace/lib/browser/workspace-service';
 import URI from '@theia/core/lib/common/uri';
 import { FileSearchService, WHITESPACE_QUERY_SEPARATOR } from '../common/file-search-service';
@@ -66,6 +66,8 @@ export class QuickFileOpenService implements QuickAccessProvider {
     protected readonly messageService: MessageService;
     @inject(FileSystemPreferences)
     protected readonly fsPreferences: FileSystemPreferences;
+    @inject(PreferenceService)
+    protected readonly preferences: PreferenceService;
 
     registerQuickAccessProvider(): void {
         this.quickAccessRegistry.registerQuickAccessProvider({
@@ -162,20 +164,22 @@ export class QuickFileOpenService implements QuickAccessProvider {
         const alreadyCollected = new Set<string>();
         const recentlyUsedItems: QuickPicks = [];
 
-        const locations = [...this.navigationLocationService.locations()].reverse();
-        for (const location of locations) {
-            const uriString = location.uri.toString();
-
-            if (location.uri.scheme === 'file' && !alreadyCollected.has(uriString) && fuzzy.test(fileFilter, uriString)) {
-                if (recentlyUsedItems.length === 0) {
-                    recentlyUsedItems.push({
-                        type: 'separator',
-                        label: nls.localizeByDefault('recently opened')
-                    });
+        if (this.preferences.get('search.quickOpen.includeHistory')) {
+            const locations = [...this.navigationLocationService.locations()].reverse();
+            for (const location of locations) {
+                const uriString = location.uri.toString();
+
+                if (location.uri.scheme === 'file' && !alreadyCollected.has(uriString) && fuzzy.test(fileFilter, uriString)) {
+                    if (recentlyUsedItems.length === 0) {
+                        recentlyUsedItems.push({
+                            type: 'separator',
+                            label: nls.localizeByDefault('recently opened')
+                        });
+                    }
+                    const item = this.toItem(fileFilter, location.uri);
+                    recentlyUsedItems.push(item);
+                    alreadyCollected.add(uriString);
                 }
-                const item = this.toItem(fileFilter, location.uri);
-                recentlyUsedItems.push(item);
-                alreadyCollected.add(uriString);
             }
         }
 

diff --git a/packages/search-in-workspace/src/browser/search-in-workspace-preferences.ts b/packages/search-in-workspace/src/browser/search-in-workspace-preferences.ts
@@ -32,6 +32,11 @@ export const searchInWorkspacePreferencesSchema: PreferenceSchema = {
             type: 'string',
             enum: ['auto', 'alwaysCollapse', 'alwaysExpand'],
         },
+        'search.quickOpen.includeHistory': {
+            description: nls.localizeByDefault('Whether to include results from recently opened files in the file results for Quick Open.'),
+            default: true,
+            type: 'boolean',
+        },
         'search.searchOnType': {
             description: nls.localizeByDefault('Search all files as you type.'),
             default: true,