volar-service-typescript 0.0.52 → 0.0.54

package/lib/plugins/semantic.d.ts

@@ -1,4 +1,4 @@
-import type { ProviderResult, LanguageServiceContext, LanguageServicePlugin } from '@volar/language-service';
+import type { LanguageServiceContext, LanguageServicePlugin, ProviderResult } from '@volar/language-service';
 import type * as ts from 'typescript';
 import type { TextDocument } from 'vscode-languageserver-textdocument';
 import { URI } from 'vscode-uri';

package/lib/plugins/semantic.js

@@ -4,15 +4,15 @@ exports.create = create;
 const path = require("path-browserify");
 const semver = require("semver");
 const tsWithImportCache = require("typescript-auto-import-cache");
+const vscode_uri_1 = require("vscode-uri");
 const getFormatCodeSettings_1 = require("../configs/getFormatCodeSettings");
 const getUserPreferences_1 = require("../configs/getUserPreferences");
-const shared_1 = require("../shared");
-const lspConverters_1 = require("../utils/lspConverters");
-const snippetForFunctionCall_1 = require("../utils/snippetForFunctionCall");
 const codeActions = require("../semanticFeatures/codeAction");
 const codeActionResolve = require("../semanticFeatures/codeActionResolve");
 const semanticTokens = require("../semanticFeatures/semanticTokens");
