@theia/core 1.66.1 → 1.67.0-next.3

package/src/browser/common-frontend-contribution.ts

@@ -19,10 +19,14 @@
 import debounce = require('lodash.debounce');
 import { injectable, inject, optional } from 'inversify';
 import { MAIN_MENU_BAR, MANAGE_MENU, MenuContribution, MenuModelRegistry, ACCOUNTS_MENU, CompoundMenuNode, CommandMenu, Group, Submenu } from '../common/menu';
+import { CommonMenus } from './common-menus';
+export { CommonMenus };
 import { KeybindingContribution, KeybindingRegistry } from './keybinding';
 import { FrontendApplication } from './frontend-application';
 import { FrontendApplicationContribution, OnWillStopAction } from './frontend-application-contribution';
 import { CommandContribution, CommandRegistry, Command } from '../common/command';
+import { CommonCommands } from './common-commands';
+export { CommonCommands };
 import { UriAwareCommandHandler } from '../common/uri-command-handler';
 import { SelectionService } from '../common/selection-service';
 import { MessageService } from '../common/message-service';
@@ -69,312 +73,6 @@ import { SidebarMenu } from './shell/sidebar-menu-widget';
 import { UndoRedoHandlerService } from './undo-redo-handler';
 import { timeout } from '../common/promise-util';
 
