Revert "Merge from vscode merge-base (#22769)" (#22779)

This reverts commit 6bd0a17d3c.
This commit is contained in:
Karl Burtram
2023-04-18 21:44:05 -07:00
committed by GitHub
parent 6bd0a17d3c
commit 47a1745180
2389 changed files with 42588 additions and 92170 deletions

View File

@@ -10,10 +10,9 @@ import { MenuItemAction } from 'vs/platform/actions/common/actions';
import { ICommandAction } from 'vs/platform/action/common/action';
import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding';
import { INotificationService } from 'vs/platform/notification/common/notification';
import { IThemeService, ThemeIcon } from 'vs/platform/theme/common/themeService';
import { ThemeIcon } from 'vs/platform/theme/common/themeService';
import { MenuEntryActionViewItem } from 'vs/platform/actions/browser/menuEntryActionViewItem';
import { IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
import { IContextMenuService } from 'vs/platform/contextview/browser/contextView';
const ids = new IdGenerator('menu-item-action-item-icon-');
@@ -33,10 +32,8 @@ export class LabeledMenuItemActionItem extends MenuEntryActionViewItem {
@IKeybindingService labeledkeybindingService: IKeybindingService,
@INotificationService _notificationService: INotificationService,
@IContextKeyService _contextKeyService: IContextKeyService,
@IThemeService _themeService: IThemeService,
@IContextMenuService _contextMenuService: IContextMenuService
) {
super(_action, undefined, labeledkeybindingService, _notificationService, _contextKeyService, _themeService, _contextMenuService);
super(_action, undefined, labeledkeybindingService, _notificationService, _contextKeyService);
}
override updateLabel(): void {
@@ -107,11 +104,9 @@ export class MaskedLabeledMenuItemActionItem extends MenuEntryActionViewItem {
action: MenuItemAction,
@IKeybindingService keybindingService: IKeybindingService,
@INotificationService notificationService: INotificationService,
@IContextKeyService contextKeyService: IContextKeyService,
@IThemeService _themeService: IThemeService,
@IContextMenuService _contextMenuService: IContextMenuService
@IContextKeyService contextKeyService: IContextKeyService
) {
super(action, undefined, keybindingService, notificationService, contextKeyService, _themeService, _contextMenuService);
super(action, undefined, keybindingService, notificationService, contextKeyService);
}
override updateLabel(): void {