Attach JSDoc to correct nodes in array pattern with elision

e.g. const [, /** string */ str] = []; ------------- Created by MOE: https://github.com/google/moe MOE_MIGRATED_REVID=208130879
google · Aug 10, 2018 · 6eba035 · 6eba035
1 parent 5f15308
commit 6eba035
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 1 deletion.
diff --git a/src/com/google/javascript/jscomp/parsing/parser/Parser.java b/src/com/google/javascript/jscomp/parsing/parser/Parser.java
@@ -3683,8 +3683,9 @@ private ParseTree parseArrayPattern(PatternKind kind) {
     eat(TokenType.OPEN_SQUARE);
     while (peek(TokenType.COMMA) || peekArrayPatternElement()) {
       if (peek(TokenType.COMMA)) {
+        SourcePosition nullStart = getTreeStartLocation();
         eat(TokenType.COMMA);
-        elements.add(new NullTree(getTreeLocation(getTreeStartLocation())));
+        elements.add(new NullTree(getTreeLocation(nullStart)));
       } else {
         elements.add(parsePatternAssignmentTarget(kind));
 

diff --git a/test/com/google/javascript/jscomp/parsing/ParserTest.java b/test/com/google/javascript/jscomp/parsing/ParserTest.java
@@ -1123,6 +1123,22 @@ public void testInlineJSDocAttachmentToArrayPatElementQualifiedNameWithDefault()
     assertNodeHasJSDocInfoWithJSType(xYZName, STRING_TYPE);
   }
 
+  public void testInlineJSDocAttachmentToArrayPatElementAfterElision() {
+    Node letNode =
+        parse("let [, /** string */ x] = [];")
+            .getFirstChild();
+    assertNode(letNode).hasType(Token.LET);
+
+    Node destructuringLhs = letNode.getFirstChild();
+    Node arrayPattern = destructuringLhs.getFirstChild();
+    Node empty = arrayPattern.getFirstChild();
+    assertNode(empty).hasToken(Token.EMPTY);
+    assertNode(empty).hasCharno(5);
+    assertNode(empty).hasLength(1);
+    Node xVarName = arrayPattern.getSecondChild();
+    assertNodeHasJSDocInfoWithJSType(xVarName, STRING_TYPE);
+  }
+
   public void testInlineJSDocAttachmentToObjLitNormalProp() {
     Node letNode = parse("let x = { normalProp: /** string */ normalPropTarget };").getFirstChild();
     assertNode(letNode).hasType(Token.LET);