-export namespace CommonMenus {
-
-    export const FILE = [...MAIN_MENU_BAR, '1_file'];
-    export const FILE_NEW_TEXT = [...FILE, '1_new_text'];
-    export const FILE_NEW = [...FILE, '1_new'];
-    export const FILE_OPEN = [...FILE, '2_open'];
-    export const FILE_SAVE = [...FILE, '3_save'];
-    export const FILE_AUTOSAVE = [...FILE, '4_autosave'];
-    export const FILE_SETTINGS = [...FILE, '5_settings'];
-    export const FILE_SETTINGS_SUBMENU = [...FILE_SETTINGS, '1_settings_submenu'];
-    export const FILE_SETTINGS_SUBMENU_OPEN = [...FILE_SETTINGS_SUBMENU, '1_settings_submenu_open'];
-    export const FILE_SETTINGS_SUBMENU_THEME = [...FILE_SETTINGS_SUBMENU, '2_settings_submenu_theme'];
-    export const FILE_CLOSE = [...FILE, '6_close'];
-
-    export const FILE_NEW_CONTRIBUTIONS = ['file', 'newFile'];
-
-    export const EDIT = [...MAIN_MENU_BAR, '2_edit'];
-    export const EDIT_UNDO = [...EDIT, '1_undo'];
-    export const EDIT_CLIPBOARD = [...EDIT, '2_clipboard'];
-    export const EDIT_FIND = [...EDIT, '3_find'];
-
-    export const VIEW = [...MAIN_MENU_BAR, '4_view'];
-    export const VIEW_PRIMARY = [...VIEW, '0_primary'];
-    export const VIEW_APPEARANCE = [...VIEW, '1_appearance'];
-    export const VIEW_APPEARANCE_SUBMENU = [...VIEW_APPEARANCE, '1_appearance_submenu'];
-    export const VIEW_APPEARANCE_SUBMENU_SCREEN = [...VIEW_APPEARANCE_SUBMENU, '2_appearance_submenu_screen'];
-    export const VIEW_APPEARANCE_SUBMENU_BAR = [...VIEW_APPEARANCE_SUBMENU, '3_appearance_submenu_bar'];
-    export const VIEW_EDITOR_SUBMENU = [...VIEW_APPEARANCE, '2_editor_submenu'];
-    export const VIEW_EDITOR_SUBMENU_SPLIT = [...VIEW_EDITOR_SUBMENU, '1_editor_submenu_split'];
-    export const VIEW_EDITOR_SUBMENU_ORTHO = [...VIEW_EDITOR_SUBMENU, '2_editor_submenu_ortho'];
-    export const VIEW_VIEWS = [...VIEW, '2_views'];
-    export const VIEW_LAYOUT = [...VIEW, '3_layout'];
-    export const VIEW_TOGGLE = [...VIEW, '4_toggle'];
-
-    export const MANAGE_GENERAL = [...MANAGE_MENU, '1_manage_general'];
-    export const MANAGE_SETTINGS = [...MANAGE_MENU, '2_manage_settings'];
-    export const MANAGE_SETTINGS_THEMES = [...MANAGE_SETTINGS, '1_manage_settings_themes'];
-
-    // last menu item
-    export const HELP = [...MAIN_MENU_BAR, '9_help'];
-
-}
-
-export namespace CommonCommands {
-
-    export const FILE_CATEGORY = 'File';
-    export const VIEW_CATEGORY = 'View';
-    export const CREATE_CATEGORY = 'Create';
-    export const PREFERENCES_CATEGORY = 'Preferences';
-    export const MANAGE_CATEGORY = 'Manage';
-    export const FILE_CATEGORY_KEY = nls.getDefaultKey(FILE_CATEGORY);
-    export const VIEW_CATEGORY_KEY = nls.getDefaultKey(VIEW_CATEGORY);
-    export const PREFERENCES_CATEGORY_KEY = nls.getDefaultKey(PREFERENCES_CATEGORY);
-
-    export const OPEN: Command = {
-        id: 'core.open',
-    };
-
-    export const CUT = Command.toDefaultLocalizedCommand({
-        id: 'core.cut',
-        label: 'Cut'
-    });
-    export const COPY = Command.toDefaultLocalizedCommand({
-        id: 'core.copy',
-        label: 'Copy'
-    });
-    export const PASTE = Command.toDefaultLocalizedCommand({
-        id: 'core.paste',
-        label: 'Paste'
-    });
-
-    export const COPY_PATH = Command.toDefaultLocalizedCommand({
-        id: 'core.copy.path',
-        label: 'Copy Path'
-    });
-
-    export const UNDO = Command.toDefaultLocalizedCommand({
-        id: 'core.undo',
-        label: 'Undo'
-    });
-    export const REDO = Command.toDefaultLocalizedCommand({
-        id: 'core.redo',
-        label: 'Redo'
-    });
-    export const SELECT_ALL = Command.toDefaultLocalizedCommand({
-        id: 'core.selectAll',
-        label: 'Select All'
-    });
-
-    export const FIND = Command.toDefaultLocalizedCommand({
-        id: 'core.find',
-        label: 'Find'
-    });
-    export const REPLACE = Command.toDefaultLocalizedCommand({
-        id: 'core.replace',
-        label: 'Replace'
-    });
-
-    export const NEXT_TAB = Command.toDefaultLocalizedCommand({
-        id: 'core.nextTab',
-        category: VIEW_CATEGORY,
-        label: 'Show Next Tab'
-    });
-    export const PREVIOUS_TAB = Command.toDefaultLocalizedCommand({
-        id: 'core.previousTab',
-        category: VIEW_CATEGORY,
-        label: 'Show Previous Tab'
-    });
-    export const NEXT_TAB_IN_GROUP = Command.toLocalizedCommand({
-        id: 'core.nextTabInGroup',
-        category: VIEW_CATEGORY,
-        label: 'Switch to Next Tab in Group'
-    }, 'theia/core/common/showNextTabInGroup', VIEW_CATEGORY_KEY);
-    export const PREVIOUS_TAB_IN_GROUP = Command.toLocalizedCommand({
-        id: 'core.previousTabInGroup',
-        category: VIEW_CATEGORY,
-        label: 'Switch to Previous Tab in Group'
-    }, 'theia/core/common/showPreviousTabInGroup', VIEW_CATEGORY_KEY);
-    export const NEXT_TAB_GROUP = Command.toLocalizedCommand({
-        id: 'core.nextTabGroup',
-        category: VIEW_CATEGORY,
-        label: 'Switch to Next Tab Group'
-    }, 'theia/core/common/showNextTabGroup', VIEW_CATEGORY_KEY);
-    export const PREVIOUS_TAB_GROUP = Command.toLocalizedCommand({
-        id: 'core.previousTabBar',
-        category: VIEW_CATEGORY,
-        label: 'Switch to Previous Tab Group'
-    }, 'theia/core/common/showPreviousTabGroup', VIEW_CATEGORY_KEY);
-    export const CLOSE_TAB = Command.toLocalizedCommand({
-        id: 'core.close.tab',
-        category: VIEW_CATEGORY,
-        label: 'Close Tab'
-    }, 'theia/core/common/closeTab', VIEW_CATEGORY_KEY);
-    export const CLOSE_OTHER_TABS = Command.toLocalizedCommand({
-        id: 'core.close.other.tabs',
-        category: VIEW_CATEGORY,
-        label: 'Close Other Tabs'
-    }, 'theia/core/common/closeOthers', VIEW_CATEGORY_KEY);
-    export const CLOSE_SAVED_TABS = Command.toDefaultLocalizedCommand({
-        id: 'workbench.action.closeUnmodifiedEditors',
-        category: VIEW_CATEGORY,
-        label: 'Close Saved Editors in Group',
-    });
-    export const CLOSE_RIGHT_TABS = Command.toLocalizedCommand({
-        id: 'core.close.right.tabs',
-        category: VIEW_CATEGORY,
-        label: 'Close Tabs to the Right'
-    }, 'theia/core/common/closeRight', VIEW_CATEGORY_KEY);
-    export const CLOSE_ALL_TABS = Command.toLocalizedCommand({
-        id: 'core.close.all.tabs',
-        category: VIEW_CATEGORY,
-        label: 'Close All Tabs'
-    }, 'theia/core/common/closeAll', VIEW_CATEGORY_KEY);
-    export const CLOSE_MAIN_TAB = Command.toLocalizedCommand({
-        id: 'core.close.main.tab',
-        category: VIEW_CATEGORY,
-        label: 'Close Tab in Main Area'
-    }, 'theia/core/common/closeTabMain', VIEW_CATEGORY_KEY);
-    export const CLOSE_OTHER_MAIN_TABS = Command.toLocalizedCommand({
-        id: 'core.close.other.main.tabs',
-        category: VIEW_CATEGORY,
-        label: 'Close Other Tabs in Main Area'
-    }, 'theia/core/common/closeOtherTabMain', VIEW_CATEGORY_KEY);
-    export const CLOSE_ALL_MAIN_TABS = Command.toLocalizedCommand({
-        id: 'core.close.all.main.tabs',
-        category: VIEW_CATEGORY,
-        label: 'Close All Tabs in Main Area'
-    }, 'theia/core/common/closeAllTabMain', VIEW_CATEGORY_KEY);
-    export const COLLAPSE_PANEL = Command.toLocalizedCommand({
-        id: 'core.collapse.tab',
-        category: VIEW_CATEGORY,
-        label: 'Collapse Side Panel'
-    }, 'theia/core/common/collapseTab', VIEW_CATEGORY_KEY);
-    export const COLLAPSE_ALL_PANELS = Command.toLocalizedCommand({
-        id: 'core.collapse.all.tabs',
-        category: VIEW_CATEGORY,
-        label: 'Collapse All Side Panels'
-    }, 'theia/core/common/collapseAllTabs', VIEW_CATEGORY_KEY);
-    export const TOGGLE_BOTTOM_PANEL = Command.toLocalizedCommand({
-        id: 'core.toggle.bottom.panel',
-        category: VIEW_CATEGORY,
-        label: 'Toggle Bottom Panel'
-    }, 'theia/core/common/collapseBottomPanel', VIEW_CATEGORY_KEY);
-    export const TOGGLE_LEFT_PANEL = Command.toLocalizedCommand({
-        id: 'core.toggle.left.panel',
-        category: VIEW_CATEGORY,
-        label: 'Toggle Left Panel'
-    }, 'theia/core/common/collapseLeftPanel', VIEW_CATEGORY_KEY);
-    export const TOGGLE_RIGHT_PANEL = Command.toLocalizedCommand({
-        id: 'core.toggle.right.panel',
-        category: VIEW_CATEGORY,
-        label: 'Toggle Right Panel'
-    }, 'theia/core/common/collapseRightPanel', VIEW_CATEGORY_KEY);
-    export const TOGGLE_STATUS_BAR = Command.toDefaultLocalizedCommand({
-        id: 'workbench.action.toggleStatusbarVisibility',
-        category: VIEW_CATEGORY,
-        label: 'Toggle Status Bar Visibility'
-    });
-    export const PIN_TAB = Command.toDefaultLocalizedCommand({
-        id: 'workbench.action.pinEditor',
-        category: VIEW_CATEGORY,
-        label: 'Pin Editor'
-    });
-    export const UNPIN_TAB = Command.toDefaultLocalizedCommand({
-        id: 'workbench.action.unpinEditor',
-        category: VIEW_CATEGORY,
-        label: 'Unpin Editor'
-    });
-    export const TOGGLE_MAXIMIZED = Command.toLocalizedCommand({
-        id: 'core.toggleMaximized',
-        category: VIEW_CATEGORY,
-        label: 'Toggle Maximized'
-    }, 'theia/core/common/toggleMaximized', VIEW_CATEGORY_KEY);
-    export const OPEN_VIEW = Command.toDefaultLocalizedCommand({
-        id: 'core.openView',
-        category: VIEW_CATEGORY,
-        label: 'Open View...'
-    });
-    export const SHOW_MENU_BAR = Command.toDefaultLocalizedCommand({
-        id: 'window.menuBarVisibility',
-        category: VIEW_CATEGORY,
-        label: 'Toggle Menu Bar'
-    });
-    /**
-     * Command Parameters:
-     * - `fileName`: string
-     * - `directory`: URI
-     */
-    export const NEW_FILE = Command.toDefaultLocalizedCommand({
-        id: 'workbench.action.files.newFile',
-        category: FILE_CATEGORY
-    });
-    // This command immediately opens a new untitled text file
-    // Some VS Code extensions use this command to create new files
-    export const NEW_UNTITLED_TEXT_FILE = Command.toDefaultLocalizedCommand({
-        id: 'workbench.action.files.newUntitledFile',
-        category: FILE_CATEGORY,
-        label: 'New Untitled Text File'
-    });
-    // This command opens a quick pick to select a file type to create
-    export const PICK_NEW_FILE = Command.toDefaultLocalizedCommand({
-        id: 'workbench.action.files.pickNewFile',
-        category: CREATE_CATEGORY,
-        label: 'New File...'
-    });
-    export const SAVE = Command.toDefaultLocalizedCommand({
-        id: 'core.save',
-        category: FILE_CATEGORY,
-        label: 'Save',
-    });
-    export const SAVE_AS = Command.toDefaultLocalizedCommand({
-        id: 'file.saveAs',
-        category: FILE_CATEGORY,
-        label: 'Save As...',
-    });
-    export const SAVE_WITHOUT_FORMATTING = Command.toDefaultLocalizedCommand({
-        id: 'core.saveWithoutFormatting',
-        category: FILE_CATEGORY,
-        label: 'Save without Formatting',
-    });
-    export const SAVE_ALL = Command.toDefaultLocalizedCommand({
-        id: 'core.saveAll',
-        category: FILE_CATEGORY,
-        label: 'Save All',
-    });
-
-    export const AUTO_SAVE = Command.toDefaultLocalizedCommand({
-        id: 'textEditor.commands.autosave',
-        category: FILE_CATEGORY,
-        label: 'Auto Save',
-    });
-
-    export const ABOUT_COMMAND = Command.toDefaultLocalizedCommand({
-        id: 'core.about',
-        label: 'About'
-    });
-
-    export const OPEN_PREFERENCES = Command.toDefaultLocalizedCommand({
-        id: 'preferences:open',
-        category: PREFERENCES_CATEGORY,
-        label: 'Open Settings (UI)',
-    });
-
-    export const SELECT_COLOR_THEME = Command.toDefaultLocalizedCommand({
-        id: 'workbench.action.selectTheme',
-        label: 'Color Theme',
-        category: PREFERENCES_CATEGORY
-    });
-    export const SELECT_ICON_THEME = Command.toDefaultLocalizedCommand({
-        id: 'workbench.action.selectIconTheme',
-        label: 'File Icon Theme',
-        category: PREFERENCES_CATEGORY
-    });
-
-    export const CONFIGURE_DISPLAY_LANGUAGE = Command.toDefaultLocalizedCommand({
-        id: 'workbench.action.configureLanguage',
-        label: 'Configure Display Language'
-    });
-
-    export const TOGGLE_BREADCRUMBS = Command.toDefaultLocalizedCommand({
-        id: 'breadcrumbs.toggle',
-        label: 'Toggle Breadcrumbs',
-        category: VIEW_CATEGORY
-    });
-}
-
 export const supportCut = environment.electron.is() || document.queryCommandSupported('cut');
 export const supportCopy = environment.electron.is() || document.queryCommandSupported('copy');
 // Chrome incorrectly returns true for document.queryCommandSupported('paste')

