@prettier/plugin-php 0.17.4 → 0.18.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@prettier/plugin-php",
-  "version": "0.17.4",
+  "version": "0.18.1",
   "description": "Prettier PHP Plugin",
   "repository": "prettier/prettier-php",
   "author": "Lucas Azzola <@azz>",
@@ -13,22 +13,22 @@
   "dependencies": {
     "linguist-languages": "^7.5.1",
     "mem": "^8.0.0",
-    "php-parser": "https://github.com/glayzzle/php-parser#e61e26102144f267ecf5e09020865a9baa6ca2f1"
+    "php-parser": "3.1.0-beta.1"
   },
   "devDependencies": {
-    "@babel/preset-env": "^7.7.5",
+    "@babel/preset-env": "^7.16.11",
     "codecov": "3.8.3",
     "cross-env": "^7.0.2",
     "eslint": "7.32.0",
     "eslint-config-prettier": "8.3.0",
-    "eslint-plugin-import": "2.24.2",
-    "eslint-plugin-jest": "24.4.0",
+    "eslint-plugin-import": "2.25.4",
+    "eslint-plugin-jest": "26.1.0",
     "eslint-plugin-prettier": "4.0.0",
-    "jest": "27.1.0",
-    "jest-runner-eslint": "0.10.1",
+    "jest": "27.5.1",
+    "jest-runner-eslint": "1.0.0",
     "jest-snapshot-serializer-raw": "^1.1.0",
     "prettier": "2.1.2",
-    "rollup": "^2.7.5",
+    "rollup": "^2.67.2",
     "rollup-plugin-alias": "^2.0.0",
     "rollup-plugin-babel": "^4.3.2",
     "rollup-plugin-commonjs": "^10.0.2",
@@ -49,10 +49,5 @@
     "prettier": "prettier --plugin=. --parser=php",
     "build-standalone": "rollup -c build/rollup.config.js",
     "debug": "node --inspect-brk node_modules/.bin/jest --runInBand"
-  },
-  "jest": {
-    "projects": [
-      "<rootDir>/jest.*.config.js"
-    ]
   }
 }

package/src/needs-parens.js

@@ -52,6 +52,7 @@ function needsParens(path) {
             (node.type === "+" || node.type === "-")
           );
         case "propertylookup":
+        case "nullsafepropertylookup":
         case "staticlookup":
         case "offsetlookup":
         case "call":
@@ -76,6 +77,7 @@ function needsParens(path) {
           return true;
         case "call":
         case "propertylookup":
+        case "nullsafepropertylookup":
         case "staticlookup":
         case "offsetlookup":
           return name === "what" && parent.what === node;
@@ -121,6 +123,7 @@ function needsParens(path) {
       }
     }
     case "propertylookup":
