@theia/monaco 1.34.1 → 1.34.3

package/lib/browser/protocol-to-monaco-converter.d.ts

@@ -1,32 +1,32 @@
-import { Position, Range, Location, TextEdit, Diagnostic, DiagnosticRelatedInformation } from '@theia/core/shared/vscode-languageserver-protocol';
-import { RecursivePartial } from '@theia/core/lib/common/types';
-import * as monaco from '@theia/monaco-editor-core';
-export declare class ProtocolToMonacoConverter {
-    asRange(range: undefined): undefined;
-    asRange(range: Range): monaco.Range;
-    asRange(range: Range | undefined): monaco.Range | undefined;
-    asRange(range: RecursivePartial<Range>): Partial<monaco.IRange>;
-    asRange(range: RecursivePartial<Range> | undefined): monaco.Range | Partial<monaco.IRange> | undefined;
-    asPosition(position: undefined): undefined;
-    asPosition(position: Position): monaco.Position;
-    asPosition(position: Position | undefined): monaco.Position | undefined;
-    asPosition(position: Partial<Position>): Partial<monaco.IPosition>;
-    asPosition(position: Partial<Position> | undefined): monaco.Position | Partial<monaco.IPosition> | undefined;
-    asLocation(item: Location): monaco.languages.Location;
-    asLocation(item: undefined): undefined;
-    asLocation(item: Location | undefined): monaco.languages.Location | undefined;
-    asTextEdit(edit: TextEdit): monaco.languages.TextEdit;
-    asTextEdit(edit: undefined): undefined;
-    asTextEdit(edit: TextEdit | undefined): undefined;
-    asTextEdits(items: TextEdit[]): monaco.languages.TextEdit[];
-    asTextEdits(items: undefined): undefined;
-    asTextEdits(items: TextEdit[] | undefined): monaco.languages.TextEdit[] | undefined;
-    asSeverity(severity?: number): monaco.MarkerSeverity;
-    asDiagnostics(diagnostics: undefined): undefined;
-    asDiagnostics(diagnostics: Diagnostic[]): monaco.editor.IMarkerData[];
-    asDiagnostics(diagnostics: Diagnostic[] | undefined): monaco.editor.IMarkerData[] | undefined;
-    asDiagnostic(diagnostic: Diagnostic): monaco.editor.IMarkerData;
-    asRelatedInformations(relatedInformation?: DiagnosticRelatedInformation[]): monaco.editor.IRelatedInformation[] | undefined;
-    asRelatedInformation(relatedInformation: DiagnosticRelatedInformation): monaco.editor.IRelatedInformation;
-}
+import { Position, Range, Location, TextEdit, Diagnostic, DiagnosticRelatedInformation } from '@theia/core/shared/vscode-languageserver-protocol';
+import { RecursivePartial } from '@theia/core/lib/common/types';
+import * as monaco from '@theia/monaco-editor-core';
+export declare class ProtocolToMonacoConverter {
+    asRange(range: undefined): undefined;
+    asRange(range: Range): monaco.Range;
+    asRange(range: Range | undefined): monaco.Range | undefined;
+    asRange(range: RecursivePartial<Range>): Partial<monaco.IRange>;
+    asRange(range: RecursivePartial<Range> | undefined): monaco.Range | Partial<monaco.IRange> | undefined;
+    asPosition(position: undefined): undefined;
+    asPosition(position: Position): monaco.Position;
+    asPosition(position: Position | undefined): monaco.Position | undefined;
+    asPosition(position: Partial<Position>): Partial<monaco.IPosition>;
+    asPosition(position: Partial<Position> | undefined): monaco.Position | Partial<monaco.IPosition> | undefined;
+    asLocation(item: Location): monaco.languages.Location;
+    asLocation(item: undefined): undefined;
+    asLocation(item: Location | undefined): monaco.languages.Location | undefined;
+    asTextEdit(edit: TextEdit): monaco.languages.TextEdit;
+    asTextEdit(edit: undefined): undefined;
+    asTextEdit(edit: TextEdit | undefined): undefined;
+    asTextEdits(items: TextEdit[]): monaco.languages.TextEdit[];
+    asTextEdits(items: undefined): undefined;
+    asTextEdits(items: TextEdit[] | undefined): monaco.languages.TextEdit[] | undefined;
+    asSeverity(severity?: number): monaco.MarkerSeverity;
+    asDiagnostics(diagnostics: undefined): undefined;
+    asDiagnostics(diagnostics: Diagnostic[]): monaco.editor.IMarkerData[];
+    asDiagnostics(diagnostics: Diagnostic[] | undefined): monaco.editor.IMarkerData[] | undefined;
+    asDiagnostic(diagnostic: Diagnostic): monaco.editor.IMarkerData;
+    asRelatedInformations(relatedInformation?: DiagnosticRelatedInformation[]): monaco.editor.IRelatedInformation[] | undefined;
+    asRelatedInformation(relatedInformation: DiagnosticRelatedInformation): monaco.editor.IRelatedInformation;
+}
 //# sourceMappingURL=protocol-to-monaco-converter.d.ts.map

