From 969982df4edfb2d8c63a8d15d20a25ed815b6432 Mon Sep 17 00:00:00 2001 From: Benjamin Pasero Date: Wed, 9 Dec 2015 16:21:18 +0100 Subject: [PATCH] back to normal sort/matching for commands --- .../parts/quickopen/browser/commandsHandler.ts | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/src/vs/workbench/parts/quickopen/browser/commandsHandler.ts b/src/vs/workbench/parts/quickopen/browser/commandsHandler.ts index 4bf71fcb423..923ec303c53 100644 --- a/src/vs/workbench/parts/quickopen/browser/commandsHandler.ts +++ b/src/vs/workbench/parts/quickopen/browser/commandsHandler.ts @@ -232,7 +232,7 @@ export class CommandsHandler extends QuickOpenHandler { entries = arrays.distinct(entries, (entry) => entry.getLabel() + entry.getGroupLabel()); // Sort by name - entries = entries.sort((entryA, entryB) => QuickOpenEntry.compare(entryA, entryB, searchValue, this.quickOpenService.isFuzzyMatchingEnabled())); + entries = entries.sort(this.sort); return TPromise.as(new QuickOpenModel(entries)); } @@ -252,7 +252,7 @@ export class CommandsHandler extends QuickOpenHandler { label = nls.localize('commandLabel', "{0}: {1}", category, label); } - let highlights = filters.matchesFuzzy(searchValue, label, this.quickOpenService.isFuzzyMatchingEnabled()); + let highlights = filters.matchesFuzzy(searchValue, label); if (highlights) { entries.push(this.instantiationService.createInstance(CommandEntry, keys.length > 0 ? keys.join(', ') : '', label, highlights, actionDescriptor)); } @@ -277,7 +277,7 @@ export class CommandsHandler extends QuickOpenHandler { let keys = this.keybindingService.lookupKeybindings(editorAction.id).map(k => this.keybindingService.getLabelFor(k)); if (action.label) { - let highlights = filters.matchesFuzzy(searchValue, action.label, this.quickOpenService.isFuzzyMatchingEnabled()); + let highlights = filters.matchesFuzzy(searchValue, action.label); if (highlights) { entries.push(this.instantiationService.createInstance(EditorActionCommandEntry, keys.length > 0 ? keys.join(', ') : '', action.label, highlights, action)); } @@ -292,7 +292,7 @@ export class CommandsHandler extends QuickOpenHandler { for (let action of actions) { let keys = this.keybindingService.lookupKeybindings(action.id).map(k => this.keybindingService.getLabelFor(k)); - let highlights = filters.matchesFuzzy(searchValue, action.label, this.quickOpenService.isFuzzyMatchingEnabled()); + let highlights = filters.matchesFuzzy(searchValue, action.label); if (highlights) { entries.push(this.instantiationService.createInstance(ActionCommandEntry, keys.join(', '), action.label, highlights, action)); } @@ -301,6 +301,13 @@ export class CommandsHandler extends QuickOpenHandler { return entries; } + private sort(elementA: QuickOpenEntryGroup, elementB: QuickOpenEntryGroup): number { + let elementAName = elementA.getLabel().toLowerCase(); + let elementBName = elementB.getLabel().toLowerCase(); + + return strings.localeCompare(elementAName, elementBName); + } + public getAutoFocus(searchValue: string): IAutoFocus { return { autoFocusFirstEntry: true, @@ -315,7 +322,6 @@ export class CommandsHandler extends QuickOpenHandler { public getEmptyLabel(searchString: string): string { return nls.localize('noCommandsMatching', "No commands matching"); } - } export class EditorCommandsHandler extends CommandsHandler { -- GitLab