Merge from vscode bd0efff9e3f36d6b3e1045cee9887003af8034d7

This commit is contained in:
ADS Merger
2020-05-06 02:35:49 +00:00
parent 9a7810cbee
commit 8420d9f04e
243 changed files with 4276 additions and 2478 deletions

View File

@@ -407,12 +407,12 @@ export class SCMAccessibilityProvider implements IListAccessibilityProvider<Tree
} else {
const result: string[] = [];
result.push(basename(element.sourceUri));
if (element.decorations.tooltip) {
result.push(element.decorations.tooltip);
}
result.push(basename(element.sourceUri));
const path = this.labelService.getUriLabel(dirname(element.sourceUri), { relative: true, noPrefix: true });
if (path) {