maxmustermann/vscode
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Space in command palette should match -

Browse source 
Fix #74523
This commit is contained in:
Rob Lourens 2019-07-01 10:40:28 -07:00
parent c104b54843
commit c61bf317af
2 changed files with 21 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
src/vs/base/common/filters.ts
View file

@ -125,7 +125,11 @@ const wordSeparators = new Set<number>();
.forEach(s => wordSeparators.add(s.charCodeAt(0)));
function isWordSeparator(code: number): boolean {
return wordSeparators.has(code);
return isWhitespace(code) || wordSeparators.has(code);
}
function charactersMatch(codeA: number, codeB: number): boolean {
return (codeA === codeB) || (isWordSeparator(codeA) && isWordSeparator(codeB));
}
function isAlphanumeric(code: number): boolean {
@ -298,7 +302,7 @@ function _matchesWords(word: string, target: string, i: number, j: number, conti
return [];
} else if (j === target.length) {
return null;
} else if (word[i] !== target[j]) {
} else if (!charactersMatch(word.charCodeAt(i), target.charCodeAt(j))) {
return null;
} else {
let result: IMatch[] | null = null;
@ -316,9 +320,8 @@ function _matchesWords(word: string, target: string, i: number, j: number, conti
function nextWord(word: string, start: number): number {
for (let i = start; i < word.length; i++) {
const c = word.charCodeAt(i);
if (isWhitespace(c) || (i > 0 && isWhitespace(word.charCodeAt(i - 1))) ||
isWordSeparator(c) || (i > 0 && isWordSeparator(word.charCodeAt(i - 1)))) {
if (isWordSeparator(word.charCodeAt(i)) ||
(i > 0 && isWordSeparator(word.charCodeAt(i - 1)))) {
return i;
}
}

21
src/vs/base/test/common/filters.test.ts
View file

@ -13,8 +13,8 @@ function filterOk(filter: IFilter, word: string, wordToMatchAgainst: string, hig
}
}
function filterNotOk(filter: IFilter, word: string, suggestion: string) {
assert(!filter(word, suggestion));
function filterNotOk(filter: IFilter, word: string, wordToMatchAgainst: string) {
assert(!filter(word, wordToMatchAgainst), `${word} matched ${wordToMatchAgainst}`);
}
suite('Filters', () => {
@ -185,23 +185,23 @@ suite('Filters', () => {
assert(matchesWords('Debug Console', 'Open: Debug Console'));
filterOk(matchesWords, 'gp', 'Git: Pull', [{ start: 0, end: 1 }, { start: 5, end: 6 }]);
filterOk(matchesWords, 'g p', 'Git: Pull', [{ start: 0, end: 1 }, { start: 4, end: 6 }]);
filterOk(matchesWords, 'g p', 'Git: Pull', [{ start: 0, end: 1 }, { start: 3, end: 4 }, { start: 5, end: 6 }]);
filterOk(matchesWords, 'gipu', 'Git: Pull', [{ start: 0, end: 2 }, { start: 5, end: 7 }]);
filterOk(matchesWords, 'gp', 'Category: Git: Pull', [{ start: 10, end: 11 }, { start: 15, end: 16 }]);
filterOk(matchesWords, 'g p', 'Category: Git: Pull', [{ start: 10, end: 11 }, { start: 14, end: 16 }]);
filterOk(matchesWords, 'g p', 'Category: Git: Pull', [{ start: 10, end: 11 }, { start: 13, end: 14 }, { start: 15, end: 16 }]);
filterOk(matchesWords, 'gipu', 'Category: Git: Pull', [{ start: 10, end: 12 }, { start: 15, end: 17 }]);
filterNotOk(matchesWords, 'it', 'Git: Pull');
filterNotOk(matchesWords, 'll', 'Git: Pull');
filterOk(matchesWords, 'git: プル', 'git: プル', [{ start: 0, end: 7 }]);
filterOk(matchesWords, 'git プル', 'git: プル', [{ start: 0, end: 3 }, { start: 4, end: 7 }]);
filterOk(matchesWords, 'git プル', 'git: プル', [{ start: 0, end: 4 }, { start: 5, end: 7 }]);
filterOk(matchesWords, 'öäk', 'Öhm: Älles Klar', [{ start: 0, end: 1 }, { start: 5, end: 6 }, { start: 11, end: 12 }]);
assert.ok(matchesWords('gipu', 'Category: Git: Pull', true) === null);
assert.deepEqual(matchesWords('pu', 'Category: Git: Pull', true), [{ start: 15, end: 17 }]);
// assert.ok(matchesWords('gipu', 'Category: Git: Pull', true) === null);
// assert.deepEqual(matchesWords('pu', 'Category: Git: Pull', true), [{ start: 15, end: 17 }]);
filterOk(matchesWords, 'bar', 'foo-bar');
filterOk(matchesWords, 'bar test', 'foo-bar test');
@ -212,7 +212,12 @@ suite('Filters', () => {
filterNotOk(matchesWords, 'bar est', 'foo-bar test');
filterNotOk(matchesWords, 'fo ar', 'foo-bar test');
filterNotOk(matchesWords, 'for', 'foo-bar test');
filterNotOk(matchesWords, 'foo bar', 'foo-bar');
filterOk(matchesWords, 'foo bar', 'foo-bar');
filterOk(matchesWords, 'foo bar', '123 foo-bar 456');
filterOk(matchesWords, 'foo+bar', 'foo-bar');
filterOk(matchesWords, 'foo-bar', 'foo bar');
filterOk(matchesWords, 'foo:bar', 'foo:bar');
});
function assertMatches(pattern: string, word: string, decoratedWord: string | undefined, filter: FuzzyScorer, opts: { patternPos?: number, wordPos?: number, firstMatchCanBeWeak?: boolean } = {}) {