fix(typescript-estree): jsx comment parsing

typescript-eslint · Jul 13, 2019 · 2728d92 · 2728d92
1 parent c2ad091
commit 2728d92
Show file tree

Hide file tree

Showing 4 changed files with 806 additions and 1 deletion.
diff --git a/packages/shared-fixtures/fixtures/comments/jsx-tag-comment-after-prop.src.js b/packages/shared-fixtures/fixtures/comments/jsx-tag-comment-after-prop.src.js
@@ -0,0 +1,11 @@
+const pure = () => {
+  return (
+      <Foo
+        // one
+        foo={123}
+        // two
+        bar="woof"
+      />
+  );
+}
+
diff --git a/packages/typescript-estree/src/convert-comments.ts b/packages/typescript-estree/src/convert-comments.ts
@@ -147,7 +147,9 @@ export function convertComments(
         // Rescan after a JSX expression
         if (
           container.parent &&
-          container.parent.kind === ts.SyntaxKind.JsxExpression
+          container.parent.kind === ts.SyntaxKind.JsxExpression &&
+          container.parent.parent &&
+          container.parent.parent.kind === ts.SyntaxKind.JsxElement
         ) {
           kind = triviaScanner.reScanJsxToken();
           continue;