@theia/core 1.52.0 → 1.53.0-next.5

package/lib/browser/undo-redo-handler.js

@@ -0,0 +1,83 @@
+"use strict";
+// *****************************************************************************
+// 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
+// *****************************************************************************
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.DomInputUndoRedoHandler = exports.UndoRedoHandlerService = exports.UndoRedoHandler = void 0;
+const tslib_1 = require("tslib");
+const inversify_1 = require("inversify");
+const common_1 = require("../common");
+exports.UndoRedoHandler = Symbol('UndoRedoHandler');
+let UndoRedoHandlerService = class UndoRedoHandlerService {
+    init() {
+        this.handlers = this.provider.getContributions().sort((a, b) => b.priority - a.priority);
+    }
+    undo() {
+        for (const handler of this.handlers) {
+            const selection = handler.select();
+            if (selection) {
+                handler.undo(selection);
+                return;
+            }
+        }
+    }
+    redo() {
+        for (const handler of this.handlers) {
+            const selection = handler.select();
+            if (selection) {
+                handler.redo(selection);
+                return;
+            }
+        }
+    }
+};
+exports.UndoRedoHandlerService = UndoRedoHandlerService;
+tslib_1.__decorate([
+    (0, inversify_1.inject)(common_1.ContributionProvider),
+    (0, inversify_1.named)(exports.UndoRedoHandler),
+    tslib_1.__metadata("design:type", Object)
+], UndoRedoHandlerService.prototype, "provider", void 0);
+tslib_1.__decorate([
+    (0, inversify_1.postConstruct)(),
+    tslib_1.__metadata("design:type", Function),
+    tslib_1.__metadata("design:paramtypes", []),
+    tslib_1.__metadata("design:returntype", void 0)
+], UndoRedoHandlerService.prototype, "init", null);
+exports.UndoRedoHandlerService = UndoRedoHandlerService = tslib_1.__decorate([
+    (0, inversify_1.injectable)()
+], UndoRedoHandlerService);
+let DomInputUndoRedoHandler = class DomInputUndoRedoHandler {
+    constructor() {
+        this.priority = 1000;
+    }
+    select() {
+        const element = document.activeElement;
+        if (element && ['input', 'textarea'].includes(element.tagName.toLowerCase())) {
+            return element;
+        }
+        return undefined;
+    }
+    undo(item) {
+        document.execCommand('undo');
+    }
+    redo(item) {
+        document.execCommand('redo');
+    }
+};
+exports.DomInputUndoRedoHandler = DomInputUndoRedoHandler;
+exports.DomInputUndoRedoHandler = DomInputUndoRedoHandler = tslib_1.__decorate([
+    (0, inversify_1.injectable)()
+], DomInputUndoRedoHandler);
+//# sourceMappingURL=undo-redo-handler.js.map