package/src/browser/common-menus.ts

@@ -0,0 +1,60 @@
+// *****************************************************************************
+// Copyright (C) 2017 TypeFox 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 { MAIN_MENU_BAR, MANAGE_MENU } from '../common/menu';
+
+export namespace CommonMenus {
+
+    export const FILE = [...MAIN_MENU_BAR, '1_file'];
+    export const FILE_NEW_TEXT = [...FILE, '1_new_text'];
+    export const FILE_NEW = [...FILE, '1_new'];
+    export const FILE_OPEN = [...FILE, '2_open'];
+    export const FILE_SAVE = [...FILE, '3_save'];
+    export const FILE_AUTOSAVE = [...FILE, '4_autosave'];
+    export const FILE_SETTINGS = [...FILE, '5_settings'];
+    export const FILE_SETTINGS_SUBMENU = [...FILE_SETTINGS, '1_settings_submenu'];
+    export const FILE_SETTINGS_SUBMENU_OPEN = [...FILE_SETTINGS_SUBMENU, '1_settings_submenu_open'];
+    export const FILE_SETTINGS_SUBMENU_THEME = [...FILE_SETTINGS_SUBMENU, '2_settings_submenu_theme'];
+    export const FILE_CLOSE = [...FILE, '6_close'];
+
+    export const FILE_NEW_CONTRIBUTIONS = ['file', 'newFile'];
+
+    export const EDIT = [...MAIN_MENU_BAR, '2_edit'];
+    export const EDIT_UNDO = [...EDIT, '1_undo'];
+    export const EDIT_CLIPBOARD = [...EDIT, '2_clipboard'];
+    export const EDIT_FIND = [...EDIT, '3_find'];
+
+    export const VIEW = [...MAIN_MENU_BAR, '4_view'];
+    export const VIEW_PRIMARY = [...VIEW, '0_primary'];
+    export const VIEW_APPEARANCE = [...VIEW, '1_appearance'];
+    export const VIEW_APPEARANCE_SUBMENU = [...VIEW_APPEARANCE, '1_appearance_submenu'];
+    export const VIEW_APPEARANCE_SUBMENU_SCREEN = [...VIEW_APPEARANCE_SUBMENU, '2_appearance_submenu_screen'];
+    export const VIEW_APPEARANCE_SUBMENU_BAR = [...VIEW_APPEARANCE_SUBMENU, '3_appearance_submenu_bar'];
+    export const VIEW_EDITOR_SUBMENU = [...VIEW_APPEARANCE, '2_editor_submenu'];
+    export const VIEW_EDITOR_SUBMENU_SPLIT = [...VIEW_EDITOR_SUBMENU, '1_editor_submenu_split'];
+    export const VIEW_EDITOR_SUBMENU_ORTHO = [...VIEW_EDITOR_SUBMENU, '2_editor_submenu_ortho'];
+    export const VIEW_VIEWS = [...VIEW, '2_views'];
+    export const VIEW_LAYOUT = [...VIEW, '3_layout'];
+    export const VIEW_TOGGLE = [...VIEW, '4_toggle'];
+
+    export const MANAGE_GENERAL = [...MANAGE_MENU, '1_manage_general'];
+    export const MANAGE_SETTINGS = [...MANAGE_MENU, '2_manage_settings'];
+    export const MANAGE_SETTINGS_THEMES = [...MANAGE_SETTINGS, '1_manage_settings_themes'];
+
+    // last menu item
+    export const HELP = [...MAIN_MENU_BAR, '9_help'];
+
+}