+    case "nullsafepropertylookup":
     case "staticlookup": {
       switch (parent.kind) {
         case "call":
@@ -138,6 +141,7 @@ function needsParens(path) {
     case "new": {
       switch (parent.kind) {
         case "propertylookup":
+        case "nullsafepropertylookup":
         case "staticlookup":
         case "offsetlookup":
         case "call":
@@ -149,6 +153,7 @@ function needsParens(path) {
     case "yield": {
       switch (parent.kind) {
         case "propertylookup":
+        case "nullsafepropertylookup":
         case "staticlookup":
         case "offsetlookup":
         case "call":
@@ -196,6 +201,7 @@ function needsParens(path) {
 
           return true;
         case "propertylookup":
+        case "nullsafepropertylookup":
         case "staticlookup":
         case "offsetlookup":
         case "call":
@@ -211,6 +217,7 @@ function needsParens(path) {
 
         // https://github.com/prettier/plugin-php/issues/1675
         case "propertylookup":
+        case "nullsafepropertylookup":
           return true;
 
         default:
@@ -225,6 +232,7 @@ function needsParens(path) {
     case "array":
       switch (parent.kind) {
         case "propertylookup":
+        case "nullsafepropertylookup":
         case "staticlookup":
         case "offsetlookup":
         case "call":

package/src/printer.js

@@ -288,7 +288,7 @@ function printMemberChain(path, options, print) {
     if (
       printedNodes[i].node.kind === "call" &&
       printedNodes[i - 1] &&
-      ["propertylookup", "staticlookup"].includes(
+      ["propertylookup", "nullsafepropertylookup", "staticlookup"].includes(
         printedNodes[i - 1].node.kind
       ) &&
       printedNodes[i - 1].needsParens
@@ -635,7 +635,9 @@ function printArgumentsList(path, options, print, argumentsKey = "arguments") {
     (shouldPrintComma(options, "7.3") &&
       ["call", "new", "unset", "isset"].includes(node.kind)) ||
     (shouldPrintComma(options, "8.0") &&
-      ["function", "closure", "method", "arrowfunc"].includes(node.kind))
+      ["function", "closure", "method", "arrowfunc", "attribute"].includes(
+        node.kind
+      ))
       ? indent(
           concat([
             lastArg && shouldPrintHardlineBeforeTrailingComma(lastArg)
@@ -1049,14 +1051,20 @@ function printLines(path, options, print, childrenAttribute = "children") {
           : isProgramLikeNode(node) && isFirstNode && node.kind !== "namespace"
           ? ""
           : concat([beforeCloseTagInlineNode, "?>"]);
+
+      const nextV = path.getNode(index + 1);
+      const skipLastComment = nextV && nextV.children && nextV.children.length;
+
       const afterInline =
         childNode.comments && childNode.comments.length
           ? concat([
               openTag,
               hardline,
-              comments.printComments(childNode.comments, options),
+              skipLastComment
+                ? comments.printComments(childNode.comments, options)
+                : "",
               hardline,
-              "?>",
+              skipLastComment ? "?>" : "",
             ])
           : isProgramLikeNode(node) && isLastNode
           ? ""
@@ -1206,14 +1214,14 @@ function printAttrs(path, options, print, { inline = false } = {}) {
   }
   path.each((agPath) => {
     const attrGroup = ["#["];
-    if (allAttrs.length > 0) {
-      allAttrs.push(inline ? " " : hardline);
+    if (!inline && allAttrs.length > 0) {
+      allAttrs.push(hardline);
     }
-    attrGroup.push(ifBreak(softline));
+    attrGroup.push(softline);
     agPath.each((attrPath) => {
       const attrNode = attrPath.getValue();
       if (attrGroup.length > 2) {
-        attrGroup.push(",", ifBreak(softline, " "));
+        attrGroup.push(",", line);
       }
       const attrStmt = [attrNode.name];
       if (attrNode.args.length > 0) {
@@ -1225,10 +1233,10 @@ function printAttrs(path, options, print, { inline = false } = {}) {
       group(
         concat([
           indent(concat(attrGroup)),
-          ifBreak(softline),
-          "]",
+          ifBreak(shouldPrintComma(options, "8.0") ? "," : ""),
           softline,
-          inline ? " " : "",
+          "]",
+          inline ? ifBreak(softline, " ") : "",
         ])
       )
     );
@@ -1260,6 +1268,10 @@ function printClass(path, options, print) {
     declaration.push(" ", path.call(print, "name"));
   }
 
+  if (node.kind === "enum" && node.valueType) {
+    declaration.push(": ", path.call(print, "valueType"));
+  }
+
   // Only `class` can have `extends` and `implements`
   if (node.extends && node.implements) {
     declaration.push(
@@ -1729,6 +1741,7 @@ function printNode(path, options, print) {
         node.alias ? concat([" as ", path.call(print, "alias")]) : "",
       ]);
     case "class":
+    case "enum":
     case "interface":
     case "trait":
       return printClass(path, options, print);
@@ -2219,7 +2232,7 @@ function printNode(path, options, print) {
               ])
             : "",
           ...path.call(
-            (pa, opt, pr) => printAttrs(pa, opt, pr, { inline: true }),
+            (pa) => printAttrs(pa, options, print, { inline: true }),
             "what"
           ),
           "class",
@@ -2813,7 +2826,11 @@ function printNode(path, options, print) {
       const parentParent = path.getParentNode(1);
       const pureParent =
         parent.kind === "cast" && parentParent ? parentParent : parent;
-      const breakLookupNodes = ["propertylookup", "staticlookup"];
+      const breakLookupNodes = [
+        "propertylookup",
+        "nullsafepropertylookup",
+        "staticlookup",
+      ];
       const breakClosingParens = breakLookupNodes.includes(pureParent.kind);
 
       const printedTest = path.call(print, "test");
@@ -3050,6 +3067,27 @@ function printNode(path, options, print) {
         : "";
     case "namedargument":
       return concat([node.name, ": ", path.call(print, "value")]);
+
+    case "enumcase":
+      return group(
+        concat([
+          "case ",
+          path.call(print, "name"),
+          node.value
+            ? concat([
+                " =",
+                printAssignmentRight(
+                  node.name,
+                  node.value,
+                  path.call(print, "value"),
+                  false,
+                  options
+                ),
+              ])
+            : "",
+        ])
+      );
+
     case "error":
     default:
       // istanbul ignore next

package/src/util.js

@@ -165,6 +165,7 @@ function nodeHasStatement(node) {
     "program",
     "namespace",
     "class",
+    "enum",
     "interface",
     "trait",
     "traituse",
@@ -420,6 +421,7 @@ function lineShouldEndWithSemicolon(path) {
     "traitalias",
     "goto",
     "constantstatement",
+    "enumcase",
     "global",
     "static",
     "echo",
@@ -485,6 +487,7 @@ function hasTrailingComment(node) {
 function isLookupNode(node) {
   return (
     node.kind === "propertylookup" ||
+    node.kind === "nullsafepropertylookup" ||
     node.kind === "staticlookup" ||
     node.kind === "offsetlookup"
   );