@volar/monaco 1.11.0 → 2.0.0-alpha.0

package/README.md

@@ -59,7 +59,7 @@ self.onmessage = () => {
 +				},
 			},
 +			typescript: {
-+				module: ts as any,
++				module: ts,
 +				compilerOptions: {
 +					// ...tsconfig options
 +				},

package/index.d.ts

@@ -1,3 +1,2 @@
-export * from './lib/editor';
-export * from './lib/languages';
-//# sourceMappingURL=index.d.ts.map
+export * from './lib/editor.js';
+export * from './lib/languages.js';

package/index.js

@@ -1,19 +1,3 @@
-"use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (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("./lib/editor"), exports);
-__exportStar(require("./lib/languages"), exports);
+export * from './lib/editor.js';
+export * from './lib/languages.js';
 //# sourceMappingURL=index.js.map

package/lib/editor.d.ts

@@ -1,7 +1,4 @@
 import type { LanguageService } from '@volar/language-service';
-import type { editor as _editor, IDisposable, Uri } from 'monaco-editor-core';
-export declare namespace editor {
-    function activateMarkers(worker: _editor.MonacoWebWorker<LanguageService>, languages: string[], markersOwn: string, getSyncUris: () => Uri[], editor: typeof import('monaco-editor-core').editor): IDisposable;
-    function activateAutoInsertion(worker: _editor.MonacoWebWorker<LanguageService>, languages: string[], getSyncUris: () => Uri[], editor: typeof import('monaco-editor-core').editor): IDisposable;
-}
-//# sourceMappingURL=editor.d.ts.map
+import type { editor, IDisposable, MonacoEditor, Uri } from 'monaco-types';
+export declare function activateMarkers(worker: editor.MonacoWebWorker<LanguageService>, languages: string[], markersOwn: string, getSyncUris: () => Uri[], editor: MonacoEditor['editor']): IDisposable;
+export declare function activateAutoInsertion(worker: editor.MonacoWebWorker<LanguageService>, languages: string[], getSyncUris: () => Uri[], editor: MonacoEditor['editor']): IDisposable;

package/lib/editor.js

@@ -1,167 +1,154 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.editor = void 0;
-const markers_1 = require("./utils/markers");
-const protocol2monaco = require("./utils/protocol2monaco");
-const monaco2protocol = require("./utils/monaco2protocol");
-var editor;
-(function (editor_1) {
-    function activateMarkers(worker, languages, markersOwn, getSyncUris, editor) {
-        const disposables = [];
-        const listener = new Map();
-        disposables.push(editor.onDidCreateModel((model) => hostingMarkers(model)), editor.onWillDisposeModel(stopHostingMarkers), editor.onDidChangeModelLanguage((event) => {
-            stopHostingMarkers(event.model);
-            hostingMarkers(event.model);
-        }), {
+import { fromPosition, fromRange, toMarkerData, toTextEdit } from 'monaco-languageserver-types';
+import { markers } from './markers.js';
+export function activateMarkers(worker, languages, markersOwn, getSyncUris, editor) {
+    const disposables = [];
+    const listener = new Map();
+    disposables.push(editor.onDidCreateModel((model) => hostingMarkers(model)), editor.onWillDisposeModel(stopHostingMarkers), editor.onDidChangeModelLanguage((event) => {
+        stopHostingMarkers(event.model);
+        hostingMarkers(event.model);
+    }), {
+        dispose: () => {
+            for (const model of editor.getModels()) {
+                stopHostingMarkers(model);
+            }
+        }
+    });
+    for (const model of editor.getModels()) {
+        hostingMarkers(model);
+    }
+    return { dispose: () => disposables.forEach((d) => d.dispose()) };
+    function stopHostingMarkers(model) {
+        editor.setModelMarkers(model, markersOwn, []);
+        const key = model.uri.toString();
+        if (listener.has(key)) {
+            listener.get(key)?.dispose();
+            listener.delete(key);
+        }
+    }
+    function hostingMarkers(model) {
+        if (!languages.includes(model.getLanguageId?.() ?? model.getModeId?.())) {
+            return;
+        }
+        let timer;
+        const changeSubscription = model.onDidChangeContent(() => {
+            clearTimeout(timer);
+            timer = setTimeout(() => doValidation(model), 250);
+        });
+        const visibleSubscription = model.onDidChangeAttached(() => {
+            if (model.isAttachedToEditor()) {
+                doValidation(model);
+            }
+            else {
+                editor.setModelMarkers(model, markersOwn, []);
+            }
+        });
+        listener.set(model.uri.toString(), {
             dispose: () => {
-                for (const model of editor.getModels()) {
-                    stopHostingMarkers(model);
-                }
+                changeSubscription.dispose();
+                visibleSubscription.dispose();
+                clearTimeout(timer);
             }
         });
-        for (const model of editor.getModels()) {
-            hostingMarkers(model);
+        doValidation(model);
+    }
+    async function doValidation(model) {
+        if (model.isDisposed()) {
+            return;
         }
-        return { dispose: () => disposables.forEach((d) => d.dispose()) };
-        function stopHostingMarkers(model) {
-            editor.setModelMarkers(model, markersOwn, []);
-            const key = model.uri.toString();
-            if (listener.has(key)) {
-                listener.get(key)?.dispose();
-                listener.delete(key);
-            }
+        if (!model.isAttachedToEditor()) {
+            return;
         }
-        function hostingMarkers(model) {
-            if (!languages.includes(model.getLanguageId?.() ?? model.getModeId?.())) {
-                return;
+        const version = model.getVersionId();
+        const languageService = await worker.withSyncedResources(getSyncUris());
+        const diagnostics = await languageService.doValidation(model.uri.toString(), 'all');
+        if (model.getVersionId() !== version) {
+            return;
+        }
+        const result = diagnostics.map(error => {
+            const marker = toMarkerData(error);
+            markers.set(marker, error);
+            return marker;
+        });
+        editor.setModelMarkers(model, markersOwn, result);
+    }
+}
+export function activateAutoInsertion(worker, languages, getSyncUris, editor) {
+    const disposables = [];
+    const listener = new Map();
+    let timeout;
+    disposables.push(editor.onDidCreateModel((model) => hostingAutoInsertion(model)), editor.onWillDisposeModel(stopHostingAutoInsertion), editor.onDidChangeModelLanguage((event) => {
+        stopHostingAutoInsertion(event.model);
+        hostingAutoInsertion(event.model);
+    }), {
+        dispose: () => {
+            for (const disposable of listener.values()) {
+                disposable.dispose();
             }
-            let timer;
-            const changeSubscription = model.onDidChangeContent(() => {
-                clearTimeout(timer);
-                timer = setTimeout(() => doValidation(model), 250);
-            });
-            const visibleSubscription = model.onDidChangeAttached(() => {
-                if (model.isAttachedToEditor()) {
-                    doValidation(model);
-                }
-                else {
-                    editor.setModelMarkers(model, markersOwn, []);
-                }
-            });
-            listener.set(model.uri.toString(), {
-                dispose: () => {
-                    changeSubscription.dispose();
-                    visibleSubscription.dispose();
-                    clearTimeout(timer);
-                }
-            });
-            doValidation(model);
+            listener.clear();
+        }
+    });
+    for (const model of editor.getModels()) {
+        hostingAutoInsertion(model);
+    }
+    return { dispose: () => disposables.forEach((d) => d.dispose()) };
+    function stopHostingAutoInsertion(model) {
+        if (listener.has(model)) {
+            listener.get(model)?.dispose();
+            listener.delete(model);
         }
-        async function doValidation(model) {
+    }
+    function hostingAutoInsertion(model) {
+        if (!languages.includes(model.getLanguageId?.() ?? model.getModeId?.())) {
+            return;
+        }
+        listener.set(model, model.onDidChangeContent((e) => {
             if (model.isDisposed()) {
                 return;
             }
             if (!model.isAttachedToEditor()) {
                 return;
             }
-            const version = model.getVersionId();
-            const languageService = await worker.withSyncedResources(getSyncUris());
-            const diagnostics = await languageService.doValidation(model.uri.toString(), 'all');
-            if (model.getVersionId() !== version) {
+            if (e.changes.length === 0 || e.isUndoing || e.isRedoing) {
                 return;
             }
-            const result = diagnostics.map(error => {
-                const marker = protocol2monaco.asMarkerData(error);
-                markers_1.markers.set(marker, error);
-                return marker;
-            });
-            editor.setModelMarkers(model, markersOwn, result);
-        }
+            const lastChange = e.changes[e.changes.length - 1];
+            doAutoInsert(model, lastChange);
+        }));
     }
-    editor_1.activateMarkers = activateMarkers;
-    function activateAutoInsertion(worker, languages, getSyncUris, editor) {
-        const disposables = [];
-        const listener = new Map();
-        let timeout;
-        disposables.push(editor.onDidCreateModel((model) => hostingAutoInsertion(model)), editor.onWillDisposeModel(stopHostingAutoInsertion), editor.onDidChangeModelLanguage((event) => {
-            stopHostingAutoInsertion(event.model);
-            hostingAutoInsertion(event.model);
-        }), {
-            dispose: () => {
-                for (const disposable of listener.values()) {
-                    disposable.dispose();
-                }
-                listener.clear();
-            }
-        });
-        for (const model of editor.getModels()) {
-            hostingAutoInsertion(model);
+    async function doAutoInsert(model, lastChange) {
+        if (timeout) {
+            clearTimeout(timeout);
+            timeout = undefined;
         }
-        return { dispose: () => disposables.forEach((d) => d.dispose()) };
-        function stopHostingAutoInsertion(model) {
-            if (listener.has(model)) {
-                listener.get(model)?.dispose();
-                listener.delete(model);
-            }
-        }
-        function hostingAutoInsertion(model) {
-            if (!languages.includes(model.getLanguageId?.() ?? model.getModeId?.())) {
-                return;
-            }
-            listener.set(model, model.onDidChangeContent((e) => {
-                if (model.isDisposed()) {
-                    return;
-                }
-                if (!model.isAttachedToEditor()) {
+        const version = model.getVersionId();
+        timeout = setTimeout(() => {
+            (async () => {
+                if (model.getVersionId() !== version) {
                     return;
                 }
-                if (e.changes.length === 0 || e.isUndoing || e.isRedoing) {
+                const languageService = await worker.withSyncedResources(getSyncUris());
+                const edit = await languageService.doAutoInsert(model.uri.toString(), fromPosition({
+                    lineNumber: lastChange.range.startLineNumber,
+                    column: lastChange.range.startColumn + lastChange.text.length,
+                }), {
+                    range: fromRange(lastChange.range),
+                    text: lastChange.text,
+                });
+                if (model.getVersionId() !== version) {
                     return;
                 }
-                const lastChange = e.changes[e.changes.length - 1];
-                doAutoInsert(model, lastChange);
-            }));
-        }
-        async function doAutoInsert(model, lastChange) {
-            if (timeout) {
-                clearTimeout(timeout);
-                timeout = undefined;
-            }
-            const version = model.getVersionId();
-            timeout = setTimeout(() => {
-                (async () => {
-                    if (model.getVersionId() !== version) {
-                        return;
-                    }
-                    const languageService = await worker.withSyncedResources(getSyncUris());
-                    const edit = await languageService.doAutoInsert(model.uri.toString(), monaco2protocol.asPosition({
-                        lineNumber: lastChange.range.startLineNumber,
-                        column: lastChange.range.startColumn + lastChange.text.length,
-                    }), {
-                        lastChange: {
-                            range: monaco2protocol.asRange(lastChange.range),
-                            rangeLength: lastChange.rangeLength,
-                            text: lastChange.text,
-                            rangeOffset: lastChange.rangeOffset,
-                        },
-                    });
-                    if (model.getVersionId() !== version) {
-                        return;
+                const codeEditor = editor.getEditors().find((e) => e.getModel() === model);
+                if (codeEditor && edit && model.getVersionId() === version) {
+                    if (typeof edit === 'string') {
+                        codeEditor?.getContribution('snippetController2')?.insert(edit);
                     }
-                    const codeEditor = editor.getEditors().find((e) => e.getModel() === model);
-                    if (codeEditor && edit && model.getVersionId() === version) {
-                        if (typeof edit === 'string') {
-                            codeEditor?.getContribution('snippetController2')?.insert(edit);
-                        }
-                        else {
-                            model.pushEditOperations([], [protocol2monaco.asTextEdit(edit)], () => []);
-                        }
+                    else {
+                        model.pushEditOperations([], [toTextEdit(edit)], () => []);
                     }
-                })();
-                timeout = undefined;
-            }, 100);
-        }
+                }
+            })();
+            timeout = undefined;
+        }, 100);
     }
-    editor_1.activateAutoInsertion = activateAutoInsertion;
-})(editor || (exports.editor = editor = {}));
+}
 //# sourceMappingURL=editor.js.map

package/lib/languages.d.ts

@@ -1,10 +1,3 @@
-import type { editor, languages as _languages, IDisposable, Uri } from 'monaco-editor-core';
 import type { LanguageService } from '@volar/language-service';
-export declare namespace languages {
-    /**
-     * @deprecated Use `registerProviders` instead.
-     */
-    const registerProvides: typeof registerProviders;
-    function registerProviders(worker: editor.MonacoWebWorker<LanguageService>, language: _languages.LanguageSelector, getSyncUris: () => Uri[], languages: typeof import('monaco-editor-core').languages): Promise<IDisposable>;
-}
-//# sourceMappingURL=languages.d.ts.map
+import type { IDisposable, MonacoEditor, Uri, editor, languages } from 'monaco-types';
+export declare function registerProviders(worker: editor.MonacoWebWorker<LanguageService>, language: languages.LanguageSelector, getSyncUris: () => Uri[], languages: MonacoEditor['languages']): Promise<IDisposable>;

package/lib/languages.js

@@ -1,43 +1,32 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.languages = void 0;
-const provider_1 = require("./utils/provider");
-var languages;
-(function (languages_1) {
-    /**
-     * @deprecated Use `registerProviders` instead.
-     */
-    languages_1.registerProvides = registerProviders;
-    async function registerProviders(worker, language, getSyncUris, languages) {
-        const provider = await (0, provider_1.createLanguageFeaturesProvider)(worker, getSyncUris);
-        const disposables = [
-            languages.registerHoverProvider(language, provider),
-            languages.registerReferenceProvider(language, provider),
-            languages.registerRenameProvider(language, provider),
-            languages.registerSignatureHelpProvider(language, provider),
-            languages.registerDocumentSymbolProvider(language, provider),
-            languages.registerDocumentHighlightProvider(language, provider),
-            languages.registerLinkedEditingRangeProvider(language, provider),
-            languages.registerDefinitionProvider(language, provider),
-            languages.registerImplementationProvider(language, provider),
-            languages.registerTypeDefinitionProvider(language, provider),
-            languages.registerCodeLensProvider(language, provider),
-            languages.registerCodeActionProvider(language, provider),
-            languages.registerDocumentFormattingEditProvider(language, provider),
-            languages.registerDocumentRangeFormattingEditProvider(language, provider),
-            languages.registerOnTypeFormattingEditProvider(language, provider),
-            languages.registerLinkProvider(language, provider),
-            languages.registerCompletionItemProvider(language, provider),
-            languages.registerColorProvider(language, provider),
-            languages.registerFoldingRangeProvider(language, provider),
-            languages.registerDeclarationProvider(language, provider),
-            languages.registerSelectionRangeProvider(language, provider),
-            languages.registerInlayHintsProvider(language, provider),
-            languages.registerDocumentSemanticTokensProvider(language, provider),
-            languages.registerDocumentRangeSemanticTokensProvider(language, provider),
-        ];
-        return { dispose: () => disposables.forEach((d) => d.dispose()) };
-    }
-    languages_1.registerProviders = registerProviders;
-})(languages || (exports.languages = languages = {}));
+import { createLanguageFeaturesProvider } from './provider.js';
+export async function registerProviders(worker, language, getSyncUris, languages) {
+    const provider = await createLanguageFeaturesProvider(worker, getSyncUris);
+    const disposables = [
+        languages.registerHoverProvider(language, provider),
+        languages.registerReferenceProvider(language, provider),
+        languages.registerRenameProvider(language, provider),
+        languages.registerSignatureHelpProvider(language, provider),
+        languages.registerDocumentSymbolProvider(language, provider),
+        languages.registerDocumentHighlightProvider(language, provider),
+        languages.registerLinkedEditingRangeProvider(language, provider),
+        languages.registerDefinitionProvider(language, provider),
+        languages.registerImplementationProvider(language, provider),
+        languages.registerTypeDefinitionProvider(language, provider),
+        languages.registerCodeLensProvider(language, provider),
+        languages.registerCodeActionProvider(language, provider),
+        languages.registerDocumentFormattingEditProvider(language, provider),
+        languages.registerDocumentRangeFormattingEditProvider(language, provider),
+        languages.registerOnTypeFormattingEditProvider(language, provider),
+        languages.registerLinkProvider(language, provider),
+        languages.registerCompletionItemProvider(language, provider),
+        languages.registerColorProvider(language, provider),
+        languages.registerFoldingRangeProvider(language, provider),
+        languages.registerDeclarationProvider(language, provider),
+        languages.registerSelectionRangeProvider(language, provider),
+        languages.registerInlayHintsProvider(language, provider),
+        languages.registerDocumentSemanticTokensProvider(language, provider),
+        languages.registerDocumentRangeSemanticTokensProvider(language, provider),
+    ];
+    return { dispose: () => disposables.forEach((d) => d.dispose()) };
+}
 //# sourceMappingURL=languages.js.map

package/lib/markers.d.ts

@@ -0,0 +1,3 @@
+import type { Diagnostic } from '@volar/language-service';
+import type { editor } from 'monaco-types';
+export declare const markers: WeakMap<editor.IMarkerData, Diagnostic>;

package/lib/markers.js

@@ -0,0 +1,2 @@
+export const markers = new WeakMap();
+//# sourceMappingURL=markers.js.map

package/lib/{utils/provider.d.ts → provider.d.ts}

@@ -1,4 +1,3 @@
 import { LanguageService } from '@volar/language-service';
-import type { editor, languages, Uri } from 'monaco-editor-core';
+import type { Uri, editor, languages } from 'monaco-types';
 export declare function createLanguageFeaturesProvider(worker: editor.MonacoWebWorker<LanguageService>, getSyncUris: () => Uri[]): Promise<languages.HoverProvider & languages.DocumentSymbolProvider & languages.DocumentHighlightProvider & languages.LinkedEditingRangeProvider & languages.DefinitionProvider & languages.TypeDefinitionProvider & languages.ImplementationProvider & languages.CodeLensProvider & languages.CodeActionProvider & languages.DocumentFormattingEditProvider & languages.DocumentRangeFormattingEditProvider & languages.OnTypeFormattingEditProvider & languages.LinkProvider & languages.CompletionItemProvider & languages.DocumentColorProvider & languages.FoldingRangeProvider & languages.DeclarationProvider & languages.SignatureHelpProvider & languages.RenameProvider & languages.ReferenceProvider & languages.SelectionRangeProvider & languages.InlayHintsProvider & languages.DocumentSemanticTokensProvider & languages.DocumentRangeSemanticTokensProvider>;
-//# sourceMappingURL=provider.d.ts.map