@theia/monaco 1.45.0 → 1.46.0-next.72

package/src/browser/monaco-languages.ts

@@ -1,177 +1,177 @@
-// *****************************************************************************
-// Copyright (C) 2017 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 { SymbolInformation, WorkspaceSymbolParams } from '@theia/core/shared/vscode-languageserver-protocol';
-import { injectable, inject, postConstruct } from '@theia/core/shared/inversify';
-import { ProblemManager } from '@theia/markers/lib/browser/problem/problem-manager';
-import URI from '@theia/core/lib/common/uri';
-import { MaybePromise, Mutable } from '@theia/core/lib/common/types';
-import { Disposable } from '@theia/core/lib/common/disposable';
-import { CancellationToken } from '@theia/core/lib/common/cancellation';
-import { Language, LanguageService } from '@theia/core/lib/browser/language-service';
-import { MonacoMarkerCollection } from './monaco-marker-collection';
-import { ProtocolToMonacoConverter } from './protocol-to-monaco-converter';
-import * as monaco from '@theia/monaco-editor-core';
-import { FileStat } from '@theia/filesystem/lib/common/files';
-import { FileStatNode } from '@theia/filesystem/lib/browser';
-import { ILanguageService } from '@theia/monaco-editor-core/esm/vs/editor/common/languages/language';
-import { StandaloneServices } from '@theia/monaco-editor-core/esm/vs/editor/standalone/browser/standaloneServices';
-
-export interface WorkspaceSymbolProvider {
-    provideWorkspaceSymbols(params: WorkspaceSymbolParams, token: CancellationToken): MaybePromise<SymbolInformation[] | undefined>;
-    resolveWorkspaceSymbol?(symbol: SymbolInformation, token: CancellationToken): Thenable<SymbolInformation | undefined>
-}
-
-@injectable()
-export class MonacoLanguages extends LanguageService {
-
-    readonly workspaceSymbolProviders: WorkspaceSymbolProvider[] = [];
-
-    protected readonly markers = new Map<string, MonacoMarkerCollection>();
-    protected readonly icons = new Map<string, string>();
-
-    @inject(ProblemManager) protected readonly problemManager: ProblemManager;
-    @inject(ProtocolToMonacoConverter) protected readonly p2m: ProtocolToMonacoConverter;
-
-    @postConstruct()
-    protected init(): void {
-        this.problemManager.onDidChangeMarkers(uri => this.updateMarkers(uri));
-        monaco.editor.onDidCreateModel(model => this.updateModelMarkers(model));
-    }
-
-    updateMarkers(uri: URI): void {
-        const markers = this.problemManager.findMarkers({ uri });
-        const uriString = uri.toString();
-        const collection = this.markers.get(uriString) || new MonacoMarkerCollection(uri, this.p2m);
-        this.markers.set(uriString, collection);
-        collection.updateMarkers(markers);
-    }
-
-    updateModelMarkers(model: monaco.editor.ITextModel): void {
-        const uriString = model.uri.toString();
-        const uri = new URI(uriString);
-        const collection = this.markers.get(uriString) || new MonacoMarkerCollection(uri, this.p2m);
-        this.markers.set(uriString, collection);
-        collection.updateModelMarkers(model);
-    }
-
-    registerWorkspaceSymbolProvider(provider: WorkspaceSymbolProvider): Disposable {
-        this.workspaceSymbolProviders.push(provider);
-        return Disposable.create(() => {
-            const index = this.workspaceSymbolProviders.indexOf(provider);
-            if (index !== -1) {
-                this.workspaceSymbolProviders.splice(index, 1);
-            }
-        });
-    }
-
-    override get languages(): Language[] {
-        return [...this.mergeLanguages(monaco.languages.getLanguages()).values()];
-    }
-
-    override getLanguage(languageId: string): Language | undefined {
-        return this.mergeLanguages(monaco.languages.getLanguages().filter(language => language.id === languageId)).get(languageId);
-    }
-
-    override detectLanguage(obj: unknown): Language | undefined {
-        if (obj === undefined) {
-            return undefined;
-        }
-        if (typeof obj === 'string') {
-            return this.detectLanguageByIdOrName(obj) ?? this.detectLanguageByURI(new URI(obj));
-        }
-        if (obj instanceof URI) {
-            return this.detectLanguageByURI(obj);
-        }
-        if (FileStat.is(obj)) {
-            return this.detectLanguageByURI(obj.resource);
-        }
-        if (FileStatNode.is(obj)) {
-            return this.detectLanguageByURI(obj.uri);
-        }
-        return undefined;
-    }
-
-    protected detectLanguageByIdOrName(obj: string): Language | undefined {
-        const languageById = this.getLanguage(obj);
-        if (languageById) {
-            return languageById;
-        }
-
-        const languageId = this.getLanguageIdByLanguageName(obj);
-        return languageId ? this.getLanguage(languageId) : undefined;
-    }
-
-    protected detectLanguageByURI(uri: URI): Language | undefined {
-        const languageId = StandaloneServices.get(ILanguageService).guessLanguageIdByFilepathOrFirstLine(uri['codeUri']);
-        return languageId ? this.getLanguage(languageId) : undefined;
-    }
-
-    getExtension(languageId: string): string | undefined {
-        return this.getLanguage(languageId)?.extensions.values().next().value;
-    }
-
-    override registerIcon(languageId: string, iconClass: string): Disposable {
-        this.icons.set(languageId, iconClass);
-        this.onDidChangeIconEmitter.fire({ languageId });
-        return Disposable.create(() => {
-            this.icons.delete(languageId);
-            this.onDidChangeIconEmitter.fire({ languageId });
-        });
-    }
-
-    override getIcon(obj: unknown): string | undefined {
-        const language = this.detectLanguage(obj);
-        return language ? this.icons.get(language.id) : undefined;
-    }
-
-    getLanguageIdByLanguageName(languageName: string): string | undefined {
-        return monaco.languages.getLanguages().find(language => language.aliases?.includes(languageName))?.id;
-    }
-
-    protected mergeLanguages(registered: monaco.languages.ILanguageExtensionPoint[]): Map<string, Mutable<Language>> {
-        const languages = new Map<string, Mutable<Language>>();
-        for (const { id, aliases, extensions, filenames } of registered) {
-            const merged = languages.get(id) || {
-                id,
-                name: '',
-                extensions: new Set(),
-                filenames: new Set()
-            };
-            if (!merged.name && aliases && aliases.length) {
-                merged.name = aliases[0];
-            }
-            if (extensions && extensions.length) {
-                for (const extension of extensions) {
-                    merged.extensions.add(extension);
-                }
-            }
-            if (filenames && filenames.length) {
-                for (const filename of filenames) {
-                    merged.filenames.add(filename);
-                }
-            }
-            languages.set(id, merged);
-        }
-        for (const [id, language] of languages) {
-            if (!language.name) {
-                language.name = id;
-            }
-        }
-        return languages;
-    }
-
-}
+// *****************************************************************************
+// Copyright (C) 2017 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 { SymbolInformation, WorkspaceSymbolParams } from '@theia/core/shared/vscode-languageserver-protocol';
+import { injectable, inject, postConstruct } from '@theia/core/shared/inversify';
+import { ProblemManager } from '@theia/markers/lib/browser/problem/problem-manager';
+import URI from '@theia/core/lib/common/uri';
+import { MaybePromise, Mutable } from '@theia/core/lib/common/types';
+import { Disposable } from '@theia/core/lib/common/disposable';
+import { CancellationToken } from '@theia/core/lib/common/cancellation';
+import { Language, LanguageService } from '@theia/core/lib/browser/language-service';
+import { MonacoMarkerCollection } from './monaco-marker-collection';
+import { ProtocolToMonacoConverter } from './protocol-to-monaco-converter';
+import * as monaco from '@theia/monaco-editor-core';
+import { FileStat } from '@theia/filesystem/lib/common/files';
+import { FileStatNode } from '@theia/filesystem/lib/browser';
+import { ILanguageService } from '@theia/monaco-editor-core/esm/vs/editor/common/languages/language';
+import { StandaloneServices } from '@theia/monaco-editor-core/esm/vs/editor/standalone/browser/standaloneServices';
+
+export interface WorkspaceSymbolProvider {
+    provideWorkspaceSymbols(params: WorkspaceSymbolParams, token: CancellationToken): MaybePromise<SymbolInformation[] | undefined>;
+    resolveWorkspaceSymbol?(symbol: SymbolInformation, token: CancellationToken): Thenable<SymbolInformation | undefined>
+}
+
+@injectable()
+export class MonacoLanguages extends LanguageService {
+
+    readonly workspaceSymbolProviders: WorkspaceSymbolProvider[] = [];
+
+    protected readonly markers = new Map<string, MonacoMarkerCollection>();
+    protected readonly icons = new Map<string, string>();
+
+    @inject(ProblemManager) protected readonly problemManager: ProblemManager;
+    @inject(ProtocolToMonacoConverter) protected readonly p2m: ProtocolToMonacoConverter;
+
+    @postConstruct()
+    protected init(): void {
+        this.problemManager.onDidChangeMarkers(uri => this.updateMarkers(uri));
+        monaco.editor.onDidCreateModel(model => this.updateModelMarkers(model));
+    }
+
+    updateMarkers(uri: URI): void {
+        const markers = this.problemManager.findMarkers({ uri });
+        const uriString = uri.toString();
+        const collection = this.markers.get(uriString) || new MonacoMarkerCollection(uri, this.p2m);
+        this.markers.set(uriString, collection);
+        collection.updateMarkers(markers);
+    }
+
+    updateModelMarkers(model: monaco.editor.ITextModel): void {
+        const uriString = model.uri.toString();
+        const uri = new URI(uriString);
+        const collection = this.markers.get(uriString) || new MonacoMarkerCollection(uri, this.p2m);
+        this.markers.set(uriString, collection);
+        collection.updateModelMarkers(model);
+    }
+
+    registerWorkspaceSymbolProvider(provider: WorkspaceSymbolProvider): Disposable {
+        this.workspaceSymbolProviders.push(provider);
+        return Disposable.create(() => {
+            const index = this.workspaceSymbolProviders.indexOf(provider);
+            if (index !== -1) {
+                this.workspaceSymbolProviders.splice(index, 1);
+            }
+        });
+    }
+
+    override get languages(): Language[] {
+        return [...this.mergeLanguages(monaco.languages.getLanguages()).values()];
+    }
+
+    override getLanguage(languageId: string): Language | undefined {
+        return this.mergeLanguages(monaco.languages.getLanguages().filter(language => language.id === languageId)).get(languageId);
+    }
+
+    override detectLanguage(obj: unknown): Language | undefined {
+        if (obj === undefined) {
+            return undefined;
+        }
+        if (typeof obj === 'string') {
+            return this.detectLanguageByIdOrName(obj) ?? this.detectLanguageByURI(new URI(obj));
+        }
+        if (obj instanceof URI) {
+            return this.detectLanguageByURI(obj);
+        }
+        if (FileStat.is(obj)) {
+            return this.detectLanguageByURI(obj.resource);
+        }
+        if (FileStatNode.is(obj)) {
+            return this.detectLanguageByURI(obj.uri);
+        }
+        return undefined;
+    }
+
+    protected detectLanguageByIdOrName(obj: string): Language | undefined {
+        const languageById = this.getLanguage(obj);
+        if (languageById) {
+            return languageById;
+        }
+
+        const languageId = this.getLanguageIdByLanguageName(obj);
+        return languageId ? this.getLanguage(languageId) : undefined;
+    }
+
+    protected detectLanguageByURI(uri: URI): Language | undefined {
+        const languageId = StandaloneServices.get(ILanguageService).guessLanguageIdByFilepathOrFirstLine(uri['codeUri']);
+        return languageId ? this.getLanguage(languageId) : undefined;
+    }
+
+    getExtension(languageId: string): string | undefined {
+        return this.getLanguage(languageId)?.extensions.values().next().value;
+    }
+
+    override registerIcon(languageId: string, iconClass: string): Disposable {
+        this.icons.set(languageId, iconClass);
+        this.onDidChangeIconEmitter.fire({ languageId });
+        return Disposable.create(() => {
+            this.icons.delete(languageId);
+            this.onDidChangeIconEmitter.fire({ languageId });
+        });
+    }
+
+    override getIcon(obj: unknown): string | undefined {
+        const language = this.detectLanguage(obj);
+        return language ? this.icons.get(language.id) : undefined;
+    }
+
+    getLanguageIdByLanguageName(languageName: string): string | undefined {
+        return monaco.languages.getLanguages().find(language => language.aliases?.includes(languageName))?.id;
+    }
+
+    protected mergeLanguages(registered: monaco.languages.ILanguageExtensionPoint[]): Map<string, Mutable<Language>> {
+        const languages = new Map<string, Mutable<Language>>();
+        for (const { id, aliases, extensions, filenames } of registered) {
+            const merged = languages.get(id) || {
+                id,
+                name: '',
+                extensions: new Set(),
+                filenames: new Set()
+            };
+            if (!merged.name && aliases && aliases.length) {
+                merged.name = aliases[0];
+            }
+            if (extensions && extensions.length) {
+                for (const extension of extensions) {
+                    merged.extensions.add(extension);
+                }
+            }
+            if (filenames && filenames.length) {
+                for (const filename of filenames) {
+                    merged.filenames.add(filename);
+                }
+            }
+            languages.set(id, merged);
+        }
+        for (const [id, language] of languages) {
+            if (!language.name) {
+                language.name = id;
+            }
+        }
+        return languages;
+    }
+
+}

