feat(ts-estree): fix parsing nested sequence expressions (#286)

typescript-eslint · Feb 16, 2019 · ecc9631 · ecc9631
1 parent 5ada030
commit ecc9631
Show file tree

Hide file tree

Showing 11 changed files with 3,905 additions and 9 deletions.
diff --git a/packages/parser/tests/lib/__snapshots__/javascript.ts.snap b/packages/parser/tests/lib/__snapshots__/javascript.ts.snap
diff --git a/packages/shared-fixtures/fixtures/javascript/commaOperator/comma-operator-conditional.src.js b/packages/shared-fixtures/fixtures/javascript/commaOperator/comma-operator-conditional.src.js
@@ -0,0 +1 @@
+var xx = (xx ? x++ : 4, 10);
diff --git a/packages/shared-fixtures/fixtures/javascript/commaOperator/comma-operator-multi.src.js b/packages/shared-fixtures/fixtures/javascript/commaOperator/comma-operator-multi.src.js
@@ -0,0 +1 @@
+var v1 = (1, 2, 3, 4, 5, 6, 7);
diff --git a/packages/shared-fixtures/fixtures/javascript/commaOperator/comma-operator-nested.src.js b/packages/shared-fixtures/fixtures/javascript/commaOperator/comma-operator-nested.src.js
@@ -0,0 +1 @@
+var v1 = ((1, 2, 3), 4, 5, (6, 7));
diff --git a/packages/shared-fixtures/fixtures/javascript/commaOperator/comma-operator-return.src.js b/packages/shared-fixtures/fixtures/javascript/commaOperator/comma-operator-return.src.js
@@ -0,0 +1,4 @@
+function f1() {
+  var a = 1;
+  return a, v1, a;
+}
diff --git a/...ges/shared-fixtures/fixtures/javascript/commaOperator/comma-operator-simple-nested.src.js b/...ges/shared-fixtures/fixtures/javascript/commaOperator/comma-operator-simple-nested.src.js
@@ -0,0 +1 @@
+const foo = (((1, 2)));
diff --git a/packages/shared-fixtures/fixtures/javascript/commaOperator/comma-operator-simple.src.js b/packages/shared-fixtures/fixtures/javascript/commaOperator/comma-operator-simple.src.js
@@ -0,0 +1 @@
+const foo = (1);
diff --git a/packages/typescript-estree/src/convert.ts b/packages/typescript-estree/src/convert.ts
@@ -1596,20 +1596,17 @@ export class Converter {
             expressions: []
           });
 
-          const left = this.convertChild(node.left),
-            right = this.convertChild(node.right);
-
-          if (left.type === AST_NODE_TYPES.SequenceExpression) {
+          const left = this.convertChild(node.left);
+          if (
+            left.type === AST_NODE_TYPES.SequenceExpression &&
+            node.left.kind !== SyntaxKind.ParenthesizedExpression
+          ) {
             result.expressions = result.expressions.concat(left.expressions);
           } else {
             result.expressions.push(left);
           }
 
-          if (right.type === AST_NODE_TYPES.SequenceExpression) {
-            result.expressions = result.expressions.concat(right.expressions);
-          } else {
-            result.expressions.push(right);
-          }
+          result.expressions.push(this.convertChild(node.right));
           return result;
         } else {
           const type = getBinaryExpressionType(node.operatorToken);

diff --git a/packages/typescript-estree/tests/ast-alignment/fixtures-to-test.ts b/packages/typescript-estree/tests/ast-alignment/fixtures-to-test.ts
@@ -206,6 +206,8 @@ tester.addFixturePatternConfig('javascript/classes', {
   ]
 });
 
+tester.addFixturePatternConfig('javascript/commaOperator');
+
 tester.addFixturePatternConfig('javascript/defaultParams');
 
 tester.addFixturePatternConfig('javascript/destructuring');
-Original file line number
+Diff line change
@@ Expand Up / @@ -206,6 +206,8 @@ tester.addFixturePatternConfig('javascript/classes', { @@
       ]
     });
+    tester.addFixturePatternConfig('javascript/commaOperator');
     tester.addFixturePatternConfig('javascript/defaultParams');
     tester.addFixturePatternConfig('javascript/destructuring');
@@ Expand Down @@