package/src/browser/index.ts

@@ -28,6 +28,8 @@ export * from './tree';
 export * from './messaging';
 export * from './endpoint';
 export * from './common-frontend-contribution';
+export * from './common-menus';
+export * from './common-commands';
 export * from './quick-input';
 export * from './widget-manager';
 export * from './saveable';

package/src/browser/quick-input/quick-command-frontend-contribution.ts

@@ -16,7 +16,7 @@
 import { injectable, inject, optional } from 'inversify';
 import { CommandRegistry, CommandContribution, MenuContribution, MenuModelRegistry, nls } from '../../common';
 import { KeybindingRegistry, KeybindingContribution } from '../keybinding';
-import { CommonMenus } from '../common-frontend-contribution';
+import { CommonMenus } from '../common-menus';
 import { CLOSE_QUICK_OPEN, CLEAR_COMMAND_HISTORY, quickCommand, QuickCommandService } from './quick-command-service';
 import { QuickInputService } from './quick-input-service';
 import { ConfirmDialog, Dialog } from '../dialogs';

package/src/browser/shell/shell-layout-restorer.ts

@@ -24,7 +24,7 @@ import { CommandContribution, CommandRegistry, Command } from '../../common/comm
 import { ThemeService } from '../theming';
 import { ContributionProvider } from '../../common/contribution-provider';
 import { ApplicationShell, applicationShellLayoutVersion, ApplicationShellLayoutVersion } from './application-shell';
