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

Improve text match splitting

Browse source
This commit is contained in:
Ladislau Szomoru 2020-05-26 15:56:00 +02:00
parent 72550d1808
commit d52ca79f0c
1 changed files with 10 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
src/vs/workbench/contrib/scm/browser/repositoryPane.ts
View file

@ -89,13 +89,18 @@ function splitMatches(uri: URI, filterData: FuzzyScore | undefined): [IMatch[] |
const allMatches = createMatches(filterData);
for (const match of allMatches) {
if (match.end <= fileName.length) {
matches!.push(match);
if (match.start < fileName.length) {
matches!.push(
{
start: match.start,
end: Math.min(match.end, fileName.length)
}
);
} else {
descriptionMatches!.push(
{
start: match.start - fileName.length,
end: match.end - fileName.length
start: match.start - (fileName.length + 1),
end: match.end - (fileName.length + 1)
}
);
}
@ -403,7 +408,7 @@ export class SCMTreeKeyboardNavigationLabelProvider implements ICompressibleKeyb
const fileName = basename(element.sourceUri);
const filePath = this.labelService.getUriLabel(dirname(element.sourceUri), { relative: true });
return filePath.length !== 0 ? `${fileName}${filePath}` : fileName;
return filePath.length !== 0 ? `${fileName} ${filePath}` : fileName;
}
}