-const vscode_uri_1 = require("vscode-uri");
+const shared_1 = require("../shared");
+const lspConverters_1 = require("../utils/lspConverters");
+const snippetForFunctionCall_1 = require("../utils/snippetForFunctionCall");
 const documentRegistries = [];
 function getDocumentRegistry(ts, useCaseSensitiveFileNames, currentDirectory) {
     let documentRegistry = documentRegistries.find(item => item[0] === useCaseSensitiveFileNames && item[1] === currentDirectory)?.[2];
@@ -69,43 +69,27 @@ function create(ts, { isValidationEnabled = async (document, context) => {
                         'class',
                         'enum',
                         'interface',
-                        'struct',
                         'typeParameter',
                         'type',
                         'parameter',
                         'variable',
                         'property',
                         'enumMember',
-                        'decorator',
-                        'event',
                         'function',
                         'method',
-                        'macro',
-                        'label',
-                        'comment',
-                        'string',
-                        'keyword',
-                        'number',
-                        'regexp',
-                        'operator',
                     ],
                     tokenModifiers: [
                         'declaration',
-                        'definition',
                         'readonly',
                         'static',
-                        'deprecated',
-                        'abstract',
                         'async',
-                        'modification',
-                        'documentation',
                         'defaultLibrary',
+                        'local', // additional
                     ],
                 },
             },
             workspaceSymbolProvider: true,
             // fileRenameEdits: true,
-            selectionRangeProvider: true,
             signatureHelpProvider: {
                 triggerCharacters: ['(', ',', '<'],
                 retriggerCharacters: [')'],
@@ -197,7 +181,9 @@ function create(ts, { isValidationEnabled = async (document, context) => {
                 function updateSourceScriptFileNames() {
                     sourceScriptNames.clear();
                     for (const fileName of languageServiceHost.getScriptFileNames()) {
-                        const uri = ctx.fileNameToUri(fileName);
+                        const maybeEmbeddedUri = ctx.fileNameToUri(fileName);
+                        const decoded = context.decodeEmbeddedDocumentUri(maybeEmbeddedUri);
+                        const uri = decoded ? decoded[0] : maybeEmbeddedUri;
                         const sourceScript = context.language.scripts.get(uri);
                         if (sourceScript?.generated) {
                             const tsCode = sourceScript.generated.languagePlugin.typescript?.getServiceScript(sourceScript.generated.root);
@@ -652,25 +638,6 @@ function create(ts, { isValidationEnabled = async (document, context) => {
                         return (0, lspConverters_1.convertFileTextChanges)(response, ctx.fileNameToUri, ctx.getTextDocument);
                     });
                 },
-                provideSelectionRanges(document, positions, token) {
-                    const uri = vscode_uri_1.URI.parse(document.uri);
-                    if (!isSemanticDocument(uri, document)) {
-                        return;
-                    }
-                    return worker(token, () => {
-                        return positions
-                            .map(position => {
-                            const fileName = ctx.uriToFileName(uri);
-                            const offset = document.offsetAt(position);
-                            const range = (0, shared_1.safeCall)(() => ctx.languageService.getSmartSelectionRange(fileName, offset));
-                            if (!range) {
-                                return;
-                            }
-                            return (0, lspConverters_1.convertSelectionRange)(range, document);
-                        })
-                            .filter(position => !!position);
-                    });
-                },
                 provideSignatureHelp(document, position, context, token) {
                     const uri = vscode_uri_1.URI.parse(document.uri);
                     if (!isSemanticDocument(uri, document)) {

package/lib/plugins/syntactic.d.ts

@@ -1,6 +1,6 @@
-import type { ProviderResult, LanguageServiceContext, LanguageServicePlugin } from '@volar/language-service';
-import type { TextDocument } from 'vscode-languageserver-textdocument';
+import type { LanguageServiceContext, LanguageServicePlugin, ProviderResult } from '@volar/language-service';
 import type * as ts from 'typescript';
+import type { TextDocument } from 'vscode-languageserver-textdocument';
 export declare function getLanguageServiceByDocument(ts: typeof import('typescript'), document: TextDocument): {
     languageService: ts.LanguageService;
     fileName: string;

package/lib/plugins/syntactic.js

@@ -4,8 +4,8 @@ exports.getLanguageServiceByDocument = getLanguageServiceByDocument;
 exports.create = create;
 const getFormatCodeSettings_1 = require("../configs/getFormatCodeSettings");
 const shared_1 = require("../shared");
-const lspConverters_1 = require("../utils/lspConverters");
 const syntaxOnlyService_1 = require("../syntaxOnlyService");
+const lspConverters_1 = require("../utils/lspConverters");
 const snapshots = new WeakMap();
 let created;
 function getLanguageServiceByDocument(ts, document) {
@@ -41,6 +41,7 @@ function create(ts, { isFormattingEnabled = async (document, context) => {
                 configurationSections: ['javascript.autoClosingTags', 'typescript.autoClosingTags'],
             },
             foldingRangeProvider: true,
+            selectionRangeProvider: true,
             documentSymbolProvider: true,
             documentFormattingProvider: true,
             documentOnTypeFormattingProvider: {
@@ -76,6 +77,24 @@ function create(ts, { isFormattingEnabled = async (document, context) => {
                     }
                     return outliningSpans.map(span => (0, lspConverters_1.convertOutliningSpan)(span, document));
                 },
+                provideSelectionRanges(document, positions) {
+                    if (!(0, shared_1.isTsDocument)(document)) {
+                        return;
+                    }
+                    const { languageService, fileName } = getLanguageServiceByDocument(ts, document);
+                    const ranges = positions
+                        .map(position => {
+                        const offset = document.offsetAt(position);
+                        const range = (0, shared_1.safeCall)(() => languageService.getSmartSelectionRange(fileName, offset));
+                        if (!range) {
+                            return;
+                        }
+                        return (0, lspConverters_1.convertSelectionRange)(range, document);
+                    });
+                    if (ranges.every(range => !!range)) {
+                        return ranges;
+                    }
+                },
                 provideDocumentSymbols(document) {
                     if (!(0, shared_1.isTsDocument)(document)) {
                         return;

package/lib/semanticFeatures/semanticTokens.js

@@ -19,14 +19,18 @@ function register(ts, ctx) {
         tokenModifiersTable[0 /* TokenModifier.declaration */] = 1 << legend.tokenModifiers.indexOf('declaration');
         tokenModifiersTable[3 /* TokenModifier.readonly */] = 1 << legend.tokenModifiers.indexOf('readonly');
         tokenModifiersTable[1 /* TokenModifier.static */] = 1 << legend.tokenModifiers.indexOf('static');
-        tokenModifiersTable[5 /* TokenModifier.local */] = 1 << legend.tokenModifiers.indexOf('local'); // missing in server tokenModifiers
+        tokenModifiersTable[5 /* TokenModifier.local */] = 1 << legend.tokenModifiers.indexOf('local');
         tokenModifiersTable[4 /* TokenModifier.defaultLibrary */] = 1 << legend.tokenModifiers.indexOf('defaultLibrary');
         tokenModifiersTable = tokenModifiersTable.map(mod => Math.max(mod, 0));
+        const end = start + length;
         const tokenSpan = response.spans;
         const tokens = [];
         let i = 0;
         while (i < tokenSpan.length) {
             const offset = tokenSpan[i++];
+            if (offset >= end) {
+                break;
+            }
             const length = tokenSpan[i++];
             const tsClassification = tokenSpan[i++];
             const tokenType = getTokenTypeFromClassification(tsClassification);
@@ -98,7 +102,7 @@ tokenModifiers[2 /* TokenModifier.async */] = 'async';
 tokenModifiers[0 /* TokenModifier.declaration */] = 'declaration';
 tokenModifiers[3 /* TokenModifier.readonly */] = 'readonly';
 tokenModifiers[1 /* TokenModifier.static */] = 'static';
-tokenModifiers[5 /* TokenModifier.local */] = 'local'; // missing in server tokenModifiers
+tokenModifiers[5 /* TokenModifier.local */] = 'local';
 tokenModifiers[4 /* TokenModifier.defaultLibrary */] = 'defaultLibrary';
 // mapping for the original ExperimentalProtocol.ClassificationType from TypeScript (only used when plugin is not available)
 const tokenTypeMap = [];

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "volar-service-typescript",
-	"version": "0.0.52",
+	"version": "0.0.54",
 	"description": "Integrate TypeScript into Volar",
 	"homepage": "https://github.com/volarjs/services/tree/master/packages/typescript",
 	"bugs": "https://github.com/volarjs/services/issues",
@@ -29,7 +29,7 @@
 	},
 	"dependencies": {
 		"path-browserify": "^1.0.1",
-		"semver": "^7.5.4",
+		"semver": "^7.6.2",
 		"typescript-auto-import-cache": "^0.3.3",
 		"vscode-languageserver-textdocument": "^1.0.11",
 		"vscode-nls": "^5.2.0",
@@ -43,5 +43,5 @@
 			"optional": true
 		}
 	},
-	"gitHead": "0038413c252e98b7d6b4e57eabdcb337d272d771"
+	"gitHead": "3b2f1593c15ea8e7f2ee02cd881c91342eeebe4e"
 }