@theia/file-search 1.58.3 → 1.59.0-next.72

package/lib/browser/quick-file-select-service.js

@@ -0,0 +1,276 @@
+"use strict";
+// *****************************************************************************
+// Copyright (C) 2017 TypeFox and others.
+//
+// This program and the accompanying materials are made available under the
+// terms of the Eclipse Public License v. 2.0 which is available at
+// http://www.eclipse.org/legal/epl-2.0.
+//
+// This Source Code may also be made available under the following Secondary
+// Licenses when the conditions for such availability set forth in the Eclipse
+// Public License v. 2.0 are satisfied: GNU General Public License, version 2
+// with the GNU Classpath Exception which is available at
+// https://www.gnu.org/software/classpath/license.html.
+//
+// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0
+// *****************************************************************************
+var QuickFileSelectService_1;
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.QuickFileSelectService = exports.FileQuickPickItem = void 0;
+const tslib_1 = require("tslib");
+const browser_1 = require("@theia/core/lib/browser");
+const label_provider_1 = require("@theia/core/lib/browser/label-provider");
+const quick_input_service_1 = require("@theia/core/lib/browser/quick-input/quick-input-service");
+const common_1 = require("@theia/core/lib/common");
+const message_service_1 = require("@theia/core/lib/common/message-service");
+const uri_1 = require("@theia/core/lib/common/uri");
+const fuzzy = require("@theia/core/shared/fuzzy");
+const inversify_1 = require("@theia/core/shared/inversify");
+const browser_2 = require("@theia/editor/lib/browser");
+const navigation_location_service_1 = require("@theia/editor/lib/browser/navigation/navigation-location-service");
+const browser_3 = require("@theia/filesystem/lib/browser");
+const workspace_service_1 = require("@theia/workspace/lib/browser/workspace-service");
+const file_search_service_1 = require("../common/file-search-service");
+// Supports patterns of <path><#|:><line><#|:|,><col?>
+const LINE_COLON_PATTERN = /\s?[#:\(](?:line )?(\d*)(?:[#:,](\d*))?\)?\s*$/;
+var FileQuickPickItem;
+(function (FileQuickPickItem) {
+    function is(obj) {
+        return obj && 'uri' in obj;
+    }
+    FileQuickPickItem.is = is;
+})(FileQuickPickItem || (exports.FileQuickPickItem = FileQuickPickItem = {}));
+let QuickFileSelectService = QuickFileSelectService_1 = class QuickFileSelectService {
+    async getPicks(fileFilter = '', token = common_1.CancellationToken.None, options = {
+        hideIgnoredFiles: true
+    }) {
+        const roots = this.workspaceService.tryGetRoots();
+        const alreadyCollected = new Set();
+        const recentlyUsedItems = [];
+        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: common_1.nls.localizeByDefault('recently opened')
+                        });
+                    }
+                    const item = this.toItem(fileFilter, location.uri);
+                    recentlyUsedItems.push(item);
+                    alreadyCollected.add(uriString);
+                }
+            }
+        }
+        if (fileFilter.length > 0) {
+            const handler = async (results) => {
+                if (token.isCancellationRequested || results.length <= 0) {
+                    return [];
+                }
+                const result = [...recentlyUsedItems];
+                const fileSearchResultItems = [];
+                for (const fileUri of results) {
+                    if (!alreadyCollected.has(fileUri)) {
+                        const item = this.toItem(fileFilter, fileUri, options.onSelect);
+                        fileSearchResultItems.push(item);
+                        alreadyCollected.add(fileUri);
+                    }
+                }
+                // Create a copy of the file search results and sort.
+                const sortedResults = fileSearchResultItems.slice();
+                sortedResults.sort((a, b) => this.compareItems(a, b, fileFilter));
+                if (sortedResults.length > 0) {
+                    result.push({
+                        type: 'separator',
+                        label: common_1.nls.localizeByDefault('file results')
+                    });
+                    result.push(...sortedResults);
+                }
+                // Return the recently used items, followed by the search results.
+                return result;
+            };
+            return this.fileSearchService.find(fileFilter, {
+                rootUris: roots.map(r => r.resource.toString()),
+                fuzzyMatch: true,
+                limit: 200,
+                useGitIgnore: options.hideIgnoredFiles,
+                excludePatterns: options.hideIgnoredFiles
+                    ? Object.keys(this.fsPreferences['files.exclude'])
+                    : undefined,
+            }, token).then(handler);
+        }
+        else {
+            return roots.length !== 0 ? recentlyUsedItems : [];
+        }
+    }
+    compareItems(left, right, fileFilter) {
+        /**
+         * Score a given string.
+         *
+         * @param str the string to score on.
+         * @returns the score.
+         */
+        function score(str) {
+            var _a;
+            if (!str) {
+                return 0;
+            }
+            let exactMatch = true;
+            const partialMatches = querySplit.reduce((matched, part) => {
+                const partMatches = str.includes(part);
+                exactMatch = exactMatch && partMatches;
+                return partMatches ? matched + QuickFileSelectService_1.Scores.partial : matched;
+            }, 0);
+            // Check fuzzy matches.
+            const fuzzyMatch = (_a = fuzzy.match(queryJoin, str)) !== null && _a !== void 0 ? _a : { score: 0 };
+            if (fuzzyMatch.score === Infinity && exactMatch) {
+                return Number.MAX_SAFE_INTEGER;
+            }
+            return fuzzyMatch.score + partialMatches + (exactMatch ? QuickFileSelectService_1.Scores.exact : 0);
+        }
+        const query = normalize(fileFilter);
+        // Adjust for whitespaces in the query.
+        const querySplit = query.split(file_search_service_1.WHITESPACE_QUERY_SEPARATOR);
+        const queryJoin = querySplit.join('');
+        const compareByLabelScore = (l, r) => score(r.label) - score(l.label);
+        const compareByLabelIndex = (l, r) => r.label.indexOf(query) - l.label.indexOf(query);
+        const compareByLabel = (l, r) => l.label.localeCompare(r.label);
+        const compareByPathScore = (l, r) => score(r.uri.path.toString()) - score(l.uri.path.toString());
+        const compareByPathIndex = (l, r) => r.uri.path.toString().indexOf(query) - l.uri.path.toString().indexOf(query);
+        const compareByPathLabel = (l, r) => l.uri.path.toString().localeCompare(r.uri.path.toString());
+        return compareWithDiscriminators(left, right, compareByLabelScore, compareByLabelIndex, compareByLabel, compareByPathScore, compareByPathIndex, compareByPathLabel);
+    }
+    toItem(lookFor, uriOrString, onSelect) {
+        const uri = uriOrString instanceof uri_1.default ? uriOrString : new uri_1.default(uriOrString);
+        const label = this.labelProvider.getName(uri);
+        const description = this.getItemDescription(uri);
+        const iconClasses = this.getItemIconClasses(uri);
+        const item = {
+            label,
+            description,
+            highlights: {
+                label: (0, quick_input_service_1.findMatches)(label, lookFor),
+                description: (0, quick_input_service_1.findMatches)(description, lookFor)
+            },
+            iconClasses,
+            uri
+        };
+        return {
+            ...item,
+            execute: () => onSelect ? onSelect(item) : undefined
+        };
+    }
+    getItemIconClasses(uri) {
+        const icon = this.labelProvider.getIcon(uri).split(' ').filter(v => v.length > 0);
+        if (icon.length > 0) {
+            icon.push('file-icon');
+        }
+        return icon;
+    }
+    getItemDescription(uri) {
+        return this.labelProvider.getDetails(uri);
+    }
+    /**
+     * Splits the given expression into a structure of search-file-filter and
+     * location-range.
+     *
+     * @param expression patterns of <path><#|:><line><#|:|,><col?>
+     */
+    splitFilterAndRange(expression) {
+        var _a, _b;
+        let filter = expression;
+        let range = undefined;
+        // Find line and column number from the expression using RegExp.
+        const patternMatch = LINE_COLON_PATTERN.exec(expression);
+        if (patternMatch) {
+            const line = parseInt((_a = patternMatch[1]) !== null && _a !== void 0 ? _a : '', 10);
+            if (Number.isFinite(line)) {
+                const lineNumber = line > 0 ? line - 1 : 0;
+                const column = parseInt((_b = patternMatch[2]) !== null && _b !== void 0 ? _b : '', 10);
+                const startColumn = Number.isFinite(column) && column > 0 ? column - 1 : 0;
+                const position = browser_2.Position.create(lineNumber, startColumn);
+                filter = expression.substring(0, patternMatch.index);
+                range = browser_2.Range.create(position, position);
+            }
+        }
+        return { filter, range };
+    }
+};
+exports.QuickFileSelectService = QuickFileSelectService;
+/**
+ * The score constants when comparing file search results.
+ */
+QuickFileSelectService.Scores = {
+    max: 1000, // represents the maximum score from fuzzy matching (Infinity).
+    exact: 500, // represents the score assigned to exact matching.
+    partial: 250 // represents the score assigned to partial matching.
+};
+tslib_1.__decorate([
+    (0, inversify_1.inject)(browser_1.KeybindingRegistry),
+    tslib_1.__metadata("design:type", browser_1.KeybindingRegistry)
+], QuickFileSelectService.prototype, "keybindingRegistry", void 0);
+tslib_1.__decorate([
+    (0, inversify_1.inject)(workspace_service_1.WorkspaceService),
+    tslib_1.__metadata("design:type", workspace_service_1.WorkspaceService)
+], QuickFileSelectService.prototype, "workspaceService", void 0);
+tslib_1.__decorate([
+    (0, inversify_1.inject)(browser_1.OpenerService),
+    tslib_1.__metadata("design:type", Object)
+], QuickFileSelectService.prototype, "openerService", void 0);
+tslib_1.__decorate([
+    (0, inversify_1.inject)(quick_input_service_1.QuickInputService),
+    (0, inversify_1.optional)(),
+    tslib_1.__metadata("design:type", Object)
+], QuickFileSelectService.prototype, "quickInputService", void 0);
+tslib_1.__decorate([
+    (0, inversify_1.inject)(browser_1.QuickAccessRegistry),
+    tslib_1.__metadata("design:type", Object)
+], QuickFileSelectService.prototype, "quickAccessRegistry", void 0);
+tslib_1.__decorate([
+    (0, inversify_1.inject)(file_search_service_1.FileSearchService),
+    tslib_1.__metadata("design:type", Object)
+], QuickFileSelectService.prototype, "fileSearchService", void 0);
+tslib_1.__decorate([
+    (0, inversify_1.inject)(label_provider_1.LabelProvider),
+    tslib_1.__metadata("design:type", label_provider_1.LabelProvider)
+], QuickFileSelectService.prototype, "labelProvider", void 0);
+tslib_1.__decorate([
+    (0, inversify_1.inject)(navigation_location_service_1.NavigationLocationService),
+    tslib_1.__metadata("design:type", navigation_location_service_1.NavigationLocationService)
+], QuickFileSelectService.prototype, "navigationLocationService", void 0);
+tslib_1.__decorate([
+    (0, inversify_1.inject)(message_service_1.MessageService),
+    tslib_1.__metadata("design:type", message_service_1.MessageService)
+], QuickFileSelectService.prototype, "messageService", void 0);
+tslib_1.__decorate([
+    (0, inversify_1.inject)(browser_3.FileSystemPreferences),
+    tslib_1.__metadata("design:type", Object)
+], QuickFileSelectService.prototype, "fsPreferences", void 0);
+tslib_1.__decorate([
+    (0, inversify_1.inject)(browser_1.PreferenceService),
+    tslib_1.__metadata("design:type", Object)
+], QuickFileSelectService.prototype, "preferences", void 0);
+exports.QuickFileSelectService = QuickFileSelectService = QuickFileSelectService_1 = tslib_1.__decorate([
+    (0, inversify_1.injectable)()
+], QuickFileSelectService);
+/**
+ * Normalize a given string.
+ *
+ * @param str the raw string value.
+ * @returns the normalized string value.
+ */
+function normalize(str) {
+    return str.trim().toLowerCase();
+}
+function compareWithDiscriminators(left, right, ...discriminators) {
+    let comparisonValue = 0;
+    let i = 0;
+    while (comparisonValue === 0 && i < discriminators.length) {
+        comparisonValue = discriminators[i](left, right);
+        i++;
+    }
+    return comparisonValue;
+}
+//# sourceMappingURL=quick-file-select-service.js.map

