@theia/monaco 1.34.2 → 1.34.3

package/src/browser/textmate/textmate-registry.ts

@@ -1,129 +1,129 @@
-// *****************************************************************************
-// Copyright (C) 2018 Ericsson 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 { IGrammarConfiguration } from 'vscode-textmate';
-import { TokenizerOption } from './textmate-tokenizer';
-import { Disposable } from '@theia/core/lib/common/disposable';
-
-export interface TextmateGrammarConfiguration extends IGrammarConfiguration {
-
-    /**
-     * Optional options to further refine the tokenization of the grammar.
-     */
-    readonly tokenizerOption?: TokenizerOption;
-
-}
-
-export interface GrammarDefinitionProvider {
-    getGrammarDefinition(): Promise<GrammarDefinition>;
-    getInjections?(scopeName: string): string[];
-}
-
-export interface GrammarDefinition {
-    format: 'json' | 'plist';
-    content: object | string;
-    location?: string;
-}
-
-@injectable()
-export class TextmateRegistry {
-
-    protected readonly scopeToProvider = new Map<string, GrammarDefinitionProvider[]>();
-    protected readonly languageToConfig = new Map<string, TextmateGrammarConfiguration[]>();
-    protected readonly languageIdToScope = new Map<string, string[]>();
-
-    get languages(): IterableIterator<string> {
-        return this.languageIdToScope.keys();
-    }
-
-    registerTextmateGrammarScope(scope: string, provider: GrammarDefinitionProvider): Disposable {
-        const providers = this.scopeToProvider.get(scope) || [];
-        const existingProvider = providers[0];
-        if (existingProvider) {
-            Promise.all([existingProvider.getGrammarDefinition(), provider.getGrammarDefinition()]).then(([a, b]) => {
-                if (a.location !== b.location || !a.location && !b.location) {
-                    console.warn(`a registered grammar provider for '${scope}' scope is overridden`);
-                }
-            });
-        }
-        providers.unshift(provider);
-        this.scopeToProvider.set(scope, providers);
-        return Disposable.create(() => {
-            const index = providers.indexOf(provider);
-            if (index !== -1) {
-                providers.splice(index, 1);
-            }
-        });
-    }
-
-    getProvider(scope: string): GrammarDefinitionProvider | undefined {
-        const providers = this.scopeToProvider.get(scope);
-        return providers && providers[0];
-    }
-
-    mapLanguageIdToTextmateGrammar(languageId: string, scope: string): Disposable {
-        const scopes = this.languageIdToScope.get(languageId) || [];
-        const existingScope = scopes[0];
-        if (typeof existingScope === 'string') {
-            console.warn(`'${languageId}' language is remapped from '${existingScope}' to '${scope}' scope`);
-        }
-        scopes.unshift(scope);
-        this.languageIdToScope.set(languageId, scopes);
-        return Disposable.create(() => {
-            const index = scopes.indexOf(scope);
-            if (index !== -1) {
-                scopes.splice(index, 1);
-            }
-        });
-    }
-
-    getScope(languageId: string): string | undefined {
-        const scopes = this.languageIdToScope.get(languageId);
-        return scopes && scopes[0];
-    }
-
-    getLanguageId(scope: string): string | undefined {
-        for (const languageId of this.languageIdToScope.keys()) {
-            if (this.getScope(languageId) === scope) {
-                return languageId;
-            }
-        }
-        return undefined;
-    }
-
-    registerGrammarConfiguration(languageId: string, config: TextmateGrammarConfiguration): Disposable {
-        const configs = this.languageToConfig.get(languageId) || [];
-        const existingConfig = configs[0];
-        if (existingConfig) {
-            console.warn(`a registered grammar configuration for '${languageId}' language is overridden`);
-        }
-        configs.unshift(config);
-        this.languageToConfig.set(languageId, configs);
-        return Disposable.create(() => {
-            const index = configs.indexOf(config);
-            if (index !== -1) {
-                configs.splice(index, 1);
-            }
-        });
-    }
-
-    getGrammarConfiguration(languageId: string): TextmateGrammarConfiguration {
-        const configs = this.languageToConfig.get(languageId);
-        return configs && configs[0] || {};
-    }
-
-}
+// *****************************************************************************
+// Copyright (C) 2018 Ericsson 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 { IGrammarConfiguration } from 'vscode-textmate';
+import { TokenizerOption } from './textmate-tokenizer';
+import { Disposable } from '@theia/core/lib/common/disposable';
+
+export interface TextmateGrammarConfiguration extends IGrammarConfiguration {
+
+    /**
+     * Optional options to further refine the tokenization of the grammar.
+     */
+    readonly tokenizerOption?: TokenizerOption;
+
+}
+
+export interface GrammarDefinitionProvider {
+    getGrammarDefinition(): Promise<GrammarDefinition>;
+    getInjections?(scopeName: string): string[];
+}
+
+export interface GrammarDefinition {
+    format: 'json' | 'plist';
+    content: object | string;
+    location?: string;
+}
+
+@injectable()
+export class TextmateRegistry {
+
+    protected readonly scopeToProvider = new Map<string, GrammarDefinitionProvider[]>();
+    protected readonly languageToConfig = new Map<string, TextmateGrammarConfiguration[]>();
+    protected readonly languageIdToScope = new Map<string, string[]>();
+
+    get languages(): IterableIterator<string> {
+        return this.languageIdToScope.keys();
+    }
+
+    registerTextmateGrammarScope(scope: string, provider: GrammarDefinitionProvider): Disposable {
+        const providers = this.scopeToProvider.get(scope) || [];
+        const existingProvider = providers[0];
+        if (existingProvider) {
+            Promise.all([existingProvider.getGrammarDefinition(), provider.getGrammarDefinition()]).then(([a, b]) => {
+                if (a.location !== b.location || !a.location && !b.location) {
+                    console.warn(`a registered grammar provider for '${scope}' scope is overridden`);
+                }
+            });
+        }
+        providers.unshift(provider);
+        this.scopeToProvider.set(scope, providers);
+        return Disposable.create(() => {
+            const index = providers.indexOf(provider);
+            if (index !== -1) {
+                providers.splice(index, 1);
+            }
+        });
+    }
+
+    getProvider(scope: string): GrammarDefinitionProvider | undefined {
+        const providers = this.scopeToProvider.get(scope);
+        return providers && providers[0];
+    }
+
+    mapLanguageIdToTextmateGrammar(languageId: string, scope: string): Disposable {
+        const scopes = this.languageIdToScope.get(languageId) || [];
+        const existingScope = scopes[0];
+        if (typeof existingScope === 'string') {
+            console.warn(`'${languageId}' language is remapped from '${existingScope}' to '${scope}' scope`);
+        }
+        scopes.unshift(scope);
+        this.languageIdToScope.set(languageId, scopes);
+        return Disposable.create(() => {
+            const index = scopes.indexOf(scope);
+            if (index !== -1) {
+                scopes.splice(index, 1);
+            }
+        });
+    }
+
+    getScope(languageId: string): string | undefined {
+        const scopes = this.languageIdToScope.get(languageId);
+        return scopes && scopes[0];
+    }
+
+    getLanguageId(scope: string): string | undefined {
+        for (const languageId of this.languageIdToScope.keys()) {
+            if (this.getScope(languageId) === scope) {
+                return languageId;
+            }
+        }
+        return undefined;
+    }
+
+    registerGrammarConfiguration(languageId: string, config: TextmateGrammarConfiguration): Disposable {
+        const configs = this.languageToConfig.get(languageId) || [];
+        const existingConfig = configs[0];
+        if (existingConfig) {
+            console.warn(`a registered grammar configuration for '${languageId}' language is overridden`);
+        }
+        configs.unshift(config);
+        this.languageToConfig.set(languageId, configs);
+        return Disposable.create(() => {
+            const index = configs.indexOf(config);
+            if (index !== -1) {
+                configs.splice(index, 1);
+            }
+        });
+    }
+
+    getGrammarConfiguration(languageId: string): TextmateGrammarConfiguration {
+        const configs = this.languageToConfig.get(languageId);
+        return configs && configs[0] || {};
+    }
+
+}

