@theia/core 1.61.0-next.8 → 1.61.1

package/src/browser/shell/theia-split-panel.ts

@@ -0,0 +1,56 @@
+// *****************************************************************************
+// Copyright (C) 2025 STMicroelectronics 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 { SplitLayout, SplitPanel } from '@lumino/widgets';
+
+export class TheiaSplitPanel extends SplitPanel {
+    constructor(options?: SplitPanel.IOptions) {
+        super(options);
+
+        let oldCursor: string | undefined;
+        let pointerId: number | undefined;
+
+        this['_evtPointerDown'] = (event: PointerEvent) => {
+            super['_evtPointerDown'](event);
+            if (this['_pressData']) { // indicating that the drag has started
+                this.node.setPointerCapture(event.pointerId);
+                pointerId = event.pointerId;
+                const layout = this.layout as SplitLayout;
+                const handle = layout.handles.find(h => h.contains(event.target as HTMLElement));
+                if (handle) {
+                    const style = window.getComputedStyle(handle);
+                    oldCursor = this.node.style.cursor;
+                    this.node.style.cursor = style.cursor;
+                }
+            }
+        };
+        this['_releaseMouse'] = () => {
+            super['_releaseMouse']();
+            if (oldCursor !== undefined) {
+                this.node.style.cursor = oldCursor;
+                oldCursor = undefined;
+            }
+            if (pointerId) {
+                this.node.releasePointerCapture(pointerId);
+                pointerId = undefined;
+            }
+        };
+    }
+
+    override handleEvent(event: Event): void {
+        super.handleEvent(event);
+    }
+}

package/src/browser/style/index.css

@@ -90,6 +90,7 @@ body {
     color: var(--theia-foreground);
     border: 1px solid var(--theia-window-activeBorder);
 }
