@theia/core 1.18.0 → 1.21.0-next.12

package/lib/browser/common-frontend-contribution.js

@@ -31,7 +31,6 @@ exports.CommonFrontendContribution = exports.RECENT_COMMANDS_STORAGE_KEY = expor
 /* eslint-disable max-len, @typescript-eslint/indent */
 const debounce = require("lodash.debounce");
 const inversify_1 = require("inversify");
-const widgets_1 = require("@phosphor/widgets");
 const menu_1 = require("../common/menu");
 const command_1 = require("../common/command");
 const uri_command_handler_1 = require("../common/uri-command-handler");
@@ -61,9 +60,11 @@ const encoding_registry_1 = require("./encoding-registry");
 const encodings_1 = require("../common/encodings");
 const env_variables_1 = require("../common/env-variables");
 const authentication_service_1 = require("./authentication-service");
+const saveable_1 = require("./saveable");
 const quick_input_1 = require("./quick-input");
 const localization_1 = require("../common/i18n/localization");
-const nls_1 = require("./nls");
+const nls_1 = require("../common/nls");
+const current_widget_command_adapter_1 = require("./shell/current-widget-command-adapter");
 var CommonMenus;
 (function (CommonMenus) {
     CommonMenus.FILE = [...menu_1.MAIN_MENU_BAR, '1_file'];
@@ -92,185 +93,194 @@ var CommonMenus;
 })(CommonMenus = exports.CommonMenus || (exports.CommonMenus = {}));
 var CommonCommands;
 (function (CommonCommands) {
-    const FILE_CATEGORY = 'File';
-    const VIEW_CATEGORY = 'View';
+    CommonCommands.FILE_CATEGORY = 'File';
+    CommonCommands.VIEW_CATEGORY = 'View';
+    CommonCommands.PREFERENCES_CATEGORY = 'Preferences';
+    CommonCommands.FILE_CATEGORY_KEY = nls_1.nls.getDefaultKey(CommonCommands.FILE_CATEGORY);
+    CommonCommands.VIEW_CATEGORY_KEY = nls_1.nls.getDefaultKey(CommonCommands.VIEW_CATEGORY);
+    CommonCommands.PREFERENCES_CATEGORY_KEY = nls_1.nls.getDefaultKey(CommonCommands.PREFERENCES_CATEGORY);
     CommonCommands.OPEN = {
         id: 'core.open',
     };
-    CommonCommands.CUT = {
+    CommonCommands.CUT = command_1.Command.toDefaultLocalizedCommand({
         id: 'core.cut',
         label: 'Cut'
-    };
-    CommonCommands.COPY = {
+    });
+    CommonCommands.COPY = command_1.Command.toDefaultLocalizedCommand({
         id: 'core.copy',
         label: 'Copy'
-    };
-    CommonCommands.PASTE = {
+    });
+    CommonCommands.PASTE = command_1.Command.toDefaultLocalizedCommand({
         id: 'core.paste',
         label: 'Paste'
-    };
-    CommonCommands.COPY_PATH = {
+    });
+    CommonCommands.COPY_PATH = command_1.Command.toDefaultLocalizedCommand({
         id: 'core.copy.path',
         label: 'Copy Path'
-    };
-    CommonCommands.UNDO = {
+    });
+    CommonCommands.UNDO = command_1.Command.toDefaultLocalizedCommand({
         id: 'core.undo',
         label: 'Undo'
-    };
-    CommonCommands.REDO = {
+    });
+    CommonCommands.REDO = command_1.Command.toDefaultLocalizedCommand({
         id: 'core.redo',
         label: 'Redo'
-    };
-    CommonCommands.SELECT_ALL = {
+    });
+    CommonCommands.SELECT_ALL = command_1.Command.toDefaultLocalizedCommand({
         id: 'core.selectAll',
         label: 'Select All'
-    };
-    CommonCommands.FIND = {
+    });
+    CommonCommands.FIND = command_1.Command.toDefaultLocalizedCommand({
         id: 'core.find',
         label: 'Find'
-    };
-    CommonCommands.REPLACE = {
+    });
+    CommonCommands.REPLACE = command_1.Command.toDefaultLocalizedCommand({
         id: 'core.replace',
         label: 'Replace'
-    };
-    CommonCommands.NEXT_TAB = {
+    });
+    CommonCommands.NEXT_TAB = command_1.Command.toDefaultLocalizedCommand({
         id: 'core.nextTab',
-        category: VIEW_CATEGORY,
-        label: 'Switch to Next Tab'
-    };
-    CommonCommands.PREVIOUS_TAB = {
+        category: CommonCommands.VIEW_CATEGORY,
+        label: 'Show Next Tab'
+    });
+    CommonCommands.PREVIOUS_TAB = command_1.Command.toDefaultLocalizedCommand({
         id: 'core.previousTab',
-        category: VIEW_CATEGORY,
-        label: 'Switch to Previous Tab'
-    };
-    CommonCommands.NEXT_TAB_IN_GROUP = {
+        category: CommonCommands.VIEW_CATEGORY,
+        label: 'Show Previous Tab'
+    });
+    CommonCommands.NEXT_TAB_IN_GROUP = command_1.Command.toLocalizedCommand({
         id: 'core.nextTabInGroup',
-        category: VIEW_CATEGORY,
+        category: CommonCommands.VIEW_CATEGORY,
         label: 'Switch to Next Tab in Group'
-    };
-    CommonCommands.PREVIOUS_TAB_IN_GROUP = {
+    }, 'theia/core/common/showNextTabInGroup', CommonCommands.VIEW_CATEGORY_KEY);
+    CommonCommands.PREVIOUS_TAB_IN_GROUP = command_1.Command.toLocalizedCommand({
         id: 'core.previousTabInGroup',
-        category: VIEW_CATEGORY,
+        category: CommonCommands.VIEW_CATEGORY,
         label: 'Switch to Previous Tab in Group'
-    };
-    CommonCommands.NEXT_TAB_GROUP = {
+    }, 'theia/core/common/showPreviousTabInGroup', CommonCommands.VIEW_CATEGORY_KEY);
+    CommonCommands.NEXT_TAB_GROUP = command_1.Command.toLocalizedCommand({
         id: 'core.nextTabGroup',
-        category: VIEW_CATEGORY,
+        category: CommonCommands.VIEW_CATEGORY,
         label: 'Switch to Next Tab Group'
-    };
-    CommonCommands.PREVIOUS_TAB_GROUP = {
+    }, 'theia/core/common/showNextTabGroup', CommonCommands.VIEW_CATEGORY_KEY);
+    CommonCommands.PREVIOUS_TAB_GROUP = command_1.Command.toLocalizedCommand({
         id: 'core.previousTabBar',
-        category: VIEW_CATEGORY,
+        category: CommonCommands.VIEW_CATEGORY,
         label: 'Switch to Previous Tab Group'
-    };
-    CommonCommands.CLOSE_TAB = {
+    }, 'theia/core/common/showPreviousTabGroup', CommonCommands.VIEW_CATEGORY_KEY);
+    CommonCommands.CLOSE_TAB = command_1.Command.toLocalizedCommand({
         id: 'core.close.tab',
-        category: VIEW_CATEGORY,
+        category: CommonCommands.VIEW_CATEGORY,
         label: 'Close Tab'
-    };
-    CommonCommands.CLOSE_OTHER_TABS = {
+    }, 'theia/core/common/closeTab', CommonCommands.VIEW_CATEGORY_KEY);
+    CommonCommands.CLOSE_OTHER_TABS = command_1.Command.toLocalizedCommand({
         id: 'core.close.other.tabs',
-        category: VIEW_CATEGORY,
+        category: CommonCommands.VIEW_CATEGORY,
         label: 'Close Other Tabs'
-    };
-    CommonCommands.CLOSE_RIGHT_TABS = {
+    }, 'theia/core/common/closeOthers', CommonCommands.VIEW_CATEGORY_KEY);
+    CommonCommands.CLOSE_SAVED_TABS = command_1.Command.toDefaultLocalizedCommand({
+        id: 'workbench.action.closeUnmodifiedEditors',
+        category: CommonCommands.VIEW_CATEGORY,
+        label: 'Close Saved Editors in Group',
+    });
+    CommonCommands.CLOSE_RIGHT_TABS = command_1.Command.toLocalizedCommand({
         id: 'core.close.right.tabs',
-        category: VIEW_CATEGORY,
+        category: CommonCommands.VIEW_CATEGORY,
         label: 'Close Tabs to the Right'
-    };
-    CommonCommands.CLOSE_ALL_TABS = {
+    }, 'theia/core/common/closeRight', CommonCommands.VIEW_CATEGORY_KEY);
+    CommonCommands.CLOSE_ALL_TABS = command_1.Command.toLocalizedCommand({
         id: 'core.close.all.tabs',
-        category: VIEW_CATEGORY,
+        category: CommonCommands.VIEW_CATEGORY,
         label: 'Close All Tabs'
-    };
-    CommonCommands.CLOSE_MAIN_TAB = {
+    }, 'theia/core/common/closeAll', CommonCommands.VIEW_CATEGORY_KEY);
+    CommonCommands.CLOSE_MAIN_TAB = command_1.Command.toLocalizedCommand({
         id: 'core.close.main.tab',
-        category: VIEW_CATEGORY,
+        category: CommonCommands.VIEW_CATEGORY,
         label: 'Close Tab in Main Area'
-    };
-    CommonCommands.CLOSE_OTHER_MAIN_TABS = {
+    }, 'theia/core/common/closeTabMain', CommonCommands.VIEW_CATEGORY_KEY);
+    CommonCommands.CLOSE_OTHER_MAIN_TABS = command_1.Command.toLocalizedCommand({
         id: 'core.close.other.main.tabs',
-        category: VIEW_CATEGORY,
+        category: CommonCommands.VIEW_CATEGORY,
         label: 'Close Other Tabs in Main Area'
-    };
-    CommonCommands.CLOSE_ALL_MAIN_TABS = {
+    }, 'theia/core/common/closeOtherTabMain', CommonCommands.VIEW_CATEGORY_KEY);
+    CommonCommands.CLOSE_ALL_MAIN_TABS = command_1.Command.toLocalizedCommand({
         id: 'core.close.all.main.tabs',
-        category: VIEW_CATEGORY,
+        category: CommonCommands.VIEW_CATEGORY,
         label: 'Close All Tabs in Main Area'
-    };
-    CommonCommands.COLLAPSE_PANEL = {
+    }, 'theia/core/common/closeAllTabMain', CommonCommands.VIEW_CATEGORY_KEY);
+    CommonCommands.COLLAPSE_PANEL = command_1.Command.toLocalizedCommand({
         id: 'core.collapse.tab',
-        category: VIEW_CATEGORY,
+        category: CommonCommands.VIEW_CATEGORY,
         label: 'Collapse Side Panel'
-    };
-    CommonCommands.COLLAPSE_ALL_PANELS = {
+    }, 'theia/core/common/collapseTab', CommonCommands.VIEW_CATEGORY_KEY);
+    CommonCommands.COLLAPSE_ALL_PANELS = command_1.Command.toLocalizedCommand({
         id: 'core.collapse.all.tabs',
-        category: VIEW_CATEGORY,
+        category: CommonCommands.VIEW_CATEGORY,
         label: 'Collapse All Side Panels'
-    };
-    CommonCommands.TOGGLE_BOTTOM_PANEL = {
+    }, 'theia/core/common/collapseAllTabs', CommonCommands.VIEW_CATEGORY_KEY);
+    CommonCommands.TOGGLE_BOTTOM_PANEL = command_1.Command.toLocalizedCommand({
         id: 'core.toggle.bottom.panel',
-        category: VIEW_CATEGORY,
+        category: CommonCommands.VIEW_CATEGORY,
         label: 'Toggle Bottom Panel'
-    };
-    CommonCommands.TOGGLE_STATUS_BAR = {
+    }, 'theia/core/common/collapseBottomPanel', CommonCommands.VIEW_CATEGORY_KEY);
+    CommonCommands.TOGGLE_STATUS_BAR = command_1.Command.toDefaultLocalizedCommand({
         id: 'workbench.action.toggleStatusbarVisibility',
-        category: VIEW_CATEGORY,
+        category: CommonCommands.VIEW_CATEGORY,
         label: 'Toggle Status Bar Visibility'
-    };
-    CommonCommands.TOGGLE_MAXIMIZED = {
+    });
+    CommonCommands.TOGGLE_MAXIMIZED = command_1.Command.toLocalizedCommand({
         id: 'core.toggleMaximized',
-        category: VIEW_CATEGORY,
+        category: CommonCommands.VIEW_CATEGORY,
         label: 'Toggle Maximized'
-    };
-    CommonCommands.OPEN_VIEW = {
+    }, 'theia/core/common/toggleMaximized', CommonCommands.VIEW_CATEGORY_KEY);
+    CommonCommands.OPEN_VIEW = command_1.Command.toDefaultLocalizedCommand({
         id: 'core.openView',
-        category: VIEW_CATEGORY,
+        category: CommonCommands.VIEW_CATEGORY,
         label: 'Open View...'
-    };
-    CommonCommands.SAVE = {
+    });
+    CommonCommands.SAVE = command_1.Command.toDefaultLocalizedCommand({
         id: 'core.save',
-        category: FILE_CATEGORY,
+        category: CommonCommands.FILE_CATEGORY,
         label: 'Save',
-    };
-    CommonCommands.SAVE_WITHOUT_FORMATTING = {
+    });
+    CommonCommands.SAVE_WITHOUT_FORMATTING = command_1.Command.toDefaultLocalizedCommand({
         id: 'core.saveWithoutFormatting',
-        category: FILE_CATEGORY,
+        category: CommonCommands.FILE_CATEGORY,
         label: 'Save without Formatting',
-    };
-    CommonCommands.SAVE_ALL = {
+    });
+    CommonCommands.SAVE_ALL = command_1.Command.toDefaultLocalizedCommand({
         id: 'core.saveAll',
-        category: FILE_CATEGORY,
+        category: CommonCommands.FILE_CATEGORY,
         label: 'Save All',
-    };
-    CommonCommands.AUTO_SAVE = {
+    });
+    CommonCommands.AUTO_SAVE = command_1.Command.toDefaultLocalizedCommand({
         id: 'textEditor.commands.autosave',
-        category: FILE_CATEGORY,
+        category: CommonCommands.FILE_CATEGORY,
         label: 'Auto Save',
-    };
-    CommonCommands.ABOUT_COMMAND = {
+    });
+    CommonCommands.ABOUT_COMMAND = command_1.Command.toDefaultLocalizedCommand({
         id: 'core.about',
         label: 'About'
-    };
-    CommonCommands.OPEN_PREFERENCES = {
+    });
+    CommonCommands.OPEN_PREFERENCES = command_1.Command.toDefaultLocalizedCommand({
         id: 'preferences:open',
-        category: 'Settings',
-        label: 'Open Preferences',
-    };
-    CommonCommands.SELECT_COLOR_THEME = {
+        category: CommonCommands.PREFERENCES_CATEGORY,
+        label: 'Open Settings (UI)',
+    });
+    CommonCommands.SELECT_COLOR_THEME = command_1.Command.toDefaultLocalizedCommand({
         id: 'workbench.action.selectTheme',
         label: 'Color Theme',
-        category: 'Preferences'
-    };
-    CommonCommands.SELECT_ICON_THEME = {
+        category: CommonCommands.PREFERENCES_CATEGORY
+    });
+    CommonCommands.SELECT_ICON_THEME = command_1.Command.toDefaultLocalizedCommand({
         id: 'workbench.action.selectIconTheme',
         label: 'File Icon Theme',
-        category: 'Preferences'
-    };
-    CommonCommands.CONFIGURE_DISPLAY_LANGUAGE = command_1.Command.toLocalizedCommand({
+        category: CommonCommands.PREFERENCES_CATEGORY
+    });
+    CommonCommands.CONFIGURE_DISPLAY_LANGUAGE = command_1.Command.toDefaultLocalizedCommand({
         id: 'workbench.action.configureLanguage',
         label: 'Configure Display Language'
-    }, 'vscode/localizationsActions/configureLocale');
+    });
 })(CommonCommands = exports.CommonCommands || (exports.CommonCommands = {}));
 exports.supportCut = browser.isNative || document.queryCommandSupported('cut');
 exports.supportCopy = browser.isNative || document.queryCommandSupported('copy');