package/lib/browser/protocol-to-monaco-converter.js

@@ -1,134 +1,134 @@
-"use strict";
-// *****************************************************************************
-// 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
-// *****************************************************************************
-var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
-    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
-    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
-    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
-    return c > 3 && r && Object.defineProperty(target, key, r), r;
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.ProtocolToMonacoConverter = void 0;
-const inversify_1 = require("@theia/core/shared/inversify");
-const monaco = require("@theia/monaco-editor-core");
-let ProtocolToMonacoConverter = class ProtocolToMonacoConverter {
-    asRange(range) {
-        if (range === undefined) {
-            return undefined;
-        }
-        const start = this.asPosition(range.start);
-        const end = this.asPosition(range.end);
-        if (start instanceof monaco.Position && end instanceof monaco.Position) {
-            return new monaco.Range(start.lineNumber, start.column, end.lineNumber, end.column);
-        }
-        const startLineNumber = !start || start.lineNumber === undefined ? undefined : start.lineNumber;
-        const startColumn = !start || start.column === undefined ? undefined : start.column;
-        const endLineNumber = !end || end.lineNumber === undefined ? undefined : end.lineNumber;
-        const endColumn = !end || end.column === undefined ? undefined : end.column;
-        return { startLineNumber, startColumn, endLineNumber, endColumn };
-    }
-    asPosition(position) {
-        if (position === undefined) {
-            return undefined;
-        }
-        const { line, character } = position;
-        const lineNumber = line === undefined ? undefined : line + 1;
-        const column = character === undefined ? undefined : character + 1;
-        if (lineNumber !== undefined && column !== undefined) {
-            return new monaco.Position(lineNumber, column);
-        }
-        return { lineNumber, column };
-    }
-    asLocation(item) {
-        if (!item) {
-            return undefined;
-        }
-        const uri = monaco.Uri.parse(item.uri);
-        const range = this.asRange(item.range);
-        return {
-            uri, range
-        };
-    }
-    asTextEdit(edit) {
-        if (!edit) {
-            return undefined;
-        }
-        const range = this.asRange(edit.range);
-        return {
-            range,
-            text: edit.newText
-        };
-    }
-    asTextEdits(items) {
-        if (!items) {
-            return undefined;
-        }
-        return items.map(item => this.asTextEdit(item));
-    }
-    asSeverity(severity) {
-        if (severity === 1) {
-            return monaco.MarkerSeverity.Error;
-        }
-        if (severity === 2) {
-            return monaco.MarkerSeverity.Warning;
-        }
-        if (severity === 3) {
-            return monaco.MarkerSeverity.Info;
-        }
-        return monaco.MarkerSeverity.Hint;
-    }
-    asDiagnostics(diagnostics) {
-        if (!diagnostics) {
-            return undefined;
-        }
-        return diagnostics.map(diagnostic => this.asDiagnostic(diagnostic));
-    }
-    asDiagnostic(diagnostic) {
-        return {
-            code: typeof diagnostic.code === 'number' ? diagnostic.code.toString() : diagnostic.code,
-            severity: this.asSeverity(diagnostic.severity),
-            message: diagnostic.message,
-            source: diagnostic.source,
-            startLineNumber: diagnostic.range.start.line + 1,
-            startColumn: diagnostic.range.start.character + 1,
-            endLineNumber: diagnostic.range.end.line + 1,
-            endColumn: diagnostic.range.end.character + 1,
-            relatedInformation: this.asRelatedInformations(diagnostic.relatedInformation),
-            tags: diagnostic.tags
-        };
-    }
-    asRelatedInformations(relatedInformation) {
-        if (!relatedInformation) {
-            return undefined;
-        }
-        return relatedInformation.map(item => this.asRelatedInformation(item));
-    }
-    asRelatedInformation(relatedInformation) {
-        return {
-            resource: monaco.Uri.parse(relatedInformation.location.uri),
-            startLineNumber: relatedInformation.location.range.start.line + 1,
-            startColumn: relatedInformation.location.range.start.character + 1,
-            endLineNumber: relatedInformation.location.range.end.line + 1,
-            endColumn: relatedInformation.location.range.end.character + 1,
-            message: relatedInformation.message
-        };
-    }
-};
-ProtocolToMonacoConverter = __decorate([
-    (0, inversify_1.injectable)()
-], ProtocolToMonacoConverter);
-exports.ProtocolToMonacoConverter = ProtocolToMonacoConverter;
+"use strict";
+// *****************************************************************************
+// 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
+// *****************************************************************************
+var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
+    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
+    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
+    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
+    return c > 3 && r && Object.defineProperty(target, key, r), r;
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.ProtocolToMonacoConverter = void 0;
+const inversify_1 = require("@theia/core/shared/inversify");
+const monaco = require("@theia/monaco-editor-core");
+let ProtocolToMonacoConverter = class ProtocolToMonacoConverter {
+    asRange(range) {
+        if (range === undefined) {
+            return undefined;
+        }
+        const start = this.asPosition(range.start);
+        const end = this.asPosition(range.end);
+        if (start instanceof monaco.Position && end instanceof monaco.Position) {
+            return new monaco.Range(start.lineNumber, start.column, end.lineNumber, end.column);
+        }
+        const startLineNumber = !start || start.lineNumber === undefined ? undefined : start.lineNumber;
+        const startColumn = !start || start.column === undefined ? undefined : start.column;
+        const endLineNumber = !end || end.lineNumber === undefined ? undefined : end.lineNumber;
+        const endColumn = !end || end.column === undefined ? undefined : end.column;
+        return { startLineNumber, startColumn, endLineNumber, endColumn };
+    }
+    asPosition(position) {
+        if (position === undefined) {
+            return undefined;
+        }
+        const { line, character } = position;
+        const lineNumber = line === undefined ? undefined : line + 1;
+        const column = character === undefined ? undefined : character + 1;
+        if (lineNumber !== undefined && column !== undefined) {
+            return new monaco.Position(lineNumber, column);
+        }
+        return { lineNumber, column };
+    }
+    asLocation(item) {
+        if (!item) {
+            return undefined;
+        }
+        const uri = monaco.Uri.parse(item.uri);
+        const range = this.asRange(item.range);
+        return {
+            uri, range
+        };
+    }
+    asTextEdit(edit) {
+        if (!edit) {
+            return undefined;
+        }
+        const range = this.asRange(edit.range);
+        return {
+            range,
+            text: edit.newText
+        };
+    }
+    asTextEdits(items) {
+        if (!items) {
+            return undefined;
+        }
+        return items.map(item => this.asTextEdit(item));
+    }
+    asSeverity(severity) {
+        if (severity === 1) {
+            return monaco.MarkerSeverity.Error;
+        }
+        if (severity === 2) {
+            return monaco.MarkerSeverity.Warning;
+        }
+        if (severity === 3) {
+            return monaco.MarkerSeverity.Info;
+        }
+        return monaco.MarkerSeverity.Hint;
+    }
+    asDiagnostics(diagnostics) {
+        if (!diagnostics) {
+            return undefined;
+        }
+        return diagnostics.map(diagnostic => this.asDiagnostic(diagnostic));
+    }
+    asDiagnostic(diagnostic) {
+        return {
+            code: typeof diagnostic.code === 'number' ? diagnostic.code.toString() : diagnostic.code,
+            severity: this.asSeverity(diagnostic.severity),
+            message: diagnostic.message,
+            source: diagnostic.source,
+            startLineNumber: diagnostic.range.start.line + 1,
+            startColumn: diagnostic.range.start.character + 1,
+            endLineNumber: diagnostic.range.end.line + 1,
+            endColumn: diagnostic.range.end.character + 1,
+            relatedInformation: this.asRelatedInformations(diagnostic.relatedInformation),
+            tags: diagnostic.tags
+        };
+    }
+    asRelatedInformations(relatedInformation) {
+        if (!relatedInformation) {
+            return undefined;
+        }
+        return relatedInformation.map(item => this.asRelatedInformation(item));
+    }
+    asRelatedInformation(relatedInformation) {
+        return {
+            resource: monaco.Uri.parse(relatedInformation.location.uri),
+            startLineNumber: relatedInformation.location.range.start.line + 1,
+            startColumn: relatedInformation.location.range.start.character + 1,
+            endLineNumber: relatedInformation.location.range.end.line + 1,
+            endColumn: relatedInformation.location.range.end.character + 1,
+            message: relatedInformation.message
+        };
+    }
+};
+ProtocolToMonacoConverter = __decorate([
+    (0, inversify_1.injectable)()
+], ProtocolToMonacoConverter);
+exports.ProtocolToMonacoConverter = ProtocolToMonacoConverter;
 //# sourceMappingURL=protocol-to-monaco-converter.js.map