package/lib/browser/quick-file-select-service.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"quick-file-select-service.js","sourceRoot":"","sources":["../../src/browser/quick-file-select-service.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,13 +1,13 @@
 {
   "name": "@theia/file-search",
-  "version": "1.58.3",
+  "version": "1.59.0-next.72+f41d8efcd",
   "description": "Theia - File Search Extension",
   "dependencies": {
-    "@theia/core": "1.58.3",
-    "@theia/editor": "1.58.3",
-    "@theia/filesystem": "1.58.3",
-    "@theia/process": "1.58.3",
-    "@theia/workspace": "1.58.3",
+    "@theia/core": "1.59.0-next.72+f41d8efcd",
+    "@theia/editor": "1.59.0-next.72+f41d8efcd",
+    "@theia/filesystem": "1.59.0-next.72+f41d8efcd",
+    "@theia/process": "1.59.0-next.72+f41d8efcd",
+    "@theia/workspace": "1.59.0-next.72+f41d8efcd",
     "@vscode/ripgrep": "^1.14.2",
     "tslib": "^2.6.2"
   },
@@ -45,10 +45,10 @@
     "watch": "theiaext watch"
   },
   "devDependencies": {
-    "@theia/ext-scripts": "1.58.3"
+    "@theia/ext-scripts": "1.58.0"
   },
   "nyc": {
     "extends": "../../configs/nyc.json"
   },
-  "gitHead": "ca70c15332f91e0f61b12cd147b5ff8326e2e6d2"
+  "gitHead": "f41d8efcd4abb79167b74bf476eafc7857e97306"
 }

