@theia/toolbar 1.45.1 → 1.46.0-next.72

package/src/browser/toolbar-command-contribution.ts

@@ -1,211 +1,211 @@
-// *****************************************************************************
-// Copyright (C) 2022 Ericsson and others.
-//
-// This program and the accompanying materials are made available under the
-// terms of the Eclipse Public License v. 2.0 which is available at
-// http://www.eclipse.org/legal/epl-2.0.
-//
-// This Source Code may also be made available under the following Secondary
-// Licenses when the conditions for such availability set forth in the Eclipse
-// Public License v. 2.0 are satisfied: GNU General Public License, version 2
-// with the GNU Classpath Exception which is available at
-// https://www.gnu.org/software/classpath/license.html.
-//
-// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0
-// *****************************************************************************
-
-import {
-    bindContributionProvider,
-    CommandContribution,
-    CommandRegistry,
-    CommandService,
-    InMemoryResources,
-    MenuContribution,
-    MenuModelRegistry,
-} from '@theia/core';
-import {
-    CommonMenus,
-    createPreferenceProxy,
-    KeybindingContribution,
-    KeybindingRegistry,
-    PreferenceContribution,
-    PreferenceScope,
-    PreferenceService,
-    QuickInputService,
-    Widget,
-} from '@theia/core/lib/browser';
-import { injectable, inject, interfaces, Container } from '@theia/core/shared/inversify';
-import { EditorManager } from '@theia/editor/lib/browser';
-import { ToolbarImpl } from './toolbar';
-import { bindToolbarIconDialog } from './toolbar-icon-selector-dialog';
-import {
-    ToolbarContribution,
-    ToolbarItemPosition,
-    ToolbarFactory,
-    Toolbar,
-    LateInjector,
-    lateInjector,
-} from './toolbar-interfaces';
-import { ToolbarCommandQuickInputService } from './toolbar-command-quick-input-service';
-import { ToolbarStorageProvider } from './toolbar-storage-provider';
-import { ToolbarController } from './toolbar-controller';
-import { ToolbarPreferencesSchema, ToolbarPreferences, TOOLBAR_ENABLE_PREFERENCE_ID } from './toolbar-preference-contribution';
-import { ToolbarDefaults, ToolbarDefaultsFactory } from './toolbar-defaults';
-import { ToolbarCommands, ToolbarMenus, UserToolbarURI, USER_TOOLBAR_URI } from './toolbar-constants';
-import { JsonSchemaContribution, JsonSchemaRegisterContext } from '@theia/core/lib/browser/json-schema-store';
-import { toolbarConfigurationSchema, toolbarSchemaId } from './toolbar-preference-schema';
-import URI from '@theia/core/lib/common/uri';
-
-@injectable()
-export class ToolbarCommandContribution implements CommandContribution, KeybindingContribution, MenuContribution, JsonSchemaContribution {
-    @inject(ToolbarController) protected readonly model: ToolbarController;
-    @inject(QuickInputService) protected readonly quickInputService: QuickInputService;
-    @inject(ToolbarCommandQuickInputService) protected toolbarCommandPickService: ToolbarCommandQuickInputService;
-    @inject(CommandService) protected readonly commandService: CommandService;
-    @inject(EditorManager) protected readonly editorManager: EditorManager;
-    @inject(PreferenceService) protected readonly preferenceService: PreferenceService;
-    @inject(ToolbarController) protected readonly toolbarModel: ToolbarController;
-    @inject(InMemoryResources) protected readonly inMemoryResources: InMemoryResources;
-    protected readonly schemaURI = new URI(toolbarSchemaId);
-
-    registerSchemas(context: JsonSchemaRegisterContext): void {
-        this.inMemoryResources.add(this.schemaURI, JSON.stringify(toolbarConfigurationSchema));
-        context.registerSchema({
-            fileMatch: ['toolbar.json'],
-            url: this.schemaURI.toString(),
-        });
-    }
-
-    registerCommands(registry: CommandRegistry): void {
-        registry.registerCommand(ToolbarCommands.CUSTOMIZE_TOOLBAR, {
-            execute: () => this.model.openOrCreateJSONFile(true),
-        });
-        registry.registerCommand(ToolbarCommands.RESET_TOOLBAR, {
-            execute: () => this.model.clearAll(),
-        });
-        registry.registerCommand(ToolbarCommands.TOGGLE_TOOLBAR, {
-            execute: () => {
-                const isVisible = this.preferenceService.get<boolean>(TOOLBAR_ENABLE_PREFERENCE_ID);
-                this.preferenceService.set(TOOLBAR_ENABLE_PREFERENCE_ID, !isVisible, PreferenceScope.User);
-            },
-        });
-
-        registry.registerCommand(ToolbarCommands.REMOVE_COMMAND_FROM_TOOLBAR, {
-            execute: async (_widget, position: ToolbarItemPosition | undefined, id?: string) => position && this.model.removeItem(position, id),
-            isVisible: (...args) => this.isToolbarWidget(args[0]),
-        });
-        registry.registerCommand(ToolbarCommands.INSERT_GROUP_LEFT, {
-            execute: async (_widget: Widget, position: ToolbarItemPosition | undefined) => position && this.model.insertGroup(position, 'left'),
-            isVisible: (widget: Widget, position: ToolbarItemPosition | undefined) => {
-                if (position) {
-                    const { alignment, groupIndex, itemIndex } = position;
-                    const owningGroupLength = this.toolbarModel.toolbarItems.items[alignment][groupIndex].length;
-                    return this.isToolbarWidget(widget) && (owningGroupLength > 1) && (itemIndex > 0);
-                }
-                return false;
-            },
-        });
-        registry.registerCommand(ToolbarCommands.INSERT_GROUP_RIGHT, {
-            execute: async (_widget: Widget, position: ToolbarItemPosition | undefined) => position && this.model.insertGroup(position, 'right'),
-            isVisible: (widget: Widget, position: ToolbarItemPosition | undefined) => {
-                if (position) {
-                    const { alignment, groupIndex, itemIndex } = position;
-                    const owningGroupLength = this.toolbarModel.toolbarItems.items[alignment][groupIndex].length;
-                    const isNotLastItem = itemIndex < (owningGroupLength - 1);
-                    return this.isToolbarWidget(widget) && owningGroupLength > 1 && isNotLastItem;
-                }
-                return false;
-            },
-        });
-        registry.registerCommand(ToolbarCommands.ADD_COMMAND_TO_TOOLBAR, {
-            execute: () => this.toolbarCommandPickService.openIconDialog(),
-        });
-    }
-
-    protected isToolbarWidget(arg: unknown): boolean {
-        return arg instanceof ToolbarImpl;
-    }
-
-    registerKeybindings(keys: KeybindingRegistry): void {
-        keys.registerKeybinding({
-            command: ToolbarCommands.TOGGLE_TOOLBAR.id,
-            keybinding: 'alt+t',
-        });
-    }
-
-    registerMenus(registry: MenuModelRegistry): void {
-        registry.registerMenuAction(CommonMenus.VIEW_LAYOUT, {
-            commandId: ToolbarCommands.TOGGLE_TOOLBAR.id,
-            order: 'z',
-        });
-
-        registry.registerMenuAction(ToolbarMenus.TOOLBAR_ITEM_CONTEXT_MENU, {
-            commandId: ToolbarCommands.ADD_COMMAND_TO_TOOLBAR.id,
-            order: 'a',
-        });
-        registry.registerMenuAction(ToolbarMenus.TOOLBAR_ITEM_CONTEXT_MENU, {
-            commandId: ToolbarCommands.INSERT_GROUP_LEFT.id,
-            order: 'b',
-        });
-        registry.registerMenuAction(ToolbarMenus.TOOLBAR_ITEM_CONTEXT_MENU, {
-            commandId: ToolbarCommands.INSERT_GROUP_RIGHT.id,
-            order: 'c',
-        });
-        registry.registerMenuAction(ToolbarMenus.TOOLBAR_ITEM_CONTEXT_MENU, {
-            commandId: ToolbarCommands.REMOVE_COMMAND_FROM_TOOLBAR.id,
-            order: 'd',
-        });
-
-        registry.registerMenuAction(ToolbarMenus.TOOLBAR_BACKGROUND_CONTEXT_MENU, {
-            commandId: ToolbarCommands.ADD_COMMAND_TO_TOOLBAR.id,
-            order: 'a',
-        });
-        registry.registerMenuAction(ToolbarMenus.TOOLBAR_BACKGROUND_CONTEXT_MENU, {
-            commandId: ToolbarCommands.CUSTOMIZE_TOOLBAR.id,
-            order: 'b',
-        });
-        registry.registerMenuAction(ToolbarMenus.TOOLBAR_BACKGROUND_CONTEXT_MENU, {
-            commandId: ToolbarCommands.TOGGLE_TOOLBAR.id,
-            order: 'c',
-        });
-        registry.registerMenuAction(ToolbarMenus.TOOLBAR_BACKGROUND_CONTEXT_MENU, {
-            commandId: ToolbarCommands.RESET_TOOLBAR.id,
-            order: 'd',
-        });
-    }
-}
-
-export function bindToolbar(bind: interfaces.Bind): void {
-    bind(ToolbarFactory).toFactory(({ container }) => (): Toolbar => {
-        const child = new Container({ defaultScope: 'Singleton' });
-        child.parent = container;
-        child.bind(Toolbar).to(ToolbarImpl);
-        return child.get(Toolbar);
-    });
-    bind(ToolbarCommandContribution).toSelf().inSingletonScope();
-    bind(CommandContribution).to(ToolbarCommandContribution);
-    bind(MenuContribution).toService(ToolbarCommandContribution);
-    bind(KeybindingContribution).toService(ToolbarCommandContribution);
-    bind(JsonSchemaContribution).toService(ToolbarCommandContribution);
-
-    bind(ToolbarCommandQuickInputService).toSelf().inSingletonScope();
-
-    bindToolbarIconDialog(bind);
-    bind(ToolbarDefaultsFactory).toConstantValue(ToolbarDefaults);
-    bind(ToolbarPreferences).toDynamicValue(({ container }) => {
-        const preferences = container.get<PreferenceService>(PreferenceService);
-        return createPreferenceProxy(preferences, ToolbarPreferencesSchema);
-    }).inSingletonScope();
-    bind(PreferenceContribution).toConstantValue({
-        schema: ToolbarPreferencesSchema,
-    });
-
-    bind(UserToolbarURI).toConstantValue(USER_TOOLBAR_URI);
-
-    bind(ToolbarController).toSelf().inSingletonScope();
-    bind(ToolbarStorageProvider).toSelf().inSingletonScope();
-    bindContributionProvider(bind, ToolbarContribution);
-    bind(LateInjector).toFactory(
-        <T>(context: interfaces.Context) => (id: interfaces.ServiceIdentifier<T>): T => lateInjector(context.container, id),
-    );
-}
+// *****************************************************************************
+// Copyright (C) 2022 Ericsson and others.
+//
+// This program and the accompanying materials are made available under the
+// terms of the Eclipse Public License v. 2.0 which is available at
+// http://www.eclipse.org/legal/epl-2.0.
+//
+// This Source Code may also be made available under the following Secondary
+// Licenses when the conditions for such availability set forth in the Eclipse
+// Public License v. 2.0 are satisfied: GNU General Public License, version 2
+// with the GNU Classpath Exception which is available at
+// https://www.gnu.org/software/classpath/license.html.
+//
+// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0
+// *****************************************************************************
+
+import {
+    bindContributionProvider,
+    CommandContribution,
+    CommandRegistry,
+    CommandService,
+    InMemoryResources,
+    MenuContribution,
+    MenuModelRegistry,
+} from '@theia/core';
+import {
+    CommonMenus,
+    createPreferenceProxy,
+    KeybindingContribution,
+    KeybindingRegistry,
+    PreferenceContribution,
+    PreferenceScope,
+    PreferenceService,
+    QuickInputService,
+    Widget,
+} from '@theia/core/lib/browser';
+import { injectable, inject, interfaces, Container } from '@theia/core/shared/inversify';
+import { EditorManager } from '@theia/editor/lib/browser';
+import { ToolbarImpl } from './toolbar';
+import { bindToolbarIconDialog } from './toolbar-icon-selector-dialog';
+import {
+    ToolbarContribution,
+    ToolbarItemPosition,
+    ToolbarFactory,
+    Toolbar,
+    LateInjector,
+    lateInjector,
+} from './toolbar-interfaces';
+import { ToolbarCommandQuickInputService } from './toolbar-command-quick-input-service';
+import { ToolbarStorageProvider } from './toolbar-storage-provider';
+import { ToolbarController } from './toolbar-controller';
+import { ToolbarPreferencesSchema, ToolbarPreferences, TOOLBAR_ENABLE_PREFERENCE_ID } from './toolbar-preference-contribution';
+import { ToolbarDefaults, ToolbarDefaultsFactory } from './toolbar-defaults';
+import { ToolbarCommands, ToolbarMenus, UserToolbarURI, USER_TOOLBAR_URI } from './toolbar-constants';
+import { JsonSchemaContribution, JsonSchemaRegisterContext } from '@theia/core/lib/browser/json-schema-store';
+import { toolbarConfigurationSchema, toolbarSchemaId } from './toolbar-preference-schema';
+import URI from '@theia/core/lib/common/uri';
+
+@injectable()
+export class ToolbarCommandContribution implements CommandContribution, KeybindingContribution, MenuContribution, JsonSchemaContribution {
+    @inject(ToolbarController) protected readonly model: ToolbarController;
+    @inject(QuickInputService) protected readonly quickInputService: QuickInputService;
+    @inject(ToolbarCommandQuickInputService) protected toolbarCommandPickService: ToolbarCommandQuickInputService;
+    @inject(CommandService) protected readonly commandService: CommandService;
+    @inject(EditorManager) protected readonly editorManager: EditorManager;
+    @inject(PreferenceService) protected readonly preferenceService: PreferenceService;
+    @inject(ToolbarController) protected readonly toolbarModel: ToolbarController;
+    @inject(InMemoryResources) protected readonly inMemoryResources: InMemoryResources;
+    protected readonly schemaURI = new URI(toolbarSchemaId);
+
+    registerSchemas(context: JsonSchemaRegisterContext): void {
+        this.inMemoryResources.add(this.schemaURI, JSON.stringify(toolbarConfigurationSchema));
+        context.registerSchema({
+            fileMatch: ['toolbar.json'],
+            url: this.schemaURI.toString(),
+        });
+    }
+
+    registerCommands(registry: CommandRegistry): void {
+        registry.registerCommand(ToolbarCommands.CUSTOMIZE_TOOLBAR, {
+            execute: () => this.model.openOrCreateJSONFile(true),
+        });
+        registry.registerCommand(ToolbarCommands.RESET_TOOLBAR, {
+            execute: () => this.model.clearAll(),
+        });
+        registry.registerCommand(ToolbarCommands.TOGGLE_TOOLBAR, {
+            execute: () => {
+                const isVisible = this.preferenceService.get<boolean>(TOOLBAR_ENABLE_PREFERENCE_ID);
+                this.preferenceService.set(TOOLBAR_ENABLE_PREFERENCE_ID, !isVisible, PreferenceScope.User);
+            },
+        });
+
+        registry.registerCommand(ToolbarCommands.REMOVE_COMMAND_FROM_TOOLBAR, {
+            execute: async (_widget, position: ToolbarItemPosition | undefined, id?: string) => position && this.model.removeItem(position, id),
+            isVisible: (...args) => this.isToolbarWidget(args[0]),
+        });
+        registry.registerCommand(ToolbarCommands.INSERT_GROUP_LEFT, {
+            execute: async (_widget: Widget, position: ToolbarItemPosition | undefined) => position && this.model.insertGroup(position, 'left'),
+            isVisible: (widget: Widget, position: ToolbarItemPosition | undefined) => {
+                if (position) {
+                    const { alignment, groupIndex, itemIndex } = position;
+                    const owningGroupLength = this.toolbarModel.toolbarItems.items[alignment][groupIndex].length;
+                    return this.isToolbarWidget(widget) && (owningGroupLength > 1) && (itemIndex > 0);
+                }
+                return false;
+            },
+        });
+        registry.registerCommand(ToolbarCommands.INSERT_GROUP_RIGHT, {
+            execute: async (_widget: Widget, position: ToolbarItemPosition | undefined) => position && this.model.insertGroup(position, 'right'),
+            isVisible: (widget: Widget, position: ToolbarItemPosition | undefined) => {
+                if (position) {
+                    const { alignment, groupIndex, itemIndex } = position;
+                    const owningGroupLength = this.toolbarModel.toolbarItems.items[alignment][groupIndex].length;
+                    const isNotLastItem = itemIndex < (owningGroupLength - 1);
+                    return this.isToolbarWidget(widget) && owningGroupLength > 1 && isNotLastItem;
+                }
+                return false;
+            },
+        });
+        registry.registerCommand(ToolbarCommands.ADD_COMMAND_TO_TOOLBAR, {
+            execute: () => this.toolbarCommandPickService.openIconDialog(),
+        });
+    }
+
+    protected isToolbarWidget(arg: unknown): boolean {
+        return arg instanceof ToolbarImpl;
+    }
+
+    registerKeybindings(keys: KeybindingRegistry): void {
+        keys.registerKeybinding({
+            command: ToolbarCommands.TOGGLE_TOOLBAR.id,
+            keybinding: 'alt+t',
+        });
+    }
+
+    registerMenus(registry: MenuModelRegistry): void {
+        registry.registerMenuAction(CommonMenus.VIEW_LAYOUT, {
+            commandId: ToolbarCommands.TOGGLE_TOOLBAR.id,
+            order: 'z',
+        });
+
+        registry.registerMenuAction(ToolbarMenus.TOOLBAR_ITEM_CONTEXT_MENU, {
+            commandId: ToolbarCommands.ADD_COMMAND_TO_TOOLBAR.id,
+            order: 'a',
+        });
+        registry.registerMenuAction(ToolbarMenus.TOOLBAR_ITEM_CONTEXT_MENU, {
+            commandId: ToolbarCommands.INSERT_GROUP_LEFT.id,
+            order: 'b',
+        });
+        registry.registerMenuAction(ToolbarMenus.TOOLBAR_ITEM_CONTEXT_MENU, {
+            commandId: ToolbarCommands.INSERT_GROUP_RIGHT.id,
+            order: 'c',
+        });
+        registry.registerMenuAction(ToolbarMenus.TOOLBAR_ITEM_CONTEXT_MENU, {
+            commandId: ToolbarCommands.REMOVE_COMMAND_FROM_TOOLBAR.id,
+            order: 'd',
+        });
+
+        registry.registerMenuAction(ToolbarMenus.TOOLBAR_BACKGROUND_CONTEXT_MENU, {
+            commandId: ToolbarCommands.ADD_COMMAND_TO_TOOLBAR.id,
+            order: 'a',
+        });
+        registry.registerMenuAction(ToolbarMenus.TOOLBAR_BACKGROUND_CONTEXT_MENU, {
+            commandId: ToolbarCommands.CUSTOMIZE_TOOLBAR.id,
+            order: 'b',
+        });
+        registry.registerMenuAction(ToolbarMenus.TOOLBAR_BACKGROUND_CONTEXT_MENU, {
+            commandId: ToolbarCommands.TOGGLE_TOOLBAR.id,
+            order: 'c',
+        });
+        registry.registerMenuAction(ToolbarMenus.TOOLBAR_BACKGROUND_CONTEXT_MENU, {
+            commandId: ToolbarCommands.RESET_TOOLBAR.id,
+            order: 'd',
+        });
+    }
+}
+
+export function bindToolbar(bind: interfaces.Bind): void {
+    bind(ToolbarFactory).toFactory(({ container }) => (): Toolbar => {
+        const child = new Container({ defaultScope: 'Singleton' });
+        child.parent = container;
+        child.bind(Toolbar).to(ToolbarImpl);
+        return child.get(Toolbar);
+    });
+    bind(ToolbarCommandContribution).toSelf().inSingletonScope();
+    bind(CommandContribution).to(ToolbarCommandContribution);
+    bind(MenuContribution).toService(ToolbarCommandContribution);
+    bind(KeybindingContribution).toService(ToolbarCommandContribution);
+    bind(JsonSchemaContribution).toService(ToolbarCommandContribution);
+
+    bind(ToolbarCommandQuickInputService).toSelf().inSingletonScope();
+
+    bindToolbarIconDialog(bind);
+    bind(ToolbarDefaultsFactory).toConstantValue(ToolbarDefaults);
+    bind(ToolbarPreferences).toDynamicValue(({ container }) => {
+        const preferences = container.get<PreferenceService>(PreferenceService);
+        return createPreferenceProxy(preferences, ToolbarPreferencesSchema);
+    }).inSingletonScope();
+    bind(PreferenceContribution).toConstantValue({
+        schema: ToolbarPreferencesSchema,
+    });
+
+    bind(UserToolbarURI).toConstantValue(USER_TOOLBAR_URI);
+
+    bind(ToolbarController).toSelf().inSingletonScope();
+    bind(ToolbarStorageProvider).toSelf().inSingletonScope();
+    bindContributionProvider(bind, ToolbarContribution);
+    bind(LateInjector).toFactory(
+        <T>(context: interfaces.Context) => (id: interfaces.ServiceIdentifier<T>): T => lateInjector(context.container, id),
+    );
+}

