don't search for nothing, fixes microsoft#26423

jrieken · jrieken · commit 73d7b085e73c · 2017-05-12T16:44:16.000+02:00
diff --git a/src/vs/base/common/filters.ts b/src/vs/base/common/filters.ts
@@ -478,6 +478,9 @@ export function fuzzyScore(pattern: string, word: string): [number, number[]] {
 		return undefined;
 	}
 
+	// keep track of the maximum score
+	let maxScore = -1;
+
 	for (i = 1; i <= patternLen; i++) {
 
 		let lastLowWordChar = '';
@@ -509,6 +512,9 @@ export function fuzzyScore(pattern: string, word: string): [number, number[]] {
 			}
 
 			_scores[i][j] = score;
+			if (score > maxScore) {
+				maxScore = score;
+			}
 
 			let diag = _table[i - 1][j - 1] + (score > 1 ? 1 : score);
 			let top = _table[i - 1][j] + -1;
@@ -544,6 +550,10 @@ export function fuzzyScore(pattern: string, word: string): [number, number[]] {
 		}
 	}
 
+	if (maxScore <= 1) {
+		return undefined;
+	}
+
 	if (_debug) {
 		console.log(printTable(_table, pattern, patternLen, word, wordLen));
 		console.log(printTable(_arrows, pattern, patternLen, word, wordLen));
diff --git a/src/vs/base/test/common/filters.test.ts b/src/vs/base/test/common/filters.test.ts
@@ -305,6 +305,21 @@ suite('Filters', () => {
 		);
 	});
 
+	test('fuzzyScore, issue #26423', function () {
+		assertMatches(
+			'fsfsfs',
+			'dsafdsafdsafdsafdsafdsafdsafasdfdsa',
+			undefined,
+			fuzzyScore
+		);
+		assertMatches(
+			'fsfsfsfsfsfsfsf',
+			'dsafdsafdsafdsafdsafdsafdsafasdfdsafdsafdsafdsafdsfdsafdsfdfdfasdnfdsajfndsjnafjndsajlknfdsa',
+			undefined,
+			fuzzyScore
+		);
+	});
+
 	function assertTopScore(filter: typeof fuzzyScore, pattern: string, expected: number, ...words: string[]) {
 		let topScore = -(100 * 10);
 		let topIdx = 0;

Original file line number	Diff line number	Diff line change
`@@ -478,6 +478,9 @@ export function fuzzyScore(pattern: string, word: string): [number, number[]] {`
`478`	`478`	`return undefined;`
`479`	`479`	`}`
`480`	`480`
	`481`	`+ // keep track of the maximum score`
	`482`	`+ let maxScore = -1;`
	`483`	`+`
`481`	`484`	`for (i = 1; i <= patternLen; i++) {`
`482`	`485`
`483`	`486`	`let lastLowWordChar = '';`
`@@ -509,6 +512,9 @@ export function fuzzyScore(pattern: string, word: string): [number, number[]] {`
`509`	`512`	`}`
`510`	`513`
`511`	`514`	`_scores[i][j] = score;`
	`515`	`+ if (score > maxScore) {`
	`516`	`+ maxScore = score;`
	`517`	`+ }`
`512`	`518`
`513`	`519`	`let diag = _table[i - 1][j - 1] + (score > 1 ? 1 : score);`
`514`	`520`	`let top = _table[i - 1][j] + -1;`
`@@ -544,6 +550,10 @@ export function fuzzyScore(pattern: string, word: string): [number, number[]] {`
`544`	`550`	`}`
`545`	`551`	`}`
`546`	`552`
	`553`	`+ if (maxScore <= 1) {`
	`554`	`+ return undefined;`
	`555`	`+ }`
	`556`	`+`
`547`	`557`	`if (_debug) {`
`548`	`558`	`console.log(printTable(_table, pattern, patternLen, word, wordLen));`
`549`	`559`	`console.log(printTable(_arrows, pattern, patternLen, word, wordLen));`