Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Filter out consecutive separators in custom menus #202388

Merged
merged 1 commit into from
Jan 15, 2024
+13 −1
Merged

Filter out consecutive separators in custom menus #202388

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
14 changes: 13 additions & 1 deletion src/vs/base/browser/ui/menu/menu.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -259,12 +259,24 @@ export class Menu extends ActionBar {
const window = getWindow(container);
menuElement.style.maxHeight = `${Math.max(10, window.innerHeight - container.getBoundingClientRect().top - 35)}px`;

actions = actions.filter(a => {
actions = actions.filter((a, idx) => {
if (options.submenuIds?.has(a.id)) {
console.warn(`Found submenu cycle: ${a.id}`);
return false;
}

// Filter out consecutive or useless separators
if (a instanceof Separator) {
if (idx === actions.length - 1 || idx === 0) {
return false;
}

const prevAction = actions[idx - 1];
if (prevAction instanceof Separator) {
return false;
}
}

return true;
});

Expand Down