@theia/core 1.55.0-next.4 → 1.55.0

package/src/browser/widget-status-bar-service.ts

@@ -0,0 +1,84 @@
+// *****************************************************************************
+// Copyright (C) 2024 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 { inject, injectable, named } from 'inversify';
+import { Widget } from './widgets';
+import { StatusBar } from './status-bar';
+import { FrontendApplicationContribution } from './frontend-application-contribution';
+import { ContributionProvider } from '../common';
+import { FrontendApplication } from './frontend-application';
+
+export const WidgetStatusBarContribution = Symbol('WidgetStatusBarContribution');
+
+export interface WidgetStatusBarContribution<T extends Widget> {
+    canHandle(widget: Widget): widget is T;
+    activate(statusBar: StatusBar, widget: T): void;
+    deactivate(statusBar: StatusBar): void;
+}
+
+/**
+ * Creates an empty {@link WidgetStatusBarContribution} that does nothing.
+ * Useful for widgets that are not handled by any other contribution, for example:
+ * * Settings widget
+ * * Welcome widget
+ * * Webview widget
+ *
+ * @param prototype Prototype to identify the kind of the widget.
+ * @returns An empty {@link WidgetStatusBarContribution}.
+ */
+export function noopWidgetStatusBarContribution(prototype: Function): WidgetStatusBarContribution<Widget> {
+    return {
+        canHandle(widget: Widget): widget is Widget {
+            return widget instanceof prototype;
+        },
+        activate: () => { },
+        deactivate: () => { }
+    };
+}
+
+@injectable()
+export class WidgetStatusBarService implements FrontendApplicationContribution {
+
+    @inject(ContributionProvider) @named(WidgetStatusBarContribution)
+    protected readonly contributionProvider: ContributionProvider<WidgetStatusBarContribution<Widget>>;
+
+    @inject(StatusBar)
+    protected readonly statusBar: StatusBar;
+
+    onStart(app: FrontendApplication): void {
+        app.shell.onDidChangeCurrentWidget(event => {
+            if (event.newValue) {
+                this.show(event.newValue);
+            }
+        });
+    }
+
+    protected show(widget: Widget): void {
+        const contributions = this.contributionProvider.getContributions();
+        // If any contribution can handle the widget, activate it
+        // If none can, keep everything as is
+        if (contributions.some(contribution => contribution.canHandle(widget))) {
+            for (const contribution of contributions) {
+                // Deactivate all contributions
+                contribution.deactivate(this.statusBar);
+                if (contribution.canHandle(widget)) {
+                    // Selectively re-activate them
+                    contribution.activate(this.statusBar, widget);
+                }
+            }
+        }
+    }
+}

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

