feat: update parser and add arrow function support (#1277)

Author: czosel

package.json

@@ -13,7 +13,7 @@
   "dependencies": {
     "linguist-languages": "^7.5.1",
     "mem": "^6.0.1",
-    "php-parser": "glayzzle/php-parser#b3b2055c24bafc1abd66cb9612b93862db4abd22"
+    "php-parser": "glayzzle/php-parser#4e9d584c7bd478175777e643e8d9d57d1863023a"
   },
   "devDependencies": {
     "@babel/preset-env": "^7.7.5",

src/printer.js

@@ -1734,6 +1734,13 @@ function printNode(path, options, print) {
     case "closure":
     case "method":
       return printFunction(path, options, print);
+    case "arrowfunc":
+      return concat([
+        "fn",
+        printArgumentsList(path, options, print),
+        " => ",
+        path.call(print, "body")
+      ]);
     case "parameter": {
       const name = concat([
         node.nullable ? "?" : "",

tests/arrowfunc/__snapshots__/jsfmt.spec.js.snap

@@ -0,0 +1,29 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`arrowfunc.php 1`] = `
+====================================options=====================================
+parsers: ["php"]
+printWidth: 80
+                                                                                | printWidth
+=====================================input======================================
+<?php
+$var = fn() => "something";
+$var = fn($arg) =>  "something";
+$var = fn(&$arg) => "something";
+$var = fn($arg, $arg, $arg) => "something";
+// $var = fn(): ?string => "something";
+
+call(fn($arg) => $arg);
+
+=====================================output=====================================
+<?php
+$var = fn() => "something";
+$var = fn($arg) => "something";
+$var = fn(&$arg) => "something";
+$var = fn($arg, $arg, $arg) => "something";
+// $var = fn(): ?string => "something";
+
+call(fn($arg) => $arg);
+
+================================================================================
+`;

tests/arrowfunc/arrowfunc.php

@@ -0,0 +1,8 @@
+<?php
+$var = fn() => "something";
+$var = fn($arg) =>  "something";
+$var = fn(&$arg) => "something";
+$var = fn($arg, $arg, $arg) => "something";
+// $var = fn(): ?string => "something";
+
+call(fn($arg) => $arg);

tests/arrowfunc/jsfmt.spec.js

@@ -0,0 +1 @@
+run_spec(__dirname, ["php"]);

tests/bin/__snapshots__/jsfmt.spec.js.snap

@@ -224,7 +224,7 @@ return $var > $someOtherReallyReallyLongVariable ? true : false;
 return $someOtherReallyReallyLongVariable > $someOtherReallyReallyLongVariable ? true : false;
 return $someOtherReallyReallyReallyReallyReallyReallyLongVariable > $someOtherReallyReallyReallyReallyReallyReallyLongVariable ? true : false;
 
-fn(
+func(
     $bifornCringerMoshedPerplexSawder,
     $askTrovenaBeenaDependsRowans,
     $glimseGlyphsHazardNoopsTieTie === averredBathersBoxroomBuggyNurl &&
@@ -680,7 +680,7 @@ return $someOtherReallyReallyReallyReallyReallyReallyLongVariable >
     ? true
     : false;
 
-fn(
+func(
     $bifornCringerMoshedPerplexSawder,
     $askTrovenaBeenaDependsRowans,
     $glimseGlyphsHazardNoopsTieTie === averredBathersBoxroomBuggyNurl &&

tests/bin/bin.php

@@ -216,7 +216,7 @@ function f()
 return $someOtherReallyReallyLongVariable > $someOtherReallyReallyLongVariable ? true : false;
 return $someOtherReallyReallyReallyReallyReallyReallyLongVariable > $someOtherReallyReallyReallyReallyReallyReallyLongVariable ? true : false;
 
-fn(
+func(
     $bifornCringerMoshedPerplexSawder,
     $askTrovenaBeenaDependsRowans,
     $glimseGlyphsHazardNoopsTieTie === averredBathersBoxroomBuggyNurl &&

tests/comments/__snapshots__/jsfmt.spec.js.snap

@@ -3375,9 +3375,9 @@ function foo(/* 1 */ $a /* 2 */ = /* 3 */ 1 /* 4 */) {}
 function foo($a): /* 5 */ ?string /* 6 */ {}
 function foo(/* 1 */ $a /* 2 */ = /* 3 */ 1 /* 4 */): /* 5 */ ?string /* 6 */ {}
 function emptyFn(/*Comment */) {}
-function fn( // Comment
+function func( // Comment
 ) {}
-function fn(
+function func(
     // Comment
 ) {}
 function foo(
@@ -3425,10 +3425,10 @@ function foo(/* 1 */ $a /* 2 */ = /* 3 */ 1 /* 4 */): /* 5 */ ?string /* 6 */
 function emptyFn(/*Comment */)
 {
 }
-function fn()
+function func()
 {
 } // Comment
-function fn()
+function func()
 {
 }
 // Comment

tests/comments/functions.php

@@ -4,9 +4,9 @@ function foo(/* 1 */ $a /* 2 */ = /* 3 */ 1 /* 4 */) {}
 function foo($a): /* 5 */ ?string /* 6 */ {}
 function foo(/* 1 */ $a /* 2 */ = /* 3 */ 1 /* 4 */): /* 5 */ ?string /* 6 */ {}
 function emptyFn(/*Comment */) {}
-function fn( // Comment
+function func( // Comment
 ) {}
-function fn(
+function func(
     // Comment
 ) {}
 function foo(

yarn.lock

@@ -4089,9 +4089,9 @@ performance-now@^2.1.0:
   resolved "https://registry.yarnpkg.com/performance-now/-/performance-now-2.1.0.tgz#6309f4e0e5fa913ec1c69307ae364b4b377c9e7b"
   integrity sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns=
 
-php-parser@glayzzle/php-parser#b3b2055c24bafc1abd66cb9612b93862db4abd22:
+php-parser@glayzzle/php-parser#4e9d584c7bd478175777e643e8d9d57d1863023a:
   version "3.0.0-prerelease.9"
-  resolved "https://codeload.github.com/glayzzle/php-parser/tar.gz/b3b2055c24bafc1abd66cb9612b93862db4abd22"
+  resolved "https://codeload.github.com/glayzzle/php-parser/tar.gz/4e9d584c7bd478175777e643e8d9d57d1863023a"
 
 pify@^2.0.0:
   version "2.3.0"