@vue/language-server 2.0.17 → 2.0.18

package/lib/hybridModeProject.js

@@ -3,21 +3,24 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.createHybridModeProjectProviderFactory = void 0;
 const simpleProject_1 = require("@volar/language-server/lib/project/simpleProject");
 const simpleProjectProvider_1 = require("@volar/language-server/lib/project/simpleProjectProvider");
+const uriMap_1 = require("@volar/language-server/lib/utils/uriMap");
 const language_core_1 = require("@vue/language-core");
 const language_service_1 = require("@vue/language-service");
 const utils_1 = require("@vue/typescript-plugin/lib/utils");
+const vscode_uri_1 = require("vscode-uri");
 function createHybridModeProjectProviderFactory(sys, getLanguagePlugins) {
     let initialized = false;
-    const serviceEnvs = new language_core_1.FileMap(sys.useCaseSensitiveFileNames);
-    const tsconfigProjects = new language_core_1.FileMap(sys.useCaseSensitiveFileNames);
-    const simpleProjects = new language_core_1.FileMap(sys.useCaseSensitiveFileNames);
+    const serviceEnvs = (0, uriMap_1.createUriMap)(sys.useCaseSensitiveFileNames);
+    const tsconfigProjects = (0, uriMap_1.createUriMap)(sys.useCaseSensitiveFileNames);
+    const simpleProjects = (0, uriMap_1.createUriMap)(sys.useCaseSensitiveFileNames);
     return {
         async get(uri) {
             if (!initialized) {
                 initialized = true;
                 initialize(this);
             }
-            const workspaceFolder = (0, simpleProjectProvider_1.getWorkspaceFolder)(uri, this.workspaceFolders);
+            const parsedUri = vscode_uri_1.URI.parse(uri);
+            const workspaceFolder = (0, simpleProjectProvider_1.getWorkspaceFolder)(parsedUri, this.workspaceFolders);
             let serviceEnv = serviceEnvs.get(workspaceFolder);
             if (!serviceEnv) {
                 serviceEnv = (0, simpleProjectProvider_1.createServiceEnvironment)(this, workspaceFolder);
@@ -27,7 +30,7 @@ function createHybridModeProjectProviderFactory(sys, getLanguagePlugins) {
             const projectInfo = (await (0, utils_1.searchNamedPipeServerForFile)(fileName))?.projectInfo;
             if (projectInfo?.kind === 1) {
                 const tsconfig = projectInfo.name;
-                const tsconfigUri = serviceEnv.typescript.fileNameToUri(tsconfig);
+                const tsconfigUri = vscode_uri_1.URI.parse(serviceEnv.typescript.fileNameToUri(tsconfig));
                 if (!tsconfigProjects.has(tsconfigUri)) {
                     tsconfigProjects.set(tsconfigUri, (async () => {
                         const languagePlugins = await getLanguagePlugins(serviceEnv, tsconfig, undefined, {
@@ -73,9 +76,10 @@ function createHybridModeProjectProviderFactory(sys, getLanguagePlugins) {
     function initialize(server) {
         server.onDidChangeWatchedFiles(({ changes }) => {
             for (const change of changes) {
-                if (tsconfigProjects.has(change.uri)) {
-                    tsconfigProjects.get(change.uri)?.then(project => project.dispose());
-                    tsconfigProjects.delete(change.uri);
+                const changeUri = vscode_uri_1.URI.parse(change.uri);
+                if (tsconfigProjects.has(changeUri)) {
+                    tsconfigProjects.get(changeUri)?.then(project => project.dispose());
+                    tsconfigProjects.delete(changeUri);
                     server.clearPushDiagnostics();
                 }
             }

package/node.d.ts

@@ -10,18 +10,18 @@ export declare const server: {
     semanticTokensLegend: import("@volar/language-server").SemanticTokensLegend;
     pullModelDiagnostics: boolean;
     documents: import("@volar/language-server").TextDocuments<import("@volar/language-server/node").SnapshotDocument>;
+    uriConverter: {
+        uriToFileName: (uri: string, parsed?: import("vscode-uri").URI | undefined) => string;
+        fileNameToUri: (fileName: string) => string;
+    };
     workspaceFolders: {
         clear: () => void;
         values: () => IterableIterator<boolean>;
-        uriKeys: () => IterableIterator<string>;
-        uriDelete: (_uri: string) => boolean;
-        uriGet: (_uri: string) => boolean | undefined;
-        uriHas: (_uri: string) => boolean;
-        uriSet: (_uri: string, item: boolean) => void;
-        pathDelete: (path: string) => boolean;
-        pathGet: (path: string) => boolean | undefined;
-        pathHas: (path: string) => boolean | undefined;
-        pathSet: (path: string, item: boolean) => void;
+        keys: () => Generator<import("vscode-uri").URI, void, unknown>;
+        delete: (uri: import("vscode-uri").URI) => boolean;
+        get: (uri: import("vscode-uri").URI) => boolean | undefined;
+        has: (uri: import("vscode-uri").URI) => boolean;
+        set: (uri: import("vscode-uri").URI, item: boolean) => Map<string, boolean>;
     };
     initialize: (initializeParams: import("@volar/language-server").VolarInitializeParams, languageServicePlugins: import("@volar/language-server").LanguageServicePlugin<any>[], projects: import("@volar/language-server").ServerProjectProvider, options?: {
         semanticTokensLegend?: import("@volar/language-server").SemanticTokensLegend | undefined;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@vue/language-server",
-	"version": "2.0.17",
+	"version": "2.0.18",
 	"license": "MIT",
 	"files": [
 		"**/*.js",
@@ -15,12 +15,13 @@
 		"directory": "packages/language-server"
 	},
 	"dependencies": {
-		"@volar/language-core": "~2.2.2",
-		"@volar/language-server": "~2.2.2",
-		"@vue/language-core": "2.0.17",
-		"@vue/language-service": "2.0.17",
-		"@vue/typescript-plugin": "2.0.17",
-		"vscode-languageserver-protocol": "^3.17.5"
+		"@volar/language-core": "~2.2.4",
+		"@volar/language-server": "~2.2.4",
+		"@vue/language-core": "2.0.18",
+		"@vue/language-service": "2.0.18",
+		"@vue/typescript-plugin": "2.0.18",
+		"vscode-languageserver-protocol": "^3.17.5",
+		"vscode-uri": "^3.0.8"
 	},
-	"gitHead": "968039cbb07961f318b4bf122bfa8e3e4a824277"
+	"gitHead": "7aac2805f03b17e4c624335f509d502002bb75a8"
 }