@theia/editor 1.53.0-next.4 → 1.53.0-next.55

package/src/browser/editor-keybinding.ts

@@ -1,55 +1,55 @@
-// *****************************************************************************
-// Copyright (C) 2018 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 { injectable } from '@theia/core/shared/inversify';
-import { environment } from '@theia/core/shared/@theia/application-package/lib/environment';
-import { isOSX, isWindows } from '@theia/core/lib/common/os';
-import { KeybindingContribution, KeybindingRegistry } from '@theia/core/lib/browser/keybinding';
-import { EditorCommands } from './editor-command';
-
-@injectable()
-export class EditorKeybindingContribution implements KeybindingContribution {
-
-    registerKeybindings(registry: KeybindingRegistry): void {
-        registry.registerKeybindings(
-            {
-                command: EditorCommands.GO_BACK.id,
-                keybinding: isOSX ? 'ctrl+-' : isWindows ? 'alt+left' : /* isLinux */ 'ctrl+alt+-'
-            },
-            {
-                command: EditorCommands.GO_FORWARD.id,
-                keybinding: isOSX ? 'ctrl+shift+-' : isWindows ? 'alt+right' : /* isLinux */ 'ctrl+shift+-'
-            },
-            {
-                command: EditorCommands.GO_LAST_EDIT.id,
-                keybinding: 'ctrl+alt+q'
-            },
-            {
-                command: EditorCommands.TOGGLE_WORD_WRAP.id,
-                keybinding: 'alt+z'
-            },
-            {
-                command: EditorCommands.REOPEN_CLOSED_EDITOR.id,
-                keybinding: this.isElectron() ? 'ctrlcmd+shift+t' : 'alt+shift+t'
-            }
-        );
-    }
-
-    private isElectron(): boolean {
-        return environment.electron.is();
-    }
-
-}
+// *****************************************************************************
+// Copyright (C) 2018 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 { injectable } from '@theia/core/shared/inversify';
+import { environment } from '@theia/core/shared/@theia/application-package/lib/environment';
+import { isOSX, isWindows } from '@theia/core/lib/common/os';
+import { KeybindingContribution, KeybindingRegistry } from '@theia/core/lib/browser/keybinding';
+import { EditorCommands } from './editor-command';
+
+@injectable()
+export class EditorKeybindingContribution implements KeybindingContribution {
+
+    registerKeybindings(registry: KeybindingRegistry): void {
+        registry.registerKeybindings(
+            {
+                command: EditorCommands.GO_BACK.id,
+                keybinding: isOSX ? 'ctrl+-' : isWindows ? 'alt+left' : /* isLinux */ 'ctrl+alt+-'
+            },
+            {
+                command: EditorCommands.GO_FORWARD.id,
+                keybinding: isOSX ? 'ctrl+shift+-' : isWindows ? 'alt+right' : /* isLinux */ 'ctrl+shift+-'
+            },
+            {
+                command: EditorCommands.GO_LAST_EDIT.id,
+                keybinding: 'ctrl+alt+q'
+            },
+            {
+                command: EditorCommands.TOGGLE_WORD_WRAP.id,
+                keybinding: 'alt+z'
+            },
+            {
+                command: EditorCommands.REOPEN_CLOSED_EDITOR.id,
+                keybinding: this.isElectron() ? 'ctrlcmd+shift+t' : 'alt+shift+t'
+            }
+        );
+    }
+
+    private isElectron(): boolean {
+        return environment.electron.is();
+    }
+
+}

package/src/browser/editor-language-quick-pick-service.ts