package/src/browser/toolbar-command-quick-input-service.ts

@@ -1,86 +1,86 @@
-// *****************************************************************************
-// Copyright (C) 2022 Ericsson and others.
-//
-// This program and the accompanying materials are made available under the
-// terms of the Eclipse Public License v. 2.0 which is available at
-// http://www.eclipse.org/legal/epl-2.0.
-//
-// This Source Code may also be made available under the following Secondary
-// Licenses when the conditions for such availability set forth in the Eclipse
-// Public License v. 2.0 are satisfied: GNU General Public License, version 2
-// with the GNU Classpath Exception which is available at
-// https://www.gnu.org/software/classpath/license.html.
-//
-// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0
-// *****************************************************************************
-
-import { Command, CommandRegistry, CommandService, nls } from '@theia/core';
-import { QuickCommandService, QuickInputService, QuickPickItem } from '@theia/core/lib/browser';
-import { injectable, inject } from '@theia/core/shared/inversify';
-import { ToolbarIconDialogFactory } from './toolbar-icon-selector-dialog';
-import { ToolbarAlignment, ToolbarAlignmentString } from './toolbar-interfaces';
-import { ToolbarController } from './toolbar-controller';
-
-@injectable()
-export class ToolbarCommandQuickInputService {
-    @inject(CommandService) protected readonly commandService: CommandService;
-    @inject(QuickInputService) protected readonly quickInputService: QuickInputService;
-    @inject(CommandRegistry) protected readonly commandRegistry: CommandRegistry;
-    @inject(QuickCommandService) protected readonly quickCommandService: QuickCommandService;
-    @inject(ToolbarController) protected readonly model: ToolbarController;
-    @inject(ToolbarIconDialogFactory) protected readonly iconDialogFactory: ToolbarIconDialogFactory;
-
-    protected quickPickItems: QuickPickItem[] = [];
-
-    protected iconClass: string | undefined;
-    protected commandToAdd: Command | undefined;
-
-    protected columnQuickPickItems: QuickPickItem[] = [
-        {
-            label: nls.localize('theia/toolbar/leftColumn', 'Left Column'),
-            id: ToolbarAlignment.LEFT,
-        },
-        {
-            label: nls.localize('theia/toolbar/centerColumn', 'Center Column'),
-            id: ToolbarAlignment.CENTER,
-        },
-        {
-            label: nls.localize('theia/toolbar/rightColumn', 'Right Column'),
-            id: ToolbarAlignment.RIGHT
-        },
-    ];
-
-    openIconDialog(): void {
-        this.quickPickItems = this.generateCommandsList();
-        this.quickInputService.showQuickPick(this.quickPickItems, {
-            placeholder: nls.localize('theia/toolbar/addCommandPlaceholder', 'Find a command to add to the toolbar'),
-        });
-    }
-
-    protected openColumnQP(): Promise<QuickPickItem | undefined> {
-        return this.quickInputService.showQuickPick(this.columnQuickPickItems, {
-            placeholder: nls.localize('theia/toolbar/toolbarLocationPlaceholder', 'Where would you like the command added?')
-        });
-    }
-
-    protected generateCommandsList(): QuickPickItem[] {
-        const { recent, other } = this.quickCommandService.getCommands();
-        return [...recent, ...other].map(command => {
-            const formattedItem = this.quickCommandService.toItem(command) as QuickPickItem;
-            return {
-                ...formattedItem,
-                alwaysShow: true,
-                execute: async (): Promise<void> => {
-                    const iconDialog = this.iconDialogFactory(command);
-                    const iconClass = await iconDialog.open();
-                    if (iconClass) {
-                        const { id } = await this.openColumnQP() ?? {};
-                        if (ToolbarAlignmentString.is(id)) {
-                            this.model.addItem({ ...command, iconClass }, id);
-                        }
-                    }
-                },
-            };
-        });
-    }
-}
+// *****************************************************************************
+// Copyright (C) 2022 Ericsson and others.
+//
+// This program and the accompanying materials are made available under the
+// terms of the Eclipse Public License v. 2.0 which is available at
+// http://www.eclipse.org/legal/epl-2.0.
+//
+// This Source Code may also be made available under the following Secondary
+// Licenses when the conditions for such availability set forth in the Eclipse
+// Public License v. 2.0 are satisfied: GNU General Public License, version 2
+// with the GNU Classpath Exception which is available at
+// https://www.gnu.org/software/classpath/license.html.
+//
+// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0
+// *****************************************************************************
+
+import { Command, CommandRegistry, CommandService, nls } from '@theia/core';
+import { QuickCommandService, QuickInputService, QuickPickItem } from '@theia/core/lib/browser';
+import { injectable, inject } from '@theia/core/shared/inversify';
+import { ToolbarIconDialogFactory } from './toolbar-icon-selector-dialog';
+import { ToolbarAlignment, ToolbarAlignmentString } from './toolbar-interfaces';
+import { ToolbarController } from './toolbar-controller';
+
+@injectable()
+export class ToolbarCommandQuickInputService {
+    @inject(CommandService) protected readonly commandService: CommandService;
+    @inject(QuickInputService) protected readonly quickInputService: QuickInputService;
+    @inject(CommandRegistry) protected readonly commandRegistry: CommandRegistry;
+    @inject(QuickCommandService) protected readonly quickCommandService: QuickCommandService;
+    @inject(ToolbarController) protected readonly model: ToolbarController;
+    @inject(ToolbarIconDialogFactory) protected readonly iconDialogFactory: ToolbarIconDialogFactory;
+
+    protected quickPickItems: QuickPickItem[] = [];
+
+    protected iconClass: string | undefined;
+    protected commandToAdd: Command | undefined;
+
+    protected columnQuickPickItems: QuickPickItem[] = [
+        {
+            label: nls.localize('theia/toolbar/leftColumn', 'Left Column'),
+            id: ToolbarAlignment.LEFT,
+        },
+        {
+            label: nls.localize('theia/toolbar/centerColumn', 'Center Column'),
+            id: ToolbarAlignment.CENTER,
+        },
+        {
+            label: nls.localize('theia/toolbar/rightColumn', 'Right Column'),
+            id: ToolbarAlignment.RIGHT
+        },
+    ];
+
+    openIconDialog(): void {
+        this.quickPickItems = this.generateCommandsList();
+        this.quickInputService.showQuickPick(this.quickPickItems, {
+            placeholder: nls.localize('theia/toolbar/addCommandPlaceholder', 'Find a command to add to the toolbar'),
+        });
+    }
+
+    protected openColumnQP(): Promise<QuickPickItem | undefined> {
+        return this.quickInputService.showQuickPick(this.columnQuickPickItems, {
+            placeholder: nls.localize('theia/toolbar/toolbarLocationPlaceholder', 'Where would you like the command added?')
+        });
+    }
+
+    protected generateCommandsList(): QuickPickItem[] {
+        const { recent, other } = this.quickCommandService.getCommands();
+        return [...recent, ...other].map(command => {
+            const formattedItem = this.quickCommandService.toItem(command) as QuickPickItem;
+            return {
+                ...formattedItem,
+                alwaysShow: true,
+                execute: async (): Promise<void> => {
+                    const iconDialog = this.iconDialogFactory(command);
+                    const iconClass = await iconDialog.open();
+                    if (iconClass) {
+                        const { id } = await this.openColumnQP() ?? {};
+                        if (ToolbarAlignmentString.is(id)) {
+                            this.model.addItem({ ...command, iconClass }, id);
+                        }
+                    }
+                },
+            };
+        });
+    }
+}