Merge from vscode 79a1f5a5ca0c6c53db617aa1fa5a2396d2caebe2

This commit is contained in:
ADS Merger
2020-05-31 19:47:51 +00:00
parent 84492049e8
commit 28be33cfea
913 changed files with 28242 additions and 15549 deletions

View File

@@ -155,14 +155,14 @@ export class SCMStatusController implements IWorkbenchContribution {
: repository.provider.label;
const disposables = new DisposableStore();
for (const c of commands) {
const tooltip = `${label} - ${c.tooltip}`;
for (const command of commands) {
const tooltip = `${label} - ${command.tooltip}`;
disposables.add(this.statusbarService.addEntry({
text: c.title,
ariaLabel: c.tooltip || label,
text: command.title,
ariaLabel: command.tooltip || label,
tooltip,
command: c
command: command.id ? command : undefined
}, 'status.scm', localize('status.scm', "Source Control"), MainThreadStatusBarAlignment.LEFT, 10000));
}