simple change for microsoft#79815

jrieken · jrieken · commit 11268173649c · 2019-08-26T17:00:52.000+02:00
diff --git a/src/vs/base/common/filters.ts b/src/vs/base/common/filters.ts
@@ -532,6 +532,12 @@ export interface FuzzyScorer {
 
 export function fuzzyScore(pattern: string, patternLow: string, patternPos: number, word: string, wordLow: string, wordPos: number, firstMatchCanBeWeak: boolean): FuzzyScore | undefined {
 
+	if (patternPos > 0) {
+		pattern = pattern.substr(patternPos);
+		patternLow = patternLow.substr(patternPos);
+		patternPos = 0;
+	}
+
 	const patternLen = pattern.length > _maxLen ? _maxLen : pattern.length;
 	const wordLen = word.length > _maxLen ? _maxLen : word.length;
 
diff --git a/src/vs/base/test/common/filters.test.ts b/src/vs/base/test/common/filters.test.ts
@@ -389,6 +389,11 @@ suite('Filters', () => {
 		assertMatches('g', 'zzGroup', 'zz^Group', fuzzyScore);
 	});
 
+	test('patternPos isn\'t working correctly #79815', function () {
+		assertMatches(':p'.substr(1), 'prop', '^prop', fuzzyScore, { patternPos: 0 });
+		assertMatches(':p', 'prop', '^prop', fuzzyScore, { patternPos: 1 });
+	});
+
 	function assertTopScore(filter: typeof fuzzyScore, pattern: string, expected: number, ...words: string[]) {
 		let topScore = -(100 * 10);
 		let topIdx = 0;
diff --git a/src/vs/workbench/contrib/quickopen/browser/gotoSymbolHandler.ts b/src/vs/workbench/contrib/quickopen/browser/gotoSymbolHandler.ts
@@ -88,7 +88,7 @@ class OutlineModel extends QuickOpenModel {
 			// Filter by search
 			if (searchValue.length > searchValuePos) {
 				const score = filters.fuzzyScore(
-					searchValue.substr(searchValuePos), searchValueLow.substr(searchValuePos), 0,
+					searchValue, searchValueLow, searchValuePos,
 					entry.getLabel(), entry.getLabel().toLowerCase(), 0,
 					true
 				);
