@theia/monaco 1.34.1 → 1.34.3

package/src/browser/monaco-gotoline-quick-access.ts

@@ -1,47 +1,47 @@
-// *****************************************************************************
-// Copyright (C) 2021 SAP SE or an SAP affiliate company 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 WITH Classpath-exception-2.0
-// *****************************************************************************
-
-import { QuickAccessContribution } from '@theia/core/lib/browser/quick-input';
-import { injectable } from '@theia/core/shared/inversify';
-import { ICodeEditor } from '@theia/monaco-editor-core/esm/vs/editor/browser/editorBrowser';
-import { ICodeEditorService } from '@theia/monaco-editor-core/esm/vs/editor/browser/services/codeEditorService';
-import { StandaloneGotoLineQuickAccessProvider } from '@theia/monaco-editor-core/esm/vs/editor/standalone/browser/quickAccess/standaloneGotoLineQuickAccess';
-import { IQuickAccessRegistry, Extensions } from '@theia/monaco-editor-core/esm/vs/platform/quickinput/common/quickAccess';
-import { Registry } from '@theia/monaco-editor-core/esm/vs/platform/registry/common/platform';
-
-export class GotoLineQuickAccess extends StandaloneGotoLineQuickAccessProvider {
-    // eslint-disable-next-line @typescript-eslint/no-explicit-any
-    constructor(...services: any[]);
-    constructor(@ICodeEditorService private readonly service: ICodeEditorService) {
-        super(service);
-    }
-
-    override get activeTextEditorControl(): ICodeEditor | undefined {
-        return (this.service.getFocusedCodeEditor() || this.service.getActiveCodeEditor()) ?? undefined;
-    }
-}
-
-@injectable()
-export class GotoLineQuickAccessContribution implements QuickAccessContribution {
-    registerQuickAccessProvider(): void {
-        Registry.as<IQuickAccessRegistry>(Extensions.Quickaccess).registerQuickAccessProvider({
-            ctor: GotoLineQuickAccess,
-            prefix: ':',
-            placeholder: '',
-            helpEntries: [{ description: 'Go to line' }]
-        });
-    }
-}
+// *****************************************************************************
+// Copyright (C) 2021 SAP SE or an SAP affiliate company 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 WITH Classpath-exception-2.0
+// *****************************************************************************
+
+import { QuickAccessContribution } from '@theia/core/lib/browser/quick-input';
+import { injectable } from '@theia/core/shared/inversify';
+import { ICodeEditor } from '@theia/monaco-editor-core/esm/vs/editor/browser/editorBrowser';
+import { ICodeEditorService } from '@theia/monaco-editor-core/esm/vs/editor/browser/services/codeEditorService';
+import { StandaloneGotoLineQuickAccessProvider } from '@theia/monaco-editor-core/esm/vs/editor/standalone/browser/quickAccess/standaloneGotoLineQuickAccess';
+import { IQuickAccessRegistry, Extensions } from '@theia/monaco-editor-core/esm/vs/platform/quickinput/common/quickAccess';
+import { Registry } from '@theia/monaco-editor-core/esm/vs/platform/registry/common/platform';
+
+export class GotoLineQuickAccess extends StandaloneGotoLineQuickAccessProvider {
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
+    constructor(...services: any[]);
+    constructor(@ICodeEditorService private readonly service: ICodeEditorService) {
+        super(service);
+    }
+
+    override get activeTextEditorControl(): ICodeEditor | undefined {
+        return (this.service.getFocusedCodeEditor() || this.service.getActiveCodeEditor()) ?? undefined;
+    }
+}
+
+@injectable()
+export class GotoLineQuickAccessContribution implements QuickAccessContribution {
+    registerQuickAccessProvider(): void {
+        Registry.as<IQuickAccessRegistry>(Extensions.Quickaccess).registerQuickAccessProvider({
+            ctor: GotoLineQuickAccess,
+            prefix: ':',
+            placeholder: '',
+            helpEntries: [{ description: 'Go to line' }]
+        });
+    }
+}

package/src/browser/monaco-gotosymbol-quick-access.ts