package/lib/browser/undo-redo-handler.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"undo-redo-handler.js","sourceRoot":"","sources":["../../src/browser/undo-redo-handler.ts"],"names":[],"mappings":";AAAA,gFAAgF;AAChF,yCAAyC;AACzC,EAAE;AACF,2EAA2E;AAC3E,mEAAmE;AACnE,wCAAwC;AACxC,EAAE;AACF,4EAA4E;AAC5E,8EAA8E;AAC9E,6EAA6E;AAC7E,yDAAyD;AACzD,uDAAuD;AACvD,EAAE;AACF,gFAAgF;AAChF,gFAAgF;;;;AAEhF,yCAAqE;AACrE,sCAAiD;AAEpC,QAAA,eAAe,GAAG,MAAM,CAAC,iBAAiB,CAAC,CAAC;AAUlD,IAAM,sBAAsB,GAA5B,MAAM,sBAAsB;IAQrB,IAAI;QACV,IAAI,CAAC,QAAQ,GAAG,IAAI,CAAC,QAAQ,CAAC,gBAAgB,EAAE,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,QAAQ,GAAG,CAAC,CAAC,QAAQ,CAAC,CAAC;IAC7F,CAAC;IAED,IAAI;QACA,KAAK,MAAM,OAAO,IAAI,IAAI,CAAC,QAAQ,EAAE,CAAC;YAClC,MAAM,SAAS,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC;YACnC,IAAI,SAAS,EAAE,CAAC;gBACZ,OAAO,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;gBACxB,OAAO;YACX,CAAC;QACL,CAAC;IACL,CAAC;IAED,IAAI;QACA,KAAK,MAAM,OAAO,IAAI,IAAI,CAAC,QAAQ,EAAE,CAAC;YAClC,MAAM,SAAS,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC;YACnC,IAAI,SAAS,EAAE,CAAC;gBACZ,OAAO,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;gBACxB,OAAO;YACX,CAAC;QACL,CAAC;IACL,CAAC;CAEJ,CAAA;AAhCY,wDAAsB;AAGZ;IADlB,IAAA,kBAAM,EAAC,6BAAoB,CAAC;IAAE,IAAA,iBAAK,EAAC,uBAAe,CAAC;;wDACuB;AAKlE;IADT,IAAA,yBAAa,GAAE;;;;kDAGf;iCAVQ,sBAAsB;IADlC,IAAA,sBAAU,GAAE;GACA,sBAAsB,CAgClC;AAGM,IAAM,uBAAuB,GAA7B,MAAM,uBAAuB;IAA7B;QAEH,aAAQ,GAAG,IAAI,CAAC;IAkBpB,CAAC;IAhBG,MAAM;QACF,MAAM,OAAO,GAAG,QAAQ,CAAC,aAAa,CAAC;QACvC,IAAI,OAAO,IAAI,CAAC,OAAO,EAAE,UAAU,CAAC,CAAC,QAAQ,CAAC,OAAO,CAAC,OAAO,CAAC,WAAW,EAAE,CAAC,EAAE,CAAC;YAC3E,OAAO,OAAO,CAAC;QACnB,CAAC;QACD,OAAO,SAAS,CAAC;IACrB,CAAC;IAED,IAAI,CAAC,IAAa;QACd,QAAQ,CAAC,WAAW,CAAC,MAAM,CAAC,CAAC;IACjC,CAAC;IAED,IAAI,CAAC,IAAa;QACd,QAAQ,CAAC,WAAW,CAAC,MAAM,CAAC,CAAC;IACjC,CAAC;CAEJ,CAAA;AApBY,0DAAuB;kCAAvB,uBAAuB;IADnC,IAAA,sBAAU,GAAE;GACA,uBAAuB,CAoBnC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@theia/core",
-  "version": "1.52.0",
+  "version": "1.53.0-next.5+1e5fb536d",
   "description": "Theia is a cloud & desktop IDE framework implemented in TypeScript.",
   "main": "lib/common/index.js",
   "typings": "lib/common/index.d.ts",
@@ -16,8 +16,8 @@
     "@phosphor/signaling": "1",
     "@phosphor/virtualdom": "1",
     "@phosphor/widgets": "1",
-    "@theia/application-package": "1.52.0",
-    "@theia/request": "1.52.0",
+    "@theia/application-package": "1.53.0-next.5+1e5fb536d",
+    "@theia/request": "1.53.0-next.5+1e5fb536d",
     "@types/body-parser": "^1.16.4",
     "@types/cookie": "^0.3.3",
     "@types/dompurify": "^2.2.2",
@@ -216,5 +216,5 @@
   "nyc": {
     "extends": "../../configs/nyc.json"
   },
-  "gitHead": "40ceebcd4ee75f13ec16b9dc7314e9384493c1ac"
+  "gitHead": "1e5fb536d65550ad8fa0fefcec731645b2afc74a"
 }

package/src/browser/browser.ts

@@ -18,7 +18,7 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { environment } from '../common';
+import { Disposable, environment } from '../common';
 
 const userAgent = typeof navigator !== 'undefined' ? navigator.userAgent : '';
 
@@ -228,3 +228,12 @@ function getMeasurementElement(style?: PartialCSSStyle): HTMLElement {
     }
     return measureElement;
 }
+
+export function onDomEvent<K extends keyof HTMLElementEventMap>(
+    element: Node,
+    type: K,
+    listener: (this: HTMLElement, ev: HTMLElementEventMap[K]) => unknown,
+    options?: boolean | AddEventListenerOptions): Disposable {
+    element.addEventListener(type, listener, options);
+    return { dispose: () => element.removeEventListener(type, listener, options) };
+}

package/src/browser/common-frontend-contribution.ts

@@ -67,6 +67,7 @@ import { UserWorkingDirectoryProvider } from './user-working-directory-provider'
 import { UNTITLED_SCHEME, UntitledResourceResolver } from '../common';
 import { LanguageQuickPickService } from './i18n/language-quick-pick-service';
 import { SidebarMenu } from './shell/sidebar-menu-widget';
