Remove support for Flow comment types

src/language-js/comments/printer-methods.js

@@ -1,13 +1,8 @@
 import isNonEmptyArray from "../../utils/is-non-empty-array.js";
 import { hasJsxIgnoreComment } from "../print/jsx.js";
 import {
-  CommentCheckFlags,
-  getComments,
   getFunctionParameters,
-  hasFlowAnnotationComment,
-  hasFlowShorthandAnnotationComment,
   hasNodeIgnoreComment,
-  isCallExpression,
   isJsxNode,
   isLineComment,
 } from "../utils/index.js";
@@ -71,15 +66,8 @@ function hasPrettierIgnore(path) {
  * @returns {boolean}
  */
 function willPrintOwnComments({ node, parent }) {
-  const hasFlowAnnotations = (node) =>
-    hasFlowAnnotationComment(getComments(node, CommentCheckFlags.Leading)) ||
-    hasFlowAnnotationComment(getComments(node, CommentCheckFlags.Trailing));
-
   return (
-    ((node &&
-      (isJsxNode(node) ||
-        hasFlowShorthandAnnotationComment(node) ||
-        (isCallExpression(parent) && hasFlowAnnotations(node)))) ||
+    ((node && isJsxNode(node)) ||
       (parent &&
         (parent.type === "JSXSpreadAttribute" ||
           parent.type === "JSXSpreadChild" ||

src/language-js/needs-parens.js

@@ -2,7 +2,6 @@ import isNonEmptyArray from "../utils/is-non-empty-array.js";
 import {
   getFunctionParameters,
   getLeftSidePathName,
-  hasFlowShorthandAnnotationComment,
   hasNakedLeftSide,
   hasNode,
   isBitwiseOperator,
@@ -36,16 +35,6 @@ function needsParens(path, options) {
     return false;
   }
 
-  if (
-    // Preserve parens if we have a Flow annotation comment, unless we're using the Flow
-    // parser. The Flow parser turns Flow comments into type annotation nodes in its
-    // AST, which we handle separately.
-    options.parser !== "flow" &&
-    hasFlowShorthandAnnotationComment(node)
-  ) {
-    return true;
-  }
-
   // Identifiers never need parentheses.
   if (node.type === "Identifier") {
     // ...unless those identifiers are embed placeholders. They might be substituted by complex

src/language-js/parse/babel.js

@@ -159,7 +159,7 @@ function createParse(parseMethod, ...optionsCombinations) {
 const parse = createParse("parse", appendPlugins(["jsx", "flow"]));
 const parseFlow = createParse(
   "parse",
-  appendPlugins(["jsx", ["flow", { all: true, enums: true }]])
+  appendPlugins(["jsx", ["flow", { all: true, enums: true }], "flowComments"])
 );
 const parseTypeScript = createParse(
   "parse",

src/language-js/print/call-expression.js

@@ -2,7 +2,6 @@ import { join, group } from "../../document/builders.js";
 import pathNeedsParens from "../needs-parens.js";
 import {
   getCallArguments,
-  hasFlowAnnotationComment,
   isCallExpression,
   isMemberish,
   isStringLiteral,
@@ -56,21 +55,6 @@ function printCallExpression(path, options, print) {
     }
   }
 
-  // Inline Flow annotation comments following Identifiers in Call nodes need to
-  // stay with the Identifier. For example:
-  //
-  // foo /*:: <SomeGeneric> */(bar);
-  //
-  // Here, we ensure that such comments stay between the Identifier and the Callee.
-  const isIdentifierWithFlowAnnotation =
-    (options.parser === "babel" || options.parser === "babel-flow") &&
-    node.callee &&
-    node.callee.type === "Identifier" &&
-    hasFlowAnnotationComment(node.callee.trailingComments);
-  if (isIdentifierWithFlowAnnotation) {
-    node.callee.trailingComments[0].printed = true;
-  }
-
   // We detect calls on member lookups and possibly print them in a
   // special chain format. See `printMemberChain` for more info.
   if (
@@ -86,9 +70,6 @@ function printCallExpression(path, options, print) {
     isNew ? "new " : "",
     isDynamicImport ? "import" : print("callee"),
     optional,
-    isIdentifierWithFlowAnnotation
-      ? `/*:: ${node.callee.trailingComments[0].value.slice(2).trim()} */`
-      : "",
     printFunctionTypeParameters(path, options, print),
     printCallArguments(path, options, print),
   ];

src/language-js/print/comment.js

@@ -21,14 +21,7 @@ function printComment(commentPath, options) {
       return printIndentableBlockComment(comment);
     }
 
-    const commentEnd = locEnd(comment);
-    const isInsideFlowComment =
-      options.originalText.slice(commentEnd - 3, commentEnd) === "*-/";
-    return [
-      "/*",
-      replaceEndOfLine(comment.value),
-      isInsideFlowComment ? "*-/" : "*/",
-    ];
+    return ["/*", replaceEndOfLine(comment.value), "*/"];
   }
 
   /* istanbul ignore next */

src/language-js/print/flow.js

@@ -12,7 +12,6 @@ import {
   rawText,
   shouldPrintComma,
 } from "../utils/index.js";
-import { locStart, locEnd } from "../loc.js";
 import { printClass } from "./class.js";
 import {
   printOpaqueType,
@@ -287,36 +286,11 @@ function printFlow(path, options, print) {
       ];
 
     case "TypeParameterDeclaration":
-    case "TypeParameterInstantiation": {
-      const printed = printTypeParameters(path, options, print, "params");
-
-      if (options.parser === "flow") {
-        const start = locStart(node);
-        const end = locEnd(node);
-        const commentStartIndex = options.originalText.lastIndexOf("/*", start);
-        const commentEndIndex = options.originalText.indexOf("*/", end);
-        if (commentStartIndex !== -1 && commentEndIndex !== -1) {
-          const comment = options.originalText
-            .slice(commentStartIndex + 2, commentEndIndex)
-            .trim();
-          if (
-            comment.startsWith("::") &&
-            !comment.includes("/*") &&
-            !comment.includes("*/")
-          ) {
-            return ["/*:: ", printed, " */"];
-          }
-        }
-      }
-
-      return printed;
-    }
+    case "TypeParameterInstantiation":
+      return printTypeParameters(path, options, print, "params");
 
     case "InferredPredicate":
       return "%checks";
-    // Unhandled types below. If encountered, nodes of these types should
-    // be either left alone or desugared into AST types that are fully
-    // supported by the pretty-printer.
     case "DeclaredPredicate":
       return ["%checks(", print("value"), ")"];
     case "AnyTypeAnnotation":

src/language-js/print/function.js

@@ -22,7 +22,6 @@ import { ArgExpansionBailout } from "../../common/errors.js";
 import {
   getFunctionParameters,
   hasLeadingOwnLineComment,
-  isFlowAnnotationComment,
   isJsxNode,
   isTemplateOnItsOwnLine,
   shouldPrintComma,
@@ -95,7 +94,7 @@ function printFunction(path, print, options, args) {
     options,
     expandArg
   );
-  const returnTypeDoc = printReturnType(path, print, options);
+  const returnTypeDoc = printReturnType(path, print);
   const shouldGroupParameters = shouldGroupFunctionParameters(
     node,
     returnTypeDoc
@@ -160,7 +159,7 @@ function printMethod(path, options, print) {
 function printMethodInternal(path, options, print) {
   const { node } = path;
   const parametersDoc = printFunctionParameters(path, print, options);
-  const returnTypeDoc = printReturnType(path, print, options);
+  const returnTypeDoc = printReturnType(path, print);
   const shouldGroupParameters = shouldGroupFunctionParameters(
     node,
     returnTypeDoc
@@ -194,7 +193,7 @@ function printArrowFunctionSignature(path, options, print, args) {
     parts.push(print(["params", 0]));
   } else {
     const expandArg = args && (args.expandLastArg || args.expandFirstArg);
-    let returnTypeDoc = printReturnType(path, print, options);
+    let returnTypeDoc = printReturnType(path, print);
     if (expandArg) {
       if (willBreak(returnTypeDoc)) {
         throw new ArgExpansionBailout();
@@ -423,17 +422,10 @@ function shouldPrintParamsWithoutParens(path, options) {
 }
 
 /** @returns {Doc} */
-function printReturnType(path, print, options) {
+function printReturnType(path, print) {
   const { node } = path;
   const returnType = print("returnType");
 
-  if (
-    node.returnType &&
-    isFlowAnnotationComment(options.originalText, node.returnType)
-  ) {
-    return [" /*: ", returnType, " */"];
-  }
-
   const parts = [returnType];
 
   // prepend colon to TypeScript type annotation

src/language-js/print/misc.js

@@ -1,6 +1,5 @@
 import { isNonEmptyArray } from "../../common/util.js";
 import { indent, join, line } from "../../document/builders.js";
-import { isFlowAnnotationComment } from "../utils/index.js";
 
 function printOptionalToken(path) {
   const { node } = path;
@@ -54,10 +53,6 @@ function printTypeAnnotation(path, options, print) {
   const isFunctionDeclarationIdentifier =
     parentNode.type === "DeclareFunction" && parentNode.id === node;
 
-  if (isFlowAnnotationComment(options.originalText, node.typeAnnotation)) {
-    return [" /*: ", print("typeAnnotation"), " */"];
-  }
-
   return [isFunctionDeclarationIdentifier ? "" : ": ", print("typeAnnotation")];
 }
 

src/language-js/printer-estree.js

@@ -20,7 +20,6 @@ import * as commentsRelatedPrinterMethods from "./comments/printer-methods.js";
 import pathNeedsParens from "./needs-parens.js";
 import preprocess from "./print-preprocess.js";
 import {
-  hasFlowShorthandAnnotationComment,
   hasComment,
   CommentCheckFlags,
   isTheOnlyJsxElementInMarkdown,
@@ -154,12 +153,6 @@ function genericPrint(path, options, print, args) {
     parts.unshift(";");
   }
 
-  if (hasFlowShorthandAnnotationComment(node)) {
-    const [comment] = node.trailingComments;
-    parts.push(" /*", comment.value.trimStart(), "*/");
-    comment.printed = true;
-  }
-
   if (isClassExpressionWithDecorators) {
     parts.push(line);
   }

src/language-js/utils/index.js

@@ -1,7 +1,6 @@
 import esutils from "esutils";
 import {
   hasNewline,
-  skipWhitespace,
   isNonEmptyArray,
   isNextLineEmptyAfterIndex,
   getStringWidth,
@@ -30,47 +29,6 @@ const isIdentifierName = esutils.keyword.isIdentifierNameES5;
  * @typedef {import("../../common/ast-path.js").default} AstPath
  */
 
-// We match any whitespace except line terminators because
-// Flow annotation comments cannot be split across lines. For example:
-//
-// (this /*
-// : any */).foo = 5;
-//
-// is not picked up by Flow (see https://github.com/facebook/flow/issues/7050), so
-// removing the newline would create a type annotation that the user did not intend
-// to create.
-const NON_LINE_TERMINATING_WHITE_SPACE = "(?:(?=.)\\s)";
-const FLOW_SHORTHAND_ANNOTATION = new RegExp(
-  `^${NON_LINE_TERMINATING_WHITE_SPACE}*:`
-);
-const FLOW_ANNOTATION = new RegExp(`^${NON_LINE_TERMINATING_WHITE_SPACE}*::`);
-
-/**
- * @param {Node} node
- * @returns {boolean}
- */
-function hasFlowShorthandAnnotationComment(node) {
-  // https://flow.org/en/docs/types/comments/
-  // Syntax example: const r = new (window.Request /*: Class<Request> */)("");
-
-  return (
-    node.extra?.parenthesized &&
-    isBlockComment(node.trailingComments?.[0]) &&
-    FLOW_SHORTHAND_ANNOTATION.test(node.trailingComments[0].value)
-  );
-}
-
-/**
- * @param {Comment[]} comments
- * @returns {boolean}
- */
-function hasFlowAnnotationComment(comments) {
-  const firstComment = comments?.[0];
-  return (
-    isBlockComment(firstComment) && FLOW_ANNOTATION.test(firstComment.value)
-  );
-}
-
 /**
  * @param {Node} node
  * @param {(Node) => boolean} fn
@@ -619,21 +577,6 @@ function getTypeScriptMappedTypeModifier(tokenNode, keyword) {
   return keyword;
 }
 
-/**
- * @param {string} text
- * @param {Node} typeAnnotation
- * @returns {boolean}
- */
-function isFlowAnnotationComment(text, typeAnnotation) {
-  const start = locStart(typeAnnotation);
-  const end = skipWhitespace(text, locEnd(typeAnnotation));
-  return (
-    end !== false &&
-    text.slice(start, start + 2) === "/*" &&
-    text.slice(end, end + 2) === "*/"
-  );
-}
-
 /**
  * @param {string} text
  * @param {Node} node
@@ -1288,8 +1231,6 @@ export {
   getLeftSidePathName,
   getParentExportDeclaration,
   getTypeScriptMappedTypeModifier,
-  hasFlowAnnotationComment,
-  hasFlowShorthandAnnotationComment,
   hasLeadingOwnLineComment,
   hasNakedLeftSide,
   hasNode,
@@ -1303,7 +1244,6 @@ export {
   isCallExpression,
   isMemberExpression,
   isExportDeclaration,
-  isFlowAnnotationComment,
   isFunctionCompositionArgs,
   isFunctionNotation,
   isFunctionOrArrowExpression,

tests/format/flow-repo/union_new/__snapshots__/jsfmt.spec.js.snap

@@ -44,7 +44,7 @@ type Children = Array<Child>;
 class Thunk {}
 class VirtualNode {
   children: Child | Children;
-  constructor(type, children /*: Children */) {
+  constructor(type, children: Children) {
     this.children = children.length === 1 ? children[0] : children;
   }
 }