@@ -1,53 +1,53 @@
-// *****************************************************************************
-// Copyright (C) 2021 SAP SE or an SAP affiliate company 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 WITH Classpath-exception-2.0
-// *****************************************************************************
-
-import { QuickAccessContribution } from '@theia/core/lib/browser/quick-input';
-import { injectable } from '@theia/core/shared/inversify';
-import { ICodeEditor } from '@theia/monaco-editor-core/esm/vs/editor/browser/editorBrowser';
-import { ICodeEditorService } from '@theia/monaco-editor-core/esm/vs/editor/browser/services/codeEditorService';
-import { ILanguageFeaturesService } from '@theia/monaco-editor-core/esm/vs/editor/common/services/languageFeatures';
-import { IOutlineModelService } from '@theia/monaco-editor-core/esm/vs/editor/contrib/documentSymbols/browser/outlineModel';
-import { StandaloneGotoSymbolQuickAccessProvider } from '@theia/monaco-editor-core/esm/vs/editor/standalone/browser/quickAccess/standaloneGotoSymbolQuickAccess';
-import { IQuickAccessRegistry, Extensions } from '@theia/monaco-editor-core/esm/vs/platform/quickinput/common/quickAccess';
-import { Registry } from '@theia/monaco-editor-core/esm/vs/platform/registry/common/platform';
-
-export class GotoSymbolQuickAccess extends StandaloneGotoSymbolQuickAccessProvider {
-    // eslint-disable-next-line @typescript-eslint/no-explicit-any
-    constructor(...services: any[]);
-    constructor(
-        @ICodeEditorService protected readonly codeEditorService: ICodeEditorService,
-        @ILanguageFeaturesService protected readonly languageFeatures: ILanguageFeaturesService,
-        @IOutlineModelService protected readonly outlineService: IOutlineModelService,
-    ) {
-        super(codeEditorService, languageFeatures, outlineService);
-    }
-
-    override get activeTextEditorControl(): ICodeEditor | undefined {
-        return (this.codeEditorService.getFocusedCodeEditor() ?? this.codeEditorService.getActiveCodeEditor()) ?? undefined;
-    }
-}
-
-@injectable()
-export class GotoSymbolQuickAccessContribution implements QuickAccessContribution {
-    registerQuickAccessProvider(): void {
-        Registry.as<IQuickAccessRegistry>(Extensions.Quickaccess).registerQuickAccessProvider({
-            ctor: GotoSymbolQuickAccess,
-            prefix: '@',
-            placeholder: '',
-            helpEntries: [{ description: 'Go to symbol' }]
-        });
-    }
-}
+// *****************************************************************************
+// Copyright (C) 2021 SAP SE or an SAP affiliate company 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 WITH Classpath-exception-2.0
+// *****************************************************************************
+
+import { QuickAccessContribution } from '@theia/core/lib/browser/quick-input';
+import { injectable } from '@theia/core/shared/inversify';
+import { ICodeEditor } from '@theia/monaco-editor-core/esm/vs/editor/browser/editorBrowser';
+import { ICodeEditorService } from '@theia/monaco-editor-core/esm/vs/editor/browser/services/codeEditorService';
+import { ILanguageFeaturesService } from '@theia/monaco-editor-core/esm/vs/editor/common/services/languageFeatures';
+import { IOutlineModelService } from '@theia/monaco-editor-core/esm/vs/editor/contrib/documentSymbols/browser/outlineModel';
+import { StandaloneGotoSymbolQuickAccessProvider } from '@theia/monaco-editor-core/esm/vs/editor/standalone/browser/quickAccess/standaloneGotoSymbolQuickAccess';
+import { IQuickAccessRegistry, Extensions } from '@theia/monaco-editor-core/esm/vs/platform/quickinput/common/quickAccess';
+import { Registry } from '@theia/monaco-editor-core/esm/vs/platform/registry/common/platform';
+
+export class GotoSymbolQuickAccess extends StandaloneGotoSymbolQuickAccessProvider {
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
+    constructor(...services: any[]);
+    constructor(
+        @ICodeEditorService protected readonly codeEditorService: ICodeEditorService,
+        @ILanguageFeaturesService protected readonly languageFeatures: ILanguageFeaturesService,
+        @IOutlineModelService protected readonly outlineService: IOutlineModelService,
+    ) {
+        super(codeEditorService, languageFeatures, outlineService);
+    }
+
+    override get activeTextEditorControl(): ICodeEditor | undefined {
+        return (this.codeEditorService.getFocusedCodeEditor() ?? this.codeEditorService.getActiveCodeEditor()) ?? undefined;
+    }
+}
+
+@injectable()
+export class GotoSymbolQuickAccessContribution implements QuickAccessContribution {
+    registerQuickAccessProvider(): void {
+        Registry.as<IQuickAccessRegistry>(Extensions.Quickaccess).registerQuickAccessProvider({
+            ctor: GotoSymbolQuickAccess,
+            prefix: '@',
+            placeholder: '',
+            helpEntries: [{ description: 'Go to symbol' }]
+        });
+    }
+}

