@theia/core 1.77.0-next.49 → 1.77.0-next.57

package/src/common/messaging/proxy-factory.ts

@@ -333,7 +333,7 @@ export class JsonRpcProxyFactory<T extends object> extends RpcProxyFactory<T> {
 
 }
 
-// eslint-disable-next-line deprecation/deprecation
+// eslint-disable-next-line @typescript-eslint/no-deprecated
 decorate(injectable(), JsonRpcProxyFactory);
-// eslint-disable-next-line deprecation/deprecation
+// eslint-disable-next-line @typescript-eslint/no-deprecated
 decorate(unmanaged(), JsonRpcProxyFactory, 0);

package/src/common/quick-pick-service.ts

@@ -282,6 +282,11 @@ export interface QuickInputService {
     readonly backButton: QuickInputButton;
     readonly onShow: Event<void>;
     readonly onHide: Event<void>;
+    /**
+     * The element that had focus when the quick input was shown, while the quick input is showing.
+     * Items whose state depends on context keys should be evaluated against this element rather than the quick input itself.
+     */
+    readonly previousFocusElement?: HTMLElement;
     open(filter: string): void;
     createInputBox(): InputBox;
     input(options?: InputOptions, token?: CancellationToken): Promise<string | undefined>;

package/src/common/stream.ts

@@ -22,7 +22,8 @@
 
 /* eslint-disable max-len */
 /* eslint-disable no-null/no-null */
-/* eslint-disable @typescript-eslint/tslint/config */
+/* eslint-disable @stylistic/brace-style */
+/* eslint-disable @theia/explicit-return-type */
 /* eslint-disable @typescript-eslint/no-explicit-any */
 
 import { DisposableCollection, Disposable } from './disposable';
@@ -730,7 +731,7 @@ export function fileToStream(file: File): ReadableStream<BinaryBuffer> {
         try {
             while (true) {
                 const { value, done } = await reader.read();
-                if (done) {break;}
+                if (done) { break; }
 
                 if (value?.byteLength) {
                     await ws.write(BinaryBuffer.wrap(value));
@@ -740,7 +741,7 @@ export function fileToStream(file: File): ReadableStream<BinaryBuffer> {
         } catch (e: unknown) {
             try {
                 await reader.cancel();
-            } catch {}
+            } catch { }
 
             ws.error(e instanceof Error ? e : new Error(String(e)));
         }

package/src/common/strings.ts

@@ -76,11 +76,8 @@ function doEqualsIgnoreCase(a: string, b: string, stopAt = a.length): boolean {
             if (diff !== 0 && diff !== 32) {
                 return false;
             }
-        }
-
-        // Any other charcode
-        // tslint:disable-next-line:one-line
-        else {
+        } else {
+            // Any other charcode
             if (String.fromCharCode(codeA).toLowerCase() !== String.fromCharCode(codeB).toLowerCase()) {
                 return false;
             }

package/src/common/ternary-search-tree.spec.ts

@@ -15,6 +15,7 @@
 // *****************************************************************************
 
 import { expect } from 'chai';
+import * as sinon from 'sinon';
 import { TernarySearchTree, KeySequenceIterator } from './ternary-search-tree';
 import { KeyCode, KeySequence, Key, KeyModifier } from './keys';
 
@@ -69,6 +70,19 @@ describe('KeySequenceIterator', () => {
         // Different value should return non-zero
         expect(iterator.cmp('different')).to.not.equal(0);
     });
+
+    it('should use dispatch identity for values and comparisons', () => {
+        const keyCode = KeyCode.createKeyCode({ first: Key.KEY_A, modifiers: [KeyModifier.CtrlCmd] });
+        const dispatchString = sinon.stub(keyCode, 'dispatchString').returns('dispatch-a');
+        const toString = sinon.stub(keyCode, 'toString').returns('serialized-a');
+
+        iterator.reset([keyCode]);
+
+        expect(iterator.value()).to.equal('dispatch-a');
+        expect(iterator.cmp('dispatch-a')).to.equal(0);
+        expect(dispatchString.called).to.be.true;
+        expect(toString.called).to.be.false;
+    });
 });
 
 describe('TernarySearchTree for KeySequences', () => {

package/src/common/ternary-search-tree.ts

@@ -21,7 +21,7 @@
 // based on https://github.com/microsoft/vscode/blob/04c36be045a94fee58e5f8992d3e3fd980294a84/src/vs/base/common/map.ts#L251
 
 /* eslint-disable @typescript-eslint/no-explicit-any */
-/* eslint-disable @typescript-eslint/tslint/config */
+/* eslint-disable @theia/explicit-return-type */
 
 import URI from './uri';
 import { CharCode } from './char-code';
@@ -208,12 +208,12 @@ export class KeySequenceIterator implements IKeyIterator<KeySequence> {
     }
 
     cmp(a: string): number {
-        const current = this._value[this._index]?.toString() ?? '';
+        const current = this._value[this._index]?.dispatchString() ?? '';
         return compare(a, current);
     }
 
     value(): string {
-        return this._value[this._index]?.toString() ?? '';
+        return this._value[this._index]?.dispatchString() ?? '';
     }
 }
 

package/src/common/uri-command-handler.ts

@@ -133,7 +133,7 @@ export namespace UriAwareCommandHandler {
      * @returns a command handler for mono-select contexts that expects a `URI` as the first parameter of its methods.
      */
     export function MonoSelect(selectionService: SelectionService, handler: UriCommandHandler<URI>): UriAwareCommandHandler<URI> {
-        /* eslint-disable-next-line deprecation/deprecation*/ // Safe to use when the generic and the options agree.
+        /* eslint-disable-next-line @typescript-eslint/no-deprecated */ // Safe to use when the generic and the options agree.
         return new UriAwareCommandHandler<URI>(selectionService, handler, { multi: false });
     }
 
@@ -141,7 +141,7 @@ export namespace UriAwareCommandHandler {
      * @returns a command handler for multi-select contexts that expects a `URI[]` as the first parameter of its methods.
      */
     export function MultiSelect(selectionService: SelectionService, handler: UriCommandHandler<URI[]>): UriAwareCommandHandler<URI[]> {
-        /* eslint-disable-next-line deprecation/deprecation*/ // Safe to use when the generic and the options agree.
+        /* eslint-disable-next-line @typescript-eslint/no-deprecated */ // Safe to use when the generic and the options agree.
         return new UriAwareCommandHandler<URI[]>(selectionService, handler, { multi: true });
     }
 }

package/src/electron-browser/keyboard/electron-keyboard-module.spec.ts

@@ -0,0 +1,29 @@
+// *****************************************************************************
+// Copyright (C) 2026 EclipseSource 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 { expect } from 'chai';
+import { NativeKeyboardLayout } from '../../common/keyboard/keyboard-layout-provider';
+import { createElectronKeyboardLayoutProvider } from './electron-keyboard-module';
+
+describe('Electron keyboard layout provider', () => {
+    it('reports the native-keymap source and delegates layout retrieval', async () => {
+        const layout: NativeKeyboardLayout = { info: { id: 'test', lang: 'en' }, mapping: {} };
+        const provider = createElectronKeyboardLayoutProvider({ getNativeLayout: async () => layout });
+
+        expect(provider.layoutSource).to.equal('native-keymap');
+        expect(await provider.getNativeLayout()).to.equal(layout);
+    });
+});

package/src/electron-browser/keyboard/electron-keyboard-module.ts

@@ -19,10 +19,17 @@ import { KeyboardLayoutProvider, keyboardPath, KeyboardLayoutChangeNotifier } fr
 import { WebSocketConnectionProvider } from '../../browser/messaging/ws-connection-provider';
 import { ElectronKeyboardLayoutChangeNotifier } from './electron-keyboard-layout-change-notifier';
 
+export function createElectronKeyboardLayoutProvider(delegate: KeyboardLayoutProvider): KeyboardLayoutProvider {
+    return {
+        layoutSource: 'native-keymap',
+        getNativeLayout: () => delegate.getNativeLayout()
+    };
+}
+
 export default new ContainerModule((bind, unbind, isBound, rebind) => {
-    bind(KeyboardLayoutProvider).toDynamicValue(ctx =>
+    bind(KeyboardLayoutProvider).toDynamicValue(ctx => createElectronKeyboardLayoutProvider(
         WebSocketConnectionProvider.createLocalProxy<KeyboardLayoutProvider>(ctx.container, keyboardPath)
-    ).inSingletonScope();
+    )).inSingletonScope();
     bind(ElectronKeyboardLayoutChangeNotifier).toSelf().inSingletonScope();
     bind(KeyboardLayoutChangeNotifier).toService(ElectronKeyboardLayoutChangeNotifier);
 });

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

@@ -22,7 +22,7 @@ import { CommonCommands } from '../../browser';
 import debounce = require('lodash.debounce');
 import { BrowserMainMenuFactory } from '../../browser/menu/browser-menu-plugin';
 import { ContextMatcher } from '../../browser/context-key-service';
-import { MenuDto, MenuRole } from '../../electron-common/electron-api';
+import { electronMenuAcceleratorMetadata, MenuDto, MenuRole } from '../../electron-common/electron-api';
 
 /**
  * Representation of possible electron menu options.
@@ -249,7 +249,7 @@ export class ElectronMainMenuFactory extends BrowserMainMenuFactory {
                 return parentItems;
             }
 
-            const accelerator = AcceleratorSource.is(menu) ? menu.getAccelerator(options.context).join(' ') : undefined;
+            const acceleratorSequence = AcceleratorSource.is(menu) ? menu.getAccelerator(options.context, 'physical') : [];
 
             const menuItem: MenuDto = {
                 id: menu.id,
@@ -258,7 +258,7 @@ export class ElectronMainMenuFactory extends BrowserMainMenuFactory {
                 checked: menu.isToggled(effectivePath, ...args),
                 enabled: !honorDisabled || menu.isEnabled(effectivePath, ...args), // see https://github.com/eclipse-theia/theia/issues/446
                 visible: true,
-                accelerator,
+                ...electronMenuAcceleratorMetadata(acceleratorSequence),
                 execute: async () => {
                     const wasToggled = menuItem.checked;
                     await menu.run(effectivePath, ...args);

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

@@ -362,6 +362,10 @@ export class ElectronMenuContribution extends BrowserMenuBarContribution impleme
                 command: ElectronCommands.RELOAD.id,
                 keybinding: 'ctrlcmd+r'
             },
+            {
+                command: ElectronCommands.ZOOM_IN.id,
+                keybinding: 'ctrlcmd+[char:0x2B]'
+            },
             {
                 command: ElectronCommands.ZOOM_IN.id,
                 keybinding: 'ctrlcmd+='

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

@@ -0,0 +1,42 @@
+// *****************************************************************************
+// Copyright (C) 2026 EclipseSource 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 { expect } from 'chai';
+import { electronMenuAccelerator, electronMenuAcceleratorMetadata, isElectronAcceleratorRepresentable } from './electron-api';
+
+describe('Electron menu accelerators', () => {
+    it('accepts only ASCII accelerators without AltGr', () => {
+        expect(isElectronAcceleratorRepresentable('Ctrl+8')).to.be.true;
+        expect(isElectronAcceleratorRepresentable('Ctrl+AltGr+8')).to.be.false;
+        expect(isElectronAcceleratorRepresentable('Ctrl+ä')).to.be.false;
+        expect(isElectronAcceleratorRepresentable('Ctrl++')).to.be.false;
+        expect(isElectronAcceleratorRepresentable('Ctrl+K Ctrl+S')).to.be.false;
+    });
+
+    it('forwards renderer accelerator text without precomputing representability', () => {
+        expect(electronMenuAcceleratorMetadata(['Ctrl+8'])).to.deep.equal({ accelerator: 'Ctrl+8' });
+        expect(electronMenuAcceleratorMetadata(['Ctrl+K', 'Ctrl+S'])).to.deep.equal({ accelerator: 'Ctrl+K Ctrl+S' });
+    });
+
+    it('omits unrepresentable accelerators', () => {
+        expect(electronMenuAccelerator({ accelerator: 'Ctrl+AltGr+8' })).to.deep.equal({});
+        expect(electronMenuAccelerator({ accelerator: 'Ctrl+K Ctrl+S' })).to.deep.equal({});
+    });
+
+    it('returns representable accelerators', () => {
+        expect(electronMenuAccelerator({ accelerator: 'Ctrl+8' })).to.deep.equal({ accelerator: 'Ctrl+8' });
+    });
+});

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

@@ -22,6 +22,29 @@ import { LaunchArguments } from '../common/launch-arguments';
 
 export type MenuRole = ('undo' | 'redo' | 'cut' | 'copy' | 'paste' | 'selectAll' | 'about' | 'services' | 'hide' | 'hideOthers' | 'unhide' | 'quit');
 
+export function isElectronAcceleratorRepresentable(accelerator: string | undefined): accelerator is string {
+    if (!accelerator || /altgr/i.test(accelerator) || /\s/.test(accelerator) || accelerator.split('+').some(token => !token)) {
+        return false;
+    }
+    for (let i = 0; i < accelerator.length; i++) {
+        if (accelerator.charCodeAt(i) > 127) {
+            return false;
+        }
+    }
+    return true;
+}
+
+export type ElectronMenuAccelerator = Pick<MenuDto, 'accelerator'>;
+
+export function electronMenuAcceleratorMetadata(acceleratorSequence: string[]): ElectronMenuAccelerator {
+    return { accelerator: acceleratorSequence.join(' ') || undefined };
+}
+
+/** Return an Electron accelerator only when the rendered single chord is representable. */
+export function electronMenuAccelerator(dto: ElectronMenuAccelerator): ElectronMenuAccelerator {
+    return isElectronAcceleratorRepresentable(dto.accelerator) ? { accelerator: dto.accelerator } : {};
+}
+
 export interface MenuDto {
     id?: string,
     label?: string,

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

@@ -57,6 +57,7 @@ import {
     CHANNEL_ABOUT_TO_CLOSE,
     CHANNEL_OPEN_WITH_SYSTEM_APP,
     CHANNEL_OPEN_URL,
+    electronMenuAccelerator,
     CHANNEL_SET_THEME,
     CHANNEL_OPEN_DEVTOOLS_FOR_WINDOW,
     CHANNEL_UPDATE_RECENT_WORKSPACES,
@@ -342,18 +343,6 @@ export class TheiaMainApi implements ElectronMainApplicationContribution {
         });
     }
 
-    private isASCI(accelerator: string | undefined): boolean {
-        if (typeof accelerator !== 'string') {
-            return false;
-        }
-        for (let i = 0; i < accelerator.length; i++) {
-            if (accelerator.charCodeAt(i) > 127) {
-                return false;
-            }
-        }
-        return true;
-    }
-
     fromMenuDto(sender: WebContents, menuId: number, menuDto: InternalMenuDto[]): MenuItemConstructorOptions[] {
         return menuDto.map(dto => {
             const result: MenuItemConstructorOptions = {
@@ -364,7 +353,7 @@ export class TheiaMainApi implements ElectronMainApplicationContribution {
                 enabled: dto.enabled,
                 visible: dto.visible,
                 role: dto.role,
-                accelerator: this.isASCI(dto.accelerator) ? dto.accelerator : undefined
+                ...electronMenuAccelerator(dto)
             };
             if (dto.submenu) {
                 result.submenu = this.fromMenuDto(sender, menuId, dto.submenu);

package/src/node/backend-application.ts

@@ -18,7 +18,7 @@ import * as dns from 'dns';
 import * as path from 'path';
 import * as http from 'http';
 import * as https from 'https';
-import * as express from 'express';
+import express from 'express';
 import * as yargs from 'yargs';
 import * as fs from 'fs-extra';
 import { inject, named, injectable, type interfaces, postConstruct } from 'inversify';

package/src/node/cli.ts

@@ -14,7 +14,7 @@
 // SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0
 // *****************************************************************************
 
-import * as yargs from 'yargs';
+import yargs from 'yargs';
 import { inject, named, injectable } from 'inversify';
 import { ContributionProvider } from '../common/contribution-provider';
 import { MaybePromise } from '../common/types';

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

@@ -15,7 +15,7 @@
 // *****************************************************************************
 
 import { expect } from 'chai';
-import * as yargs from 'yargs';
+import yargs from 'yargs';
 import * as temp from 'temp';
 import * as fs from 'fs';
 import { ContainerModule, Container } from 'inversify';