@vue/language-service 3.3.2 → 3.3.4

package/lib/plugins/vue-inlayhints.js

@@ -93,25 +93,34 @@ function create(ts) {
 function findDestructuredProps(ts, ast, props) {
     const rootScope = Object.create(null);
     const scopeStack = [rootScope];
+    const functionScopeStack = [rootScope];
     let currentScope = rootScope;
     const excludedIds = new WeakSet();
     for (const prop of props) {
         rootScope[prop] = true;
     }
-    function pushScope() {
-        scopeStack.push(currentScope = Object.create(currentScope));
+    function pushScope(isFunctionScope = false) {
+        const scope = currentScope = Object.create(currentScope);
+        scopeStack.push(scope);
+        if (isFunctionScope) {
+            functionScopeStack.push(scope);
+        }
     }
-    function popScope() {
+    function popScope(isFunctionScope = false) {
         scopeStack.pop();
-        currentScope = scopeStack[scopeStack.length - 1] || null;
+        if (isFunctionScope) {
+            functionScopeStack.pop();
+        }
+        currentScope = scopeStack.at(-1) || null;
     }
-    function registerLocalBinding(id) {
+    function registerLocalBinding(id, scope = currentScope) {
         excludedIds.add(id);
-        if (currentScope) {
-            currentScope[id.text] = false;
+        if (scope) {
+            scope[id.text] = false;
         }
     }
     const references = [];
+    walkFunctionScopeVarDeclarations(ast, true);
     walkScope(ast, true);
     walk(ast);
     return references;
@@ -140,7 +149,7 @@ function findDestructuredProps(ts, ast, props) {
             }
         });
     }
-    function walkVariableDeclaration(decl, isRoot = false) {
+    function walkVariableDeclaration(decl, isRoot = false, scope = currentScope) {
         const { initializer, name } = decl;
         const isDefineProps = isRoot
             && initializer
@@ -151,10 +160,30 @@ function findDestructuredProps(ts, ast, props) {
                 excludedIds.add(id);
             }
             else {
-                registerLocalBinding(id);
+                registerLocalBinding(id, scope);
             }
         }
     }
+    function walkFunctionScopeVarDeclarations(scopeNode, isRoot = false) {
+        const scope = functionScopeStack.at(-1);
+        walk(scopeNode);
+        function walk(parent) {
+            ts.forEachChild(parent, node => {
+                if (ts.isFunctionLike(node)
+                    || ts.isClassDeclaration(node)
+                    || ts.isClassExpression(node)) {
+                    return;
+                }
+                if (ts.isVariableDeclarationList(node)
+                    && !(node.flags & ts.NodeFlags.BlockScoped)) {
+                    for (const decl of node.declarations) {
+                        walkVariableDeclaration(decl, isRoot && node.parent.parent === scopeNode, scope);
+                    }
+                }
+                walk(node);
+            });
+        }
+    }
     function walkFunctionDeclaration(node) {
         const { name, parameters } = node;
         if (name && ts.isIdentifier(name)) {
@@ -179,9 +208,10 @@ function findDestructuredProps(ts, ast, props) {
                 return false;
             }
             if (ts.isFunctionLike(node)) {
-                pushScope();
+                pushScope(true);
                 walkFunctionDeclaration(node);
-                if ('body' in node) {
+                if ('body' in node && node.body) {
+                    walkFunctionScopeVarDeclarations(node.body);
                     walkScope(node.body);
                 }
                 return;
@@ -213,8 +243,10 @@ function findDestructuredProps(ts, ast, props) {
             }
         }
         function leave(node) {
-            if (ts.isFunctionLike(node)
-                || ts.isCatchClause(node)
+            if (ts.isFunctionLike(node)) {
+                popScope(true);
+            }
+            else if (ts.isCatchClause(node)
                 || (ts.isBlock(node)
                     && !ts.isFunctionLike(parent)
                     && !ts.isCatchClause(parent))) {

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@vue/language-service",
-	"version": "3.3.2",
+	"version": "3.3.4",
 	"license": "MIT",
 	"files": [
 		"data",
@@ -20,7 +20,7 @@
 	},
 	"dependencies": {
 		"@volar/language-service": "2.4.28",
-		"@vue/language-core": "3.3.2",
+		"@vue/language-core": "3.3.4",
 		"@vue/shared": "^3.5.0",
 		"path-browserify": "^1.0.1",
 		"volar-service-css": "0.0.71",
@@ -39,9 +39,9 @@
 		"@volar/kit": "2.4.28",
 		"@volar/typescript": "2.4.28",
 		"@vue/compiler-dom": "^3.5.0",
-		"@vue/typescript-plugin": "3.3.2",
+		"@vue/typescript-plugin": "3.3.4",
 		"vscode-css-languageservice": "^6.3.10",
-		"vue-component-meta": "3.3.2"
+		"vue-component-meta": "3.3.4"
 	},
-	"gitHead": "7a00047bb6d133bf26fa6e916e856fdca40b3c49"
+	"gitHead": "043a77b6182db32f4076f84a767c1c674ef2b149"
 }