-import { CommonCommands } from '../common-frontend-contribution';
+import { CommonCommands } from '../common-commands';
 import { WindowService } from '../window/window-service';
 import { StopReason } from '../../common/frontend-application-state';
 import { isFunction, isObject, MaybePromise } from '../../common';

package/src/browser/shell/view-contribution.ts

@@ -22,7 +22,7 @@ import {
 } from '../../common';
 import { KeybindingContribution, KeybindingRegistry } from '../keybinding';
 import { WidgetManager } from '../widget-manager';
-import { CommonMenus } from '../common-frontend-contribution';
+import { CommonMenus } from '../common-menus';
 import { ApplicationShell } from './application-shell';
 import { QuickViewService } from '../quick-input';
 

package/src/browser/window-contribution.ts

@@ -19,7 +19,7 @@ import { Command, CommandContribution, CommandRegistry, environment } from '../c
 import { WindowService } from './window/window-service';
 import { KeybindingContribution, KeybindingRegistry } from './keybinding';
 import { MenuContribution, MenuModelRegistry } from '../common/menu';
-import { CommonMenus } from '../browser/common-frontend-contribution';
+import { CommonMenus } from './common-menus';
 
 export namespace WindowCommands {
 

package/src/common/preferences/preference-service.ts

@@ -361,8 +361,13 @@ export class PreferenceServiceImpl implements PreferenceService {
                 const provider = this.getProvider(scope);
                 if (provider) {
                     const scopeValue: JSONValue | undefined = provider.get(preferenceName);
-                    // Skip if a more specific scope has this preference defined
                     if (scope > change.scope && scopeValue !== undefined) {
+                        const preference = this.schemaService.getSchemaProperty(change.preferenceName);
+                        if (!preference?.type || preference.type === 'object' || preference.type === 'array'
+                            || Array.isArray(preference.type) && preference.type.some(candidate => candidate === 'object' || candidate === 'array')) {
+                            // Merge object/array preferences
+                            acceptChange(change);
+                        }
                         break;
                     }
                     // Handle changes in the same scope