From 219b61e7f9d71c908756f0a8e7c2f2a30f8843f6 Mon Sep 17 00:00:00 2001
From: Benjamin Pasero <benjpas@microsoft.com>
Date: Wed, 9 Dec 2015 16:31:20 +0100
Subject: [PATCH] reduce fuzzy use to file picker

---
 .../browser/parts/quickopen/editorHistoryModel.ts          | 7 +++----
 .../browser/parts/quickopen/quickOpenController.ts         | 4 ++--
 .../workbench/parts/quickopen/browser/gotoSymbolHandler.ts | 6 +++---
 3 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/src/vs/workbench/browser/parts/quickopen/editorHistoryModel.ts b/src/vs/workbench/browser/parts/quickopen/editorHistoryModel.ts
index f24b1dfab38..79a06735d37 100644
--- a/src/vs/workbench/browser/parts/quickopen/editorHistoryModel.ts
+++ b/src/vs/workbench/browser/parts/quickopen/editorHistoryModel.ts
@@ -214,7 +214,6 @@ export class EditorHistoryModel extends QuickOpenModel {
 	public getResults(searchValue: string): QuickOpenEntry[] {
 		searchValue = searchValue.trim();
 		const searchInPath = searchValue.indexOf(paths.nativeSep) >= 0;
-		const enableFuzzy = this.quickOpenService.isFuzzyMatchingEnabled();
 
 		let results: QuickOpenEntry[] = [];
 		for (let i = 0; i < this.entries.length; i++) {
@@ -225,16 +224,16 @@ export class EditorHistoryModel extends QuickOpenModel {
 
 			// Check if this entry is a match for the search value
 			let targetToMatch = searchInPath ? labels.getPathLabel(entry.getResource(), this.contextService) : entry.getLabel();
-			if (!filters.matchesFuzzy(searchValue, targetToMatch, enableFuzzy)) {
+			if (!filters.matchesFuzzy(searchValue, targetToMatch)) {
 				continue;
 			}
 
 			// Apply highlights
-			const {labelHighlights, descriptionHighlights} = QuickOpenEntry.highlight(entry, searchValue, enableFuzzy);
+			const {labelHighlights, descriptionHighlights} = QuickOpenEntry.highlight(entry, searchValue);
 			results.push(entry.clone(labelHighlights, descriptionHighlights));
 		}
 
 		// Sort
-		return results.sort((elementA: EditorHistoryEntry, elementB: EditorHistoryEntry) => QuickOpenEntry.compare(elementA, elementB, searchValue, enableFuzzy));
+		return results.sort((elementA: EditorHistoryEntry, elementB: EditorHistoryEntry) => QuickOpenEntry.compare(elementA, elementB, searchValue));
 	}
 }
diff --git a/src/vs/workbench/browser/parts/quickopen/quickOpenController.ts b/src/vs/workbench/browser/parts/quickopen/quickOpenController.ts
index 9df77eaef24..6cffabc6760 100644
--- a/src/vs/workbench/browser/parts/quickopen/quickOpenController.ts
+++ b/src/vs/workbench/browser/parts/quickopen/quickOpenController.ts
@@ -357,10 +357,10 @@ export class QuickOpenController extends WorkbenchComponent implements IQuickOpe
 						// Filter by value
 						else {
 							entries.forEach((entry) => {
-								let labelHighlights = filters.matchesFuzzy(value, entry.getLabel(), this.isFuzzyMatchingEnabled());
+								let labelHighlights = filters.matchesFuzzy(value, entry.getLabel());
 								let descriptionHighlights: filters.IMatch[] = null;
 								if (options.matchOnDescription) {
-									descriptionHighlights = filters.matchesFuzzy(value, entry.getDescription(), this.isFuzzyMatchingEnabled());
+									descriptionHighlights = filters.matchesFuzzy(value, entry.getDescription());
 								}
 
 								if (labelHighlights || descriptionHighlights) {
diff --git a/src/vs/workbench/parts/quickopen/browser/gotoSymbolHandler.ts b/src/vs/workbench/parts/quickopen/browser/gotoSymbolHandler.ts
index 56a5b36e41e..80d674a4480 100644
--- a/src/vs/workbench/parts/quickopen/browser/gotoSymbolHandler.ts
+++ b/src/vs/workbench/parts/quickopen/browser/gotoSymbolHandler.ts
@@ -55,7 +55,7 @@ class OutlineModel extends QuickOpenModel {
 		this.outline = outline;
 	}
 
-	public dofilter(searchValue: string, enableFuzzy: boolean): void {
+	public dofilter(searchValue: string): void {
 
 		// Normalize search
 		let normalizedSearchValue = searchValue;
@@ -74,7 +74,7 @@ class OutlineModel extends QuickOpenModel {
 
 			// Filter by search
 			if (normalizedSearchValue) {
-				let highlights = filters.matchesFuzzy(normalizedSearchValue, entry.getLabel(), enableFuzzy);
+				let highlights = filters.matchesFuzzy(normalizedSearchValue, entry.getLabel());
 				if (highlights) {
 					entry.setHighlights(highlights);
 					entry.setHidden(false);
@@ -407,7 +407,7 @@ export class GotoSymbolHandler extends QuickOpenHandler {
 		return this.getActiveOutline().then((outline) => {
 
 			// Filter by search
-			outline.dofilter(searchValue, this.quickOpenService.isFuzzyMatchingEnabled());
+			outline.dofilter(searchValue);
 
 			return outline;
 		});
-- 
GitLab