@@ -38,7 +38,9 @@ export abstract class ReactWidget extends BaseWidget {
 
     protected override onUpdateRequest(msg: Message): void {
         super.onUpdateRequest(msg);
-        this.nodeRoot.render(<React.Fragment>{this.render()}</React.Fragment>);
+        if (!this.isDisposed) {
+            this.nodeRoot.render(<React.Fragment>{this.render()}</React.Fragment>);
+        }
     }
 
     /**

package/src/electron-browser/menu/electron-main-menu-factory.ts

@@ -74,42 +74,45 @@ export type ElectronMenuItemRole = ('undo' | 'redo' | 'cut' | 'copy' | 'paste' |
 @injectable()
 export class ElectronMainMenuFactory extends BrowserMainMenuFactory {
 
-    protected _menu?: MenuDto[];
-    protected _toggledCommands: Set<string> = new Set();
+    protected menu?: MenuDto[];
+    protected toggledCommands: Set<string> = new Set();
 
     @inject(PreferenceService)
     protected preferencesService: PreferenceService;
 
+    setMenuBar = debounce(() => this.doSetMenuBar(), 100);
+
     @postConstruct()
     postConstruct(): void {
-        this.preferencesService.onPreferenceChanged(
-            debounce(e => {
-                if (e.preferenceName === 'window.menuBarVisibility') {
-                    this.setMenuBar();
-                }
-                if (this._menu) {
-                    for (const cmd of this._toggledCommands) {
-                        const menuItem = this.findMenuById(this._menu, cmd);
-                        if (menuItem) {
-                            menuItem.checked = this.commandRegistry.isToggled(cmd);
-                        }
-                    }
-                    window.electronTheiaCore.setMenu(this._menu);
-                }
-            }, 10)
-        );
         this.keybindingRegistry.onKeybindingsChanged(() => {
             this.setMenuBar();
         });
         this.menuProvider.onDidChange(() => {
             this.setMenuBar();
         });
+        this.preferencesService.ready.then(() => {
+            this.preferencesService.onPreferenceChanged(
+                debounce(e => {
+                    if (e.preferenceName === 'window.menuBarVisibility') {
+                        this.doSetMenuBar();
+                    }
+                    if (this.menu) {
+                        for (const cmd of this.toggledCommands) {
+                            const menuItem = this.findMenuById(this.menu, cmd);
+                            if (menuItem && (!!menuItem.checked !== this.commandRegistry.isToggled(cmd))) {
+                                menuItem.checked = !menuItem.checked;
+                            }
+                        }
+                        window.electronTheiaCore.setMenu(this.menu);
+                    }
+                }, 10)
+            );
+        });
     }
 
-    async setMenuBar(): Promise<void> {
-        await this.preferencesService.ready;
-        const createdMenuBar = this.createElectronMenuBar();
-        window.electronTheiaCore.setMenu(createdMenuBar);
+    doSetMenuBar(): void {
+        this.menu = this.createElectronMenuBar();
+        window.electronTheiaCore.setMenu(this.menu);
     }
 
     createElectronMenuBar(): MenuDto[] | undefined {
@@ -117,14 +120,12 @@ export class ElectronMainMenuFactory extends BrowserMainMenuFactory {
         const maxWidget = document.getElementsByClassName(MAXIMIZED_CLASS);
         if (preference === 'visible' || (preference === 'classic' && maxWidget.length === 0)) {
             const menuModel = this.menuProvider.getMenu(MAIN_MENU_BAR);
-            this._menu = this.fillMenuTemplate([], menuModel, [], { honorDisabled: false, rootMenuPath: MAIN_MENU_BAR }, false);
+            const menu = this.fillMenuTemplate([], menuModel, [], { honorDisabled: false, rootMenuPath: MAIN_MENU_BAR }, false);
             if (isOSX) {
-                this._menu.unshift(this.createOSXMenu());
+                menu.unshift(this.createOSXMenu());
             }
-            return this._menu;
+            return menu;
         }
-        this._menu = undefined;
-        // eslint-disable-next-line no-null/no-null
         return undefined;
     }
 
@@ -208,7 +209,7 @@ export class ElectronMainMenuFactory extends BrowserMainMenuFactory {
             parentItems.push(menuItem);
 
             if (this.commandRegistry.getToggledHandler(commandId, ...args)) {
-                this._toggledCommands.add(commandId);
+                this.toggledCommands.add(commandId);
             }
         }
         return parentItems;
@@ -273,11 +274,11 @@ export class ElectronMainMenuFactory extends BrowserMainMenuFactory {
             // We need to check if we can execute it.
             if (this.menuCommandExecutor.isEnabled(menuPath, cmd, ...args)) {
                 await this.menuCommandExecutor.executeCommand(menuPath, cmd, ...args);
-                if (this._menu && this.menuCommandExecutor.isVisible(menuPath, cmd, ...args)) {
-                    const item = this.findMenuById(this._menu, cmd);
+                if (this.menu && this.menuCommandExecutor.isVisible(menuPath, cmd, ...args)) {
+                    const item = this.findMenuById(this.menu, cmd);
                     if (item) {
                         item.checked = this.menuCommandExecutor.isToggled(menuPath, cmd, ...args);
-                        window.electronTheiaCore.setMenu(this._menu);
+                        window.electronTheiaCore.setMenu(this.menu);
                     }
                 }
             }

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

@@ -29,7 +29,6 @@ import { WindowService } from '../../browser/window/window-service';
 import { WindowTitleService } from '../../browser/window/window-title-service';
 
 import '../../../src/electron-browser/menu/electron-menu-style.css';
-import { MenuDto } from '../../electron-common/electron-api';
 import { ThemeService } from '../../browser/theming';
 import { ThemeChangeEvent } from '../../common/theme';
 
@@ -203,7 +202,7 @@ export class ElectronMenuContribution extends BrowserMenuBarContribution impleme
         }
     }
 
-    protected setMenu(app: FrontendApplication, electronMenu: MenuDto[] | undefined = this.factory.createElectronMenuBar()): void {
+    protected setMenu(app: FrontendApplication): void {
         if (!isOSX) {
             this.hideTopPanel(app);
             if (this.titleBarStyle === 'custom' && !this.menuBar) {
@@ -211,7 +210,7 @@ export class ElectronMenuContribution extends BrowserMenuBarContribution impleme
                 return;
             }
         }
-        window.electronTheiaCore.setMenu(electronMenu);
+        this.factory.setMenuBar();
     }
 
     protected createCustomTitleBar(app: FrontendApplication): void {

package/src/electron-browser/preload.ts

@@ -35,8 +35,8 @@ const { ipcRenderer, contextBridge } = require('electron');
 
 // a map of menuId => map<handler id => handler>
 const commandHandlers = new Map<number, Map<number, () => void>>();
-let nextHandlerId = 0;
-const mainMenuId = 0;
+let nextHandlerId = 1;
+const mainMenuId = 1;
 let nextMenuId = mainMenuId + 1;
 
 let openUrlHandler: ((url: string) => Promise<boolean>) | undefined;

package/src/node/env-variables/env-variables-server.ts

@@ -23,6 +23,7 @@ import { EnvVariable, EnvVariablesServer } from '../../common/env-variables';
 import { isWindows } from '../../common/os';
 import { FileUri } from '../../common/file-uri';
 import { BackendApplicationPath } from '../backend-application';
+import { BackendApplicationConfigProvider } from '../backend-application-config-provider';
 
 @injectable()
 export class EnvVariablesServerImpl implements EnvVariablesServer {
@@ -64,7 +65,7 @@ export class EnvVariablesServerImpl implements EnvVariablesServer {
                 this.pathExistenceCache[userDataPath] = true;
             }
         } else {
-            process.env.THEIA_CONFIG_DIR = join(homedir(), '.theia');
+            process.env.THEIA_CONFIG_DIR = join(homedir(), BackendApplicationConfigProvider.get().configurationFolder);
         }
         return FileUri.create(process.env.THEIA_CONFIG_DIR).toString();
     }

package/src/node/logger-cli-contribution.ts

@@ -19,7 +19,7 @@ import { injectable } from 'inversify';
 import { LogLevel } from '../common/logger';
 import { CliContribution } from './cli';
 import * as fs from 'fs-extra';
-import * as nsfw from 'nsfw';
+import { subscribe } from '@parcel/watcher';
 import { Event, Emitter } from '../common/event';
 import * as path from 'path';
 
@@ -89,13 +89,17 @@ export class LogLevelCliContribution implements CliContribution {
         }
     }
 
-    protected watchLogConfigFile(filename: string): Promise<void> {
-        return nsfw(filename, async (events: nsfw.FileChangeEvent[]) => {
+    protected async watchLogConfigFile(filename: string): Promise<void> {
+        await subscribe(filename, async (err, events) => {
+            if (err) {
+                console.log(`Error during log file watching ${filename}: ${err}`);
+                return;
+            }
             try {
                 for (const event of events) {
-                    switch (event.action) {
-                        case nsfw.actions.CREATED:
-                        case nsfw.actions.MODIFIED:
+                    switch (event.type) {
+                        case 'create':
+                        case 'update':
                             await this.slurpLogConfigFile(filename);
                             this.logConfigChangedEvent.fire(undefined);
                             break;
@@ -104,8 +108,6 @@ export class LogLevelCliContribution implements CliContribution {
             } catch (e) {
                 console.error(`Error reading log config file ${filename}: ${e}`);
             }
-        }).then((watcher: nsfw.NSFW) => {
-            watcher.start();
         });
     }
 

package/shared/nsfw/index.d.ts

@@ -1,2 +0,0 @@
-import nsfw = require('nsfw');
-export = nsfw;

package/shared/nsfw/index.js

@@ -1 +0,0 @@
-module.exports = require('nsfw');