@vue/language-server 3.0.0-beta.3 → 3.0.0-beta.5

package/index.js

@@ -11,7 +11,13 @@ const reactionsAnalyze_1 = require("./lib/reactionsAnalyze");
 const reactionsAnalyzeLS_1 = require("./lib/reactionsAnalyzeLS");
 const connection = (0, node_1.createConnection)();
 const server = (0, node_1.createServer)(connection);
+const tsserverRequestHandlers = new Map();
+let tsserverRequestId = 0;
 connection.listen();
+connection.onNotification('tsserver/response', ([id, res]) => {
+    tsserverRequestHandlers.get(id)?.(res);
+    tsserverRequestHandlers.delete(id);
+});
 connection.onInitialize(params => {
     const tsconfigProjects = (0, language_service_1.createUriMap)();
     const file2ProjectInfo = new Map();
@@ -25,13 +31,7 @@ connection.onInitialize(params => {
             }
         }
     });
-    let simpleLs;
-    let tsserverRequestId = 0;
-    const tsserverRequestHandlers = new Map();
-    connection.onNotification('tsserver/response', ([id, res]) => {
-        tsserverRequestHandlers.get(id)?.(res);
-        tsserverRequestHandlers.delete(id);
-    });
+    let simpleLanguageService;
     return server.initialize(params, {
         setup() { },
         async getLanguageService(uri) {
@@ -39,7 +39,7 @@ connection.onInitialize(params => {
                 const fileName = uri.fsPath.replace(/\\/g, '/');
                 let projectInfoPromise = file2ProjectInfo.get(fileName);
                 if (!projectInfoPromise) {
-                    projectInfoPromise = sendTsRequest('_vue:' + ts.server.protocol.CommandTypes.ProjectInfo, {
+                    projectInfoPromise = sendTsServerRequest('_vue:' + ts.server.protocol.CommandTypes.ProjectInfo, {
                         file: fileName,
                         needFileNameList: false,
                     });
@@ -48,69 +48,69 @@ connection.onInitialize(params => {
                 const projectInfo = await projectInfoPromise;
                 if (projectInfo) {
                     const { configFileName } = projectInfo;
-                    let ls = tsconfigProjects.get(vscode_uri_1.URI.file(configFileName));
-                    if (!ls) {
-                        ls = createLs(server, configFileName);
-                        tsconfigProjects.set(vscode_uri_1.URI.file(configFileName), ls);
+                    let languageService = tsconfigProjects.get(vscode_uri_1.URI.file(configFileName));
+                    if (!languageService) {
+                        languageService = createProjectLanguageService(server, configFileName);
+                        tsconfigProjects.set(vscode_uri_1.URI.file(configFileName), languageService);
                     }
-                    return ls;
+                    return languageService;
                 }
             }
-            return simpleLs ??= createLs(server, undefined);
+            return simpleLanguageService ??= createProjectLanguageService(server, undefined);
         },
         getExistingLanguageServices() {
             return Promise.all([
                 ...tsconfigProjects.values(),
-                simpleLs,
+                simpleLanguageService,
             ].filter(promise => !!promise));
         },
         reload() {
-            for (const ls of tsconfigProjects.values()) {
-                ls.dispose();
+            for (const languageService of tsconfigProjects.values()) {
+                languageService.dispose();
             }
             tsconfigProjects.clear();
-            if (simpleLs) {
-                simpleLs.dispose();
-                simpleLs = undefined;
+            if (simpleLanguageService) {
+                simpleLanguageService.dispose();
+                simpleLanguageService = undefined;
             }
         },
     }, (0, language_service_1.createVueLanguageServicePlugins)(ts, {
         collectExtractProps(...args) {
-            return sendTsRequest('_vue:collectExtractProps', args);
+            return sendTsServerRequest('_vue:collectExtractProps', args);
         },
         getComponentDirectives(...args) {
-            return sendTsRequest('_vue:getComponentDirectives', args);
+            return sendTsServerRequest('_vue:getComponentDirectives', args);
         },
         getComponentEvents(...args) {
-            return sendTsRequest('_vue:getComponentEvents', args);
+            return sendTsServerRequest('_vue:getComponentEvents', args);
         },
         getComponentNames(...args) {
-            return sendTsRequest('_vue:getComponentNames', args);
+            return sendTsServerRequest('_vue:getComponentNames', args);
         },
         getComponentProps(...args) {
-            return sendTsRequest('_vue:getComponentProps', args);
+            return sendTsServerRequest('_vue:getComponentProps', args);
         },
         getElementAttrs(...args) {
-            return sendTsRequest('_vue:getElementAttrs', args);
+            return sendTsServerRequest('_vue:getElementAttrs', args);
         },
         getElementNames(...args) {
-            return sendTsRequest('_vue:getElementNames', args);
+            return sendTsServerRequest('_vue:getElementNames', args);
         },
         getImportPathForFile(...args) {
-            return sendTsRequest('_vue:getImportPathForFile', args);
+            return sendTsServerRequest('_vue:getImportPathForFile', args);
         },
         getPropertiesAtLocation(...args) {
-            return sendTsRequest('_vue:getPropertiesAtLocation', args);
+            return sendTsServerRequest('_vue:getPropertiesAtLocation', args);
         },
         getDocumentHighlights(fileName, position) {
-            return sendTsRequest('_vue:documentHighlights-full', {
+            return sendTsServerRequest('_vue:documentHighlights-full', {
                 file: fileName,
                 ...{ position },
                 filesToSearch: [fileName],
             });
         },
         async getQuickInfoAtPosition(fileName, { line, character }) {
-            const result = await sendTsRequest('_vue:' + ts.server.protocol.CommandTypes.Quickinfo, {
+            const result = await sendTsServerRequest('_vue:' + ts.server.protocol.CommandTypes.Quickinfo, {
                 file: fileName,
                 line: line + 1,
                 offset: character + 1,
@@ -118,14 +118,14 @@ connection.onInitialize(params => {
             return ts.displayPartsToString(result?.displayParts ?? []);
         },
     }));
-    async function sendTsRequest(command, args) {
+    async function sendTsServerRequest(command, args) {
         return await new Promise(resolve => {
             const requestId = ++tsserverRequestId;
             tsserverRequestHandlers.set(requestId, resolve);
             connection.sendNotification('tsserver/request', [requestId, command, args]);
         });
     }
-    function createLs(server, tsconfig) {
+    function createProjectLanguageService(server, tsconfig) {
         const commonLine = tsconfig
             ? (0, language_core_1.createParsedCommandLine)(ts, ts.sys, tsconfig)
             : {
@@ -151,12 +151,6 @@ connection.onInitialize(params => {
 });
 connection.onInitialized(server.initialized);
 connection.onShutdown(server.shutdown);
-connection.onRequest('vue/parseSfc', (params) => {
-    const document = server.documents.get(vscode_uri_1.URI.parse(params.textDocument.uri));
-    if (document) {
-        return (0, language_core_1.parse)(document.getText());
-    }
-});
 connection.onRequest('vue/interpolationRanges', async (params) => {
     const uri = vscode_uri_1.URI.parse(params.textDocument.uri);
     const languageService = await server.project.getLanguageService(uri);

package/lib/reactionsAnalyze.js

@@ -121,7 +121,6 @@ function analyze(ts, languageService, fileName, position) {
             }
             node.forEachChild(child => visit(child, needToUse, ts.isPropertyAccessExpression(node) || ts.isElementAccessExpression(node)));
         }
-        ;
     }
     function findSubscribers(refName, trackKinds, visited = new Set()) {
         return (0, language_core_1.findBindingVars)(ts, refName, sourceFile)
@@ -180,13 +179,16 @@ function analyze(ts, languageService, fileName, position) {
         return result;
     }
     function findSignalByNamePosition(position) {
-        return signals.find(ref => ref.bindingInfo && ref.bindingInfo.name.getStart(sourceFile) <= position && ref.bindingInfo.name.getEnd() >= position);
+        return signals.find(ref => ref.bindingInfo && ref.bindingInfo.name.getStart(sourceFile) <= position
+            && ref.bindingInfo.name.getEnd() >= position);
     }
     function findEffectByEffectHandlerPosition(position) {
-        return signals.find(ref => ref.sideEffectInfo && ref.sideEffectInfo.handler.getStart(sourceFile) <= position && ref.sideEffectInfo.handler.getEnd() >= position);
+        return signals.find(ref => ref.sideEffectInfo && ref.sideEffectInfo.handler.getStart(sourceFile) <= position
+            && ref.sideEffectInfo.handler.getEnd() >= position);
     }
     function findEffectByDepsHandlerPosition(position) {
-        return signals.find(ref => ref.trackInfo && ref.trackInfo.depsHandler.getStart(sourceFile) <= position && ref.trackInfo.depsHandler.getEnd() >= position);
+        return signals.find(ref => ref.trackInfo && ref.trackInfo.depsHandler.getStart(sourceFile) <= position
+            && ref.trackInfo.depsHandler.getEnd() >= position);
     }
 }
 function collect(ts, sourceFile) {
@@ -200,7 +202,8 @@ function collect(ts, sourceFile) {
                 const call = node.initializer;
                 if (ts.isIdentifier(call.expression)) {
                     const callName = call.expression.escapedText;
-                    if (callName === 'ref' || callName === 'shallowRef' || callName === 'toRef' || callName === 'useTemplateRef' || callName === 'defineModel') {
+                    if (callName === 'ref' || callName === 'shallowRef' || callName === 'toRef' || callName === 'useTemplateRef'
+                        || callName === 'defineModel') {
                         signals.push({
                             bindingInfo: {
                                 isRef: true,
@@ -209,7 +212,8 @@ function collect(ts, sourceFile) {
                             },
                         });
                     }
-                    else if (callName === 'reactive' || callName === 'shallowReactive' || callName === 'defineProps' || callName === 'withDefaults') {
+                    else if (callName === 'reactive' || callName === 'shallowReactive' || callName === 'defineProps'
+                        || callName === 'withDefaults') {
                         signals.push({
                             bindingInfo: {
                                 isRef: true,

package/lib/reactionsAnalyzeLS.js

@@ -20,10 +20,13 @@ const host = {
 function getLanguageService(ts, snapshot, languageId) {
     if (currentSnapshot !== snapshot) {
         currentSnapshot = snapshot;
-        currentFileName = '/tmp.' + (languageId === 'javascript' ? 'js' :
-            languageId === 'typescriptreact' ? 'tsx' :
-                languageId === 'javascriptreact' ? 'jsx' :
-                    'ts');
+        currentFileName = '/tmp.' + (languageId === 'javascript'
+            ? 'js'
+            : languageId === 'typescriptreact'
+                ? 'tsx'
+                : languageId === 'javascriptreact'
+                    ? 'jsx'
+                    : 'ts');
         currentProjectVersion++;
     }
     languageService ??= ts.createLanguageService(host);

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@vue/language-server",
-	"version": "3.0.0-beta.3",
+	"version": "3.0.0-beta.5",
 	"license": "MIT",
 	"files": [
 		"**/*.js",
@@ -16,10 +16,10 @@
 		"directory": "packages/language-server"
 	},
 	"dependencies": {
-		"@volar/language-server": "2.4.14",
-		"@vue/language-core": "3.0.0-beta.3",
-		"@vue/language-service": "3.0.0-beta.3",
-		"@vue/typescript-plugin": "3.0.0-beta.3",
+		"@volar/language-server": "2.4.15",
+		"@vue/language-core": "3.0.0-beta.5",
+		"@vue/language-service": "3.0.0-beta.5",
+		"@vue/typescript-plugin": "3.0.0-beta.5",
 		"vscode-uri": "^3.0.8"
 	},
 	"peerDependencies": {
@@ -27,7 +27,7 @@
 	},
 	"devDependencies": {
 		"@typescript/server-harness": "latest",
-		"@volar/test-utils": "2.4.14"
+		"@volar/test-utils": "2.4.15"
 	},
-	"gitHead": "17e3beabc13e9eb59a82fb1a9f0252fd6685e444"
+	"gitHead": "3a4648914c60c90444d939cf762a016a4318ca09"
 }