@@ -311,14 +321,14 @@ let CommonFrontendContribution = class CommonFrontendContribution {
         app.shell.leftPanelHandler.addBottomMenu({
             id: 'settings-menu',
             iconClass: 'codicon codicon-settings-gear',
-            title: 'Settings',
+            title: nls_1.nls.localizeByDefault(CommonCommands.PREFERENCES_CATEGORY),
             menuPath: menu_1.SETTINGS_MENU,
             order: 0,
         });
         const accountsMenu = {
             id: 'accounts-menu',
             iconClass: 'codicon codicon-person',
-            title: 'Accounts',
+            title: nls_1.nls.localizeByDefault('Accounts'),
             menuPath: menu_1.ACCOUNTS_MENU,
             order: 1,
         };
@@ -380,7 +390,7 @@ let CommonFrontendContribution = class CommonFrontendContribution {
                     this.shell.leftPanelHandler.addTopMenu({
                         id: mainMenuId,
                         iconClass: 'codicon codicon-menu',
-                        title: 'Application Menu',
+                        title: nls_1.nls.localizeByDefault('Application Menu'),
                         menuPath: ['menubar'],
                         order: 0,
                     });
@@ -410,10 +420,10 @@ let CommonFrontendContribution = class CommonFrontendContribution {
         this.selectionService.onSelectionChanged(updateContextKeys);
     }
     registerMenus(registry) {
-        registry.registerSubmenu(CommonMenus.FILE, 'File');
-        registry.registerSubmenu(CommonMenus.EDIT, 'Edit');
-        registry.registerSubmenu(CommonMenus.VIEW, 'View');
-        registry.registerSubmenu(CommonMenus.HELP, 'Help');
+        registry.registerSubmenu(CommonMenus.FILE, nls_1.nls.localizeByDefault('File'));
+        registry.registerSubmenu(CommonMenus.EDIT, nls_1.nls.localizeByDefault('Edit'));
+        registry.registerSubmenu(CommonMenus.VIEW, nls_1.nls.localizeByDefault('View'));
+        registry.registerSubmenu(CommonMenus.HELP, nls_1.nls.localizeByDefault('Help'));
         registry.registerMenuAction(CommonMenus.FILE_SAVE, {
             commandId: CommonCommands.SAVE.id
         });
@@ -423,7 +433,7 @@ let CommonFrontendContribution = class CommonFrontendContribution {
         registry.registerMenuAction(CommonMenus.FILE_AUTOSAVE, {
             commandId: CommonCommands.AUTO_SAVE.id
         });
-        registry.registerSubmenu(CommonMenus.FILE_SETTINGS_SUBMENU, 'Settings');
+        registry.registerSubmenu(CommonMenus.FILE_SETTINGS_SUBMENU, nls_1.nls.localizeByDefault(CommonCommands.PREFERENCES_CATEGORY));
         registry.registerMenuAction(CommonMenus.EDIT_UNDO, {
             commandId: CommonCommands.UNDO.id,
             order: '0'
@@ -469,39 +479,49 @@ let CommonFrontendContribution = class CommonFrontendContribution {
             commandId: CommonCommands.COLLAPSE_ALL_PANELS.id,
             order: '2'
         });
-        registry.registerMenuAction(tab_bars_1.SHELL_TABBAR_CONTEXT_MENU, {
+        registry.registerMenuAction(tab_bars_1.SHELL_TABBAR_CONTEXT_CLOSE, {
             commandId: CommonCommands.CLOSE_TAB.id,
-            label: 'Close',
+            label: nls_1.nls.localizeByDefault('Close'),
             order: '0'
         });
-        registry.registerMenuAction(tab_bars_1.SHELL_TABBAR_CONTEXT_MENU, {
+        registry.registerMenuAction(tab_bars_1.SHELL_TABBAR_CONTEXT_CLOSE, {
             commandId: CommonCommands.CLOSE_OTHER_TABS.id,
-            label: 'Close Others',
+            label: nls_1.nls.localizeByDefault('Close Others'),
             order: '1'
         });
-        registry.registerMenuAction(tab_bars_1.SHELL_TABBAR_CONTEXT_MENU, {
+        registry.registerMenuAction(tab_bars_1.SHELL_TABBAR_CONTEXT_CLOSE, {
             commandId: CommonCommands.CLOSE_RIGHT_TABS.id,
-            label: 'Close to the Right',
+            label: nls_1.nls.localizeByDefault('Close to the Right'),
             order: '2'
         });
-        registry.registerMenuAction(tab_bars_1.SHELL_TABBAR_CONTEXT_MENU, {
+        registry.registerMenuAction(tab_bars_1.SHELL_TABBAR_CONTEXT_CLOSE, {
+            commandId: CommonCommands.CLOSE_SAVED_TABS.id,
+            label: nls_1.nls.localizeByDefault('Close Saved'),
+            order: '3',
+        });
+        registry.registerMenuAction(tab_bars_1.SHELL_TABBAR_CONTEXT_CLOSE, {
             commandId: CommonCommands.CLOSE_ALL_TABS.id,
-            label: 'Close All',
-            order: '3'
+            label: nls_1.nls.localizeByDefault('Close All'),
+            order: '4'
         });
-        registry.registerMenuAction(tab_bars_1.SHELL_TABBAR_CONTEXT_MENU, {
+        registry.registerMenuAction(tab_bars_1.SHELL_TABBAR_CONTEXT_SPLIT, {
             commandId: CommonCommands.COLLAPSE_PANEL.id,
-            label: 'Collapse',
-            order: '4'
+            label: CommonCommands.COLLAPSE_PANEL.label,
+            order: '5'
         });
-        registry.registerMenuAction(tab_bars_1.SHELL_TABBAR_CONTEXT_MENU, {
+        registry.registerMenuAction(tab_bars_1.SHELL_TABBAR_CONTEXT_SPLIT, {
             commandId: CommonCommands.TOGGLE_MAXIMIZED.id,
-            label: 'Toggle Maximized',
-            order: '5'
+            label: CommonCommands.TOGGLE_MAXIMIZED.label,
+            order: '6'
+        });
+        registry.registerMenuAction(tab_bars_1.SHELL_TABBAR_CONTEXT_COPY, {
+            commandId: CommonCommands.COPY_PATH.id,
+            label: CommonCommands.COPY_PATH.label,
+            order: '1',
         });
         registry.registerMenuAction(CommonMenus.HELP, {
             commandId: CommonCommands.ABOUT_COMMAND.id,
-            label: 'About',
+            label: CommonCommands.ABOUT_COMMAND.label,
             order: '9'
         });
         registry.registerMenuAction(CommonMenus.VIEW_PRIMARY, {
@@ -555,6 +575,8 @@ let CommonFrontendContribution = class CommonFrontendContribution {
             }
         });
         commandRegistry.registerCommand(CommonCommands.COPY_PATH, uri_command_handler_1.UriAwareCommandHandler.MultiSelect(this.selectionService, {
+            isVisible: uris => Array.isArray(uris) && uris.some(uri => uri instanceof uri_1.default),
+            isEnabled: uris => Array.isArray(uris) && uris.some(uri => uri instanceof uri_1.default),
             execute: async (uris) => {
                 if (uris.length) {
                     const lineDelimiter = os_1.isWindows ? '\r\n' : '\n';
@@ -605,62 +627,58 @@ let CommonFrontendContribution = class CommonFrontendContribution {
             isEnabled: () => this.shell.previousTabBar() !== undefined,
             execute: () => this.shell.activatePreviousTabBar()
         });
-        commandRegistry.registerCommand(CommonCommands.CLOSE_TAB, {
-            isEnabled: (event) => {
-                const tabBar = this.shell.findTabBar(event);
-                if (!tabBar) {
-                    return false;
-                }
-                const currentTitle = this.shell.findTitle(tabBar, event);
-                return currentTitle !== undefined && currentTitle.closable;
-            },
-            execute: (event) => {
-                const tabBar = this.shell.findTabBar(event);
-                const currentTitle = this.shell.findTitle(tabBar, event);
-                this.shell.closeTabs(tabBar, title => title === currentTitle);
-            }
-        });
-        commandRegistry.registerCommand(CommonCommands.CLOSE_OTHER_TABS, {
-            isEnabled: (event) => {
-                const tabBar = this.shell.findTabBar(event);
-                if (!tabBar) {
-                    return false;
-                }
-                const currentTitle = this.shell.findTitle(tabBar, event);
-                return tabBar.titles.some(title => title !== currentTitle && title.closable);
-            },
-            execute: (event) => {
-                const tabBar = this.shell.findTabBar(event);
-                const currentTitle = this.shell.findTitle(tabBar, event);
-                this.shell.closeTabs(tabBar, title => title !== currentTitle && title.closable);
-            }
-        });
-        commandRegistry.registerCommand(CommonCommands.CLOSE_RIGHT_TABS, {
-            isEnabled: (event) => {
-                const tabBar = this.shell.findTabBar(event);
-                if (!tabBar) {
-                    return false;
-                }
-                const currentIndex = this.findTitleIndex(tabBar, event);
-                return tabBar.titles.some((title, index) => index > currentIndex && title.closable);
+        commandRegistry.registerCommand(CommonCommands.CLOSE_TAB, new current_widget_command_adapter_1.CurrentWidgetCommandAdapter(this.shell, {
+            isEnabled: title => Boolean(title === null || title === void 0 ? void 0 : title.closable),
+            execute: (title, tabBar) => tabBar && this.shell.closeTabs(tabBar, candidate => candidate === title),
+        }));
+        commandRegistry.registerCommand(CommonCommands.CLOSE_OTHER_TABS, new current_widget_command_adapter_1.CurrentWidgetCommandAdapter(this.shell, {
+            isEnabled: (title, tabbar) => Boolean(tabbar === null || tabbar === void 0 ? void 0 : tabbar.titles.some(candidate => candidate !== title && candidate.closable)),
+            execute: (title, tabbar) => tabbar && this.shell.closeTabs(tabbar, candidate => candidate !== title && candidate.closable),
+        }));
+        commandRegistry.registerCommand(CommonCommands.CLOSE_SAVED_TABS, new current_widget_command_adapter_1.CurrentWidgetCommandAdapter(this.shell, {
+            isEnabled: (_title, tabbar) => Boolean(tabbar === null || tabbar === void 0 ? void 0 : tabbar.titles.some(candidate => candidate.closable && !saveable_1.Saveable.isDirty(candidate.owner))),
+            execute: (_title, tabbar) => tabbar && this.shell.closeTabs(tabbar, candidate => candidate.closable && !saveable_1.Saveable.isDirty(candidate.owner)),
+        }));
+        commandRegistry.registerCommand(CommonCommands.CLOSE_RIGHT_TABS, new current_widget_command_adapter_1.CurrentWidgetCommandAdapter(this.shell, {
+            isEnabled: (title, tabbar) => {
+                let targetSeen = false;
+                return Boolean(tabbar === null || tabbar === void 0 ? void 0 : tabbar.titles.some(candidate => {
+                    if (targetSeen && candidate.closable) {
+                        return true;
+                    }
+                    ;
+                    if (candidate === title) {
+                        targetSeen = true;
+                    }
+                    ;
+                }));
             },
-            isVisible: (event) => {
-                const area = this.findTabArea(event);
+            isVisible: (_title, tabbar) => {
+                var _a;
+                const area = (_a = (tabbar && this.shell.getAreaFor(tabbar))) !== null && _a !== void 0 ? _a : this.shell.currentTabArea;
                 return area !== undefined && area !== 'left' && area !== 'right';
             },
-            execute: (event) => {
-                const tabBar = this.shell.findTabBar(event);
-                const currentIndex = this.findTitleIndex(tabBar, event);
-                this.shell.closeTabs(tabBar, (title, index) => index > currentIndex && title.closable);
+            execute: (title, tabbar) => {
+                if (tabbar) {
+                    let targetSeen = false;
+                    this.shell.closeTabs(tabbar, candidate => {
+                        if (targetSeen && candidate.closable) {
+                            return true;
+                        }
+                        ;
+                        if (candidate === title) {
+                            targetSeen = true;
+                        }
+                        ;
+                        return false;
+                    });
+                }
             }
-        });
-        commandRegistry.registerCommand(CommonCommands.CLOSE_ALL_TABS, {
-            isEnabled: (event) => {
-                const tabBar = this.shell.findTabBar(event);
-                return tabBar !== undefined && tabBar.titles.some(title => title.closable);
-            },
-            execute: (event) => this.shell.closeTabs(this.shell.findTabBar(event), title => title.closable)
-        });
+        }));
+        commandRegistry.registerCommand(CommonCommands.CLOSE_ALL_TABS, new current_widget_command_adapter_1.CurrentWidgetCommandAdapter(this.shell, {
+            isEnabled: (_title, tabbar) => Boolean(tabbar === null || tabbar === void 0 ? void 0 : tabbar.titles.some(title => title.closable)),
+            execute: (_title, tabbar) => tabbar && this.shell.closeTabs(tabbar, candidate => candidate.closable),
+        }));
         commandRegistry.registerCommand(CommonCommands.CLOSE_MAIN_TAB, {
             isEnabled: () => {
                 const currentWidget = this.shell.getCurrentWidget('main');
@@ -683,11 +701,11 @@ let CommonFrontendContribution = class CommonFrontendContribution {
             isEnabled: () => this.shell.mainAreaTabBars.some(tb => tb.titles.some(title => title.closable)),
             execute: () => this.shell.closeTabs('main', title => title.closable)
         });
-        commandRegistry.registerCommand(CommonCommands.COLLAPSE_PANEL, {
-            isEnabled: (event) => application_shell_1.ApplicationShell.isSideArea(this.findTabArea(event)),
-            isVisible: (event) => application_shell_1.ApplicationShell.isSideArea(this.findTabArea(event)),
-            execute: (event) => this.shell.collapsePanel(this.findTabArea(event))
-        });
+        commandRegistry.registerCommand(CommonCommands.COLLAPSE_PANEL, new current_widget_command_adapter_1.CurrentWidgetCommandAdapter(this.shell, {
+            isEnabled: (_title, tabbar) => Boolean(tabbar && application_shell_1.ApplicationShell.isSideArea(this.shell.getAreaFor(tabbar))),
+            isVisible: (_title, tabbar) => Boolean(tabbar && application_shell_1.ApplicationShell.isSideArea(this.shell.getAreaFor(tabbar))),
+            execute: (_title, tabbar) => tabbar && this.shell.collapsePanel(this.shell.getAreaFor(tabbar))
+        }));
         commandRegistry.registerCommand(CommonCommands.COLLAPSE_ALL_PANELS, {
             execute: () => {
                 this.shell.collapsePanel('left');
@@ -709,11 +727,11 @@ let CommonFrontendContribution = class CommonFrontendContribution {
         commandRegistry.registerCommand(CommonCommands.TOGGLE_STATUS_BAR, {
             execute: () => this.preferenceService.updateValue('workbench.statusBar.visible', !this.preferences['workbench.statusBar.visible'])
         });
-        commandRegistry.registerCommand(CommonCommands.TOGGLE_MAXIMIZED, {
-            isEnabled: (event) => this.canToggleMaximized(event),
-            isVisible: (event) => this.canToggleMaximized(event),
-            execute: (event) => this.toggleMaximized(event)
-        });
+        commandRegistry.registerCommand(CommonCommands.TOGGLE_MAXIMIZED, new current_widget_command_adapter_1.CurrentWidgetCommandAdapter(this.shell, {
+            isEnabled: title => Boolean((title === null || title === void 0 ? void 0 : title.owner) && this.shell.canToggleMaximized(title === null || title === void 0 ? void 0 : title.owner)),
+            isVisible: title => Boolean((title === null || title === void 0 ? void 0 : title.owner) && this.shell.canToggleMaximized(title === null || title === void 0 ? void 0 : title.owner)),
+            execute: title => (title === null || title === void 0 ? void 0 : title.owner) && this.shell.toggleMaximized(title === null || title === void 0 ? void 0 : title.owner),
+        }));
         commandRegistry.registerCommand(CommonCommands.SAVE, {
             execute: () => this.shell.save({ formatType: 1 /* ON */ })
         });
@@ -739,61 +757,6 @@ let CommonFrontendContribution = class CommonFrontendContribution {
             execute: () => this.configureDisplayLanguage()
         });
     }
-    findTabArea(event) {
-        const tabBar = this.shell.findTabBar(event);
-        if (tabBar) {
-            return this.shell.getAreaFor(tabBar);
-        }
-        return this.shell.currentTabArea;
-    }
-    /**
-     * Finds the index of the selected title from the tab-bar.
-     * @param tabBar: used for providing an array of titles.
-     * @returns the index of the selected title if it is available in the tab-bar, else returns the index of currently-selected title.
-     */
-    findTitleIndex(tabBar, event) {
-        if (event) {
-            const targetTitle = this.shell.findTitle(tabBar, event);
-            return targetTitle ? tabBar.titles.indexOf(targetTitle) : tabBar.currentIndex;
-        }
-        return tabBar.currentIndex;
-    }
-    canToggleMaximized(event) {
-        if ((event === null || event === void 0 ? void 0 : event.target) instanceof HTMLElement) {
-            const widget = this.shell.findWidgetForElement(event.target);
-            if (widget) {
-                return this.shell.mainPanel.contains(widget) || this.shell.bottomPanel.contains(widget);
-            }
-        }
-        return this.shell.canToggleMaximized();
-    }
-    /**
-     * Maximize the bottom or the main dockpanel based on the widget.
-     * @param event used to find the selected widget.
-     */
-    toggleMaximized(event) {
-        if ((event === null || event === void 0 ? void 0 : event.target) instanceof HTMLElement) {
-            const widget = this.shell.findWidgetForElement(event.target);
-            if (widget) {
-                if (this.shell.mainPanel.contains(widget)) {
-                    this.shell.mainPanel.toggleMaximized();
-                }
-                else if (this.shell.bottomPanel.contains(widget)) {
-                    this.shell.bottomPanel.toggleMaximized();
-                }
-                if (widget instanceof widgets_1.TabBar) {
-                    // reveals the widget when maximized.
-                    const title = this.shell.findTitle(widget, event);
-                    if (title) {
-                        this.shell.revealWidget(title.owner.id);
-                    }
-                }
-            }
-        }
-        else {
-            this.shell.toggleMaximized();
-        }
-    }
     isElectron() {
         return environment_1.environment.electron.is();
     }
@@ -963,7 +926,7 @@ let CommonFrontendContribution = class CommonFrontendContribution {
             return a.label.localeCompare(b.label);
         });
         (_a = this.quickInputService) === null || _a === void 0 ? void 0 : _a.showQuickPick(items, {
-            placeholder: 'Select File Icon Theme',
+            placeholder: nls_1.nls.localizeByDefault('Select File Icon Theme'),
             activeItem: items.find(item => item.id === resetTo),
             onDidChangeSelection: (quickPick, selectedItems) => {
                 resetTo = undefined;
@@ -1000,7 +963,7 @@ let CommonFrontendContribution = class CommonFrontendContribution {
         }
         const items = [...itemsByTheme.light, ...itemsByTheme.dark, ...itemsByTheme.hc];
         (_a = this.quickInputService) === null || _a === void 0 ? void 0 : _a.showQuickPick(items, {
-            placeholder: 'Select Color Theme (Up/Down Keys to Preview)',
+            placeholder: nls_1.nls.localizeByDefault('Select Color Theme (Up/Down Keys to Preview)'),
             activeItem: items.find((item) => item.id === resetTo),
             // eslint-disable-next-line @typescript-eslint/no-explicit-any
             onDidChangeSelection: (quickPick, selectedItems) => {