package/src/browser/monaco-indexed-db.ts

@@ -1,130 +1,130 @@
-// *****************************************************************************
-// Copyright (C) 2020 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 WITH Classpath-exception-2.0
-// *****************************************************************************
-
-import * as idb from 'idb';
-import { Disposable, DisposableCollection } from '@theia/core/lib/common/disposable';
-import { ThemeService } from '@theia/core/lib/browser/theming';
-import * as monaco from '@theia/monaco-editor-core';
-import { injectable } from '@theia/core/shared/inversify';
-import type { ThemeMix } from './textmate/monaco-theme-types';
-import { Theme } from '@theia/core/lib/common/theme';
-import { Emitter, Event, isObject } from '@theia/core';
-
-let _monacoDB: Promise<idb.IDBPDatabase> | undefined;
-if ('indexedDB' in window) {
-    _monacoDB = idb.openDB('theia-monaco', 1, {
-        upgrade: db => {
-            if (!db.objectStoreNames.contains('themes')) {
-                db.createObjectStore('themes', { keyPath: 'id' });
-            }
-        }
-    });
-}
-
-export const monacoDB = _monacoDB;
-
-export interface MonacoThemeState {
-    id: string,
-    label: string,
-    description?: string,
-    uiTheme: monaco.editor.BuiltinTheme
-    data: ThemeMix
-}
-export namespace MonacoThemeState {
-    export function is(state: unknown): state is MonacoThemeState {
-        return isObject(state) && 'id' in state && 'label' in state && 'uiTheme' in state && 'data' in state;
-    }
-}
-
-export async function getThemes(): Promise<MonacoThemeState[]> {
-    if (!monacoDB) {
-        return [];
-    }
-    const db = await monacoDB;
-    const result = await db.transaction('themes', 'readonly').objectStore('themes').getAll();
-    return result.filter(MonacoThemeState.is);
-}
-
-export function putTheme(state: MonacoThemeState): Disposable {
-    const toDispose = new DisposableCollection(Disposable.create(() => { /* mark as not disposed */ }));
-    doPutTheme(state, toDispose);
-    return toDispose;
-}
-async function doPutTheme(state: MonacoThemeState, toDispose: DisposableCollection): Promise<void> {
-    if (!monacoDB) {
-        return;
-    }
-    const db = await monacoDB;
-    if (toDispose.disposed) {
-        return;
-    }
-    const id = state.id;
-    await db.transaction('themes', 'readwrite').objectStore('themes').put(state);
-    if (toDispose.disposed) {
-        await deleteTheme(id);
-        return;
-    }
-    toDispose.push(Disposable.create(() => deleteTheme(id)));
-}
-
-export async function deleteTheme(id: string): Promise<void> {
-    if (!monacoDB) {
-        return;
-    }
-    const db = await monacoDB;
-    await db.transaction('themes', 'readwrite').objectStore('themes').delete(id);
-}
-
-export function stateToTheme(state: MonacoThemeState): Theme {
-    const { id, label, description, uiTheme, data } = state;
-    const type = uiTheme === 'vs' ? 'light' : uiTheme === 'vs-dark' ? 'dark' : 'hc';
-    return {
-        type,
-        id,
-        label,
-        description,
-        editorTheme: data.name!
-    };
-}
-
-@injectable()
-export class ThemeServiceWithDB extends ThemeService {
-    protected onDidRetrieveThemeEmitter = new Emitter<MonacoThemeState>();
-    get onDidRetrieveTheme(): Event<MonacoThemeState> {
-        return this.onDidRetrieveThemeEmitter.event;
-    }
-
-    override loadUserTheme(): void {
-        this.loadUserThemeWithDB();
-    }
-
-    protected async loadUserThemeWithDB(): Promise<void> {
-        const themeId = window.localStorage.getItem(ThemeService.STORAGE_KEY) ?? this.defaultTheme.id;
-        const theme = this.themes[themeId] ?? await getThemes().then(themes => {
-            const matchingTheme = themes.find(candidate => candidate.id === themeId);
-            if (matchingTheme) {
-                this.onDidRetrieveThemeEmitter.fire(matchingTheme);
-                return stateToTheme(matchingTheme);
-            }
-        }) ?? this.getTheme(themeId);
-        // In case the theme comes from the DB.
-        if (!this.themes[theme.id]) {
-            this.themes[theme.id] = theme;
-        }
-        this.setCurrentTheme(theme.id, false);
-        this.deferredInitializer.resolve();
-    }
-}
+// *****************************************************************************
+// Copyright (C) 2020 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 WITH Classpath-exception-2.0
+// *****************************************************************************
+
+import * as idb from 'idb';
+import { Disposable, DisposableCollection } from '@theia/core/lib/common/disposable';
+import { ThemeService } from '@theia/core/lib/browser/theming';
+import * as monaco from '@theia/monaco-editor-core';
+import { injectable } from '@theia/core/shared/inversify';
+import type { ThemeMix } from './textmate/monaco-theme-types';
+import { Theme } from '@theia/core/lib/common/theme';
+import { Emitter, Event, isObject } from '@theia/core';
+
+let _monacoDB: Promise<idb.IDBPDatabase> | undefined;
+if ('indexedDB' in window) {
+    _monacoDB = idb.openDB('theia-monaco', 1, {
+        upgrade: db => {
+            if (!db.objectStoreNames.contains('themes')) {
+                db.createObjectStore('themes', { keyPath: 'id' });
+            }
+        }
+    });
+}
+
+export const monacoDB = _monacoDB;
+
+export interface MonacoThemeState {
+    id: string,
+    label: string,
+    description?: string,
+    uiTheme: monaco.editor.BuiltinTheme
+    data: ThemeMix
+}
+export namespace MonacoThemeState {
+    export function is(state: unknown): state is MonacoThemeState {
+        return isObject(state) && 'id' in state && 'label' in state && 'uiTheme' in state && 'data' in state;
+    }
+}
+
+export async function getThemes(): Promise<MonacoThemeState[]> {
+    if (!monacoDB) {
+        return [];
+    }
+    const db = await monacoDB;
+    const result = await db.transaction('themes', 'readonly').objectStore('themes').getAll();
+    return result.filter(MonacoThemeState.is);
+}
+
+export function putTheme(state: MonacoThemeState): Disposable {
+    const toDispose = new DisposableCollection(Disposable.create(() => { /* mark as not disposed */ }));
+    doPutTheme(state, toDispose);
+    return toDispose;
+}
+async function doPutTheme(state: MonacoThemeState, toDispose: DisposableCollection): Promise<void> {
+    if (!monacoDB) {
+        return;
+    }
+    const db = await monacoDB;
+    if (toDispose.disposed) {
+        return;
+    }
+    const id = state.id;
+    await db.transaction('themes', 'readwrite').objectStore('themes').put(state);
+    if (toDispose.disposed) {
+        await deleteTheme(id);
+        return;
+    }
+    toDispose.push(Disposable.create(() => deleteTheme(id)));
+}
+
+export async function deleteTheme(id: string): Promise<void> {
+    if (!monacoDB) {
+        return;
+    }
+    const db = await monacoDB;
+    await db.transaction('themes', 'readwrite').objectStore('themes').delete(id);
+}
+
+export function stateToTheme(state: MonacoThemeState): Theme {
+    const { id, label, description, uiTheme, data } = state;
+    const type = uiTheme === 'vs' ? 'light' : uiTheme === 'vs-dark' ? 'dark' : 'hc';
+    return {
+        type,
+        id,
+        label,
+        description,
+        editorTheme: data.name!
+    };
+}
+
+@injectable()
+export class ThemeServiceWithDB extends ThemeService {
+    protected onDidRetrieveThemeEmitter = new Emitter<MonacoThemeState>();
+    get onDidRetrieveTheme(): Event<MonacoThemeState> {
+        return this.onDidRetrieveThemeEmitter.event;
+    }
+
+    override loadUserTheme(): void {
+        this.loadUserThemeWithDB();
+    }
+
+    protected async loadUserThemeWithDB(): Promise<void> {
+        const themeId = window.localStorage.getItem(ThemeService.STORAGE_KEY) ?? this.defaultTheme.id;
+        const theme = this.themes[themeId] ?? await getThemes().then(themes => {
+            const matchingTheme = themes.find(candidate => candidate.id === themeId);
+            if (matchingTheme) {
+                this.onDidRetrieveThemeEmitter.fire(matchingTheme);
+                return stateToTheme(matchingTheme);
+            }
+        }) ?? this.getTheme(themeId);
+        // In case the theme comes from the DB.
+        if (!this.themes[theme.id]) {
+            this.themes[theme.id] = theme;
+        }
+        this.setCurrentTheme(theme.id, false);
+        this.deferredInitializer.resolve();
+    }
+}

