Skip to content

Commit ce389f3

Browse files
committed
fix submenus in peek
1 parent 642adf0 commit ce389f3

1 file changed

Lines changed: 11 additions & 3 deletions

File tree

src/vs/editor/contrib/peekView/peekView.ts

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,8 @@ import { registerEditorContribution } from 'vs/editor/browser/editorExtensions';
2626
import { IEditorContribution } from 'vs/editor/common/editorCommon';
2727
import { registerColor, contrastBorder, activeContrastBorder } from 'vs/platform/theme/common/colorRegistry';
2828
import { Codicon } from 'vs/base/common/codicons';
29-
import { MenuItemAction } from 'vs/platform/actions/common/actions';
30-
import { MenuEntryActionViewItem } from 'vs/platform/actions/browser/menuEntryActionViewItem';
29+
import { MenuItemAction, SubmenuItemAction } from 'vs/platform/actions/common/actions';
30+
import { MenuEntryActionViewItem, SubmenuEntryActionViewItem } from 'vs/platform/actions/browser/menuEntryActionViewItem';
3131

3232
export const IPeekViewService = createDecorator<IPeekViewService>('IPeekViewService');
3333
export interface IPeekViewService {
@@ -205,7 +205,15 @@ export abstract class PeekViewWidget extends ZoneWidget {
205205

206206
protected _getActionBarOptions(): IActionBarOptions {
207207
return {
208-
actionViewItemProvider: action => action instanceof MenuItemAction ? this.instantiationService.createInstance(MenuEntryActionViewItem, action) : undefined
208+
actionViewItemProvider: action => {
209+
if (action instanceof MenuItemAction) {
210+
return this.instantiationService.createInstance(MenuEntryActionViewItem, action);
211+
} else if (action instanceof SubmenuItemAction) {
212+
return this.instantiationService.createInstance(SubmenuEntryActionViewItem, action);
213+
}
214+
215+
return undefined;
216+
}
209217
};
210218
}
211219

0 commit comments

Comments
 (0)