Fix inconsistent language comment detection (#9743)

src/language-js/comments.js

@@ -19,8 +19,6 @@ const {
   hasFlowShorthandAnnotationComment,
   hasFlowAnnotationComment,
   hasIgnoreComment,
-  hasComment,
-  CommentCheckFlags,
 } = require("./utils");
 const { locStart, locEnd } = require("./loc");
 
@@ -866,18 +864,6 @@ function handleTSMappedTypeComments({
   return false;
 }
 
-/**
- * @param {Node} node
- * @param {(comment: Comment) => boolean} fn
- * @returns boolean
- */
-function hasLeadingComment(node, fn = () => true) {
-  if (node.leadingComments) {
-    return node.leadingComments.some(fn);
-  }
-  return hasComment(node, CommentCheckFlags.Leading, fn);
-}
-
 /**
  * @param {Node} node
  * @returns {boolean}
@@ -994,7 +980,6 @@ module.exports = {
   handleOwnLineComment,
   handleEndOfLineComment,
   handleRemainingComment,
-  hasLeadingComment,
   isTypeCastComment,
   getGapRegex,
   getCommentChildNodes,

src/language-js/embed.js

@@ -1,7 +1,6 @@
 "use strict";
 
-const { isBlockComment } = require("./utils");
-const { hasLeadingComment } = require("./comments");
+const { hasComment, CommentCheckFlags } = require("./utils");
 const formatMarkdown = require("./embed/markdown");
 const formatCss = require("./embed/css");
 const formatGraphql = require("./embed/graphql");
@@ -267,10 +266,10 @@ function hasLanguageComment(node, languageName) {
   // we will not trim the comment value and we will expect exactly one space on
   // either side of the GraphQL string
   // Also see ./clean.js
-  return hasLeadingComment(
+  return hasComment(
     node,
-    (comment) =>
-      isBlockComment(comment) && comment.value === ` ${languageName} `
+    CommentCheckFlags.Block | CommentCheckFlags.Leading,
+    ({ value }) => value === ` ${languageName} `
   );
 }