development/vscode
development/vscode
1
0
Fork 0
mirror of https://github.com/Microsoft/vscode synced 2024-09-19 18:48:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

Quick open: bad results highlighting in this case (fixes #39123)

Browse source
This commit is contained in:
Benjamin Pasero 2017-11-25 09:13:11 +01:00
parent 1e097ae6f1
commit 2ca965d4b3
2 changed files with 51 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
src/vs/base/parts/quickopen/common/quickOpenScorer.ts
View file

@ -52,20 +52,6 @@ export function score(target: string, query: string, queryLower: string, fuzzy:
}
}
// When searching fuzzy, we require the query to be contained fully
// in the target string as separate substrings
else {
let targetOffset = 0;
for (let queryIndex = 0; queryIndex < queryLength; queryIndex++) {
targetOffset = targetLower.indexOf(queryLower[queryIndex], targetOffset);
if (targetOffset === -1) {
return NO_SCORE;
}
targetOffset++;
}
}
const res = doScore(query, queryLower, queryLength, target, targetLower, targetLength);
// if (DEBUG) {
@ -81,7 +67,8 @@ function doScore(query: string, queryLower: string, queryLength: number, target:
const matches = [];
//
// Build Scorer Matrix
// Build Scorer Matrix:
//
// The matrix is composed of query q and target t. For each index we score
// q[i] with t[i] and compare that with the previous score. If the score is
// equal or larger, we keep the match. In addition to the score, we also keep
@ -105,7 +92,17 @@ function doScore(query: string, queryLower: string, queryLength: number, target:
const matchesSequenceLength = queryIndex > 0 && targetIndex > 0 ? matches[diagIndex] : 0;
const score = computeCharScore(query, queryLower, queryIndex, target, targetLower, targetIndex, matchesSequenceLength);
// If we are not matching on the first query character any more, we only produce a
// score if we had a score previously for the last query index (by looking at the diagScore).
// This makes sure that the query always matches in sequence on the target. For example
// given a target of "ede" and a query of "de", we would otherwise produce a wrong high score
// for query[1] ("e") matching on target[0] ("e") because of the "beginning of word" boost.
let score: number;
if (!diagScore && queryIndex > 0) {
score = 0;
} else {
score = computeCharScore(query, queryLower, queryIndex, target, targetLower, targetIndex, matchesSequenceLength);
}
// We have a score and its equal or larger than the left score
// Match: sequence continues growing from previous diag value
@ -145,7 +142,7 @@ function doScore(query: string, queryLower: string, queryLength: number, target:
// Print matrix
// if (DEBUG_MATRIX) {
// printMatrix(query, target, matches, scores);
// printMatrix(query, target, matches, scores);
// }
return [scores[queryLength * targetLength - 1], positions.reverse()];

37
src/vs/base/parts/quickopen/test/common/quickOpenScorer.test.ts
View file

@ -244,6 +244,43 @@ suite('Quick Open Scorer', () => {
assert.ok(!res.score);
});
test('scoreItem - proper target offset #2', function () {
const resource = URI.file('ede');
const res = scoreItem(resource, 'de', true, ResourceAccessor, cache);
assert.equal(res.labelMatch.length, 1);
assert.equal(res.labelMatch[0].start, 1);
assert.equal(res.labelMatch[0].end, 3);
});
test('scoreItem - proper target offset #3', function () {
const resource = URI.file('/src/vs/editor/browser/viewParts/lineNumbers/flipped-cursor-2x.svg');
const res = scoreItem(resource, 'debug', true, ResourceAccessor, cache);
assert.equal(res.descriptionMatch.length, 3);
assert.equal(res.descriptionMatch[0].start, 9);
assert.equal(res.descriptionMatch[0].end, 10);
assert.equal(res.descriptionMatch[1].start, 36);
assert.equal(res.descriptionMatch[1].end, 37);
assert.equal(res.descriptionMatch[2].start, 40);
assert.equal(res.descriptionMatch[2].end, 41);
assert.equal(res.labelMatch.length, 2);
assert.equal(res.labelMatch[0].start, 9);
assert.equal(res.labelMatch[0].end, 10);
assert.equal(res.labelMatch[1].start, 20);
assert.equal(res.labelMatch[1].end, 21);
});
test('scoreItem - no match unless query contained in sequence', function () {
const resource = URI.file('abcde');
const res = scoreItem(resource, 'edcda', true, ResourceAccessor, cache);
assert.ok(!res.score);
});
test('compareItemsByScore - identity', function () {
const resourceA = URI.file('/some/path/fileA.txt');
const resourceB = URI.file('/some/path/other/fileB.txt');