package/src/browser/textmate/textmate-snippet-completion-provider.ts

@@ -1,73 +1,73 @@
-// *****************************************************************************
-// 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 * as monaco from '@theia/monaco-editor-core';
-import { SnippetParser } from '@theia/monaco-editor-core/esm/vs/editor/contrib/snippet/browser/snippetParser';
-
-/**
- * @deprecated use MonacoSnippetSuggestProvider instead
- */
-export class TextmateSnippetCompletionProvider implements monaco.languages.CompletionItemProvider {
-
-    private items: monaco.languages.CompletionItem[];
-
-    constructor(protected config: TextmateSnippets, protected mdLanguage: string = '') {
-        this.items = [];
-        for (const name of Object.keys(config)) {
-            const textmateSnippet = config[name];
-            const insertText = Array.isArray(textmateSnippet.body) ? textmateSnippet.body.join('\n') : textmateSnippet.body;
-            this.items.push({
-                label: textmateSnippet.prefix,
-                detail: textmateSnippet.description,
-                kind: monaco.languages.CompletionItemKind.Snippet,
-                documentation: {
-                    value: '```' + this.mdLanguage + '\n' + this.replaceVariables(insertText) + '```'
-                },
-                insertText: insertText,
-                range: undefined!
-            });
-        }
-    }
-
-    protected replaceVariables(textmateSnippet: string): string {
-        return new SnippetParser().parse(textmateSnippet).toString();
-    }
-
-    provideCompletionItems(document: monaco.editor.ITextModel,
-        position: monaco.Position,
-        context: monaco.languages.CompletionContext,
-        token: monaco.CancellationToken): monaco.languages.CompletionList {
-        return {
-            suggestions: this.items
-        };
-    }
-}
-
-/**
- * @deprecated use JsonSerializedSnippets & MonacoSnippetSuggestProvider instead
- */
-export interface TextmateSnippets {
-    [name: string]: TextmateSnippet;
-}
-
-/**
- * @deprecated use JsonSerializedSnippet & MonacoSnippetSuggestProvider instead
- */
-export interface TextmateSnippet {
-    readonly prefix: string,
-    readonly body: string[],
-    readonly description: string
-}
+// *****************************************************************************
+// 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 * as monaco from '@theia/monaco-editor-core';
+import { SnippetParser } from '@theia/monaco-editor-core/esm/vs/editor/contrib/snippet/browser/snippetParser';
+
+/**
+ * @deprecated use MonacoSnippetSuggestProvider instead
+ */
+export class TextmateSnippetCompletionProvider implements monaco.languages.CompletionItemProvider {
+
+    private items: monaco.languages.CompletionItem[];
+
+    constructor(protected config: TextmateSnippets, protected mdLanguage: string = '') {
+        this.items = [];
+        for (const name of Object.keys(config)) {
+            const textmateSnippet = config[name];
+            const insertText = Array.isArray(textmateSnippet.body) ? textmateSnippet.body.join('\n') : textmateSnippet.body;
+            this.items.push({
+                label: textmateSnippet.prefix,
+                detail: textmateSnippet.description,
+                kind: monaco.languages.CompletionItemKind.Snippet,
+                documentation: {
+                    value: '```' + this.mdLanguage + '\n' + this.replaceVariables(insertText) + '```'
+                },
+                insertText: insertText,
+                range: undefined!
+            });
+        }
+    }
+
+    protected replaceVariables(textmateSnippet: string): string {
+        return new SnippetParser().parse(textmateSnippet).toString();
+    }
+
+    provideCompletionItems(document: monaco.editor.ITextModel,
+        position: monaco.Position,
+        context: monaco.languages.CompletionContext,
+        token: monaco.CancellationToken): monaco.languages.CompletionList {
+        return {
+            suggestions: this.items
+        };
+    }
+}
+
+/**
+ * @deprecated use JsonSerializedSnippets & MonacoSnippetSuggestProvider instead
+ */
+export interface TextmateSnippets {
+    [name: string]: TextmateSnippet;
+}
+
+/**
+ * @deprecated use JsonSerializedSnippet & MonacoSnippetSuggestProvider instead
+ */
+export interface TextmateSnippet {
+    readonly prefix: string,
+    readonly body: string[],
+    readonly description: string
+}