package/src/browser/file-search-frontend-module.ts

@@ -21,6 +21,7 @@ import { QuickFileOpenFrontendContribution } from './quick-file-open-contributio
 import { QuickFileOpenService } from './quick-file-open';
 import { fileSearchServicePath, FileSearchService } from '../common/file-search-service';
 import { QuickAccessContribution } from '@theia/core/lib/browser/quick-input/quick-access';
+import { QuickFileSelectService } from './quick-file-select-service';
 
 export default new ContainerModule((bind: interfaces.Bind) => {
     bind(FileSearchService).toDynamicValue(ctx => {
@@ -33,5 +34,6 @@ export default new ContainerModule((bind: interfaces.Bind) => {
         bind(serviceIdentifier).toService(QuickFileOpenFrontendContribution)
     );
 
+    bind(QuickFileSelectService).toSelf().inSingletonScope();
     bind(QuickFileOpenService).toSelf().inSingletonScope();
 });

package/src/browser/quick-file-open.ts

@@ -14,19 +14,16 @@
 // SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0
 // *****************************************************************************
 
-import { inject, injectable, optional, postConstruct } from '@theia/core/shared/inversify';
-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';
+import { CommonCommands, KeybindingRegistry, OpenerService, QuickAccessProvider, QuickAccessRegistry } from '@theia/core/lib/browser';
+import { QuickInputService, QuickPickItem, QuickPicks } from '@theia/core/lib/browser/quick-input/quick-input-service';
 import { CancellationToken, Command, nls } from '@theia/core/lib/common';
-import { LabelProvider } from '@theia/core/lib/browser/label-provider';
-import { NavigationLocationService } from '@theia/editor/lib/browser/navigation/navigation-location-service';
-import * as fuzzy from '@theia/core/shared/fuzzy';
 import { MessageService } from '@theia/core/lib/common/message-service';
-import { FileSystemPreferences } from '@theia/filesystem/lib/browser';
+import URI from '@theia/core/lib/common/uri';
+import { inject, injectable, optional, postConstruct } from '@theia/core/shared/inversify';
 import { EditorOpenerOptions, EditorWidget, Position, Range } from '@theia/editor/lib/browser';
-import { findMatches, QuickInputService, QuickPickItem, QuickPicks } from '@theia/core/lib/browser/quick-input/quick-input-service';
+import { NavigationLocationService } from '@theia/editor/lib/browser/navigation/navigation-location-service';
+import { WorkspaceService } from '@theia/workspace/lib/browser/workspace-service';
+import { QuickFileSelectService } from './quick-file-select-service';
 
 export const quickFileOpen = Command.toDefaultLocalizedCommand({
     id: 'file-search.openFile',
@@ -56,18 +53,12 @@ export class QuickFileOpenService implements QuickAccessProvider {
     protected readonly quickInputService: QuickInputService;
     @inject(QuickAccessRegistry)
     protected readonly quickAccessRegistry: QuickAccessRegistry;
-    @inject(FileSearchService)
-    protected readonly fileSearchService: FileSearchService;
-    @inject(LabelProvider)
-    protected readonly labelProvider: LabelProvider;
     @inject(NavigationLocationService)
     protected readonly navigationLocationService: NavigationLocationService;
     @inject(MessageService)
     protected readonly messageService: MessageService;
-    @inject(FileSystemPreferences)
-    protected readonly fsPreferences: FileSystemPreferences;
-    @inject(PreferenceService)
-    protected readonly preferences: PreferenceService;
+    @inject(QuickFileSelectService)
+    protected readonly quickFileSelectService: QuickFileSelectService;
 
     registerQuickAccessProvider(): void {
         this.quickAccessRegistry.registerQuickAccessProvider({
@@ -96,15 +87,6 @@ export class QuickFileOpenService implements QuickAccessProvider {
      */
     protected filterAndRange: FilterAndRange = this.filterAndRangeDefault;
 
-    /**
-     * The score constants when comparing file search results.
-     */
-    private static readonly Scores = {
-        max: 1000,  // represents the maximum score from fuzzy matching (Infinity).
-        exact: 500, // represents the score assigned to exact matching.
-        partial: 250 // represents the score assigned to partial matching.
-    };
-
     @postConstruct()
     protected init(): void {
         this.quickInputService?.onHide(() => {
@@ -156,125 +138,13 @@ export class QuickFileOpenService implements QuickAccessProvider {
     }
 
     async getPicks(filter: string, token: CancellationToken): Promise<QuickPicks> {
-        const roots = this.workspaceService.tryGetRoots();
-
         this.filterAndRange = this.splitFilterAndRange(filter);
         const fileFilter = this.filterAndRange.filter;
-
-        const alreadyCollected = new Set<string>();
-        const recentlyUsedItems: QuickPicks = [];
-
-        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);
-                }
-            }
-        }
-
-        if (fileFilter.length > 0) {
-            const handler = async (results: string[]) => {
-                if (token.isCancellationRequested || results.length <= 0) {
-                    return [];
-                }
-
-                const result = [...recentlyUsedItems];
-                const fileSearchResultItems: FileQuickPickItem[] = [];
-
-                for (const fileUri of results) {
-                    if (!alreadyCollected.has(fileUri)) {
-                        const item = this.toItem(fileFilter, fileUri);
-                        fileSearchResultItems.push(item);
-                        alreadyCollected.add(fileUri);
-                    }
-                }
-
-                // Create a copy of the file search results and sort.
-                const sortedResults = fileSearchResultItems.slice();
-                sortedResults.sort((a, b) => this.compareItems(a, b));
-
-                if (sortedResults.length > 0) {
-                    result.push({
-                        type: 'separator',
-                        label: nls.localizeByDefault('file results')
-                    });
-                    result.push(...sortedResults);
-                }
-
-                // Return the recently used items, followed by the search results.
-                return result;
-            };
-
-            return this.fileSearchService.find(fileFilter, {
-                rootUris: roots.map(r => r.resource.toString()),
-                fuzzyMatch: true,
-                limit: 200,
-                useGitIgnore: this.hideIgnoredFiles,
-                excludePatterns: this.hideIgnoredFiles
-                    ? Object.keys(this.fsPreferences['files.exclude'])
-                    : undefined,
-            }, token).then(handler);
-        } else {
-            return roots.length !== 0 ? recentlyUsedItems : [];
-        }
-    }
-
-    protected compareItems(
-        left: FileQuickPickItem,
-        right: FileQuickPickItem): number {
-
-        /**
-         * Score a given string.
-         *
-         * @param str the string to score on.
-         * @returns the score.
-         */
-        function score(str: string | undefined): number {
-            if (!str) {
-                return 0;
-            }
-
-            let exactMatch = true;
-            const partialMatches = querySplit.reduce((matched, part) => {
-                const partMatches = str.includes(part);
-                exactMatch = exactMatch && partMatches;
-                return partMatches ? matched + QuickFileOpenService.Scores.partial : matched;
-            }, 0);
-
-            // Check fuzzy matches.
-            const fuzzyMatch = fuzzy.match(queryJoin, str) ?? { score: 0 };
-            if (fuzzyMatch.score === Infinity && exactMatch) {
-                return Number.MAX_SAFE_INTEGER;
-            }
-
-            return fuzzyMatch.score + partialMatches + (exactMatch ? QuickFileOpenService.Scores.exact : 0);
-        }
-
-        const query: string = normalize(this.filterAndRange.filter);
-        // Adjust for whitespaces in the query.
-        const querySplit = query.split(WHITESPACE_QUERY_SEPARATOR);
-        const queryJoin = querySplit.join('');
-
-        const compareByLabelScore = (l: FileQuickPickItem, r: FileQuickPickItem) => score(r.label) - score(l.label);
-        const compareByLabelIndex = (l: FileQuickPickItem, r: FileQuickPickItem) => r.label.indexOf(query) - l.label.indexOf(query);
-        const compareByLabel = (l: FileQuickPickItem, r: FileQuickPickItem) => l.label.localeCompare(r.label);
-
-        const compareByPathScore = (l: FileQuickPickItem, r: FileQuickPickItem) => score(r.uri.path.toString()) - score(l.uri.path.toString());
-        const compareByPathIndex = (l: FileQuickPickItem, r: FileQuickPickItem) => r.uri.path.toString().indexOf(query) - l.uri.path.toString().indexOf(query);
-        const compareByPathLabel = (l: FileQuickPickItem, r: FileQuickPickItem) => l.uri.path.toString().localeCompare(r.uri.path.toString());
-
-        return compareWithDiscriminators(left, right, compareByLabelScore, compareByLabelIndex, compareByLabel, compareByPathScore, compareByPathIndex, compareByPathLabel);
+        return this.quickFileSelectService.getPicks(fileFilter, token, {
+            hideIgnoredFiles: this.hideIgnoredFiles,
+            onSelect: item => this.openFile(item.uri)
+        },
+        );
     }
 
     openFile(uri: URI): void {
@@ -298,37 +168,6 @@ export class QuickFileOpenService implements QuickAccessProvider {
         return { selection: this.filterAndRange.range };
     }
 
-    private toItem(lookFor: string, uriOrString: URI | string): FileQuickPickItem {
-        const uri = uriOrString instanceof URI ? uriOrString : new URI(uriOrString);
-        const label = this.labelProvider.getName(uri);
-        const description = this.getItemDescription(uri);
-        const iconClasses = this.getItemIconClasses(uri);
-
-        return {
-            label,
-            description,
-            highlights: {
-                label: findMatches(label, lookFor),
-                description: findMatches(description, lookFor)
-            },
-            iconClasses,
-            uri,
-            execute: () => this.openFile(uri)
-        };
-    }
-
-    private getItemIconClasses(uri: URI): string[] | undefined {
-        const icon = this.labelProvider.getIcon(uri).split(' ').filter(v => v.length > 0);
-        if (icon.length > 0) {
-            icon.push('file-icon');
-        }
-        return icon;
-    }
-
-    private getItemDescription(uri: URI): string {
-        return this.labelProvider.getDetails(uri);
-    }
-
     private getPlaceHolder(): string {
         let placeholder = nls.localizeByDefault('Search files by name (append {0} to go to line or {1} to go to symbol)', ':', '@');
         const keybinding = this.getKeyCommand();
@@ -367,24 +206,3 @@ export class QuickFileOpenService implements QuickAccessProvider {
         return { filter, range };
     }
 }
-
-/**
- * Normalize a given string.
- *
- * @param str the raw string value.
- * @returns the normalized string value.
- */
-function normalize(str: string): string {
-    return str.trim().toLowerCase();
-}
-
-function compareWithDiscriminators<T>(left: T, right: T, ...discriminators: ((left: T, right: T) => number)[]): number {
-    let comparisonValue = 0;
-    let i = 0;
-
-    while (comparisonValue === 0 && i < discriminators.length) {
-        comparisonValue = discriminators[i](left, right);
-        i++;
-    }
-    return comparisonValue;
-}