@prettier/plugin-php 0.19.3 → 0.19.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@prettier/plugin-php",
-  "version": "0.19.3",
+  "version": "0.19.4",
   "description": "Prettier PHP Plugin",
   "repository": "prettier/prettier-php",
   "author": "Lucas Azzola <@azz>",
@@ -19,16 +19,17 @@
     "@babel/preset-env": "^7.19.4",
     "codecov": "3.8.3",
     "cross-env": "^7.0.2",
-    "eslint": "8.32.0",
-    "eslint-config-prettier": "8.6.0",
+    "eslint": "8.36.0",
+    "eslint-config-prettier": "8.7.0",
     "eslint-plugin-import": "2.27.5",
     "eslint-plugin-jest": "27.2.1",
     "eslint-plugin-prettier": "4.2.1",
-    "jest": "29.3.1",
-    "jest-environment-jsdom": "29.3.1",
-    "jest-runner-eslint": "1.1.0",
+    "eslint-plugin-prettier-doc": "^1.1.0",
+    "jest": "29.5.0",
+    "jest-environment-jsdom": "29.5.0",
+    "jest-runner-eslint": "2.0.0",
     "jest-snapshot-serializer-raw": "^1.1.0",
-    "prettier": "2.1.2",
+    "prettier": "^2.8.4",
     "rollup": "^2.75.7",
     "rollup-plugin-alias": "^2.0.0",
     "rollup-plugin-babel": "^4.3.2",

package/src/clean.js

@@ -2,6 +2,23 @@
 
 const util = require("./util");
 
+const ignoredProperties = new Set([
+  "loc",
+  "range",
+  "raw",
+  "comments",
+  "leadingComments",
+  "trailingComments",
+  "parenthesizedExpression",
+  "parent",
+  "prev",
+  "start",
+  "end",
+  "tokens",
+  "errors",
+  "extra",
+]);
+
 /**
  * This function takes the existing ast node and a copy, by reference
  * We use it for testing, so that we can compare pre-post versions of the AST,
@@ -9,25 +26,6 @@ const util = require("./util");
  * changed by the printer, etc.)
  */
 function clean(node, newObj) {
-  [
-    "loc",
-    "range",
-    "raw",
-    "comments",
-    "leadingComments",
-    "trailingComments",
-    "parenthesizedExpression",
-    "parent",
-    "prev",
-    "start",
-    "end",
-    "tokens",
-    "errors",
-    "extra",
-  ].forEach((name) => {
-    delete newObj[name];
-  });
-
   if (node.kind === "string") {
     // TODO if options are available in this method, replace with
     // newObj.isDoubleQuote = !util.useSingleQuote(node, options);
@@ -44,7 +42,7 @@ function clean(node, newObj) {
       return null;
     }
 
-    newObj.value = newObj.value.replace(/\r\n?|\n/g, "");
+    newObj.value = newObj.value.replace(/\n/g, "");
   }
 
   // continue ((2)); -> continue 2;
@@ -110,4 +108,6 @@ function clean(node, newObj) {
   }
 }
 
+clean.ignoredProperties = ignoredProperties;
+
 module.exports = clean;

package/src/comments.js

@@ -8,15 +8,8 @@ const {
   hasNewline,
   hasNewlineInRange,
 } = require("prettier").util;
-const {
-  concat,
-  join,
-  indent,
-  hardline,
-  cursor,
-  lineSuffix,
-  breakParent,
-} = require("prettier").doc.builders;
+const { join, indent, hardline, cursor, lineSuffix, breakParent } =
+  require("prettier").doc.builders;
 const {
   getNextNonSpaceNonCommentCharacterIndex,
   isNextLineEmpty,
@@ -860,7 +853,7 @@ function printDanglingComments(path, options, sameIndent, filter) {
   if (sameIndent) {
     return join(hardline, parts);
   }
-  return indent(concat([hardline, join(hardline, parts)]));
+  return indent([hardline, join(hardline, parts)]);
 }
 
 function hasLeadingComment(node) {
@@ -896,7 +889,7 @@ function printComments(comments, options) {
       parts.push(hardline);
     }
   });
