@theia/core 1.59.0 → 1.60.0-next.43

package/package.json

@@ -1,24 +1,24 @@
 {
   "name": "@theia/core",
-  "version": "1.59.0",
+  "version": "1.60.0-next.43+2a13720d2",
   "description": "Theia is a cloud & desktop IDE framework implemented in TypeScript.",
   "main": "lib/common/index.js",
   "typings": "lib/common/index.d.ts",
   "dependencies": {
     "@babel/runtime": "^7.10.0",
+    "@lumino/algorithm": "^2.0.2",
+    "@lumino/commands": "^2.3.1",
+    "@lumino/coreutils": "^2.2.0",
+    "@lumino/domutils": "^2.0.2",
+    "@lumino/dragdrop": "^2.1.5",
+    "@lumino/messaging": "^2.0.2",
+    "@lumino/properties": "^2.0.2",
+    "@lumino/signaling": "^2.1.3",
+    "@lumino/virtualdom": "^2.0.2",
+    "@lumino/widgets": "2.5.0",
     "@parcel/watcher": "^2.5.0",
-    "@phosphor/algorithm": "1",
-    "@phosphor/commands": "1",
-    "@phosphor/coreutils": "1",
-    "@phosphor/domutils": "1",
-    "@phosphor/dragdrop": "1",
-    "@phosphor/messaging": "1",
-    "@phosphor/properties": "1",
-    "@phosphor/signaling": "1",
-    "@phosphor/virtualdom": "1",
-    "@phosphor/widgets": "1",
-    "@theia/application-package": "1.59.0",
-    "@theia/request": "1.59.0",
+    "@theia/application-package": "1.60.0-next.43+2a13720d2",
+    "@theia/request": "1.60.0-next.43+2a13720d2",
     "@types/body-parser": "^1.16.4",
     "@types/cookie": "^0.3.3",
     "@types/dompurify": "^2.2.2",
@@ -93,16 +93,16 @@
     },
     "shared": {
       "export *": [
-        "@phosphor/algorithm",
-        "@phosphor/commands",
-        "@phosphor/coreutils",
-        "@phosphor/domutils",
-        "@phosphor/dragdrop",
-        "@phosphor/messaging",
-        "@phosphor/properties",
-        "@phosphor/signaling",
-        "@phosphor/virtualdom",
-        "@phosphor/widgets",
+        "@lumino/algorithm",
+        "@lumino/commands",
+        "@lumino/coreutils",
+        "@lumino/domutils",
+        "@lumino/dragdrop",
+        "@lumino/messaging",
+        "@lumino/properties",
+        "@lumino/signaling",
+        "@lumino/virtualdom",
+        "@lumino/widgets",
         "@theia/application-package",
         "@theia/application-package/lib/api",
         "@theia/application-package/lib/environment",
@@ -218,5 +218,5 @@
   "nyc": {
     "extends": "../../configs/nyc.json"
   },
-  "gitHead": "21358137e41342742707f660b8e222f940a27652"
+  "gitHead": "2a13720d2d41d8ae6ee4e34cd2dee1c656a18018"
 }

package/shared/@lumino/algorithm/index.d.ts

@@ -0,0 +1 @@
+export * from '@lumino/algorithm';

package/shared/@lumino/algorithm/index.js

@@ -0,0 +1 @@
+module.exports = require('@lumino/algorithm');

package/shared/@lumino/commands/index.d.ts

@@ -0,0 +1 @@
+export * from '@lumino/commands';

package/shared/@lumino/commands/index.js

@@ -0,0 +1 @@
+module.exports = require('@lumino/commands');

package/shared/@lumino/coreutils/index.d.ts

@@ -0,0 +1 @@
+export * from '@lumino/coreutils';

package/shared/@lumino/coreutils/index.js

@@ -0,0 +1 @@
+module.exports = require('@lumino/coreutils');

package/shared/@lumino/domutils/index.d.ts

@@ -0,0 +1 @@
+export * from '@lumino/domutils';

package/shared/@lumino/domutils/index.js

@@ -0,0 +1 @@
+module.exports = require('@lumino/domutils');

package/shared/@lumino/dragdrop/index.d.ts

@@ -0,0 +1 @@
+export * from '@lumino/dragdrop';

package/shared/@lumino/dragdrop/index.js

@@ -0,0 +1 @@
+module.exports = require('@lumino/dragdrop');

package/shared/@lumino/messaging/index.d.ts

@@ -0,0 +1 @@
+export * from '@lumino/messaging';

package/shared/@lumino/messaging/index.js

@@ -0,0 +1 @@
+module.exports = require('@lumino/messaging');

package/shared/@lumino/properties/index.d.ts

@@ -0,0 +1 @@
+export * from '@lumino/properties';

package/shared/@lumino/properties/index.js

@@ -0,0 +1 @@
+module.exports = require('@lumino/properties');

package/shared/@lumino/signaling/index.d.ts

@@ -0,0 +1 @@
+export * from '@lumino/signaling';

package/shared/@lumino/signaling/index.js

@@ -0,0 +1 @@
+module.exports = require('@lumino/signaling');

package/shared/@lumino/virtualdom/index.d.ts

@@ -0,0 +1 @@
+export * from '@lumino/virtualdom';

package/shared/@lumino/virtualdom/index.js

@@ -0,0 +1 @@
+module.exports = require('@lumino/virtualdom');

package/shared/@lumino/widgets/index.d.ts

@@ -0,0 +1 @@
+export * from '@lumino/widgets';

package/shared/@lumino/widgets/index.js

@@ -0,0 +1 @@
+module.exports = require('@lumino/widgets');

package/src/browser/about-dialog.tsx

@@ -94,8 +94,9 @@ export class AboutDialog extends ReactDialog<void> {
 
     protected renderExtensions(): React.ReactNode {
         const extensionsInfos = this.extensionsInfos;
+        const listOfExtensions = nls.localize('theia/core/about/listOfExtensions', 'List of extensions');
         return <>
-            <h3>List of extensions</h3>
+            <h3>{listOfExtensions}</h3>
             <ul className={ABOUT_EXTENSIONS_CLASS}>
                 {
                     extensionsInfos

package/src/browser/browser.ts

@@ -18,7 +18,7 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { Disposable, environment } from '../common';
+import { Disposable, environment, isOSX } from '../common';
 
 const userAgent = typeof navigator !== 'undefined' ? navigator.userAgent : '';
 
@@ -237,3 +237,8 @@ export function onDomEvent<K extends keyof HTMLElementEventMap>(
     element.addEventListener(type, listener, options);
     return { dispose: () => element.removeEventListener(type, listener, options) };
 }
+
+/** Is a mouse `event` the pointer event that triggers the context menu on this platform? */
+export function isContextMenuEvent(event: MouseEvent): boolean {
+    return isOSX && event.ctrlKey && event.button === 0 || event.button === 2;
+}

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

@@ -493,28 +493,30 @@ export class CommonFrontendContribution implements FrontendApplicationContributi
         this.preferences.ready.then(() => this.setSashProperties());
         this.preferences.onPreferenceChanged(e => this.handlePreferenceChange(e, app));
 
-        app.shell.leftPanelHandler.addBottomMenu({
-            id: 'settings-menu',
-            iconClass: codicon('settings-gear'),
-            title: nls.localizeByDefault(CommonCommands.MANAGE_CATEGORY),
-            menuPath: MANAGE_MENU,
-            order: 0,
-        });
-        const accountsMenu: SidebarMenu = {
-            id: 'accounts-menu',
-            iconClass: codicon('account'),
-            title: nls.localizeByDefault('Accounts'),
-            menuPath: ACCOUNTS_MENU,
-            order: 1,
-            onDidBadgeChange: this.authenticationService.onDidUpdateSignInCount
-        };
-        this.authenticationService.onDidRegisterAuthenticationProvider(() => {
-            app.shell.leftPanelHandler.addBottomMenu(accountsMenu);
-        });
-        this.authenticationService.onDidUnregisterAuthenticationProvider(() => {
-            if (this.authenticationService.getProviderIds().length === 0) {
-                app.shell.leftPanelHandler.removeBottomMenu(accountsMenu.id);
-            }
+        app.shell.initialized.then(() => {
+            app.shell.leftPanelHandler.addBottomMenu({
+                id: 'settings-menu',
+                iconClass: codicon('settings-gear'),
+                title: nls.localizeByDefault(CommonCommands.MANAGE_CATEGORY),
+                menuPath: MANAGE_MENU,
+                order: 0,
+            });
+            const accountsMenu: SidebarMenu = {
+                id: 'accounts-menu',
+                iconClass: codicon('account'),
+                title: nls.localizeByDefault('Accounts'),
+                menuPath: ACCOUNTS_MENU,
+                order: 1,
+                onDidBadgeChange: this.authenticationService.onDidUpdateSignInCount
+            };
+            this.authenticationService.onDidRegisterAuthenticationProvider(() => {
+                app.shell.leftPanelHandler.addBottomMenu(accountsMenu);
+            });
+            this.authenticationService.onDidUnregisterAuthenticationProvider(() => {
+                if (this.authenticationService.getProviderIds().length === 0) {
+                    app.shell.leftPanelHandler.removeBottomMenu(accountsMenu.id);
+                }
+            });
         });
     }
 

package/src/browser/common-styling-participants.ts

@@ -138,14 +138,14 @@ export class MenuStylingParticipant implements StylingParticipant {
         if (isHighContrast(theme.type) && focusBorder) {
             // Menu items
             collector.addRule(`
-                .p-Menu .p-Menu-item.p-mod-active {
+                .lm-Menu .lm-Menu-item.lm-mod-active {
                     outline: 1px solid ${focusBorder};
                     outline-offset: -1px;
                 }
-                .p-MenuBar .p-MenuBar-item.p-mod-active {
+                .lm-MenuBar .lm-MenuBar-item.lm-mod-active {
                     outline: 1px dashed ${focusBorder};
                 }
-                .p-MenuBar.p-mod-active .p-MenuBar-item.p-mod-active {
+                .lm-MenuBar.lm-mod-active .lm-MenuBar-item.lm-mod-active {
                     outline: 1px solid ${focusBorder};
                 }
             `);
@@ -166,7 +166,7 @@ export class BadgeStylingParticipant implements StylingParticipant {
         const contrastBorder = theme.getColor('contrastBorder');
 
         if (isHighContrast(theme.type) && contrastBorder) {
-            collector.addRule(`.p-TabBar .theia-badge-decorator-sidebar {
+            collector.addRule(`.lm-TabBar .theia-badge-decorator-sidebar {
                 outline: 1px solid ${contrastBorder};
             }`);
         }
@@ -182,20 +182,20 @@ export class TabbarStylingParticipant implements StylingParticipant {
 
         if (highContrast && focusBorder) {
             collector.addRule(`
-                #theia-bottom-content-panel .p-TabBar .p-TabBar-tab,
-                #theia-main-content-panel .p-TabBar .p-TabBar-tab {
+                #theia-bottom-content-panel .lm-TabBar .lm-TabBar-tab,
+                #theia-main-content-panel .lm-TabBar .lm-TabBar-tab {
                     outline-offset: -4px;
                 }
-                #theia-bottom-content-panel .p-TabBar .p-TabBar-tab.p-mod-current,
-                #theia-main-content-panel .p-TabBar .p-TabBar-tab.p-mod-current {
+                #theia-bottom-content-panel .lm-TabBar .lm-TabBar-tab.lm-mod-current,
+                #theia-main-content-panel .lm-TabBar .lm-TabBar-tab.lm-mod-current {
                     outline: 1px solid ${focusBorder};
                 }
-                #theia-bottom-content-panel .p-TabBar:not(.theia-tabBar-active) .p-TabBar-tab.p-mod-current,
-                #theia-main-content-panel .p-TabBar:not(.theia-tabBar-active) .p-TabBar-tab.p-mod-current {
+                #theia-bottom-content-panel .lm-TabBar:not(.theia-tabBar-active) .lm-TabBar-tab.lm-mod-current,
+                #theia-main-content-panel .lm-TabBar:not(.theia-tabBar-active) .lm-TabBar-tab.lm-mod-current {
                     outline: 1px dotted ${focusBorder};
                 }
-                #theia-bottom-content-panel .p-TabBar .p-TabBar-tab:not(.p-mod-current):hover,
-                #theia-main-content-panel .p-TabBar .p-TabBar-tab:not(.p-mod-current):hover {
+                #theia-bottom-content-panel .lm-TabBar .lm-TabBar-tab:not(.lm-mod-current):hover,
+                #theia-main-content-panel .lm-TabBar .lm-TabBar-tab:not(.lm-mod-current):hover {
                     outline: 1px dashed ${focusBorder};
                 }
             `);
@@ -206,13 +206,13 @@ export class TabbarStylingParticipant implements StylingParticipant {
         const tabActiveBorder = theme.getColor('tab.activeBorder') || (highContrast && contrastBorder) || 'transparent';
         const tabUnfocusedActiveBorder = theme.getColor('tab.unfocusedActiveBorder') || (highContrast && contrastBorder) || 'transparent';
         collector.addRule(`
-            #theia-main-content-panel .p-TabBar .p-TabBar-tab.p-mod-current {
+            #theia-main-content-panel .lm-TabBar .lm-TabBar-tab.lm-mod-current {
                 color: var(--theia-tab-activeForeground);
                 ${tabActiveBackground ? `background: ${tabActiveBackground};` : ''}
                 ${tabActiveBorderTop ? `border-top: 1px solid ${tabActiveBorderTop};` : ''}
                 border-bottom: 1px solid ${tabActiveBorder};
             }
-            #theia-main-content-panel .p-TabBar:not(.theia-tabBar-active) .p-TabBar-tab.p-mod-current {
+            #theia-main-content-panel .lm-TabBar:not(.theia-tabBar-active) .lm-TabBar-tab.lm-mod-current {
                 background: var(--theia-tab-unfocusedActiveBackground);
                 color: var(--theia-tab-unfocusedActiveForeground);
                 ${tabUnfocusedActiveBorderTop ? `border-top: 1px solid ${tabUnfocusedActiveBorderTop};` : ''}
@@ -227,18 +227,18 @@ export class TabbarStylingParticipant implements StylingParticipant {
         if (tabActiveModifiedBorder || tabInactiveModifiedBorder) {
             collector.addRule(`
                 body.theia-editor-highlightModifiedTabs
-                #theia-main-content-panel .p-TabBar .p-TabBar-tab.theia-mod-dirty {
+                #theia-main-content-panel .lm-TabBar .lm-TabBar-tab.theia-mod-dirty {
                     border-top: 2px solid ${tabInactiveModifiedBorder};
                     padding-bottom: 1px;
                 }
 
                 body.theia-editor-highlightModifiedTabs
-                #theia-main-content-panel .p-TabBar.theia-tabBar-active .p-TabBar-tab.theia-mod-dirty.p-mod-current {
+                #theia-main-content-panel .lm-TabBar.theia-tabBar-active .lm-TabBar-tab.theia-mod-dirty.lm-mod-current {
                     border-top: 2px solid ${tabActiveModifiedBorder};
                 }
                 
                 body.theia-editor-highlightModifiedTabs
-                #theia-main-content-panel .p-TabBar:not(.theia-tabBar-active) .p-TabBar-tab.theia-mod-dirty:not(.p-mod-current) {
+                #theia-main-content-panel .lm-TabBar:not(.theia-tabBar-active) .lm-TabBar-tab.theia-mod-dirty:not(.lm-mod-current) {
                     border-top: 2px solid ${tabUnfocusedInactiveModifiedBorder};
                 }
             `);
@@ -247,12 +247,12 @@ export class TabbarStylingParticipant implements StylingParticipant {
         // Activity Bar Active Border
         const activityBarActiveBorder = theme.getColor('activityBar.activeBorder') || 'var(--theia-activityBar-foreground)';
         collector.addRule(`
-            .p-TabBar.theia-app-left .p-TabBar-tab.p-mod-current {
+            .lm-TabBar.theia-app-left .lm-TabBar-tab.lm-mod-current {
                 border-top-color: transparent;
                 box-shadow: 2px 0 0 ${activityBarActiveBorder} inset;
             }
           
-            .p-TabBar.theia-app-right .p-TabBar-tab.p-mod-current {
+            .lm-TabBar.theia-app-right .lm-TabBar-tab.lm-mod-current {
                 border-top-color: transparent;
                 box-shadow: -2px 0 0 ${activityBarActiveBorder} inset;
             }
@@ -261,7 +261,7 @@ export class TabbarStylingParticipant implements StylingParticipant {
         const tabHoverBackground = theme.getColor('tab.hoverBackground');
         if (tabHoverBackground) {
             collector.addRule(`
-                #theia-main-content-panel .p-TabBar .p-TabBar-tab:hover {
+                #theia-main-content-panel .lm-TabBar .lm-TabBar-tab:hover {
                     background-color: ${tabHoverBackground};
                 }
             `);
@@ -270,7 +270,7 @@ export class TabbarStylingParticipant implements StylingParticipant {
         const tabUnfocusedHoverBackground = theme.getColor('tab.unfocusedHoverBackground');
         if (tabUnfocusedHoverBackground) {
             collector.addRule(`
-                #theia-main-content-panel .p-TabBar:not(.theia-tabBar-active) .p-TabBar-tab:hover {
+                #theia-main-content-panel .lm-TabBar:not(.theia-tabBar-active) .lm-TabBar-tab:hover {
                     background-color: ${tabUnfocusedHoverBackground};
                 }
             `);
@@ -280,7 +280,7 @@ export class TabbarStylingParticipant implements StylingParticipant {
         const tabHoverForeground = theme.getColor('tab.hoverForeground');
         if (tabHoverForeground) {
             collector.addRule(`
-                #theia-main-content-panel .p-TabBar .p-TabBar-tab:hover {
+                #theia-main-content-panel .lm-TabBar .lm-TabBar-tab:hover {
                     color: ${tabHoverForeground};
                 }
             `);
@@ -289,7 +289,7 @@ export class TabbarStylingParticipant implements StylingParticipant {
         const tabUnfocusedHoverForeground = theme.getColor('tab.unfocusedHoverForeground');
         if (tabUnfocusedHoverForeground) {
             collector.addRule(`
-                #theia-main-content-panel .p-TabBar:not(.theia-tabBar-active) .p-TabBar-tab:hover {
+                #theia-main-content-panel .lm-TabBar:not(.theia-tabBar-active) .lm-TabBar-tab:hover {
                     color: ${tabUnfocusedHoverForeground};
                 }
             `);
@@ -299,7 +299,7 @@ export class TabbarStylingParticipant implements StylingParticipant {
         const tabHoverBorder = theme.getColor('tab.hoverBorder');
         if (tabHoverBorder) {
             collector.addRule(`
-                #theia-main-content-panel .p-TabBar .p-TabBar-tab:hover {
+                #theia-main-content-panel .lm-TabBar .lm-TabBar-tab:hover {
                     box-shadow: 0 1px 0 ${tabHoverBorder} inset;
                 }
             `);
@@ -308,7 +308,7 @@ export class TabbarStylingParticipant implements StylingParticipant {
         const tabUnfocusedHoverBorder = theme.getColor('tab.unfocusedHoverBorder');
         if (tabUnfocusedHoverBorder) {
             collector.addRule(`
-                #theia-main-content-panel .p-TabBar:not(.theia-tabBar-active) .p-TabBar-tab:hover {
+                #theia-main-content-panel .lm-TabBar:not(.theia-tabBar-active) .lm-TabBar-tab:hover {
                     box-shadow: 0 1px 0 ${tabUnfocusedHoverBorder} inset;
                 }
             `);

package/src/browser/menu/browser-context-menu-renderer.ts

@@ -40,8 +40,7 @@ export class BrowserContextMenuRenderer extends ContextMenuRenderer {
         if (onHide) {
             contextMenu.aboutToClose.connect(() => onHide!());
         }
-        // eslint-disable-next-line @typescript-eslint/no-explicit-any
-        contextMenu.open(x, y, undefined, context);
+        contextMenu.open(x, y, { host: context?.ownerDocument.body});
         return new BrowserContextMenuAccess(contextMenu);
     }
 

package/src/browser/menu/browser-menu-plugin.ts

@@ -15,9 +15,8 @@
 // *****************************************************************************
 
 import { injectable, inject } from 'inversify';
-import { Menu, MenuBar, Menu as MenuWidget, Widget } from '@phosphor/widgets';
-import { CommandRegistry as PhosphorCommandRegistry } from '@phosphor/commands';
-import { ElementExt } from '@phosphor/domutils';
+import { Menu, MenuBar, Menu as MenuWidget, Widget } from '@lumino/widgets';
+import { CommandRegistry as LuminoCommandRegistry } from '@lumino/commands';
 import {
     CommandRegistry, environment, DisposableCollection, Disposable,
     MenuModelRegistry, MAIN_MENU_BAR, MenuPath, MenuNode, MenuCommandExecutor, CompoundMenuNode, CompoundMenuNodeRole, CommandMenuNode,
@@ -32,6 +31,7 @@ import { Message, waitForRevealed } from '../widgets';
 import { ApplicationShell } from '../shell';
 import { CorePreferences } from '../core-preferences';
 import { PreferenceService } from '../preferences/preference-service';
+import { ElementExt } from '@lumino/domutils';
 
 export abstract class MenuBarWidget extends MenuBar {
     abstract activateMenu(label: string, ...labels: string[]): Promise<MenuWidget>;
@@ -161,7 +161,7 @@ export class BrowserMainMenuFactory implements MenuWidgetFactory {
 }
 
 export function isMenuElement(element: HTMLElement | null): boolean {
-    return !!element && element.className.includes('p-Menu');
+    return !!element && element.className.includes('lm-Menu');
 }
 
 export class DynamicMenuBarWidget extends MenuBarWidget {
@@ -181,7 +181,8 @@ export class DynamicMenuBarWidget extends MenuBarWidget {
                 // We want to save the focus object for the former case only.
                 if (!this.childMenu) {
                     const { activeElement } = document;
-                    if (activeElement instanceof HTMLElement) {
+                    // we do not want to restore focus to menus
+                    if (activeElement instanceof HTMLElement && !isMenuElement(activeElement)) {
                         this.previousFocusedElement = activeElement;
                     }
                 }
@@ -322,14 +323,14 @@ export class DynamicMenuWidget extends MenuWidget {
         });
     }
 
-    public override open(x: number, y: number, options?: MenuWidget.IOpenOptions, anchor?: HTMLElement): void {
+    public override open(x: number, y: number, options?: MenuWidget.IOpenOptions): void {
         const cb = () => {
             this.restoreFocusedElement();
             this.aboutToClose.disconnect(cb);
         };
         this.aboutToClose.connect(cb);
         this.preserveFocusedElement();
-        super.open(x, y, options, anchor);
+        super.open(x, y, options);
     }
 
     protected updateSubMenus(parent: MenuWidget, menu: CompoundMenuNode, commands: MenuCommandRegistry): void {
@@ -337,6 +338,13 @@ export class DynamicMenuWidget extends MenuWidget {
         while (items[items.length - 1]?.type === 'separator') {
             items.pop();
         }
+        // Add at least one entry to avoid empty menus.
+        // This is needed as Lumino does all kind of checks whether a menu is empty and for example prevents activating it
+        // This item will be cleared once the menu is opened via the next update as we don't have empty main menus
+        // See https://github.com/jupyterlab/lumino/issues/729
+        if (items.length === 0) {
+            items.push({ type: 'separator' });
+        }
         for (const item of items) {
             parent.addItem(item);
         }
@@ -382,7 +390,7 @@ export class DynamicMenuWidget extends MenuWidget {
     }
 
     protected preserveFocusedElement(previousFocusedElement: Element | null = document.activeElement): boolean {
-        if (!this.previousFocusedElement && previousFocusedElement instanceof HTMLElement) {
+        if (!this.previousFocusedElement && previousFocusedElement instanceof HTMLElement && !isMenuElement(previousFocusedElement)) {
             this.previousFocusedElement = previousFocusedElement;
             return true;
         }
@@ -401,14 +409,16 @@ export class DynamicMenuWidget extends MenuWidget {
     protected runWithPreservedFocusContext(what: () => void): void {
         let focusToRestore: HTMLElement | undefined = undefined;
         const { activeElement } = document;
-        if (this.previousFocusedElement && activeElement instanceof HTMLElement && this.previousFocusedElement !== activeElement) {
+        if (this.previousFocusedElement &&
+            activeElement instanceof HTMLElement &&
+            this.previousFocusedElement !== activeElement) {
             focusToRestore = activeElement;
             this.previousFocusedElement.focus({ preventScroll: true });
         }
         try {
             what();
         } finally {
-            if (focusToRestore) {
+            if (focusToRestore && !isMenuElement(focusToRestore)) {
                 focusToRestore.focus({ preventScroll: true });
             }
         }
@@ -465,9 +475,9 @@ export class BrowserMenuBarContribution implements FrontendApplicationContributi
 }
 
 /**
- * Stores Theia-specific action menu nodes instead of PhosphorJS commands with their handlers.
+ * Stores Theia-specific action menu nodes instead of Lumino commands with their handlers.
  */
-export class MenuCommandRegistry extends PhosphorCommandRegistry {
+export class MenuCommandRegistry extends LuminoCommandRegistry {
 
     protected actions = new Map<string, [MenuNode & CommandMenuNode, unknown[]]>();
     protected toDispose = new DisposableCollection();
@@ -516,7 +526,7 @@ export class MenuCommandRegistry extends PhosphorCommandRegistry {
         const unregisterCommand = this.addCommand(id, {
             execute: () => commandExecutor.executeCommand(menuPath, id, ...args),
             label: menu.label,
-            icon: menu.icon,
+            iconClass: menu.icon,
             isEnabled: () => enabled,
             isVisible: () => visible,
             isToggled: () => toggled
@@ -532,7 +542,7 @@ export class MenuCommandRegistry extends PhosphorCommandRegistry {
             this.addKeyBinding({
                 command: id,
                 keys,
-                selector: '.p-Widget' // We have the PhosphorJS dependency anyway.
+                selector: '.lm-Widget' // We have the Lumino dependency anyway.
             });
         }
         return Disposable.create(() => unregisterCommand.dispose());

package/src/browser/preferences/injectable-preference-proxy.ts

@@ -19,7 +19,7 @@ import { PreferenceSchema } from '../../common/preferences/preference-schema';
 import { Disposable, DisposableCollection, Emitter, Event, isObject, MaybePromise } from '../../common';
 import { PreferenceChangeEvent, PreferenceEventEmitter, PreferenceProxy, PreferenceProxyOptions, PreferenceRetrieval } from './preference-proxy';
 import { PreferenceChange, PreferenceChangeImpl, PreferenceChanges, PreferenceScope, PreferenceService } from './preference-service';
-import { JSONValue } from '@phosphor/coreutils';
+import { JSONValue } from '@lumino/coreutils';
 import { PreferenceProviderDataChange } from './preference-provider';
 import { OverridePreferenceName } from './preference-language-override-service';
 

package/src/browser/preferences/preference-contribution.ts

@@ -28,7 +28,7 @@ import { bindPreferenceConfigurations, PreferenceConfigurations } from './prefer
 export { PreferenceSchema, PreferenceSchemaProperties, PreferenceDataSchema, PreferenceItem, PreferenceSchemaProperty, PreferenceDataProperty };
 import { isObject, Mutable } from '../../common/types';
 import { PreferenceLanguageOverrideService } from './preference-language-override-service';
-import { JSONValue } from '@phosphor/coreutils';
+import { JSONValue } from '@lumino/coreutils';
 
 /* eslint-disable guard-for-in, @typescript-eslint/no-explicit-any */
 

package/src/browser/preferences/preference-provider.ts

@@ -18,7 +18,7 @@
 
 import debounce = require('p-debounce');
 import { injectable, inject } from 'inversify';
-import { JSONExt, JSONValue } from '@phosphor/coreutils';
+import { JSONExt, JSONValue } from '@lumino/coreutils';
 import URI from '../../common/uri';
 import { Disposable, DisposableCollection, Emitter, Event, isObject } from '../../common';
 import { Deferred } from '../../common/promise-util';

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

@@ -24,7 +24,7 @@ import { PreferenceSchemaProvider } from './preference-contribution';
 import URI from '../../common/uri';
 import { PreferenceScope } from './preference-scope';
 import { PreferenceConfigurations } from './preference-configurations';
-import { JSONExt, JSONValue } from '@phosphor/coreutils/lib/json';
+import { JSONExt, JSONValue } from '@lumino/coreutils';
 import { OverridePreferenceName, PreferenceLanguageOverrideService } from './preference-language-override-service';
 
 export { PreferenceScope };

package/src/browser/preferences/preference-validation-service.spec.ts

@@ -19,7 +19,7 @@ import { PreferenceValidationService } from './preference-validation-service';
 import { PreferenceItem, PreferenceSchemaProvider } from './preference-contribution';
 import { PreferenceLanguageOverrideService } from './preference-language-override-service';
 import * as assert from 'assert';
-import { JSONValue } from '@phosphor/coreutils';
+import { JSONValue } from '@lumino/coreutils';
 import { IJSONSchema, JsonType } from '../../common/json-schema';
 
 /* eslint-disable no-null/no-null */

package/src/browser/preferences/preference-validation-service.ts

@@ -15,7 +15,7 @@
 // *****************************************************************************
 
 import { PreferenceItem } from '../../common/preferences/preference-schema';
-import { JSONObject, JSONValue } from '../../../shared/@phosphor/coreutils';
+import { JSONObject, JSONValue } from '../../../shared/@lumino/coreutils';
 import { PreferenceSchemaProvider } from './preference-contribution';
 import { PreferenceLanguageOverrideService } from './preference-language-override-service';
 import { inject, injectable } from '../../../shared/inversify';