package/lib/browser/textmate/index.d.ts

@@ -1,5 +1,5 @@
-export * from './textmate-registry';
-export * from './textmate-contribution';
-export * from './monaco-textmate-service';
-export * from './monaco-textmate-frontend-bindings';
+export * from './textmate-registry';
+export * from './textmate-contribution';
+export * from './monaco-textmate-service';
+export * from './monaco-textmate-frontend-bindings';
 //# sourceMappingURL=index.d.ts.map

package/lib/browser/textmate/index.js

@@ -1,32 +1,32 @@
-"use strict";
-// *****************************************************************************
-// 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
-// *****************************************************************************
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __exportStar = (this && this.__exportStar) || function(m, exports) {
-    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-__exportStar(require("./textmate-registry"), exports);
-__exportStar(require("./textmate-contribution"), exports);
-__exportStar(require("./monaco-textmate-service"), exports);
-__exportStar(require("./monaco-textmate-frontend-bindings"), exports);
+"use strict";
+// *****************************************************************************
+// 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
+// *****************************************************************************
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __exportStar = (this && this.__exportStar) || function(m, exports) {
+    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+__exportStar(require("./textmate-registry"), exports);
+__exportStar(require("./textmate-contribution"), exports);
+__exportStar(require("./monaco-textmate-service"), exports);
+__exportStar(require("./monaco-textmate-frontend-bindings"), exports);
 //# sourceMappingURL=index.js.map

package/lib/browser/textmate/monaco-textmate-frontend-bindings.d.ts

@@ -1,13 +1,13 @@
-import { interfaces } from '@theia/core/shared/inversify';
-import { OnigScanner, OnigString } from 'vscode-oniguruma';
-import { IOnigLib } from 'vscode-textmate';
-export declare class OnigasmLib implements IOnigLib {
-    createOnigScanner(sources: string[]): OnigScanner;
-    createOnigString(sources: string): OnigString;
-}
-declare const _default: (bind: interfaces.Bind, unbind: interfaces.Unbind, isBound: interfaces.IsBound, rebind: interfaces.Rebind) => void;
-export default _default;
-export declare function dynamicOnigasmLib(ctx: interfaces.Context): Promise<IOnigLib>;
-export declare function createOnigasmLib(): Promise<IOnigLib>;
-export declare function fetchOnigasm(): Promise<ArrayBuffer>;
+import { interfaces } from '@theia/core/shared/inversify';
+import { OnigScanner, OnigString } from 'vscode-oniguruma';
+import { IOnigLib } from 'vscode-textmate';
+export declare class OnigasmLib implements IOnigLib {
+    createOnigScanner(sources: string[]): OnigScanner;
+    createOnigString(sources: string): OnigString;
+}
+declare const _default: (bind: interfaces.Bind, unbind: interfaces.Unbind, isBound: interfaces.IsBound, rebind: interfaces.Rebind) => void;
+export default _default;
+export declare function dynamicOnigasmLib(ctx: interfaces.Context): Promise<IOnigLib>;
+export declare function createOnigasmLib(): Promise<IOnigLib>;
+export declare function fetchOnigasm(): Promise<ArrayBuffer>;
 //# sourceMappingURL=monaco-textmate-frontend-bindings.d.ts.map

package/lib/browser/textmate/monaco-textmate-frontend-bindings.js

@@ -1,95 +1,95 @@
-"use strict";
-// *****************************************************************************
-// 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
-// *****************************************************************************
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.fetchOnigasm = exports.createOnigasmLib = exports.dynamicOnigasmLib = exports.OnigasmLib = void 0;
-const browser_1 = require("@theia/core/lib/browser");
-const core_1 = require("@theia/core");
-const textmate_registry_1 = require("./textmate-registry");
-const textmate_contribution_1 = require("./textmate-contribution");
-const monaco_textmate_service_1 = require("./monaco-textmate-service");
-const monaco_theme_registry_1 = require("./monaco-theme-registry");
-const vscode_oniguruma_1 = require("vscode-oniguruma");
-const vscode_textmate_1 = require("vscode-textmate");
-const monaco_theme_types_1 = require("./monaco-theme-types");
-class OnigasmLib {
-    createOnigScanner(sources) {
-        return (0, vscode_oniguruma_1.createOnigScanner)(sources);
-    }
-    createOnigString(sources) {
-        return (0, vscode_oniguruma_1.createOnigString)(sources);
-    }
-}
-exports.OnigasmLib = OnigasmLib;
-exports.default = (bind, unbind, isBound, rebind) => {
-    bind(monaco_theme_types_1.OnigasmPromise).toDynamicValue(dynamicOnigasmLib).inSingletonScope();
-    bind(monaco_textmate_service_1.MonacoTextmateService).toSelf().inSingletonScope();
-    bind(browser_1.FrontendApplicationContribution).toService(monaco_textmate_service_1.MonacoTextmateService);
-    (0, core_1.bindContributionProvider)(bind, textmate_contribution_1.LanguageGrammarDefinitionContribution);
-    bind(textmate_registry_1.TextmateRegistry).toSelf().inSingletonScope();
-    bind(monaco_theme_registry_1.MonacoThemeRegistry).toSelf().inSingletonScope();
-    bind(monaco_theme_types_1.TextmateRegistryFactory).toFactory(({ container }) => (theme) => {
-        const onigLib = container.get(monaco_theme_types_1.OnigasmPromise);
-        const textmateRegistry = container.get(textmate_registry_1.TextmateRegistry);
-        return new vscode_textmate_1.Registry({
-            onigLib,
-            theme,
-            loadGrammar: async (scopeName) => {
-                const provider = textmateRegistry.getProvider(scopeName);
-                if (provider) {
-                    const definition = await provider.getGrammarDefinition();
-                    let rawGrammar;
-                    if (typeof definition.content === 'string') {
-                        rawGrammar = (0, vscode_textmate_1.parseRawGrammar)(definition.content, definition.format === 'json' ? 'grammar.json' : 'grammar.plist');
-                    }
-                    else {
-                        rawGrammar = definition.content;
-                    }
-                    return rawGrammar;
-                }
-                return undefined;
-            },
-            getInjections: (scopeName) => {
-                const provider = textmateRegistry.getProvider(scopeName);
-                if (provider && provider.getInjections) {
-                    return provider.getInjections(scopeName);
-                }
-                return [];
-            }
-        });
-    });
-};
-async function dynamicOnigasmLib(ctx) {
-    return createOnigasmLib();
-}
-exports.dynamicOnigasmLib = dynamicOnigasmLib;
-async function createOnigasmLib() {
-    if (!browser_1.isBasicWasmSupported) {
-        throw new Error('wasm not supported');
-    }
-    const wasm = await fetchOnigasm();
-    await (0, vscode_oniguruma_1.loadWASM)(wasm);
-    return new OnigasmLib();
-}
-exports.createOnigasmLib = createOnigasmLib;
-async function fetchOnigasm() {
-    // Using Webpack's wasm loader should give us a URL to fetch the resource from:
-    const onigasmPath = require('vscode-oniguruma/release/onig.wasm');
-    const response = await fetch(onigasmPath, { method: 'GET' });
-    return response.arrayBuffer();
-}
-exports.fetchOnigasm = fetchOnigasm;
+"use strict";
+// *****************************************************************************
+// 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
+// *****************************************************************************
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.fetchOnigasm = exports.createOnigasmLib = exports.dynamicOnigasmLib = exports.OnigasmLib = void 0;
+const browser_1 = require("@theia/core/lib/browser");
+const core_1 = require("@theia/core");
+const textmate_registry_1 = require("./textmate-registry");
+const textmate_contribution_1 = require("./textmate-contribution");
+const monaco_textmate_service_1 = require("./monaco-textmate-service");
+const monaco_theme_registry_1 = require("./monaco-theme-registry");
+const vscode_oniguruma_1 = require("vscode-oniguruma");
+const vscode_textmate_1 = require("vscode-textmate");
+const monaco_theme_types_1 = require("./monaco-theme-types");
+class OnigasmLib {
+    createOnigScanner(sources) {
+        return (0, vscode_oniguruma_1.createOnigScanner)(sources);
+    }
+    createOnigString(sources) {
+        return (0, vscode_oniguruma_1.createOnigString)(sources);
+    }
+}
+exports.OnigasmLib = OnigasmLib;
+exports.default = (bind, unbind, isBound, rebind) => {
+    bind(monaco_theme_types_1.OnigasmPromise).toDynamicValue(dynamicOnigasmLib).inSingletonScope();
+    bind(monaco_textmate_service_1.MonacoTextmateService).toSelf().inSingletonScope();
+    bind(browser_1.FrontendApplicationContribution).toService(monaco_textmate_service_1.MonacoTextmateService);
+    (0, core_1.bindContributionProvider)(bind, textmate_contribution_1.LanguageGrammarDefinitionContribution);
+    bind(textmate_registry_1.TextmateRegistry).toSelf().inSingletonScope();
+    bind(monaco_theme_registry_1.MonacoThemeRegistry).toSelf().inSingletonScope();
+    bind(monaco_theme_types_1.TextmateRegistryFactory).toFactory(({ container }) => (theme) => {
+        const onigLib = container.get(monaco_theme_types_1.OnigasmPromise);
+        const textmateRegistry = container.get(textmate_registry_1.TextmateRegistry);
+        return new vscode_textmate_1.Registry({
+            onigLib,
+            theme,
+            loadGrammar: async (scopeName) => {
+                const provider = textmateRegistry.getProvider(scopeName);
+                if (provider) {
+                    const definition = await provider.getGrammarDefinition();
+                    let rawGrammar;
+                    if (typeof definition.content === 'string') {
+                        rawGrammar = (0, vscode_textmate_1.parseRawGrammar)(definition.content, definition.format === 'json' ? 'grammar.json' : 'grammar.plist');
+                    }
+                    else {
+                        rawGrammar = definition.content;
+                    }
+                    return rawGrammar;
+                }
+                return undefined;
+            },
+            getInjections: (scopeName) => {
+                const provider = textmateRegistry.getProvider(scopeName);
+                if (provider && provider.getInjections) {
+                    return provider.getInjections(scopeName);
+                }
+                return [];
+            }
+        });
+    });
+};
+async function dynamicOnigasmLib(ctx) {
+    return createOnigasmLib();
+}
+exports.dynamicOnigasmLib = dynamicOnigasmLib;
+async function createOnigasmLib() {
+    if (!browser_1.isBasicWasmSupported) {
+        throw new Error('wasm not supported');
+    }
+    const wasm = await fetchOnigasm();
+    await (0, vscode_oniguruma_1.loadWASM)(wasm);
+    return new OnigasmLib();
+}
+exports.createOnigasmLib = createOnigasmLib;
+async function fetchOnigasm() {
+    // Using Webpack's wasm loader should give us a URL to fetch the resource from:
+    const onigasmPath = require('vscode-oniguruma/release/onig.wasm');
+    const response = await fetch(onigasmPath, { method: 'GET' });
+    return response.arrayBuffer();
+}
+exports.fetchOnigasm = fetchOnigasm;
 //# sourceMappingURL=monaco-textmate-frontend-bindings.js.map