Fix

sosukesuzuki · sosukesuzuki · commit 776f858c0444 · 2020-06-27T03:58:03.000+09:00
diff --git a/src/language-js/comments.js b/src/language-js/comments.js
@@ -947,12 +947,32 @@ function handleTSMappedTypeComments(
   return false;
 }
 
-function hasQuestionBetweenTestAndComment(testNode, comment, text, options) {
+function hasQuestionBetweenTestAndComment(
+  testNode,
+  comment,
+  text,
+  options,
+  n = 0
+) {
+  const testNodeLocEnd = options.locEnd(testNode) + n;
+  const commentLocStart = options.locStart(comment);
   const idx = privateUtil.getNextNonSpaceNonCommentCharacterIndexWithStartIndex(
     text,
-    options.locEnd(testNode)
+    testNodeLocEnd
   );
-  return text[idx] === "?" && idx < options.locStart(comment);
+  if (testNodeLocEnd < commentLocStart) {
+    if (text[idx] === "?") {
+      return idx < commentLocStart;
+    }
+    return hasQuestionBetweenTestAndComment(
+      testNode,
+      comment,
+      text,
+      options,
+      n + 1
+    );
+  }
+  return false;
 }
 
 function handleTernaryTrailingComments(
diff --git a/tests/js/conditional/__snapshots__/jsfmt.spec.js.snap b/tests/js/conditional/__snapshots__/jsfmt.spec.js.snap
@@ -180,6 +180,14 @@ c */? foo : bar : bar;
 ?
 foo : bar;
 
+(test) ?
+// comment
+foo :  bar;
+
+test ?
+// comment
+foo :  bar;
+
 =====================================output=====================================
 var inspect =
   4 === util.inspect.length
@@ -356,6 +364,16 @@ test
   ? foo
   : bar;
 
+test
+  ? // comment
+    foo
+  : bar;
+
+test
+  ? // comment
+    foo
+  : bar;
+
 ================================================================================
 `;
 
diff --git a/tests/js/conditional/comments.js b/tests/js/conditional/comments.js
@@ -171,3 +171,11 @@ c */? foo : bar : bar;
 // comment
 ?
 foo : bar;
+
+(test) ?
+// comment
+foo :  bar;
+
+test ?
+// comment
+foo :  bar;