package/src/browser/monaco-marker-collection.ts

@@ -1,83 +1,83 @@
-// *****************************************************************************
-// 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-only WITH Classpath-exception-2.0
-// *****************************************************************************
-
-import { Diagnostic } from '@theia/core/shared/vscode-languageserver-protocol';
-import { ProtocolToMonacoConverter } from './protocol-to-monaco-converter';
-import * as monaco from '@theia/monaco-editor-core';
-import { Marker } from '@theia/markers/lib/common/marker';
-import URI from '@theia/core/lib/common/uri';
-
-export class MonacoMarkerCollection {
-    protected readonly uri: monaco.Uri;
-    protected readonly p2m: ProtocolToMonacoConverter;
-    protected markers: Marker<Diagnostic>[] = [];
-    protected owners = new Map<string, Diagnostic[]>();
-    protected didUpdate: boolean = false;
-
-    constructor(
-        uri: URI,
-        p2m: ProtocolToMonacoConverter
-    ) {
-        this.uri = monaco.Uri.parse(uri.toString());
-        this.p2m = p2m;
-    }
-
-    updateMarkers(markers: Marker<Diagnostic>[]): void {
-        this.markers = markers;
-        const model = monaco.editor.getModel(this.uri);
-        this.doUpdateMarkers(model ? model : undefined);
-    }
-
-    updateModelMarkers(model: monaco.editor.ITextModel): void {
-        if (!this.didUpdate) {
-            this.doUpdateMarkers(model);
-            return;
-        }
-        for (const [owner, diagnostics] of this.owners) {
-            this.setModelMarkers(model, owner, diagnostics);
-        }
-    }
-
-    doUpdateMarkers(model: monaco.editor.ITextModel | undefined): void {
-        if (!model) {
-            this.didUpdate = false;
-            return;
-        }
-        this.didUpdate = true;
-        const toClean = new Set<string>(this.owners.keys());
-        this.owners.clear();
-        for (const marker of this.markers) {
-            const diagnostics = this.owners.get(marker.owner) || [];
-            diagnostics.push(marker.data);
-            this.owners.set(marker.owner, diagnostics);
-        }
-        for (const [owner, diagnostics] of this.owners) {
-            toClean.delete(owner);
-            this.setModelMarkers(model, owner, diagnostics);
-        }
-        for (const owner of toClean) {
-            this.clearModelMarkers(model, owner);
-        }
-    }
-
-    setModelMarkers(model: monaco.editor.ITextModel, owner: string, diagnostics: Diagnostic[]): void {
-        monaco.editor.setModelMarkers(model, owner, this.p2m.asDiagnostics(diagnostics));
-    }
-
-    clearModelMarkers(model: monaco.editor.ITextModel, owner: string): void {
-        monaco.editor.setModelMarkers(model, owner, []);
-    }
-}
+// *****************************************************************************
+// 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-only WITH Classpath-exception-2.0
+// *****************************************************************************
+
+import { Diagnostic } from '@theia/core/shared/vscode-languageserver-protocol';
+import { ProtocolToMonacoConverter } from './protocol-to-monaco-converter';
+import * as monaco from '@theia/monaco-editor-core';
+import { Marker } from '@theia/markers/lib/common/marker';
+import URI from '@theia/core/lib/common/uri';
+
+export class MonacoMarkerCollection {
+    protected readonly uri: monaco.Uri;
+    protected readonly p2m: ProtocolToMonacoConverter;
+    protected markers: Marker<Diagnostic>[] = [];
+    protected owners = new Map<string, Diagnostic[]>();
+    protected didUpdate: boolean = false;
+
+    constructor(
+        uri: URI,
+        p2m: ProtocolToMonacoConverter
+    ) {
+        this.uri = monaco.Uri.parse(uri.toString());
+        this.p2m = p2m;
+    }
+
+    updateMarkers(markers: Marker<Diagnostic>[]): void {
+        this.markers = markers;
+        const model = monaco.editor.getModel(this.uri);
+        this.doUpdateMarkers(model ? model : undefined);
+    }
+
+    updateModelMarkers(model: monaco.editor.ITextModel): void {
+        if (!this.didUpdate) {
+            this.doUpdateMarkers(model);
+            return;
+        }
+        for (const [owner, diagnostics] of this.owners) {
+            this.setModelMarkers(model, owner, diagnostics);
+        }
+    }
+
+    doUpdateMarkers(model: monaco.editor.ITextModel | undefined): void {
+        if (!model) {
+            this.didUpdate = false;
+            return;
+        }
+        this.didUpdate = true;
+        const toClean = new Set<string>(this.owners.keys());
+        this.owners.clear();
+        for (const marker of this.markers) {
+            const diagnostics = this.owners.get(marker.owner) || [];
+            diagnostics.push(marker.data);
+            this.owners.set(marker.owner, diagnostics);
+        }
+        for (const [owner, diagnostics] of this.owners) {
+            toClean.delete(owner);
+            this.setModelMarkers(model, owner, diagnostics);
+        }
+        for (const owner of toClean) {
+            this.clearModelMarkers(model, owner);
+        }
+    }
+
+    setModelMarkers(model: monaco.editor.ITextModel, owner: string, diagnostics: Diagnostic[]): void {
+        monaco.editor.setModelMarkers(model, owner, this.p2m.asDiagnostics(diagnostics));
+    }
+
+    clearModelMarkers(model: monaco.editor.ITextModel, owner: string): void {
+        monaco.editor.setModelMarkers(model, owner, []);
+    }
+}