Remove legacy code (#2229)

* Remove `getNextNonSpaceNonCommentCharacterIndex` * `isNextLineEmpty` * `isPreviousLineEmpty` * Fix
prettier · Aug 30, 2023 · e0530b1 · e0530b1
1 parent c80e8da
commit e0530b1
Show file tree

Hide file tree

Showing 3 changed files with 65 additions and 94 deletions.
diff --git a/src/comments.js b/src/comments.js
@@ -1,10 +1,5 @@
 import { util as prettierUtil, doc } from "prettier";
-import {
- getNextNonSpaceNonCommentCharacterIndex,
- isNextLineEmpty,
- isPreviousLineEmpty,
- isLookupNode,
-} from "./util.js";
+import { isLookupNode } from "./util.js";
 import { locStart, locEnd } from "./loc.js";
 
 const {
@@ -14,6 +9,9 @@ const {
  skipNewline,
  hasNewline,
  hasNewlineInRange,
+ getNextNonSpaceNonCommentCharacterIndex,
+ isNextLineEmpty,
+ isPreviousLineEmpty,
 } = prettierUtil;
 const { join, indent, hardline, cursor, lineSuffix, breakParent } =
  doc.builders;
@@ -275,13 +273,12 @@ function handleLastFunctionArgComments(
  precedingNode,
  enclosingNode,
  followingNode,
- comment,
- options
+ comment
+ /* options */
 ) {
  const nextCharIndex = getNextNonSpaceNonCommentCharacterIndex(
  text,
- comment,
- options
+ locEnd(comment)
  );
  const nextCharacter = text.charAt(nextCharIndex);
 
@@ -330,17 +327,16 @@ function handleIfStatementComments(
  precedingNode,
  enclosingNode,
  followingNode,
- comment,
- options
+ comment
+ /* options */
 ) {
  if (!enclosingNode || enclosingNode.kind !== "if" || !followingNode) {
  return false;
  }
 
  const nextCharIndex = getNextNonSpaceNonCommentCharacterIndex(
  text,
- comment,
- options
+ locEnd(comment)
  );
  const nextCharacter = text.charAt(nextCharIndex);
 
@@ -504,7 +500,13 @@ function handleClassComments(enclosingNode, followingNode, comment) {
  return false;
 }
 
-function handleFunction(text, enclosingNode, followingNode, comment, options) {
+function handleFunction(
+ text,
+ enclosingNode,
+ followingNode,
+ comment
+ /* options */
+) {
  if (
  enclosingNode &&
  (enclosingNode.kind === "function" || enclosingNode.kind === "method")
@@ -525,8 +527,7 @@ function handleFunction(text, enclosingNode, followingNode, comment, options) {
  locEnd(comment) < locStart(enclosingNode.body);
  const nextCharIndex = getNextNonSpaceNonCommentCharacterIndex(
  text,
- comment,
- options
+ locEnd(comment)
  );
  // we additionally need to check if this isn't a trailing argument comment,
  // by checking the next character isn't ")"
@@ -606,11 +607,15 @@ function handleHalt(precedingNode, enclosingNode, followingNode, comment) {
  return false;
 }
 
-function handleCommentInEmptyParens(text, enclosingNode, comment, options) {
+function handleCommentInEmptyParens(
+ text,
+ enclosingNode,
+ comment
+ /* options */
+) {
  const nextCharIndex = getNextNonSpaceNonCommentCharacterIndex(
  text,
- comment,
- options
+ locEnd(comment)
  );
 
  if (text.charAt(nextCharIndex) !== ")") {
@@ -787,8 +792,8 @@ function handleWhileComments(
  precedingNode,
  enclosingNode,
  followingNode,
- comment,
- options
+ comment
+ /* options */
 ) {
  if (!enclosingNode || enclosingNode.kind !== "while" || !followingNode) {
  return false;
@@ -801,8 +806,7 @@ function handleWhileComments(
 
  const nextCharIndex = getNextNonSpaceNonCommentCharacterIndex(
  text,
- comment,
- options
+ locEnd(comment)
  );
  const nextCharacter = text.charAt(nextCharIndex);
 
@@ -884,7 +888,7 @@ function printComments(comments, options) {
  parts.push(hardline);
  }
  if (
- isNextLineEmpty(options.originalText, comment, options) &&
+ isNextLineEmpty(options.originalText, locEnd(comment)) &&
  !isLastComment
  ) {
  parts.push(hardline);
@@ -974,8 +978,7 @@ function printTrailingComment(path, print, options) {
 
  const isLineBeforeEmpty = isPreviousLineEmpty(
  options.originalText,
- comment,
- options
+ locStart(comment)
  );
 
  return lineSuffix([hardline, isLineBeforeEmpty ? hardline : "", contents]);

diff --git a/src/printer.js b/src/printer.js
@@ -1,23 +1,4 @@
 import { util as prettierUtil, doc } from "prettier";
-const {
- breakParent,
- join,
- line,
- lineSuffix,
- group,
- conditionalGroup,
- indent,
- dedent,
- ifBreak,
- hardline,
- softline,
- literalline,
- align,
- dedentToRoot,
-} = doc.builders;
-const { willBreak } = doc.utils;
-const { isNextLineEmptyAfterIndex, hasNewline, hasNewlineInRange } =
- prettierUtil;
 import {
  printAllComments,
  hasTrailingComment,
@@ -57,10 +38,33 @@ import {
  isReferenceLikeNode,
  getNextNode,
  normalizeMagicMethodName,
+} from "./util.js";
+
+const {
+ breakParent,
+ join,
+ line,
+ lineSuffix,
+ group,
+ conditionalGroup,
+ indent,
+ dedent,
+ ifBreak,
+ hardline,
+ softline,
+ literalline,
+ align,
+ dedentToRoot,
+} = doc.builders;
+const { willBreak } = doc.utils;
+const {
+ isNextLineEmptyAfterIndex,
+ hasNewline,
+ hasNewlineInRange,
  getNextNonSpaceNonCommentCharacterIndex,
  isNextLineEmpty,
  isPreviousLineEmpty,
-} from "./util.js";
+} = prettierUtil;
 
 function isMinVersion(actualVersion, requiredVersion) {
  return parseFloat(actualVersion) >= parseFloat(requiredVersion);
@@ -197,8 +201,7 @@ function printMemberChain(path, options, print) {
  const { originalText } = options;
  const nextCharIndex = getNextNonSpaceNonCommentCharacterIndex(
  originalText,
- node,
- options
+ locEnd(node)
  );
  const nextChar = originalText.charAt(nextCharIndex);
 
@@ -212,7 +215,7 @@ function printMemberChain(path, options, print) {
  );
  }
 
- return isNextLineEmpty(originalText, node, options);
+ return isNextLineEmpty(originalText, locEnd(node));
  }
 
  function traverse(path) {
@@ -592,7 +595,7 @@ function printArgumentsList(path, options, print, argumentsKey = "arguments") {
 
  if (isLast) {
  // do nothing
- } else if (isNextLineEmpty(options.originalText, arg, options)) {
+ } else if (isNextLineEmpty(options.originalText, locEnd(arg))) {
  if (isFirst) {
  hasEmptyLineFollowingFirstArg = true;
  }
@@ -859,7 +862,7 @@ function printArrayItems(path, options, print) {
 
  separatorParts = [",", line];
 
- if (node && isNextLineEmpty(options.originalText, node, options)) {
+ if (node && isNextLineEmpty(options.originalText, locEnd(node))) {
  separatorParts.push(softline);
  }
  }, "items");
@@ -941,7 +944,7 @@ function printLines(path, options, print, childrenAttribute = "children") {
  printedPath,
  canPrintBlankLine ? hardline : "",
  canPrintBlankLine &&
- isNextLineEmpty(options.originalText, childNode, options)
+ isNextLineEmpty(options.originalText, locEnd(childNode))
  ? hardline
  : "",
  ];
@@ -1081,7 +1084,7 @@ function printLines(path, options, print, childrenAttribute = "children") {
  ? hardline
  : ""
  : " ",
- isNextLineEmpty(options.originalText, lastNode, options)
+ isNextLineEmpty(options.originalText, locEnd(lastNode))
  ? hardline
  : "",
  ]
@@ -1107,7 +1110,7 @@ function printStatements(path, options, print, childrenAttribute) {
  if (!isLastStatement(path)) {
  parts.push(hardline);
 
- if (isNextLineEmpty(options.originalText, path.node, options)) {
+ if (isNextLineEmpty(options.originalText, locEnd(path.node))) {
  parts.push(hardline);
  }
  }
@@ -1854,7 +1857,7 @@ function printNode(path, options, print) {
 
  if (hasDanglingComments(node)) {
  parts.push(
- isNextLineEmpty(options.originalText, node.body, options)
+ isNextLineEmpty(options.originalText, locEnd(node.body))
  ? hardline
  : "",
  printDanglingComments(path, options, true),
@@ -2828,7 +2831,7 @@ function printNode(path, options, print) {
  const body = print("body");
  const maybeEmptyLineBetweenArms =
  !path.isFirst &&
- isPreviousLineEmpty(options.originalText, armNode, options)
+ isPreviousLineEmpty(options.originalText, locStart(armNode))
  ? hardline
  : "";
 

diff --git a/src/util.js b/src/util.js
@@ -1,39 +1,7 @@
-import { util as prettierUtil, version as prettierVersion } from "prettier";
+import { util as prettierUtil } from "prettier";
 import { locStart } from "./loc.js";
 
-const {
- hasNewline,
- skipEverythingButNewLine,
- skipNewline,
- isNextLineEmpty: _isNextLineEmpty,
- isPreviousLineEmpty: _isPreviousLineEmpty,
- getNextNonSpaceNonCommentCharacterIndex:
- _getNextNonSpaceNonCommentCharacterIndex,
-} = prettierUtil;
-
-function lookupIfPrettier2(options, prop) {
- return parseInt(prettierVersion[0]) > 1 ? options[prop] : options;
-}
-
-function isPreviousLineEmpty(text, node, options) {
- return _isPreviousLineEmpty(
- text,
- node,
- lookupIfPrettier2(options, "locStart")
- );
-}
-
-function isNextLineEmpty(text, node, options) {
- return _isNextLineEmpty(text, node, lookupIfPrettier2(options, "locEnd"));
-}
-
-function getNextNonSpaceNonCommentCharacterIndex(text, node, options) {
- return _getNextNonSpaceNonCommentCharacterIndex(
- text,
- node,
- lookupIfPrettier2(options, "locEnd")
- );
-}
+const { hasNewline, skipEverythingButNewLine, skipNewline } = prettierUtil;
 
 function printNumber(rawNumber) {
  return (
@@ -711,7 +679,4 @@ export {
  getAncestorNode,
  getNextNode,
  normalizeMagicMethodName,
- isPreviousLineEmpty,
- isNextLineEmpty,
- getNextNonSpaceNonCommentCharacterIndex,
 };