@theia/core 1.54.0 → 1.55.0-next.25

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/split-widget.ts

@@ -14,12 +14,11 @@
 // SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0
 // *****************************************************************************
 
-import { Emitter } from 'vscode-languageserver-protocol';
 import { ApplicationShell, StatefulWidget } from '../shell';
 import { BaseWidget, Message, PanelLayout, SplitPanel, Widget } from './widget';
 import { CompositeSaveable, Saveable, SaveableSource } from '../saveable';
 import { Navigatable } from '../navigatable-types';
-import { URI } from '../../common';
+import { Emitter, URI } from '../../common';
 
 /**
  * A widget containing a number of panes in a split layout.

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/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');