@volar/vscode 1.7.4 → 1.7.6

package/out/features/tsVersion.d.ts

@@ -1,7 +1,7 @@
 import * as path from 'typesafe-path';
 import * as vscode from 'vscode';
 import type { BaseLanguageClient } from 'vscode-languageclient';
-export declare function activate(cmd: string, context: vscode.ExtensionContext, client: BaseLanguageClient, shouldStatusBarShow: (document: vscode.TextDocument) => boolean, resolveStatusText: (text: string) => string, disableTakeOverMode: boolean, cdn?: string): Promise<vscode.Disposable>;
+export declare function activate(cmd: string, context: vscode.ExtensionContext, client: BaseLanguageClient, shouldStatusBarShow: (document: vscode.TextDocument) => boolean, resolveStatusText: (text: string) => string, disableTakeOverMode: boolean): Promise<vscode.Disposable>;
 export declare function getTsdk(context: vscode.ExtensionContext): Promise<{
     tsdk: string | path.PosixPath;
     version: string | undefined;

package/out/features/tsVersion.js

@@ -5,7 +5,7 @@ const path = require("typesafe-path");
 const vscode = require("vscode");
 const common_1 = require("../common");
 const defaultTsdkPath = 'node_modules/typescript/lib';
-async function activate(cmd, context, client, shouldStatusBarShow, resolveStatusText, disableTakeOverMode, cdn = 'https://unpkg.com/') {
+async function activate(cmd, context, client, shouldStatusBarShow, resolveStatusText, disableTakeOverMode) {
     const subscriptions = [];
     const statusBar = vscode.window.createStatusBarItem(vscode.StatusBarAlignment.Right);
     statusBar.command = cmd;
@@ -24,7 +24,7 @@ async function activate(cmd, context, client, shouldStatusBarShow, resolveStatus
                 useVSCodeTsdk: {
                     label: (!tsdk.isWorkspacePath ? '• ' : '') + "Use VS Code's Version",
                     description: vscodeTsdk.version,
-                    detail: vscodeTsdk.isWeb ? vscodeTsdk.path.replace('/node_modules/', cdn) : undefined,
+                    detail: vscodeTsdk.isWeb ? vscodeTsdk.path : undefined,
                 },
                 useConfigWorkspaceTsdk: configTsdkPath && !vscodeTsdk.isWeb ? {
                     label: (tsdk.isWorkspacePath ? '• ' : '') + 'Use Workspace Version',

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@volar/vscode",
-	"version": "1.7.4",
+	"version": "1.7.6",
 	"main": "out/index.js",
 	"license": "MIT",
 	"files": [
@@ -13,7 +13,7 @@
 		"directory": "packages/vscode"
 	},
 	"dependencies": {
-		"@volar/language-server": "1.7.4",
+		"@volar/language-server": "1.7.6",
 		"typesafe-path": "^0.2.2",
 		"vscode-nls": "^5.2.0"
 	},
@@ -21,5 +21,5 @@
 		"@types/vscode": "latest",
 		"vscode-languageclient": "latest"
 	},
-	"gitHead": "65ed950a3440d8abd6d189cea6ff48c0e23a6384"
+	"gitHead": "b2dbe05318c06658ae97a65f9bc6d1badc55a81b"
 }

package/out/features/serverStatus.d.ts

@@ -1,3 +0,0 @@
-import * as vscode from 'vscode';
-import type { BaseLanguageClient } from 'vscode-languageclient';
-export declare function activate(cmd: string, clients: BaseLanguageClient[]): Promise<vscode.Disposable>;

package/out/features/serverStatus.js

@@ -1,15 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.activate = void 0;
-const vscode = require("vscode");
-const language_server_1 = require("@volar/language-server");
-async function activate(cmd, clients) {
-    return vscode.commands.registerCommand(cmd, async () => {
-        for (const client of clients) {
-            await client.sendNotification(language_server_1.ReportStats.type);
-            client.outputChannel.show();
-        }
-    });
-}
-exports.activate = activate;
-//# sourceMappingURL=serverStatus.js.map

package/out/features/showVirtualFiles.d.ts

@@ -1,3 +0,0 @@
-import * as vscode from 'vscode';
-import { BaseLanguageClient } from 'vscode-languageclient';
-export declare function activate(_cmd: string, client: BaseLanguageClient): Promise<vscode.Disposable>;

package/out/features/showVirtualFiles.js

@@ -1,198 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.activate = void 0;
-const vscode = require("vscode");
-const vscode_languageclient_1 = require("vscode-languageclient");
-const language_server_1 = require("@volar/language-server");
-const source_map_1 = require("@volar/source-map");
-const scheme = 'volar-virtual-file';
-const mappingDecorationType = vscode.window.createTextEditorDecorationType({
-    borderWidth: '1px',
-    borderStyle: 'solid',
-    overviewRulerColor: 'blue',
-    overviewRulerLane: vscode.OverviewRulerLane.Right,
-    light: {
-        // this color will be used in light color themes
-        borderColor: 'darkblue'
-    },
-    dark: {
-        // this color will be used in dark color themes
-        borderColor: 'lightblue'
-    }
-});
-const mappingSelectionDecorationType = vscode.window.createTextEditorDecorationType({
-    cursor: 'crosshair',
-    light: {
-        backgroundColor: 'lightblue'
-    },
-    dark: {
-        backgroundColor: 'darkblue'
-    }
-});
-async function activate(_cmd, client) {
-    const subscriptions = [];
-    subscriptions.push(vscode.languages.registerHoverProvider({ scheme }, {
-        async provideHover(document, position, _token) {
-            const maps = virtualUriToSourceMap.get(document.uri.toString());
-            if (!maps)
-                return;
-            const data = [];
-            for (const [sourceUri, _, map] of maps) {
-                const source = map.toSourceOffset(document.offsetAt(position));
-                if (source) {
-                    data.push({
-                        uri: sourceUri,
-                        mapping: source,
-                    });
-                }
-            }
-            if (data.length === 0)
-                return;
-            return new vscode.Hover(data.map((data) => [
-                data.uri,
-                '',
-                '',
-                '```json',
-                JSON.stringify(data.mapping, null, 2),
-                '```',
-            ].join('\n')));
-        }
-    }));
-    subscriptions.push(vscode.languages.registerDefinitionProvider({ scheme }, {
-        async provideDefinition(document, position, _token) {
-            const stacks = virtualUriToStacks.get(document.uri.toString());
-            if (!stacks)
-                return;
-            const offset = document.offsetAt(position);
-            const stack = stacks.find(stack => stack.range[0] <= offset && offset <= stack.range[1]);
-            if (!stack)
-                return;
-            const line = Number(stack.source.split(':').at(-2));
-            const character = Number(stack.source.split(':').at(-1));
-            const fileName = stack.source.split(':').slice(0, -2).join(':');
-            const link = {
-                originSelectionRange: new vscode.Range(document.positionAt(stack.range[0]), document.positionAt(stack.range[1])),
-                targetUri: vscode.Uri.file(fileName),
-                targetRange: new vscode.Range(line - 1, character - 1, line - 1, character - 1),
-            };
-            return [link];
-        }
-    }));
-    const sourceUriToVirtualUris = new Map();
-    const virtualUriToSourceEditor = new Map();
-    const virtualUriToSourceMap = new Map();
-    const virtualUriToStacks = new Map();
-    const docChangeEvent = new vscode.EventEmitter();
-    const virtualDocuments = new Map();
-    let updateVirtualDocument;
-    let updateDecorationsTimeout;
-    subscriptions.push(vscode.window.onDidChangeActiveTextEditor(updateDecorations));
-    subscriptions.push(vscode.window.onDidChangeTextEditorSelection(updateDecorations));
-    subscriptions.push(vscode.window.onDidChangeVisibleTextEditors(updateDecorations));
-    subscriptions.push(vscode.workspace.onDidChangeTextDocument(e => {
-        if (sourceUriToVirtualUris.has(e.document.uri.toString())) {
-            const virtualUris = sourceUriToVirtualUris.get(e.document.uri.toString());
-            clearTimeout(updateVirtualDocument);
-            updateVirtualDocument = setTimeout(() => {
-                virtualUris?.forEach(uri => {
-                    docChangeEvent.fire(vscode.Uri.parse(uri));
-                });
-            }, 100);
-        }
-    }));
-    subscriptions.push(vscode.workspace.registerTextDocumentContentProvider(scheme, {
-        onDidChange: docChangeEvent.event,
-        async provideTextDocumentContent(uri) {
-            const fileName = uri.with({ scheme: 'file' }).fsPath;
-            const requestEditor = virtualUriToSourceEditor.get(uri.toString());
-            if (requestEditor) {
-                const virtualFile = await client.sendRequest(language_server_1.GetVirtualFileRequest.type, { sourceFileUri: requestEditor.document.uri.toString(), virtualFileName: fileName });
-                virtualUriToSourceMap.set(uri.toString(), []);
-                Object.entries(virtualFile.mappings).forEach(([sourceUri, mappings]) => {
-                    const sourceEditor = vscode.window.visibleTextEditors.find(editor => editor.document.uri.toString() === sourceUri);
-                    if (sourceEditor) {
-                        virtualUriToSourceMap.get(uri.toString())?.push([
-                            sourceEditor.document.uri.toString(),
-                            sourceEditor.document.version,
-                            new source_map_1.SourceMap(mappings),
-                        ]);
-                        if (!sourceUriToVirtualUris.has(sourceUri)) {
-                            sourceUriToVirtualUris.set(sourceUri, new Set());
-                        }
-                        sourceUriToVirtualUris.get(sourceUri)?.add(uri.toString());
-                    }
-                });
-                virtualDocuments.set(uri.toString(), vscode_languageclient_1.TextDocument.create('', '', 0, virtualFile.content));
-                virtualUriToStacks.set(uri.toString(), virtualFile.codegenStacks);
-                clearTimeout(updateDecorationsTimeout);
-                updateDecorationsTimeout = setTimeout(updateDecorations, 100);
-                return virtualFile.content;
-            }
-        }
-    }));
-    return vscode.Disposable.from(...subscriptions);
-    function updateDecorations() {
-        for (const [virtualUri, sources] of virtualUriToSourceMap) {
-            const virtualEditor = vscode.window.visibleTextEditors.find(editor => editor.document.uri.toString() === virtualUri);
-            let virtualRanges1 = [];
-            let virtualRanges2 = [];
-            if (virtualEditor) {
-                for (const [sourceUri, sourceVersion, map] of sources) {
-                    const sourceEditor = vscode.window.visibleTextEditors.find(editor => editor.document.uri.toString() === sourceUri);
-                    if (sourceEditor && sourceEditor.document.version === sourceVersion) {
-                        const mappingDecorationRanges = map.mappings.map(mapping => new vscode.Range(sourceEditor.document.positionAt(mapping.sourceRange[0]), sourceEditor.document.positionAt(mapping.sourceRange[1])));
-                        sourceEditor.setDecorations(mappingDecorationType, mappingDecorationRanges);
-                        virtualRanges1 = virtualRanges1.concat(map.mappings.map(mapping => new vscode.Range(getGeneratedPosition(virtualUri, mapping.generatedRange[0]), getGeneratedPosition(virtualUri, mapping.generatedRange[1]))));
-                        /**
-                         * selection
-                         */
-                        if (vscode.window.activeTextEditor) {
-                            const selection = vscode.window.activeTextEditor.selection;
-                            const startOffset = vscode.window.activeTextEditor.document.offsetAt(selection.start);
-                            sourceEditor.setDecorations(mappingSelectionDecorationType, []);
-                            if (vscode.window.activeTextEditor === sourceEditor) {
-                                const matchVirtualRanges = [...map.toGeneratedOffsets(startOffset)];
-                                sourceEditor.setDecorations(mappingSelectionDecorationType, matchVirtualRanges.map(mapped => new vscode.Range(sourceEditor.document.positionAt(mapped[1].sourceRange[0]), sourceEditor.document.positionAt(mapped[1].sourceRange[1]))));
-                                virtualRanges2 = virtualRanges2.concat(matchVirtualRanges.map(mapped => new vscode.Range(getGeneratedPosition(virtualUri, mapped[1].generatedRange[0]), getGeneratedPosition(virtualUri, mapped[1].generatedRange[1]))));
-                                const mapped = matchVirtualRanges.sort((a, b) => a[1].generatedRange[0] - b[1].generatedRange[0])[0];
-                                if (mapped) {
-                                    virtualEditor.revealRange(new vscode.Range(getGeneratedPosition(virtualUri, mapped[1].generatedRange[0]), getGeneratedPosition(virtualUri, mapped[1].generatedRange[1])));
-                                }
-                            }
-                            else if (vscode.window.activeTextEditor === virtualEditor) {
-                                const matchSourceRanges = [...map.toSourceOffsets(startOffset)];
-                                sourceEditor.setDecorations(mappingSelectionDecorationType, matchSourceRanges.map(mapped => new vscode.Range(sourceEditor.document.positionAt(mapped[1].sourceRange[0]), sourceEditor.document.positionAt(mapped[1].sourceRange[1]))));
-                                virtualRanges2 = virtualRanges2.concat(matchSourceRanges.map(mapped => new vscode.Range(getGeneratedPosition(virtualUri, mapped[1].generatedRange[0]), getGeneratedPosition(virtualUri, mapped[1].generatedRange[1]))));
-                                const mapped = matchSourceRanges.sort((a, b) => a[1].sourceRange[0] - b[1].sourceRange[0])[0];
-                                if (mapped) {
-                                    sourceEditor.revealRange(new vscode.Range(sourceEditor.document.positionAt(mapped[1].sourceRange[0]), sourceEditor.document.positionAt(mapped[1].sourceRange[1])));
-                                }
-                            }
-                        }
-                        else {
-                            sourceEditor.setDecorations(mappingSelectionDecorationType, []);
-                        }
-                    }
-                }
-                virtualEditor.setDecorations(mappingDecorationType, virtualRanges1);
-                virtualEditor.setDecorations(mappingSelectionDecorationType, virtualRanges2);
-            }
-            else {
-                for (const [sourceUri] of sources) {
-                    const sourceEditor = vscode.window.visibleTextEditors.find(editor => editor.document.uri.toString() === sourceUri);
-                    if (sourceEditor) {
-                        sourceEditor.setDecorations(mappingDecorationType, []);
-                        sourceEditor.setDecorations(mappingSelectionDecorationType, []);
-                    }
-                }
-            }
-        }
-    }
-    function getGeneratedPosition(virtualUri, offset) {
-        const document = virtualDocuments.get(virtualUri);
-        const position = document.positionAt(offset);
-        return new vscode.Position(position.line, position.character);
-    }
-}
-exports.activate = activate;
-//# sourceMappingURL=showVirtualFiles.js.map