package/src/browser/monaco-keybinding-contexts.ts

@@ -1,43 +1,43 @@
-// *****************************************************************************
-// 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 WITH Classpath-exception-2.0
-// *****************************************************************************
-
-import { injectable } from '@theia/core/shared/inversify';
-import { EditorWidget } from '@theia/editor/lib/browser/editor-widget';
-import { StrictEditorTextFocusContext } from '@theia/editor/lib/browser/editor-keybinding-contexts';
-import { MonacoEditor } from './monaco-editor';
-
-/**
- * Besides checking whether this editor is the currently active one and has the focus, it also checks the followings:
- *  - the suggest widget is visible
- *  - the find (and replace) widget is visible.
- *  - the rename input widget (which we use for refactoring and not find and replace) is visible.
- *
- * If any of the above-mentioned additional checks evaluates to `true` the `canHandle` will evaluate to `false`.
- *
- * See: https://github.com/eamodio/vscode-gitlens/blob/57226d54d1e929be04b02ee31ca294c50305481b/package.json#L2857
- */
-@injectable()
-export class MonacoStrictEditorTextFocusContext extends StrictEditorTextFocusContext {
-
-    protected override canHandle(widget: EditorWidget): boolean {
-        const { editor } = widget;
-        if (editor instanceof MonacoEditor) {
-            return editor.isFocused({ strict: true });
-        }
-        return super.canHandle(widget);
-    }
-
-}
+// *****************************************************************************
+// 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 WITH Classpath-exception-2.0
+// *****************************************************************************
+
+import { injectable } from '@theia/core/shared/inversify';
+import { EditorWidget } from '@theia/editor/lib/browser/editor-widget';
+import { StrictEditorTextFocusContext } from '@theia/editor/lib/browser/editor-keybinding-contexts';
+import { MonacoEditor } from './monaco-editor';
+
+/**
+ * Besides checking whether this editor is the currently active one and has the focus, it also checks the followings:
+ *  - the suggest widget is visible
+ *  - the find (and replace) widget is visible.
+ *  - the rename input widget (which we use for refactoring and not find and replace) is visible.
+ *
+ * If any of the above-mentioned additional checks evaluates to `true` the `canHandle` will evaluate to `false`.
+ *
+ * See: https://github.com/eamodio/vscode-gitlens/blob/57226d54d1e929be04b02ee31ca294c50305481b/package.json#L2857
+ */
+@injectable()
+export class MonacoStrictEditorTextFocusContext extends StrictEditorTextFocusContext {
+
+    protected override canHandle(widget: EditorWidget): boolean {
+        const { editor } = widget;
+        if (editor instanceof MonacoEditor) {
+            return editor.isFocused({ strict: true });
+        }
+        return super.canHandle(widget);
+    }
+
+}