@@ -1,68 +1,68 @@
-// *****************************************************************************
-// 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 } from '@theia/core/shared/inversify';
-import { Language, LanguageService } from '@theia/core/lib/browser/language-service';
-import { nls, QuickInputService, QuickPickItemOrSeparator, QuickPickValue, URI } from '@theia/core';
-import { LabelProvider } from '@theia/core/lib/browser';
-
-@injectable()
-export class EditorLanguageQuickPickService {
-    @inject(LanguageService)
-    protected readonly languages: LanguageService;
-
-    @inject(QuickInputService)
-    protected readonly quickInputService: QuickInputService;
-
-    @inject(LabelProvider)
-    protected readonly labelProvider: LabelProvider;
-
-    async pickEditorLanguage(current: string): Promise<QuickPickValue<'autoDetect' | Language> | undefined> {
-        const items: Array<QuickPickValue<'autoDetect' | Language> | QuickPickItemOrSeparator> = [
-            { label: nls.localizeByDefault('Auto Detect'), value: 'autoDetect' },
-            { type: 'separator', label: nls.localizeByDefault('languages (identifier)') },
-            ... (this.languages.languages.map(language => this.toQuickPickLanguage(language, current))).sort((e, e2) => e.label.localeCompare(e2.label))
-        ];
-        const selectedMode = await this.quickInputService?.showQuickPick(items, { placeholder: nls.localizeByDefault('Select Language Mode') });
-        return (selectedMode && 'value' in selectedMode) ? selectedMode : undefined;
-    }
-
-    protected toQuickPickLanguage(value: Language, current: string): QuickPickValue<Language> {
-        const languageUri = this.toLanguageUri(value);
-        const icon = this.labelProvider.getIcon(languageUri);
-        const iconClasses = icon !== '' ? [icon + ' file-icon'] : undefined;
-        const configured = current === value.id;
-        return {
-            value,
-            label: value.name,
-            description: nls.localizeByDefault(`({0})${configured ? ' - Configured Language' : ''}`, value.id),
-            iconClasses
-        };
-    }
-
-    protected toLanguageUri(language: Language): URI {
-        const extension = language.extensions.values().next();
-        if (extension.value) {
-            return new URI('file:///' + extension.value);
-        }
-        const filename = language.filenames.values().next();
-        if (filename.value) {
-            return new URI('file:///' + filename.value);
-        }
-        return new URI('file:///.txt');
-    }
-
-}
+// *****************************************************************************
+// 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 } from '@theia/core/shared/inversify';
+import { Language, LanguageService } from '@theia/core/lib/browser/language-service';
+import { nls, QuickInputService, QuickPickItemOrSeparator, QuickPickValue, URI } from '@theia/core';
+import { LabelProvider } from '@theia/core/lib/browser';
+
+@injectable()
+export class EditorLanguageQuickPickService {
+    @inject(LanguageService)
+    protected readonly languages: LanguageService;
+
+    @inject(QuickInputService)
+    protected readonly quickInputService: QuickInputService;
+
+    @inject(LabelProvider)
+    protected readonly labelProvider: LabelProvider;
+
+    async pickEditorLanguage(current: string): Promise<QuickPickValue<'autoDetect' | Language> | undefined> {
+        const items: Array<QuickPickValue<'autoDetect' | Language> | QuickPickItemOrSeparator> = [
+            { label: nls.localizeByDefault('Auto Detect'), value: 'autoDetect' },
+            { type: 'separator', label: nls.localizeByDefault('languages (identifier)') },
+            ... (this.languages.languages.map(language => this.toQuickPickLanguage(language, current))).sort((e, e2) => e.label.localeCompare(e2.label))
+        ];
+        const selectedMode = await this.quickInputService?.showQuickPick(items, { placeholder: nls.localizeByDefault('Select Language Mode') });
+        return (selectedMode && 'value' in selectedMode) ? selectedMode : undefined;
+    }
+
+    protected toQuickPickLanguage(value: Language, current: string): QuickPickValue<Language> {
+        const languageUri = this.toLanguageUri(value);
+        const icon = this.labelProvider.getIcon(languageUri);
+        const iconClasses = icon !== '' ? [icon + ' file-icon'] : undefined;
+        const configured = current === value.id;
+        return {
+            value,
+            label: value.name,
+            description: nls.localizeByDefault(`({0})${configured ? ' - Configured Language' : ''}`, value.id),
+            iconClasses
+        };
+    }
+
+    protected toLanguageUri(language: Language): URI {
+        const extension = language.extensions.values().next();
+        if (extension.value) {
+            return new URI('file:///' + extension.value);
+        }
+        const filename = language.filenames.values().next();
+        if (filename.value) {
+            return new URI('file:///' + filename.value);
+        }
+        return new URI('file:///.txt');
+    }
+
+}

package/src/browser/editor-linenumber-contribution.ts

