@type tag correctly applies to multiple var decls (microsoft#832)

sandersn · web-flow · commit d851a61fc472 · 2025-04-28T16:38:45.000Z
diff --git a/internal/parser/reparser.go b/internal/parser/reparser.go
@@ -126,6 +126,7 @@ func (p *Parser) reparseTags(parent *ast.Node, jsDoc []*ast.Node) {
 					for _, declaration := range parent.AsVariableStatement().DeclarationList.AsVariableDeclarationList().Declarations.Nodes {
 						if declaration.AsVariableDeclaration().Type == nil {
 							declaration.AsVariableDeclaration().Type = p.makeNewType(tag.AsJSDocTypeTag().TypeExpression, declaration)
+							break
 						}
 					}
 				} else if parent.Kind == ast.KindVariableDeclaration {
diff --git a/testdata/baselines/reference/conformance/typeTagForMultipleVariableDeclarations.symbols b/testdata/baselines/reference/conformance/typeTagForMultipleVariableDeclarations.symbols
@@ -0,0 +1,18 @@
+//// [tests/cases/conformance/typeTagForMultipleVariableDeclarations.ts] ////
+
+=== typeTagForMultipleVariableDeclarations.js ===
+/** @type {number} */
+var x,y,z;
+>x : Symbol(x, Decl(typeTagForMultipleVariableDeclarations.js, 1, 3))
+>y : Symbol(y, Decl(typeTagForMultipleVariableDeclarations.js, 1, 6))
+>z : Symbol(z, Decl(typeTagForMultipleVariableDeclarations.js, 1, 8))
+
+x
+>x : Symbol(x, Decl(typeTagForMultipleVariableDeclarations.js, 1, 3))
+
+y
+>y : Symbol(y, Decl(typeTagForMultipleVariableDeclarations.js, 1, 6))
+
+z
+>z : Symbol(z, Decl(typeTagForMultipleVariableDeclarations.js, 1, 8))
+
diff --git a/testdata/baselines/reference/conformance/typeTagForMultipleVariableDeclarations.types b/testdata/baselines/reference/conformance/typeTagForMultipleVariableDeclarations.types
@@ -0,0 +1,18 @@
+//// [tests/cases/conformance/typeTagForMultipleVariableDeclarations.ts] ////
+
+=== typeTagForMultipleVariableDeclarations.js ===
+/** @type {number} */
+var x,y,z;
+>x : number
+>y : any
+>z : any
+
+x
+>x : number
+
+y
+>y : any
+
+z
+>z : any
+
diff --git a/testdata/tests/cases/conformance/typeTagForMultipleVariableDeclarations.ts b/testdata/tests/cases/conformance/typeTagForMultipleVariableDeclarations.ts
@@ -0,0 +1,8 @@
+// @checkJs: true
+// @filename: typeTagForMultipleVariableDeclarations.js
+// @allowJs: true
+/** @type {number} */
+var x,y,z;
+x
+y
+z

Original file line number	Diff line number	Diff line change
`@@ -126,6 +126,7 @@ func (p Parser) reparseTags(parent ast.Node, jsDoc []*ast.Node) {`
`126`	`126`	`for _, declaration := range parent.AsVariableStatement().DeclarationList.AsVariableDeclarationList().Declarations.Nodes {`
`127`	`127`	`if declaration.AsVariableDeclaration().Type == nil {`
`128`	`128`	`declaration.AsVariableDeclaration().Type = p.makeNewType(tag.AsJSDocTypeTag().TypeExpression, declaration)`
	`129`	`+ break`
`129`	`130`	`}`
`130`	`131`	`}`
`131`	`132`	`} else if parent.Kind == ast.KindVariableDeclaration {`