+import { UndoRedoHandlerService } from './undo-redo-handler';
 
 export namespace CommonMenus {
 
@@ -443,7 +444,11 @@ export class CommonFrontendContribution implements FrontendApplicationContributi
     @inject(UntitledResourceResolver)
     protected readonly untitledResourceResolver: UntitledResourceResolver;
 
+    @inject(UndoRedoHandlerService)
+    protected readonly undoRedoHandlerService: UndoRedoHandlerService;
+
     protected pinnedKey: ContextKey<boolean>;
+    protected inputFocus: ContextKey<boolean>;
 
     async configure(app: FrontendApplication): Promise<void> {
         // FIXME: This request blocks valuable startup time (~200ms).
@@ -458,6 +463,9 @@ export class CommonFrontendContribution implements FrontendApplicationContributi
         this.contextKeyService.createKey<boolean>('isMac', OS.type() === OS.Type.OSX);
         this.contextKeyService.createKey<boolean>('isWindows', OS.type() === OS.Type.Windows);
         this.contextKeyService.createKey<boolean>('isWeb', !this.isElectron());
+        this.inputFocus = this.contextKeyService.createKey<boolean>('inputFocus', false);
+        this.updateInputFocus();
+        browser.onDomEvent(document, 'focusin', () => this.updateInputFocus());
 
         this.pinnedKey = this.contextKeyService.createKey<boolean>('activeEditorIsPinned', false);
         this.updatePinnedKey();
@@ -513,6 +521,15 @@ export class CommonFrontendContribution implements FrontendApplicationContributi
         }
     }
 
+    protected updateInputFocus(): void {
+        const activeElement = document.activeElement;
+        if (activeElement) {
+            const isInput = activeElement.tagName?.toLowerCase() === 'input'
+                || activeElement.tagName?.toLowerCase() === 'textarea';
+            this.inputFocus.set(isInput);
+        }
+    }
+
     protected updatePinnedKey(): void {
         const activeTab = this.shell.findTabBar();
         const pinningTarget = activeTab && this.shell.findTitle(activeTab);
@@ -801,10 +818,14 @@ export class CommonFrontendContribution implements FrontendApplicationContributi
         }));
 
         commandRegistry.registerCommand(CommonCommands.UNDO, {
-            execute: () => document.execCommand('undo')
+            execute: () => {
+                this.undoRedoHandlerService.undo();
+            }
         });
         commandRegistry.registerCommand(CommonCommands.REDO, {
-            execute: () => document.execCommand('redo')
+            execute: () => {
+                this.undoRedoHandlerService.redo();
+            }
         });
         commandRegistry.registerCommand(CommonCommands.SELECT_ALL, {
             execute: () => document.execCommand('selectAll')
@@ -1067,7 +1088,7 @@ export class CommonFrontendContribution implements FrontendApplicationContributi
             },
             {
                 command: CommonCommands.REDO.id,
-                keybinding: 'ctrlcmd+shift+z'
+                keybinding: isOSX ? 'ctrlcmd+shift+z' : 'ctrlcmd+y'
             },
             {
                 command: CommonCommands.SELECT_ALL.id,
@@ -1899,6 +1920,94 @@ export class CommonFrontendContribution implements FrontendApplicationContributi
                 }, description: 'Status bar warning items foreground color. Warning items stand out from other status bar entries to indicate warning conditions. The status bar is shown in the bottom of the window.'
             },
 