@@ -1,88 +1,88 @@
-// *****************************************************************************
-// Copyright (C) 2023 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 { EditorManager } from './editor-manager';
-import { EditorMouseEvent, MouseTargetType, Position, TextEditor } from './editor';
-import { injectable, inject } from '@theia/core/shared/inversify';
-import { FrontendApplicationContribution, ContextMenuRenderer } from '@theia/core/lib/browser';
-import { ContextKeyService } from '@theia/core/lib/browser/context-key-service';
-import { Disposable, DisposableCollection, MenuPath } from '@theia/core';
-import { EditorWidget } from './editor-widget';
-
-export const EDITOR_LINENUMBER_CONTEXT_MENU: MenuPath = ['editor_linenumber_context_menu'];
-
-@injectable()
-export class EditorLineNumberContribution implements FrontendApplicationContribution {
-
-    @inject(ContextKeyService)
-    protected readonly contextKeyService: ContextKeyService;
-
-    @inject(ContextMenuRenderer)
-    protected readonly contextMenuRenderer: ContextMenuRenderer;
-
-    @inject(EditorManager)
-    protected readonly editorManager: EditorManager;
-
-    onStart(): void {
-        this.editorManager.onCreated(editor => this.addLineNumberContextMenu(editor));
-    }
-
-    protected addLineNumberContextMenu(editorWidget: EditorWidget): void {
-        const editor = editorWidget.editor;
-        if (editor) {
-            const disposables = new DisposableCollection();
-            disposables.push(editor.onMouseDown(event => this.handleContextMenu(editor, event)));
-            const dispose = () => disposables.dispose();
-            editorWidget.disposed.connect(dispose);
-            disposables.push(Disposable.create(() => editorWidget.disposed.disconnect(dispose)));
-        }
-    }
-
-    protected handleContextMenu(editor: TextEditor, event: EditorMouseEvent): void {
-        if (event.target && (event.target.type === MouseTargetType.GUTTER_LINE_NUMBERS || event.target.type === MouseTargetType.GUTTER_GLYPH_MARGIN)) {
-            if (event.event.button === 2) {
-                editor.focus();
-                const lineNumber = lineNumberFromPosition(event.target.position);
-                const contextKeyService = this.contextKeyService.createOverlay([['editorLineNumber', lineNumber]]);
-                const uri = editor.getResourceUri()!;
-                const args = [{
-                    lineNumber: lineNumber,
-                    column: 1, // Compatible with Monaco editor IPosition API
-                    uri: uri['codeUri'],
-                }];
-
-                setTimeout(() => {
-                    this.contextMenuRenderer.render({
-                        menuPath: EDITOR_LINENUMBER_CONTEXT_MENU,
-                        anchor: event.event,
-                        args,
-                        contextKeyService
-                    });
-                });
-            }
-        }
-    }
-
-}
-
-function lineNumberFromPosition(position: Position | undefined): number | undefined {
-    // position.line is 0-based line position, where the expected editor line number is 1-based.
-    if (position) {
-        return position.line + 1;
-    }
-    return undefined;
-}
-
+// *****************************************************************************
+// Copyright (C) 2023 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 { EditorManager } from './editor-manager';
+import { EditorMouseEvent, MouseTargetType, Position, TextEditor } from './editor';
+import { injectable, inject } from '@theia/core/shared/inversify';
+import { FrontendApplicationContribution, ContextMenuRenderer } from '@theia/core/lib/browser';
+import { ContextKeyService } from '@theia/core/lib/browser/context-key-service';
+import { Disposable, DisposableCollection, MenuPath } from '@theia/core';
+import { EditorWidget } from './editor-widget';
+
+export const EDITOR_LINENUMBER_CONTEXT_MENU: MenuPath = ['editor_linenumber_context_menu'];
+
+@injectable()
+export class EditorLineNumberContribution implements FrontendApplicationContribution {
+
+    @inject(ContextKeyService)
+    protected readonly contextKeyService: ContextKeyService;
+
+    @inject(ContextMenuRenderer)
+    protected readonly contextMenuRenderer: ContextMenuRenderer;
+
+    @inject(EditorManager)
+    protected readonly editorManager: EditorManager;
+
+    onStart(): void {
+        this.editorManager.onCreated(editor => this.addLineNumberContextMenu(editor));
+    }
+
+    protected addLineNumberContextMenu(editorWidget: EditorWidget): void {
+        const editor = editorWidget.editor;
+        if (editor) {
+            const disposables = new DisposableCollection();
+            disposables.push(editor.onMouseDown(event => this.handleContextMenu(editor, event)));
+            const dispose = () => disposables.dispose();
+            editorWidget.disposed.connect(dispose);
+            disposables.push(Disposable.create(() => editorWidget.disposed.disconnect(dispose)));
+        }
+    }
+
+    protected handleContextMenu(editor: TextEditor, event: EditorMouseEvent): void {
+        if (event.target && (event.target.type === MouseTargetType.GUTTER_LINE_NUMBERS || event.target.type === MouseTargetType.GUTTER_GLYPH_MARGIN)) {
+            if (event.event.button === 2) {
+                editor.focus();
+                const lineNumber = lineNumberFromPosition(event.target.position);
+                const contextKeyService = this.contextKeyService.createOverlay([['editorLineNumber', lineNumber]]);
+                const uri = editor.getResourceUri()!;
+                const args = [{
+                    lineNumber: lineNumber,
+                    column: 1, // Compatible with Monaco editor IPosition API
+                    uri: uri['codeUri'],
+                }];
+
+                setTimeout(() => {
+                    this.contextMenuRenderer.render({
+                        menuPath: EDITOR_LINENUMBER_CONTEXT_MENU,
+                        anchor: event.event,
+                        args,
+                        contextKeyService
+                    });
+                });
+            }
+        }
+    }
+
+}
+
+function lineNumberFromPosition(position: Position | undefined): number | undefined {
+    // position.line is 0-based line position, where the expected editor line number is 1-based.
+    if (position) {
+        return position.line + 1;
+    }
+    return undefined;
+}
+