@theia/core 1.59.0 → 1.60.0-next.43

package/src/browser/view-container.ts

@@ -15,7 +15,7 @@
 // *****************************************************************************
 
 import { interfaces, injectable, inject, postConstruct } from 'inversify';
-import { IIterator, toArray, find, some, every, map, ArrayExt } from '@phosphor/algorithm';
+import { find, some, every, map, ArrayExt } from '@lumino/algorithm';
 import {
     Widget, EXPANSION_TOGGLE_CLASS, COLLAPSED_CLASS, CODICON_TREE_ITEM_CLASSES, MessageLoop, Message, SplitPanel,
     BaseWidget, addEventListener, SplitLayout, LayoutItem, PanelLayout, addKeyListener, waitForRevealed, UnsafeWidgetUtilities, DockPanel, PINNED_CLASS
@@ -34,9 +34,9 @@ import { isEmpty, isObject, nls } from '../common';
 import { WidgetManager } from './widget-manager';
 import { Key } from './keys';
 import { ProgressBarFactory } from './progress-bar-factory';
-import { Drag, IDragEvent } from '@phosphor/dragdrop';
-import { MimeData } from '@phosphor/coreutils';
-import { ElementExt } from '@phosphor/domutils';
+import { Drag } from '@lumino/dragdrop';
+import { MimeData } from '@lumino/coreutils';
+import { ElementExt } from '@lumino/domutils';
 import { TabBarDecoratorService } from './shell/tab-bar-decorator';
 
 export interface ViewContainerTitleOptions {
@@ -224,7 +224,7 @@ export class ViewContainer extends BaseWidget implements StatefulWidget, Applica
     }
 
     protected updateSplitterVisibility(): void {
-        const className = 'p-first-visible';
+        const className = 'lm-first-visible';
         let firstFound = false;
         for (const part of this.getParts()) {
             if (!part.isHidden && !firstFound) {
@@ -717,47 +717,47 @@ export class ViewContainer extends BaseWidget implements StatefulWidget, Applica
 
     protected override onBeforeAttach(msg: Message): void {
         super.onBeforeAttach(msg);
-        this.node.addEventListener('p-dragenter', this, true);
-        this.node.addEventListener('p-dragover', this, true);
-        this.node.addEventListener('p-dragleave', this, true);
-        this.node.addEventListener('p-drop', this, true);
+        this.node.addEventListener('lm-dragenter', this, true);
+        this.node.addEventListener('lm-dragover', this, true);
+        this.node.addEventListener('lm-dragleave', this, true);
+        this.node.addEventListener('lm-drop', this, true);
     }
 
     protected override onAfterDetach(msg: Message): void {
         super.onAfterDetach(msg);
-        this.node.removeEventListener('p-dragenter', this, true);
-        this.node.removeEventListener('p-dragover', this, true);
-        this.node.removeEventListener('p-dragleave', this, true);
-        this.node.removeEventListener('p-drop', this, true);
+        this.node.removeEventListener('lm-dragenter', this, true);
+        this.node.removeEventListener('lm-dragover', this, true);
+        this.node.removeEventListener('lm-dragleave', this, true);
+        this.node.removeEventListener('lm-drop', this, true);
     }
 
     handleEvent(event: Event): void {
         switch (event.type) {
-            case 'p-dragenter':
-                this.handleDragEnter(event as IDragEvent);
+            case 'lm-dragenter':
+                this.handleDragEnter(event as Drag.Event);
                 break;
-            case 'p-dragover':
-                this.handleDragOver(event as IDragEvent);
+            case 'lm-dragover':
+                this.handleDragOver(event as Drag.Event);
                 break;
-            case 'p-dragleave':
-                this.handleDragLeave(event as IDragEvent);
+            case 'lm-dragleave':
+                this.handleDragLeave(event as Drag.Event);
                 break;
-            case 'p-drop':
-                this.handleDrop(event as IDragEvent);
+            case 'lm-drop':
+                this.handleDrop(event as Drag.Event);
                 break;
         }
     }
 
-    handleDragEnter(event: IDragEvent): void {
-        if (event.mimeData.hasData('application/vnd.phosphor.view-container-factory')) {
+    handleDragEnter(event: Drag.Event): void {
+        if (event.mimeData.hasData('application/vnd.lumino.view-container-factory')) {
             event.preventDefault();
             event.stopPropagation();
         }
     }
 
     toDisposeOnDragEnd = new DisposableCollection();
-    handleDragOver(event: IDragEvent): void {
-        const factory = event.mimeData.getData('application/vnd.phosphor.view-container-factory');
+    handleDragOver(event: Drag.Event): void {
+        const factory = event.mimeData.getData('application/vnd.lumino.view-container-factory');
         const widget = factory && factory();
         if (!(widget instanceof ViewContainerPart)) {
             return;
@@ -801,17 +801,17 @@ export class ViewContainer extends BaseWidget implements StatefulWidget, Applica
         event.dropAction = event.proposedAction;
     };
 
-    handleDragLeave(event: IDragEvent): void {
+    handleDragLeave(event: Drag.Event): void {
         this.toDisposeOnDragEnd.dispose();
-        if (event.mimeData.hasData('application/vnd.phosphor.view-container-factory')) {
+        if (event.mimeData.hasData('application/vnd.lumino.view-container-factory')) {
             event.preventDefault();
             event.stopPropagation();
         }
     };
 
-    handleDrop(event: IDragEvent): void {
+    handleDrop(event: Drag.Event): void {
         this.toDisposeOnDragEnd.dispose();
-        const factory = event.mimeData.getData('application/vnd.phosphor.view-container-factory');
+        const factory = event.mimeData.getData('application/vnd.lumino.view-container-factory');
         const draggedPart = factory && factory();
         if (!(draggedPart instanceof ViewContainerPart)) {
             event.dropAction = 'none';
@@ -838,7 +838,7 @@ export class ViewContainer extends BaseWidget implements StatefulWidget, Applica
                 event => {
                     event.preventDefault();
                     const mimeData = new MimeData();
-                    mimeData.setData('application/vnd.phosphor.view-container-factory', () => part);
+                    mimeData.setData('application/vnd.lumino.view-container-factory', () => part);
                     const clonedHeader = part.headerElement.cloneNode(true) as HTMLElement;
                     clonedHeader.style.width = part.node.style.width;
                     clonedHeader.style.opacity = '0.6';
@@ -848,7 +848,7 @@ export class ViewContainer extends BaseWidget implements StatefulWidget, Applica
                         proposedAction: 'move',
                         supportedActions: 'move'
                     });
-                    part.node.classList.add('p-mod-hidden');
+                    part.node.classList.add('lm-mod-hidden');
                     drag.start(event.clientX, event.clientY).then(dropAction => {
                         // The promise is resolved when the drag has ended
                         if (dropAction === 'move' && part.currentViewContainerId !== this.id) {
@@ -856,7 +856,7 @@ export class ViewContainer extends BaseWidget implements StatefulWidget, Applica
                             this.lastVisibleState = this.doStoreState();
                         }
                     });
-                    setTimeout(() => { part.node.classList.remove('p-mod-hidden'); }, 0);
+                    setTimeout(() => { part.node.classList.remove('lm-mod-hidden'); }, 0);
                 }, false));
     }
 
@@ -1368,13 +1368,13 @@ export class ViewContainerLayout extends SplitLayout {
         return (this as any)._items as Array<LayoutItem & ViewContainerLayout.Item>;
     }
 
-    override iter(): IIterator<ViewContainerPart> {
+    iter(): IterableIterator<ViewContainerPart> {
         return map(this.items, item => item.widget);
     }
 
     // @ts-expect-error TS2611 `SplitLayout.widgets` is declared as `readonly widgets` but is implemented as a getter.
     get widgets(): ViewContainerPart[] {
-        return toArray(this.iter());
+        return Array.from(this.iter());
     }
 
     override attachWidget(index: number, widget: ViewContainerPart): void {

package/src/browser/widget-manager.spec.ts

@@ -20,7 +20,7 @@ let disableJsDom = enableJSDOM();
 import { Container, ContainerModule } from 'inversify';
 import { expect } from 'chai';
 import { WidgetManager, WidgetFactory } from './widget-manager';
-import { Widget } from '@phosphor/widgets';
+import { Widget } from '@lumino/widgets';
 import { ILogger } from '../common/logger';
 import { MockLogger } from '../common/test/mock-logger';
 import { bindContributionProvider } from '../common';

package/src/browser/widget-manager.ts

@@ -15,7 +15,7 @@
 // *****************************************************************************
 
 import { inject, named, injectable } from 'inversify';
-import { Widget } from '@phosphor/widgets';
+import { Widget } from '@lumino/widgets';
 import { ILogger, Emitter, Event, ContributionProvider, MaybePromise, WaitUntilEvent } from '../common';
 import stableJsonStringify = require('fast-json-stable-stringify');
 

package/src/browser/widgets/react-widget.tsx

@@ -18,7 +18,7 @@ import * as React from 'react';
 import { injectable, unmanaged } from 'inversify';
 import { Disposable } from '../../common';
 import { BaseWidget, Message } from './widget';
-import { Widget } from '@phosphor/widgets';
+import { Widget } from '@lumino/widgets';
 import { createRoot, Root } from 'react-dom/client';
 
 @injectable()

package/src/browser/widgets/widget.ts

@@ -17,20 +17,20 @@
 /* eslint-disable @typescript-eslint/no-explicit-any */
 
 import { injectable, decorate, unmanaged } from 'inversify';
-import { Title, Widget } from '@phosphor/widgets';
-import { Message, MessageLoop } from '@phosphor/messaging';
+import { Title, Widget } from '@lumino/widgets';
+import { Message, MessageLoop } from '@lumino/messaging';
 import { Emitter, Event, Disposable, DisposableCollection, MaybePromise, isObject } from '../../common';
 import { KeyCode, KeysOrKeyCodes } from '../keyboard/keys';
 
 import PerfectScrollbar from 'perfect-scrollbar';
 import { PreviewableWidget } from '../widgets/previewable-widget';
-import { Slot } from '@phosphor/signaling';
+import { Slot } from '@lumino/signaling';
 
 decorate(injectable(), Widget);
 decorate(unmanaged(), Widget, 0);
 
-export * from '@phosphor/widgets';
-export * from '@phosphor/messaging';
+export * from '@lumino/widgets';
+export * from '@lumino/messaging';
 
 export const ACTION_ITEM = 'action-label';
 
@@ -62,8 +62,8 @@ export const DEFAULT_SCROLL_OPTIONS: PerfectScrollbar.Options = {
 };
 
 /**
- * At a number of places in the code, we have effectively reimplemented Phosphor's Widget.attach and Widget.detach,
- * but omitted the checks that Phosphor expects to be performed for those operations. That is a bad idea, because it
+ * At a number of places in the code, we have effectively reimplemented Lumino's Widget.attach and Widget.detach,
+ * but omitted the checks that Lumino expects to be performed for those operations. That is a bad idea, because it
  * means that we are telling widgets that they are attached or detached when not all the conditions that should apply
  * do apply. We should explicitly mark those locations so that we know where we should go fix them later.
  */

package/src/common/json-schema.ts

@@ -14,7 +14,7 @@
 // SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0
 // *****************************************************************************
 
-import { JSONValue } from '@phosphor/coreutils';
+import { JSONValue } from '@lumino/coreutils';
 
 export type JsonType = 'string' | 'array' | 'number' | 'integer' | 'object' | 'boolean' | 'null';
 

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

@@ -16,7 +16,7 @@
 
 /* eslint-disable @typescript-eslint/no-explicit-any */
 
-import { JSONValue } from '@phosphor/coreutils';
+import { JSONValue } from '@lumino/coreutils';
 import { IJSONSchema } from '../json-schema';
 import { PreferenceScope } from './preference-scope';
 import { isObject, isString } from '../types';
@@ -73,7 +73,10 @@ export interface PreferenceItem extends IJSONSchema {
      */
     defaultValue?: JSONValue;
     overridable?: boolean;
+    /** If false, the preference will not be included in the schema or the UI. */
     included?: boolean;
+    /** If true, this item will registered as part of the preference schema, but hidden in the preference editor UI. */
+    hidden?: boolean;
     [key: string]: any;
 }
 export interface PreferenceSchemaProperty extends PreferenceItem {

package/src/common/theme.ts

@@ -18,6 +18,8 @@ import { URI } from 'vscode-uri';
 
 export type ThemeType = 'light' | 'dark' | 'hc' | 'hcLight';
 
+export type ThemeMode = 'light' | 'dark';
+
 export interface Theme {
     readonly id: string;
     readonly type: ThemeType;
@@ -32,6 +34,10 @@ export function isHighContrast(scheme: ThemeType): boolean {
     return scheme === 'hc' || scheme === 'hcLight';
 }
 
+export function getThemeMode(type: ThemeType): ThemeMode {
+    return (type === 'hc' || type === 'dark') ? 'dark' : 'light';
+}
+
 export interface ThemeChangeEvent {
     readonly newTheme: Theme;
     readonly oldTheme?: Theme;

package/src/electron-browser/menu/electron-menu-contribution.ts

@@ -30,7 +30,7 @@ import { WindowTitleService } from '../../browser/window/window-title-service';
 
 import '../../../src/electron-browser/menu/electron-menu-style.css';
 import { ThemeService } from '../../browser/theming';
-import { ThemeChangeEvent } from '../../common/theme';
+import { getThemeMode, ThemeChangeEvent } from '../../common/theme';
 
 export namespace ElectronCommands {
     export const TOGGLE_DEVELOPER_TOOLS = Command.toDefaultLocalizedCommand({
@@ -185,16 +185,16 @@ export class ElectronMenuContribution extends BrowserMenuBarContribution impleme
     /**
      * Hides the `theia-top-panel` depending on the selected `titleBarStyle`.
      * The `theia-top-panel` is used as the container of the main, application menu-bar for the
-     * browser. Native Electron has it's own.
+     * browser. Native Electron has its own.
      * By default, this method is called on application `onStart`.
      */
     protected hideTopPanel(app: FrontendApplication): void {
         const itr = app.shell.children();
         let child = itr.next();
-        while (child) {
+        while (!child.done) {
             // Top panel for the menu contribution is not required for native Electron title bar.
-            if (child.id === 'theia-top-panel') {
-                child.setHidden(this.titleBarStyle !== 'custom');
+            if (child.value.id === 'theia-top-panel') {
+                child.value.setHidden(this.titleBarStyle !== 'custom');
                 break;
             } else {
                 child = itr.next();
@@ -424,6 +424,7 @@ export class ElectronMenuContribution extends BrowserMenuBarContribution impleme
     protected handleThemeChange(e: ThemeChangeEvent): void {
         const backgroundColor = window.getComputedStyle(document.body).backgroundColor;
         window.electronTheiaCore.setBackgroundColor(backgroundColor);
+        window.electronTheiaCore.setTheme(getThemeMode(e.newTheme.type));
     }
 
 }

package/src/electron-browser/preload.ts

@@ -27,7 +27,7 @@ import {
     CHANNEL_REQUEST_RELOAD, CHANNEL_APP_STATE_CHANGED, CHANNEL_SHOW_ITEM_IN_FOLDER, CHANNEL_READ_CLIPBOARD, CHANNEL_WRITE_CLIPBOARD,
     CHANNEL_KEYBOARD_LAYOUT_CHANGED, CHANNEL_IPC_CONNECTION, InternalMenuDto, CHANNEL_REQUEST_SECONDARY_CLOSE, CHANNEL_SET_BACKGROUND_COLOR,
     CHANNEL_WC_METADATA, CHANNEL_ABOUT_TO_CLOSE, CHANNEL_OPEN_WITH_SYSTEM_APP,
-    CHANNEL_OPEN_URL
+    CHANNEL_OPEN_URL, CHANNEL_SET_THEME
 } from '../electron-common/electron-api';
 
 // eslint-disable-next-line import/no-extraneous-dependencies
@@ -120,6 +120,9 @@ const api: TheiaCoreAPI = {
     setBackgroundColor: function (backgroundColor): void {
         ipcRenderer.send(CHANNEL_SET_BACKGROUND_COLOR, backgroundColor);
     },
+    setTheme: function (theme): void {
+        ipcRenderer.send(CHANNEL_SET_THEME, theme);
+    },
     minimize: function (): void {
         ipcRenderer.send(CHANNEL_MINIMIZE);
     },
@@ -160,7 +163,7 @@ const api: TheiaCoreAPI = {
         return Disposable.create(() => ipcRenderer.off(CHANNEL_ON_WINDOW_EVENT, h));
     },
     setCloseRequestHandler: function (handler: (stopReason: StopReason) => Promise<boolean>): void {
-        ipcRenderer.on(CHANNEL_REQUEST_CLOSE, async (event, stopReason, confirmChannel, cancelChannel) => {
+        ipcRenderer.on(CHANNEL_REQUEST_CLOSE, async (event: Electron.IpcRendererEvent, stopReason: StopReason, confirmChannel: string, cancelChannel: string) => {
             try {
                 if (await handler(stopReason)) {
                     event.sender.send(confirmChannel);
@@ -249,7 +252,7 @@ function createDisposableListener(channel: string, handler: (event: any, ...args
 
 export function preload(): void {
     console.log('exposing theia core electron api');
-    ipcRenderer.on(CHANNEL_INVOKE_MENU, (_, menuId: number, handlerId: number) => {
+    ipcRenderer.on(CHANNEL_INVOKE_MENU, (_: Electron.IpcRendererEvent, menuId: number, handlerId: number) => {
         const map = commandHandlers.get(menuId);
         if (map) {
             const handler = map.get(handlerId);

package/src/electron-common/electron-api.ts

@@ -17,6 +17,7 @@
 import { NativeKeyboardLayout } from '../common/keyboard/keyboard-layout-provider';
 import { Disposable } from '../common';
 import { FrontendApplicationState, StopReason } from '../common/frontend-application-state';
+import { ThemeMode } from '../common/theme';
 
 export type MenuRole = ('undo' | 'redo' | 'cut' | 'copy' | 'paste' | 'selectAll' | 'about' | 'services' | 'hide' | 'hideOthers' | 'unhide' | 'quit');
 
@@ -65,6 +66,7 @@ export interface TheiaCoreAPI {
     getTitleBarStyleAtStartup(): Promise<string>;
     setTitleBarStyle(style: string): void;
     setBackgroundColor(backgroundColor: string): void;
+    setTheme(theme: ThemeMode): void;
     minimize(): void;
     isMaximized(): boolean; // TODO: this should really be async, since it blocks the renderer process
     maximize(): void;
@@ -125,6 +127,7 @@ export const CHANNEL_ATTACH_SECURITY_TOKEN = 'AttachSecurityToken';
 export const CHANNEL_GET_TITLE_STYLE_AT_STARTUP = 'GetTitleStyleAtStartup';
 export const CHANNEL_SET_TITLE_STYLE = 'SetTitleStyle';
 export const CHANNEL_SET_BACKGROUND_COLOR = 'SetBackgroundColor';
+export const CHANNEL_SET_THEME = 'SetTheme';
 export const CHANNEL_CLOSE = 'Close';
 export const CHANNEL_MINIMIZE = 'Minimize';
 export const CHANNEL_MAXIMIZE = 'Maximize';

package/src/electron-main/electron-api-main.ts

@@ -55,7 +55,8 @@ import {
     CHANNEL_WC_METADATA,
     CHANNEL_ABOUT_TO_CLOSE,
     CHANNEL_OPEN_WITH_SYSTEM_APP,
-    CHANNEL_OPEN_URL
+    CHANNEL_OPEN_URL,
+    CHANNEL_SET_THEME
 } from '../electron-common/electron-api';
 import { ElectronMainApplication, ElectronMainApplicationContribution } from './electron-main-application';
 import { Disposable, DisposableCollection, isOSX, MaybePromise } from '../common';
@@ -176,6 +177,8 @@ export class TheiaMainApi implements ElectronMainApplicationContribution {
 
         ipcMain.on(CHANNEL_SET_BACKGROUND_COLOR, (event, backgroundColor) => application.setBackgroundColor(event.sender, backgroundColor));
 
+        ipcMain.on(CHANNEL_SET_THEME, (event, theme) => application.setTheme(theme));
+
         ipcMain.on(CHANNEL_MINIMIZE, event => {
             BrowserWindow.fromWebContents(event.sender)?.minimize();
         });

package/src/electron-main/electron-main-application.ts

@@ -42,6 +42,7 @@ import { createDisposableListener } from './event-utils';
 import { TheiaRendererAPI } from './electron-api-main';
 import { StopReason } from '../common/frontend-application-state';
 import { dynamicRequire } from '../node/dynamic-require';
+import { ThemeMode } from '../common/theme';
 
 export { ElectronMainApplicationGlobals };
 
@@ -277,6 +278,10 @@ export class ElectronMainApplication {
         this.saveState(webContents);
     }
 
+    public setTheme(theme: ThemeMode): void {
+        nativeTheme.themeSource = theme;
+    }
+
     protected saveState(webContents: Electron.WebContents): void {
         const browserWindow = BrowserWindow.fromWebContents(webContents);
         if (browserWindow) {

package/src/node/messaging/websocket-frontend-connection-service.ts

@@ -103,7 +103,7 @@ export class WebsocketFrontendConnectionService implements FrontendConnectionSer
 
     handleSocketDisconnect(socket: Socket, channel: ReconnectableSocketChannel, frontEndId: string): void {
         socket.on('disconnect', evt => {
-            console.info('socked closed');
+            console.info('socket closed');
             channel.disconnect();
 
             const timeout = this.frontendConnectionTimeout();
@@ -183,4 +183,3 @@ class ReconnectableSocketChannel extends AbstractChannel {
         return writeBuffer;
     }
 }
-

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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