package/src/browser/textmate/textmate-tokenizer.ts

@@ -1,84 +1,84 @@
-// *****************************************************************************
-// Copyright (C) 2018 Ericsson 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 { INITIAL, StateStack, IGrammar } from 'vscode-textmate';
-import * as monaco from '@theia/monaco-editor-core';
-
-export class TokenizerState implements monaco.languages.IState {
-
-    constructor(
-        public readonly ruleStack: StateStack
-    ) { }
-
-    clone(): monaco.languages.IState {
-        return new TokenizerState(this.ruleStack);
-    }
-
-    equals(other: monaco.languages.IState): boolean {
-        return other instanceof TokenizerState && (other === this || other.ruleStack === this.ruleStack);
-    }
-
-}
-
-/**
- * Options for the TextMate tokenizer.
- */
-export interface TokenizerOption {
-
-    /**
-     * Maximum line length that will be handled by the TextMate tokenizer. If the length of the actual line exceeds this
-     * limit, the tokenizer terminates and the tokenization of any subsequent lines might be broken.
-     *
-     * If the `lineLimit` is not defined, it means, there are no line length limits. Otherwise, it must be a positive
-     * integer or an error will be thrown.
-     */
-    lineLimit?: number;
-
-}
-
-export function createTextmateTokenizer(grammar: IGrammar, options: TokenizerOption): monaco.languages.EncodedTokensProvider & monaco.languages.TokensProvider {
-    if (options.lineLimit !== undefined && (options.lineLimit <= 0 || !Number.isInteger(options.lineLimit))) {
-        throw new Error(`The 'lineLimit' must be a positive integer. It was ${options.lineLimit}.`);
-    }
-    return {
-        getInitialState: () => new TokenizerState(INITIAL),
-        tokenizeEncoded(line: string, state: TokenizerState): monaco.languages.IEncodedLineTokens {
-            if (options.lineLimit !== undefined && line.length > options.lineLimit) {
-                // Skip tokenizing the line if it exceeds the line limit.
-                return { endState: state.ruleStack, tokens: new Uint32Array() };
-            }
-            const result = grammar.tokenizeLine2(line, state.ruleStack, 500);
-            return {
-                endState: new TokenizerState(result.ruleStack),
-                tokens: result.tokens
-            };
-        },
-        tokenize(line: string, state: TokenizerState): monaco.languages.ILineTokens {
-            if (options.lineLimit !== undefined && line.length > options.lineLimit) {
-                // Skip tokenizing the line if it exceeds the line limit.
-                return { endState: state.ruleStack, tokens: [] };
-            }
-            const result = grammar.tokenizeLine(line, state.ruleStack, 500);
-            return {
-                endState: new TokenizerState(result.ruleStack),
-                tokens: result.tokens.map(t => ({
-                    startIndex: t.startIndex,
-                    scopes: t.scopes.reverse().join(' ')
-                }))
-            };
-        }
-    };
-}
+// *****************************************************************************
+// Copyright (C) 2018 Ericsson 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 { INITIAL, StateStack, IGrammar } from 'vscode-textmate';
+import * as monaco from '@theia/monaco-editor-core';
+
+export class TokenizerState implements monaco.languages.IState {
+
+    constructor(
+        public readonly ruleStack: StateStack
+    ) { }
+
+    clone(): monaco.languages.IState {
+        return new TokenizerState(this.ruleStack);
+    }
+
+    equals(other: monaco.languages.IState): boolean {
+        return other instanceof TokenizerState && (other === this || other.ruleStack === this.ruleStack);
+    }
+
+}
+
+/**
+ * Options for the TextMate tokenizer.
+ */
+export interface TokenizerOption {
+
+    /**
+     * Maximum line length that will be handled by the TextMate tokenizer. If the length of the actual line exceeds this
+     * limit, the tokenizer terminates and the tokenization of any subsequent lines might be broken.
+     *
+     * If the `lineLimit` is not defined, it means, there are no line length limits. Otherwise, it must be a positive
+     * integer or an error will be thrown.
+     */
+    lineLimit?: number;
+
+}
+
+export function createTextmateTokenizer(grammar: IGrammar, options: TokenizerOption): monaco.languages.EncodedTokensProvider & monaco.languages.TokensProvider {
+    if (options.lineLimit !== undefined && (options.lineLimit <= 0 || !Number.isInteger(options.lineLimit))) {
+        throw new Error(`The 'lineLimit' must be a positive integer. It was ${options.lineLimit}.`);
+    }
+    return {
+        getInitialState: () => new TokenizerState(INITIAL),
+        tokenizeEncoded(line: string, state: TokenizerState): monaco.languages.IEncodedLineTokens {
+            if (options.lineLimit !== undefined && line.length > options.lineLimit) {
+                // Skip tokenizing the line if it exceeds the line limit.
+                return { endState: state.ruleStack, tokens: new Uint32Array() };
+            }
+            const result = grammar.tokenizeLine2(line, state.ruleStack, 500);
+            return {
+                endState: new TokenizerState(result.ruleStack),
+                tokens: result.tokens
+            };
+        },
+        tokenize(line: string, state: TokenizerState): monaco.languages.ILineTokens {
+            if (options.lineLimit !== undefined && line.length > options.lineLimit) {
+                // Skip tokenizing the line if it exceeds the line limit.
+                return { endState: state.ruleStack, tokens: [] };
+            }
+            const result = grammar.tokenizeLine(line, state.ruleStack, 500);
+            return {
+                endState: new TokenizerState(result.ruleStack),
+                tokens: result.tokens.map(t => ({
+                    startIndex: t.startIndex,
+                    scopes: t.scopes.reverse().join(' ')
+                }))
+            };
+        }
+    };
+}