-  return concat(parts);
+  return parts;
 }
 
 function isBlockComment(comment) {
@@ -937,7 +930,7 @@ function canAttachComment(node) {
 // TODO remove after https://github.com/prettier/prettier/issues/5087
 function prependCursorPlaceholder(path, options, printed) {
   if (path.getNode() === options.cursorNode && path.getValue()) {
-    return concat([cursor, printed, cursor]);
+    return [cursor, printed, cursor];
   }
 
   return printed;
@@ -957,15 +950,15 @@ function printLeadingComment(commentPath, print, options) {
   // Leading block comments should see if they need to stay on the
   // same line or not.
   if (isBlock) {
-    return concat([
+    return [
       contents,
       hasNewline(options.originalText, options.locEnd(comment))
         ? hardline
         : " ",
-    ]);
+    ];
   }
 
-  return concat([contents, hardline]);
+  return [contents, hardline];
 }
 
 function printTrailingComment(commentPath, print, options) {
@@ -1000,18 +993,13 @@ function printTrailingComment(commentPath, print, options) {
       options
     );
 
-    return lineSuffix(
-      concat([hardline, isLineBeforeEmpty ? hardline : "", contents])
-    );
+    return lineSuffix([hardline, isLineBeforeEmpty ? hardline : "", contents]);
   } else if (isBlock) {
     // Trailing block comments never need a newline
-    return concat([" ", contents]);
+    return [" ", contents];
   }
 
-  return concat([
-    lineSuffix(concat([" ", contents])),
-    !isBlock ? breakParent : "",
-  ]);
+  return [lineSuffix([" ", contents]), !isBlock ? breakParent : ""];
 }
 
 function printAllComments(path, print, options, needsSemi) {
@@ -1049,7 +1037,7 @@ function printAllComments(path, print, options, needsSemi) {
   return prependCursorPlaceholder(
     path,
     options,
-    concat(leadingParts.concat(trailingParts))
+    leadingParts.concat(trailingParts)
   );
 }
 

package/src/index.js

@@ -86,7 +86,7 @@ const printers = {
             return comment.value;
           }
 
-          const lines = comment.value.split(/\r?\n/g);
+          const lines = comment.value.split("\n");
           // if this is a block comment, handle indentation
           if (
             lines

package/src/parser.js

@@ -9,7 +9,7 @@ function parse(text, parsers, opts) {
   }
 
   // Todo https://github.com/glayzzle/php-parser/issues/170
-  text = text.replace(/\?>\r?\n<\?/g, "?>\n___PSEUDO_INLINE_PLACEHOLDER___<?");
+  text = text.replace(/\?>\n<\?/g, "?>\n___PSEUDO_INLINE_PLACEHOLDER___<?");
 
   // initialize a new parser instance
   const parser = new engine({
@@ -52,10 +52,6 @@ function parse(text, parsers, opts) {
   // currently inline comments include the line break at the end, we need to
   // strip those out and update the end location for each comment manually
   ast.comments.forEach((comment) => {
-    if (comment.value[comment.value.length - 1] === "\r") {
-      comment.value = comment.value.slice(0, -1);
-      comment.loc.end.offset = comment.loc.end.offset - 1;
-    }
     if (comment.value[comment.value.length - 1] === "\n") {
       comment.value = comment.value.slice(0, -1);
       comment.loc.end.offset = comment.loc.end.offset - 1;

package/src/pragma.js

@@ -22,16 +22,6 @@ const getPageLevelDocBlock = memoize((text) => {
   }
 });
 
-function guessLineEnding(text) {
-  const index = text.indexOf("\n");
-
-  if (index >= 0 && text.charAt(index - 1) === "\r") {
-    return "\r\n";
-  }
-
-  return "\n";
-}
-
 function hasPragma(text) {
   // fast path optimization - check if the pragma shows up in the file at all
   if (!reHasPragma.test(text)) {
@@ -49,8 +39,8 @@ function hasPragma(text) {
   return false;
 }
 
-function injectPragma(docblock, text) {
-  let lines = docblock.split(/\r?\n/g);
+function injectPragma(docblock) {
+  let lines = docblock.split("\n");
 
   if (lines.length === 1) {
     // normalize to multiline for simplicity
@@ -66,7 +56,7 @@ function injectPragma(docblock, text) {
   // not found => index == -1, which conveniently will splice 1 from the end.
   lines.splice(pragmaIndex, 0, " * @format");
 
-  return lines.join(guessLineEnding(text));
+  return lines.join("\n");
 }
 
 function insertPragma(text) {