+
 body:window-inactive,
 body:-moz-window-inactive {
     border-color: var(--theia-window-inactiveBorder);
@@ -139,19 +140,10 @@ blockquote {
 }
 
 .theia-maximized {
-    position: fixed !important;
     top: 0 !important;
-    bottom: 0 !important;
     left: 0 !important;
-    right: 0 !important;
-    width: auto !important;
-    height: auto !important;
-    z-index: 255 !important;
-    background: var(--theia-editor-background);
-}
-
-.theia-visible-menu-maximized {
-    top: var(--theia-private-menubar-height) !important;
+    width: 100% !important;
+    height: 100% !important;
 }
 
 .theia-ApplicationShell {

package/src/browser/style/sidepanel.css

@@ -188,7 +188,7 @@
 }
 
 .lm-Widget .theia-sidebar-menu-item {
-    cursor: pointer;
+  cursor: pointer;
 }
 
 .lm-Widget.theia-sidebar-menu i {
@@ -334,6 +334,7 @@
   padding-left: 5px;
   align-items: center;
   background-color: var(--theia-sideBar-background);
+  overflow: hidden;
 }
 
 .theia-sidepanel-toolbar .theia-sidepanel-title {
@@ -366,6 +367,3 @@
   overflow: hidden;
   text-overflow: ellipsis;
 }
-
-
-

package/src/browser/tree/tree-widget.tsx

@@ -445,6 +445,13 @@ export class TreeWidget extends ReactWidget implements StatefulWidget {
         super.onUpdateRequest(msg);
     }
 
+    protected override handleVisiblityChanged(isNowVisible: boolean): void {
+        super.handleVisiblityChanged(isNowVisible);
+        if (isNowVisible) {
+            this.update();
+        }
+    }
+
     protected override onResize(msg: Widget.ResizeMessage): void {
         super.onResize(msg);
         this.update();

package/src/browser/view-container.ts

@@ -38,6 +38,7 @@ import { Drag } from '@lumino/dragdrop';
 import { MimeData } from '@lumino/coreutils';
 import { ElementExt } from '@lumino/domutils';
 import { TabBarDecoratorService } from './shell/tab-bar-decorator';
+import { TheiaSplitPanel } from './shell/theia-split-panel';
 
 export interface ViewContainerTitleOptions {
     label: string;
@@ -152,7 +153,7 @@ export class ViewContainer extends BaseWidget implements StatefulWidget, Applica
         this.addClass('theia-view-container');
         const layout = new PanelLayout();
         this.layout = layout;
-        this.panel = new SplitPanel({
+        this.panel = new TheiaSplitPanel({
             layout: new ViewContainerLayout({
                 renderer: SplitPanel.defaultRenderer,
                 orientation: this.orientation,

package/src/browser/widgets/widget.ts

@@ -295,6 +295,7 @@ export function addKeyListener<K extends keyof HTMLElementEventMap = never>(
             return (actual: KeyCode) => KeysOrKeyCodes.toKeyCodes(keysOrKeyCodes).some(k => k.equals(actual));
         }
     })();
+
     toDispose.push(addEventListener(element, 'keydown', e => {
         const kc = KeyCode.createKeyCode(e);
         if (keyCodePredicate(kc)) {

package/src/common/content-replacer.spec.ts

@@ -63,7 +63,7 @@ describe('ContentReplacer', () => {
         ];
         const result = contentReplacer.applyReplacements(originalContent, replacements);
         expect(result.updatedContent).to.equal(originalContent);
-        expect(result.errors).to.include('Multiple occurrences found for: "Repeat"');
+        expect(result.errors.some(candidate => candidate.startsWith('Multiple occurrences found for: "Repeat"'))).to.be.true;
     });
 
     it('should prepend newContent when oldContent is an empty string', () => {
@@ -108,7 +108,7 @@ describe('ContentReplacer', () => {
         ];
         const result = contentReplacer.applyReplacements(originalContent, replacements);
         expect(result.updatedContent).to.equal(originalContent);
-        expect(result.errors).to.include('Multiple occurrences found for: "Repeat"');
+        expect(result.errors.some(candidate => candidate.startsWith('Multiple occurrences found for: "Repeat"'))).to.be.true;
     });
 
     it('should return an error when conflicting replacements for the same oldContent are provided', () => {

package/src/common/content-replacer.ts

@@ -60,7 +60,8 @@ export class ContentReplacer {
                 if (multiple) {
                     updatedContent = this.replaceContentAll(updatedContent, oldContent, newContent);
                 } else {
-                    errorMessages.push(`Multiple occurrences found for: "${oldContent}"`);
+                    errorMessages.push(`Multiple occurrences found for: "${oldContent}". Set 'multiple' to true if multiple occurrences of the oldContent are expected to be\
+                         replaced at once.`);
                 }
             } else {
                 updatedContent = this.replaceContentOnce(updatedContent, oldContent, newContent);

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

@@ -21,7 +21,6 @@ import { isOSX, MAIN_MENU_BAR, MenuPath, MenuNode, CommandMenuNode, CompoundMenu
 import { Keybinding } from '../../common/keybinding';
 import { PreferenceService, CommonCommands } from '../../browser';
 import debounce = require('lodash.debounce');
-import { MAXIMIZED_CLASS } from '../../browser/shell/theia-dock-panel';
 import { BrowserMainMenuFactory } from '../../browser/menu/browser-menu-plugin';
 import { ContextMatcher } from '../../browser/context-key-service';
 import { MenuDto, MenuRole } from '../../electron-common/electron-api';
@@ -111,22 +110,24 @@ export class ElectronMainMenuFactory extends BrowserMainMenuFactory {
     }
 
     doSetMenuBar(): void {
-        this.menu = this.createElectronMenuBar();
-        window.electronTheiaCore.setMenu(this.menu);
+        const preference = this.preferencesService.get<string>('window.menuBarVisibility') || 'classic';
+        const shouldShowTop = !window.electronTheiaCore.isFullScreen() || preference === 'visible';
+        if (shouldShowTop) {
+            this.menu = this.createElectronMenuBar();
+            window.electronTheiaCore.setMenu(this.menu);
+            window.electronTheiaCore.setMenuBarVisible(true);
+        } else {
+            window.electronTheiaCore.setMenuBarVisible(false);
+        }
     }
 
-    createElectronMenuBar(): MenuDto[] | undefined {
-        const preference = this.preferencesService.get<string>('window.menuBarVisibility') || 'classic';
-        const maxWidget = document.getElementsByClassName(MAXIMIZED_CLASS);
-        if (preference === 'visible' || (preference === 'classic' && maxWidget.length === 0)) {
-            const menuModel = this.menuProvider.getMenu(MAIN_MENU_BAR);
-            const menu = this.fillMenuTemplate([], menuModel, [], { honorDisabled: false, rootMenuPath: MAIN_MENU_BAR }, false);
-            if (isOSX) {
-                menu.unshift(this.createOSXMenu());
-            }
-            return menu;
+    createElectronMenuBar(): MenuDto[] {
+        const menuModel = this.menuProvider.getMenu(MAIN_MENU_BAR)!;
+        const menu = this.fillMenuTemplate([], menuModel, [], { honorDisabled: false, rootMenuPath: MAIN_MENU_BAR }, false);
+        if (isOSX) {
+            menu.unshift(this.createOSXMenu());
         }
-        return undefined;
+        return menu;
     }
 
     createElectronContextMenu(menuPath: MenuPath, args?: any[], context?: HTMLElement, contextKeyService?: ContextMatcher, skipSingleRootNode?: boolean): MenuDto[] {

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

@@ -120,10 +120,7 @@ export class ElectronMenuContribution extends BrowserMenuBarContribution impleme
             }
         };
         onStateChange = this.stateService.onStateChanged(stateServiceListener);
-        this.shell.mainPanel.onDidToggleMaximized(() => {
-            this.handleToggleMaximized();
-        });
-        this.shell.bottomPanel.onDidToggleMaximized(() => {
+        this.shell.onDidToggleMaximized(() => {
             this.handleToggleMaximized();
         });
         this.attachMenuBarVisibilityListener();

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

@@ -746,11 +746,14 @@ export class ElectronMainApplication {
         this.stopContributions();
     }
 
-    protected async onSecondInstance(event: ElectronEvent, argv: string[], cwd: string): Promise<void> {
-        if (argv.includes('--open-url')) {
-            this.openUrl(argv[argv.length - 1]);
+    protected async onSecondInstance(event: ElectronEvent, _: string[], cwd: string, originalArgv: string[]): Promise<void> {
+        // the second instance passes it's original argument array as the fourth argument to this method
+        // The `argv` second parameter is not usable for us since it is mangled by electron before being passed here
+
+        if (originalArgv.includes('--open-url')) {
+            this.openUrl(originalArgv[originalArgv.length - 1]);
         } else {
-            createYargs(this.processArgv.getProcessArgvWithoutBin(argv), process.cwd())
+            createYargs(this.processArgv.getProcessArgvWithoutBin(originalArgv), cwd)
                 .help(false)
                 .command('$0 [file]', false,
                     cmd => cmd
@@ -758,7 +761,7 @@ export class ElectronMainApplication {
                     async args => {
                         await this.handleMainCommand({
                             file: args.file,
-                            cwd: process.cwd(),
+                            cwd: cwd,
                             secondInstance: true
                         });
                     },

package/src/node/backend-application-module.ts

@@ -43,6 +43,7 @@ import { BackendRequestFacade } from './request/backend-request-facade';
 import { FileSystemLocking, FileSystemLockingImpl } from './filesystem-locking';
 import { BackendRemoteService } from './remote/backend-remote-service';
 import { RemoteCliContribution } from './remote/remote-cli-contribution';
+import { SettingService, SettingServiceImpl } from './setting-service';
 
 decorate(injectable(), ApplicationPackage);
 
@@ -136,4 +137,7 @@ export const backendApplicationModule = new ContainerModule(bind => {
     bindBackendStopwatchServer(bind);
 
     bind(FileSystemLocking).to(FileSystemLockingImpl).inSingletonScope();
+
+    bind(SettingServiceImpl).toSelf().inSingletonScope();
+    bind(SettingService).toService(SettingServiceImpl);
 });

package/src/node/index.ts

@@ -19,4 +19,5 @@ export * from './debug';
 export * from '../common/file-uri';
 export * from './messaging';
 export * from './cli';
+export * from './setting-service';
 export { FileSystemLocking } from './filesystem-locking';

package/src/node/setting-service.ts

@@ -0,0 +1,78 @@
+// *****************************************************************************
+// Copyright (C) 2025 STMicroelectronics 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, postConstruct } from 'inversify';
+import { EnvVariablesServer } from '../common/env-variables';
+import { Deferred } from '../common/promise-util';
+import { promises as fs } from 'fs';
+import { URI } from '../common';
+
+export const SettingService = Symbol('SettingService');
+
+/**
+ * A service providing a simple user-level, persistent key-value store on the back end
+ */
+export interface SettingService {
+    set(key: string, value: string): Promise<void>;
+    get(key: string): Promise<string | undefined>;
+}
+
+@injectable()
+export class SettingServiceImpl implements SettingService {
+
+    @inject(EnvVariablesServer)
+    protected readonly envVarServer: EnvVariablesServer;
+
+    protected readonly ready = new Deferred<void>();
+    protected values: Record<string, string> = {};
+
+    @postConstruct()
+    protected init(): void {
+        const asyncInit = async () => {
+            const configDir = new URI(await this.envVarServer.getConfigDirUri());
+            const path: string = configDir.resolve('backend-settings.json').path.fsPath();
+            try {
+                const contents = await fs.readFile(path, {
+                    encoding: 'utf-8'
+                });
+                this.values = JSON.parse(contents);
+            } catch (e) {
+                console.log(e);
+            } finally {
+                this.ready.resolve();
+            }
+        };
+        asyncInit();
+    }
+
+    async set(key: string, value: string): Promise<void> {
+        await this.ready.promise;
+        this.values[key] = value;
+        await this.writeFile();
+    }
+
+    async writeFile(): Promise<void> {
+        const configDir = new URI(await this.envVarServer.getConfigDirUri());
+        const path: string = configDir.resolve('backend-settings.json').path.fsPath();
+        const values = JSON.stringify(this.values);
+        await fs.writeFile(path, values);
+    }
+
+    async get(key: string): Promise<string | undefined> {
+        await this.ready.promise;
+        return this.values[key];
+    }
+}