volar-service-typescript 0.0.55 → 0.0.56

package/lib/configs/getUserPreferences.js

@@ -6,8 +6,8 @@ const shared_1 = require("../shared");
 const vscode_uri_1 = require("vscode-uri");
 async function getUserPreferences(ctx, document) {
     let currentDirectory = '';
-    if (ctx.language.typescript) {
-        currentDirectory = ctx.language.typescript.languageServiceHost.getCurrentDirectory();
+    if (ctx.project.typescript) {
+        currentDirectory = ctx.project.typescript.languageServiceHost.getCurrentDirectory();
     }
     const uri = vscode_uri_1.URI.parse(document.uri);
     const documentUri = ctx.decodeEmbeddedDocumentUri(uri)?.[0] ?? uri;

package/lib/plugins/semantic.js

@@ -96,10 +96,11 @@ function create(ts, { isValidationEnabled = async (document, context) => {
             },
         },
         create(context) {
-            if (!context.language.typescript) {
+            if (!context.project.typescript) {
+                console.warn(`[volar] typescript-semantic requires typescript project.`);
                 return {};
             }
-            const { sys, languageServiceHost, asFileName, asScriptId, getExtraServiceScript } = context.language.typescript;
+            const { sys, languageServiceHost, asFileName, asUri, getExtraServiceScript } = context.project.typescript;
             const created = tsWithImportCache.createLanguageService(ts, sys, languageServiceHost, proxiedHost => ts.createLanguageService(proxiedHost, getDocumentRegistry(ts, sys.useCaseSensitiveFileNames, languageServiceHost.getCurrentDirectory())));
             const { languageService } = created;
             const ctx = {
@@ -119,7 +120,7 @@ function create(ts, { isValidationEnabled = async (document, context) => {
                         const sourceScript = context.language.scripts.fromVirtualCode(extraServiceScript.code);
                         return context.encodeEmbeddedDocumentUri(sourceScript.id, extraServiceScript.code.id);
                     }
-                    const uri = asScriptId(fileName);
+                    const uri = asUri(fileName);
                     const sourceScript = context.language.scripts.get(uri);
                     const serviceScript = sourceScript?.generated?.languagePlugin.typescript?.getServiceScript(sourceScript.generated.root);
                     if (sourceScript && serviceScript) {
@@ -714,7 +715,7 @@ function create(ts, { isValidationEnabled = async (document, context) => {
                     }
                     const token = {
                         isCancellationRequested() {
-                            return ctx.language.typescript?.languageServiceHost.getCancellationToken?.().isCancellationRequested() ?? false;
+                            return ctx.project.typescript?.languageServiceHost.getCancellationToken?.().isCancellationRequested() ?? false;
                         },
                         throwIfCancellationRequested() { },
                     };

package/lib/semanticFeatures/semanticTokens.js

@@ -7,7 +7,7 @@ function register(ts, ctx) {
         const fileName = ctx.uriToFileName(uri);
         const start = range ? document.offsetAt(range.start) : 0;
         const length = range ? (document.offsetAt(range.end) - start) : document.getText().length;
-        if (ctx.language.typescript?.languageServiceHost.getCancellationToken?.().isCancellationRequested()) {
+        if (ctx.project.typescript?.languageServiceHost.getCancellationToken?.().isCancellationRequested()) {
             return;
         }
         const response = (0, shared_1.safeCall)(() => ctx.languageService.getEncodedSemanticClassifications(fileName, { start, length }, ts.SemanticClassificationFormat.TwentyTwenty));

package/lib/utils/typeConverters.d.ts

@@ -1,5 +1,5 @@
 import type * as ts from 'typescript';
 export declare namespace SymbolKind {
-    function fromProtocolScriptElementKind(kind: ts.ScriptElementKind): 2 | 5 | 6 | 7 | 9 | 10 | 11 | 12 | 13 | 15 | 22 | 26;
+    function fromProtocolScriptElementKind(kind: ts.ScriptElementKind): 2 | 5 | 10 | 22 | 11 | 6 | 7 | 13 | 12 | 9 | 26 | 15;
 }
 //# sourceMappingURL=typeConverters.d.ts.map

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "volar-service-typescript",
-	"version": "0.0.55",
+	"version": "0.0.56",
 	"description": "Integrate TypeScript into Volar",
 	"homepage": "https://github.com/volarjs/services/tree/master/packages/typescript",
 	"bugs": "https://github.com/volarjs/services/issues",
@@ -26,7 +26,7 @@
 	"devDependencies": {
 		"@types/path-browserify": "latest",
 		"@types/semver": "latest",
-		"@volar/typescript": "~2.4.0-alpha.0"
+		"@volar/typescript": "~2.4.0-alpha.1"
 	},
 	"dependencies": {
 		"path-browserify": "^1.0.1",
@@ -37,12 +37,12 @@
 		"vscode-uri": "^3.0.8"
 	},
 	"peerDependencies": {
-		"@volar/language-service": "~2.4.0-alpha.0"
+		"@volar/language-service": "~2.4.0-alpha.1"
 	},
 	"peerDependenciesMeta": {
 		"@volar/language-service": {
 			"optional": true
 		}
 	},
-	"gitHead": "2ab1ef6c5ad543e762522f80048cd73c3aa04bb6"
+	"gitHead": "83dc20fd032ab64507ef7a0e643e1d0bf34f201b"
 }