Improve destructured @param tag matching (#1428)

Author: sandersn

internal/parser/reparser.go

@@ -527,19 +527,25 @@ func (p *Parser) makeQuestionIfOptional(parameter *ast.JSDocParameterTag) *ast.N
 	return questionToken
 }
 
-func findMatchingParameter(fun *ast.Node, tag *ast.JSDocParameterTag, jsDoc *ast.Node) (*ast.ParameterDeclaration, bool) {
-	tagIndex := core.FindIndex(jsDoc.AsJSDoc().Tags.Nodes, func(n *ast.Node) bool {
-		return n.Kind == ast.KindJSDocParameterTag && n.AsJSDocParameterOrPropertyTag() == tag
-	})
+func findMatchingParameter(fun *ast.Node, parameterTag *ast.JSDocParameterTag, jsDoc *ast.Node) (*ast.ParameterDeclaration, bool) {
+	tagIndex := -1
+	paramCount := -1
+	for _, tag := range jsDoc.AsJSDoc().Tags.Nodes {
+		if tag.Kind == ast.KindJSDocParameterTag {
+			paramCount++
+			if tag.AsJSDocParameterOrPropertyTag() == parameterTag {
+				tagIndex = paramCount
+				break
+			}
+		}
+	}
 	for parameterIndex, parameter := range fun.Parameters() {
 		if parameter.Name().Kind == ast.KindIdentifier {
-			if tag.Name().Kind == ast.KindIdentifier && parameter.Name().Text() == tag.Name().Text() {
-				return parameter.AsParameterDeclaration(), true
-			}
-		} else {
-			if parameterIndex == tagIndex {
+			if parameterTag.Name().Kind == ast.KindIdentifier && parameter.Name().Text() == parameterTag.Name().Text() {
 				return parameter.AsParameterDeclaration(), true
 			}
+		} else if parameterIndex == tagIndex {
+			return parameter.AsParameterDeclaration(), true
 		}
 	}
 	return nil, false

testdata/baselines/reference/submodule/conformance/jsDeclarationsOptionalTypeLiteralProps1.js

@@ -44,7 +44,7 @@ function foo({ a, b, c }) {
  * @returns {number}
  */
 declare function foo({ a, b, c }: {
-    a: any;
-    b: any;
-    c: any;
+    a: number;
+    b?: number;
+    c?: number;
 }): number;

testdata/baselines/reference/submodule/conformance/jsDeclarationsOptionalTypeLiteralProps1.js.diff

@@ -12,16 +12,16 @@
  * @returns {number}
  */
 function foo({ a, b, c }) {
->foo : ({ a, b, c }: { a: any; b: any; c: any; }) => number
->a : any
->b : any
->c : any
+>foo : ({ a, b, c }: { a: number; b?: number; c?: number; }) => number
+>a : number
+>b : number
+>c : number
 
     return a + b + c;
->a + b + c : any
->a + b : any
->a : any
->b : any
->c : any
+>a + b + c : number
+>a + b : number
+>a : number
+>b : number
+>c : number
 }
 

testdata/baselines/reference/submodule/conformance/jsDeclarationsOptionalTypeLiteralProps1.types

@@ -44,7 +44,7 @@ function foo({ a, b, c }) {
  * @returns {number}
  */
 declare function foo({ a, b, c }: {
-    a: any;
-    b: any;
-    c: any;
+    a: number;
+    b?: number;
+    c?: number;
 }): number;

testdata/baselines/reference/submodule/conformance/jsDeclarationsOptionalTypeLiteralProps2.errors.txt

@@ -8,14 +8,12 @@
  /**
   * foo
   *
-@@= skipped -28, +27 lines =@@
-  * @returns {number}
+@@= skipped -29, +28 lines =@@
   */
  declare function foo({ a, b, c }: {
--    a: number;
+     a: number;
 -    b?: number | undefined;
 -    c?: number | undefined;
-+    a: any;
-+    b: any;
-+    c: any;
++    b?: number;
++    c?: number;
  }): number;

testdata/baselines/reference/submodule/conformance/jsDeclarationsOptionalTypeLiteralProps2.js

@@ -12,22 +12,22 @@
  * @returns {number}
  */
 function foo({ a, b, c }) {
->foo : ({ a, b, c }: { a: any; b: any; c: any; }) => number
->a : any
->b : any
->c : any
+>foo : ({ a, b, c }: { a: number; b?: number | undefined; c?: number | undefined; }) => number
+>a : number
+>b : number | undefined
+>c : number | undefined
 
     return a + (b ?? 0) + (c ?? 0);
->a + (b ?? 0) + (c ?? 0) : any
->a + (b ?? 0) : any
->a : any
->(b ?? 0) : any
->b ?? 0 : any
->b : any
+>a + (b ?? 0) + (c ?? 0) : number
+>a + (b ?? 0) : number
+>a : number
+>(b ?? 0) : number
+>b ?? 0 : number
+>b : number | undefined
 >0 : 0
->(c ?? 0) : any
->c ?? 0 : any
->c : any
+>(c ?? 0) : number
+>c ?? 0 : number
+>c : number | undefined
 >0 : 0
 }
 

testdata/baselines/reference/submodule/conformance/jsDeclarationsOptionalTypeLiteralProps2.js.diff

@@ -5,23 +5,7 @@
   */
  function foo({ a, b, c }) {
 ->foo : ({ a, b, c }: {    a: number;    b?: number;    c?: number;}) => number
-->a : number
-->b : number
-->c : number
-+>foo : ({ a, b, c }: { a: any; b: any; c: any; }) => number
-+>a : any
-+>b : any
-+>c : any
-
-     return a + b + c;
-->a + b + c : number
-->a + b : number
-->a : number
-->b : number
-->c : number
-+>a + b + c : any
-+>a + b : any
-+>a : any
-+>b : any
-+>c : any
- }
++>foo : ({ a, b, c }: { a: number; b?: number; c?: number; }) => number
+ >a : number
+ >b : number
+ >c : number