+            // editor find
+
+            {
+                id: 'editor.findMatchBackground',
+                defaults: {
+                    light: '#A8AC94',
+                    dark: '#515C6A',
+                    hcDark: undefined,
+                    hcLight: undefined
+                },
+                description: 'Color of the current search match.'
+            },
+
+            {
+                id: 'editor.findMatchForeground',
+                defaults: {
+                    light: undefined,
+                    dark: undefined,
+                    hcDark: undefined,
+                    hcLight: undefined
+                },
+                description: 'Text color of the current search match.'
+            },
+            {
+                id: 'editor.findMatchHighlightBackground',
+                defaults: {
+                    light: '#EA5C0055',
+                    dark: '#EA5C0055',
+                    hcDark: undefined,
+                    hcLight: undefined
+                },
+                description: 'Color of the other search matches. The color must not be opaque so as not to hide underlying decorations.'
+            },
+
+            {
+                id: 'editor.findMatchHighlightForeground',
+                defaults: {
+                    light: undefined,
+                    dark: undefined,
+                    hcDark: undefined,
+                    hcLight: undefined
+                },
+                description: 'Foreground color of the other search matches.'
+            },
+
+            {
+                id: 'editor.findRangeHighlightBackground',
+                defaults: {
+                    dark: '#3a3d4166',
+                    light: '#b4b4b44d',
+                    hcDark: undefined,
+                    hcLight: undefined
+                },
+                description: 'Color of the range limiting the search. The color must not be opaque so as not to hide underlying decorations.'
+            },
+
+            {
+                id: 'editor.findMatchBorder',
+                defaults: {
+                    light: undefined,
+                    dark: undefined,
+                    hcDark: 'activeContrastBorder',
+                    hcLight: 'activeContrastBorder'
+                },
+                description: 'Border color of the current search match.'
+            },
+            {
+                id: 'editor.findMatchHighlightBorder',
+                defaults: {
+                    light: undefined,
+                    dark: undefined,
+                    hcDark: 'activeContrastBorder',
+                    hcLight: 'activeContrastBorder'
+                },
+                description: 'Border color of the other search matches.'
+            },
+
+            {
+                id: 'editor.findRangeHighlightBorder',
+                defaults: {
+                    dark: undefined,
+                    light: undefined,
+                    hcDark: Color.transparent('activeContrastBorder', 0.4),
+                    hcLight: Color.transparent('activeContrastBorder', 0.4)
+                },
+                description: 'Border color of the range limiting the search. The color must not be opaque so as not to hide underlying decorations.'
+            },
+
             // Quickinput colors should be aligned with https://code.visualstudio.com/api/references/theme-color#quick-picker
             // if not yet contributed by Monaco, check runtime css variables to learn.
             {

package/src/browser/frontend-application-module.ts

@@ -143,6 +143,7 @@ import { LanguageIconLabelProvider } from './language-icon-provider';
 import { bindTreePreferences } from './tree';
 import { OpenWithService } from './open-with-service';
 import { ViewColumnService } from './shell/view-column-service';
+import { DomInputUndoRedoHandler, UndoRedoHandler, UndoRedoHandlerService } from './undo-redo-handler';
 
 export { bindResourceProvider, bindMessageService, bindPreferenceService };
 
@@ -466,4 +467,9 @@ export const frontendApplicationModule = new ContainerModule((bind, _unbind, _is
     bind(SecondaryWindowHandler).toSelf().inSingletonScope();
 
     bind(ViewColumnService).toSelf().inSingletonScope();
+
+    bind(UndoRedoHandlerService).toSelf().inSingletonScope();
+    bindContributionProvider(bind, UndoRedoHandler);
+    bind(DomInputUndoRedoHandler).toSelf().inSingletonScope();
+    bind(UndoRedoHandler).toService(DomInputUndoRedoHandler);
 });

package/src/browser/index.ts

@@ -47,3 +47,4 @@ export * from './decoration-style';
 export * from './styling-service';
 export * from './hover-service';
 export * from './saveable-service';
+export * from './undo-redo-handler';

package/src/browser/style/index.css

@@ -239,7 +239,8 @@ blockquote {
     -o-user-select: none;
 }
 
-:focus {
+/* Since an iframe has its own focus tracking, we don't show focus on iframes */
+:focus:not(iframe) {
     outline-width: 1px;
     outline-style: solid;
     outline-offset: -1px;

package/src/browser/undo-redo-handler.ts

@@ -0,0 +1,85 @@
+// *****************************************************************************
+// 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, postConstruct } from 'inversify';
+import { ContributionProvider } from '../common';
+
+export const UndoRedoHandler = Symbol('UndoRedoHandler');
+
+export interface UndoRedoHandler<T> {
+    priority: number;
+    select(): T | undefined;
+    undo(item: T): void;
+    redo(item: T): void;
+}
+
+@injectable()
+export class UndoRedoHandlerService {
+
+    @inject(ContributionProvider) @named(UndoRedoHandler)
+    protected readonly provider: ContributionProvider<UndoRedoHandler<unknown>>;
+
+    protected handlers: UndoRedoHandler<unknown>[];
+
+    @postConstruct()
+    protected init(): void {
+        this.handlers = this.provider.getContributions().sort((a, b) => b.priority - a.priority);
+    }
+
+    undo(): void {
+        for (const handler of this.handlers) {
+            const selection = handler.select();
+            if (selection) {
+                handler.undo(selection);
+                return;
+            }
+        }
+    }
+
+    redo(): void {
+        for (const handler of this.handlers) {
+            const selection = handler.select();
+            if (selection) {
+                handler.redo(selection);
+                return;
+            }
+        }
+    }
+
+}
+
+@injectable()
+export class DomInputUndoRedoHandler implements UndoRedoHandler<Element> {
+
+    priority = 1000;
+
+    select(): Element | undefined {
+        const element = document.activeElement;
+        if (element && ['input', 'textarea'].includes(element.tagName.toLowerCase())) {
+            return element;
+        }
+        return undefined;
+    }
+
+    undo(item: Element): void {
+        document.execCommand('undo');
+    }
+
+    redo(item: Element): void {
+        document.execCommand('redo');
+    }
+
+}