@volar/vscode 1.4.0 → 1.4.1

package/out/features/tsVersion.d.ts

@@ -1,8 +1,9 @@
+import * as path from 'typesafe-path';
 import * as vscode from 'vscode';
 import { 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 getTsdk(context: vscode.ExtensionContext): Promise<{
-    tsdk: string;
+    tsdk: string | path.PosixPath;
     version: string | undefined;
     isWorkspacePath: boolean;
 }>;

package/out/features/tsVersion.js

@@ -78,7 +78,7 @@ async function activate(cmd, context, client, shouldStatusBarShow, resolveStatus
         }
     }
     async function reloadServers() {
-        const tsPaths = getTsdk(context);
+        const tsPaths = await getTsdk(context);
         const newInitOptions = {
             ...client.clientOptions.initializationOptions,
             typescript: tsPaths,
@@ -111,7 +111,7 @@ function resolveWorkspaceTsdk(tsdk) {
     if (path.isAbsolute(tsdk)) {
         try {
             if (require.resolve('./typescript.js', { paths: [tsdk] })) {
-                return tsdk;
+                return tsdk.replace(/\\/g, '/');
             }
         }
         catch { }
@@ -121,7 +121,7 @@ function resolveWorkspaceTsdk(tsdk) {
         const _path = path.join(folder, tsdk);
         try {
             if (require.resolve('./typescript.js', { paths: [_path] })) {
-                return _path;
+                return _path.replace(/\\/g, '/');
             }
         }
         catch { }
@@ -130,15 +130,15 @@ function resolveWorkspaceTsdk(tsdk) {
 async function getVScodeTsdk() {
     const nightly = vscode.extensions.getExtension('ms-vscode.vscode-typescript-next');
     if (nightly) {
-        const path = nightly.extensionPath.toString() + '/node_modules/typescript/lib';
+        const libPath = path.join(nightly.extensionPath, 'node_modules/typescript/lib').replace(/\\/g, '/');
         return {
-            path,
-            version: await getTsVersion(path),
+            path: libPath,
+            version: await getTsVersion(libPath),
             isWeb: false,
         };
     }
     if (vscode.env.appRoot) {
-        const libPath = path.join(vscode.env.appRoot, 'extensions/node_modules/typescript/lib');
+        const libPath = path.join(vscode.env.appRoot, 'extensions/node_modules/typescript/lib').replace(/\\/g, '/');
         return {
             path: libPath,
             version: await getTsVersion(libPath),

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@volar/vscode",
-	"version": "1.4.0",
+	"version": "1.4.1",
 	"main": "out/index.js",
 	"license": "MIT",
 	"files": [
@@ -13,8 +13,8 @@
 		"directory": "packages/vscode"
 	},
 	"dependencies": {
-		"@volar/language-server": "1.4.0",
-		"@volar/source-map": "1.4.0",
+		"@volar/language-server": "1.4.1",
+		"@volar/source-map": "1.4.1",
 		"typesafe-path": "^0.2.2",
 		"vscode-nls": "^5.2.0"
 	},
@@ -26,5 +26,5 @@
 		"@types/vscode": "*",
 		"vscode-languageclient": "*"
 	},
-	"gitHead": "9bf14ef0d08c53f9ae32cf538d9748fa91cc4ab7"
+	"gitHead": "2c8a783542ace3292649a04490919b515e387b9e"
 }