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

In case the debug toolbar is docked we need to make sure that the docked toolbar has the up to date commands registered

Browse source 
fixes #115945
This commit is contained in:
isidor 2021-08-10 16:46:12 +02:00
parent ec19e508a6
commit 7cd055cdce
No known key found for this signature in database
GPG key ID: F9280366A8370105
1 changed files with 17 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
src/vs/workbench/contrib/debug/browser/debugToolBar.ts
View file

@ -257,6 +257,7 @@ export class DebugToolBar extends Themable implements IWorkbenchContribution {
// Debug toolbar
let debugViewTitleItems: IDisposable[] = [];
const registerDebugToolBarItem = (id: string, title: string, order: number, icon?: { light?: URI, dark?: URI } | ThemeIcon, when?: ContextKeyExpression, precondition?: ContextKeyExpression, alt?: ICommandAction) => {
MenuRegistry.appendMenuItem(MenuId.DebugToolBar, {
group: 'navigation',
@ -272,7 +273,7 @@ const registerDebugToolBarItem = (id: string, title: string, order: number, icon
});
// Register actions in debug viewlet when toolbar is docked
MenuRegistry.appendMenuItem(MenuId.ViewContainerTitle, {
debugViewTitleItems.push(MenuRegistry.appendMenuItem(MenuId.ViewContainerTitle, {
group: 'navigation',
when: ContextKeyExpr.and(when, ContextKeyEqualsExpr.create('viewContainer', VIEWLET_ID), CONTEXT_DEBUG_STATE.notEqualsTo('inactive'), ContextKeyExpr.equals('config.debug.toolBarLocation', 'docked')),
order,
@ -282,9 +283,23 @@ const registerDebugToolBarItem = (id: string, title: string, order: number, icon
icon,
precondition
}
});
}));
};
MenuRegistry.onDidChangeMenu(e => {
// In case the debug toolbar is docked we need to make sure that the docked toolbar has the up to date commands registered #115945
if (e.has(MenuId.DebugToolBar)) {
dispose(debugViewTitleItems);
const items = MenuRegistry.getMenuItems(MenuId.DebugToolBar);
for (const i of items) {
debugViewTitleItems.push(MenuRegistry.appendMenuItem(MenuId.ViewContainerTitle, {
...i,
when: ContextKeyExpr.and(i.when, ContextKeyEqualsExpr.create('viewContainer', VIEWLET_ID), CONTEXT_DEBUG_STATE.notEqualsTo('inactive'), ContextKeyExpr.equals('config.debug.toolBarLocation', 'docked'))
}));
}
}
});
registerDebugToolBarItem(CONTINUE_ID, CONTINUE_LABEL, 10, icons.debugContinue, CONTEXT_DEBUG_STATE.isEqualTo('stopped'));
registerDebugToolBarItem(PAUSE_ID, PAUSE_LABEL, 10, icons.debugPause, CONTEXT_DEBUG_STATE.notEqualsTo('stopped'), CONTEXT_DEBUG_STATE.isEqualTo('running'));
registerDebugToolBarItem(STOP_ID, STOP_LABEL, 70, icons.debugStop, CONTEXT_FOCUSED_SESSION_IS_ATTACH.toNegated(), undefined, { id: DISCONNECT_ID, title: DISCONNECT_LABEL, icon: icons.debugDisconnect });