Merge pull request #1308 from Soh1121/issue-968/fix-wrong-indentation-with-arrow-function

Fix wrong indentation with arrow function

Author: jrfnl

src/Standards/Generic/Sniffs/WhiteSpace/ScopeIndentSniff.php

@@ -1134,15 +1134,6 @@ public function process(File $phpcsFile, int $stackPtr)
                 }
 
                 $condition = $tokens[$tokens[$i]['scope_condition']]['code'];
-                if ($condition === T_FN) {
-                    if ($this->debug === true) {
-                        $line = $tokens[$tokens[$i]['scope_condition']]['line'];
-                        StatusWriter::write("* ignoring arrow function on line $line *");
-                    }
-
-                    $i = $closer;
-                    continue;
-                }
 
                 if (isset(Tokens::SCOPE_OPENERS[$condition]) === true
                     && in_array($condition, $this->nonIndentingScopes, true) === false
@@ -1175,14 +1166,15 @@ public function process(File $phpcsFile, int $stackPtr)
                 }
             }
 
-            // Closing an anon class, closure, or match.
+            // Closing an anon class, closure, match, or arrow function.
             // Each may be returned, which can confuse control structures that
             // use return as a closer, like CASE statements.
             if (isset($tokens[$i]['scope_condition']) === true
                 && $tokens[$i]['scope_closer'] === $i
                 && ($tokens[$tokens[$i]['scope_condition']]['code'] === T_CLOSURE
                 || $tokens[$tokens[$i]['scope_condition']]['code'] === T_ANON_CLASS
-                || $tokens[$tokens[$i]['scope_condition']]['code'] === T_MATCH)
+                || $tokens[$tokens[$i]['scope_condition']]['code'] === T_MATCH
+                || $tokens[$tokens[$i]['scope_condition']]['code'] === T_FN)
             ) {
                 if ($this->debug === true) {
                     $type = str_replace('_', ' ', strtolower(substr($tokens[$tokens[$i]['scope_condition']]['type'], 2)));

src/Standards/Generic/Tests/WhiteSpace/ScopeIndentUnitTest.1.inc

@@ -1620,6 +1620,34 @@ function test() {
         from [ 3, 4 ];
 }
 
+// Issue #968: Arrow function in function call argument
+return json_encode(
+    array_filter(
+        [
+            'foo' => 42,
+            'bar' => null,
+        ],
+        static fn(mixed $value) => $value !== null
+    ),
+    JSON_THROW_ON_ERROR
+);
+
+// Issue #968: Arrow function with multiple arguments
+$result = array_map(
+    static fn($a, $b) => $a + $b,
+    $array1,
+    $array2
+);
+
+// Issue #968: Nested arrow function
+$result = array_map(
+    static fn($x) => array_filter(
+        $x,
+        static fn($y) => $y > 0
+    ),
+    $data
+);
+
 /* ADD NEW TESTS ABOVE THIS LINE AND MAKE SURE THAT THE 1 (space-based) AND 2 (tab-based) FILES ARE IN SYNC! */
 ?>
 

src/Standards/Generic/Tests/WhiteSpace/ScopeIndentUnitTest.1.inc.fixed

@@ -1620,6 +1620,34 @@ function test() {
         from [ 3, 4 ];
 }
 
+// Issue #968: Arrow function in function call argument
+return json_encode(
+    array_filter(
+        [
+            'foo' => 42,
+            'bar' => null,
+        ],
+        static fn(mixed $value) => $value !== null
+    ),
+    JSON_THROW_ON_ERROR
+);
+
+// Issue #968: Arrow function with multiple arguments
+$result = array_map(
+    static fn($a, $b) => $a + $b,
+    $array1,
+    $array2
+);
+
+// Issue #968: Nested arrow function
+$result = array_map(
+    static fn($x) => array_filter(
+        $x,
+        static fn($y) => $y > 0
+    ),
+    $data
+);
+
 /* ADD NEW TESTS ABOVE THIS LINE AND MAKE SURE THAT THE 1 (space-based) AND 2 (tab-based) FILES ARE IN SYNC! */
 ?>
 

src/Standards/Generic/Tests/WhiteSpace/ScopeIndentUnitTest.2.inc

@@ -1620,6 +1620,34 @@ function test() {
 		from [ 3, 4 ];
 }
 
+// Issue #968: Arrow function in function call argument
+return json_encode(
+	array_filter(
+		[
+			'foo' => 42,
+			'bar' => null,
+		],
+		static fn(mixed $value) => $value !== null
+	),
+	JSON_THROW_ON_ERROR
+);
+
+// Issue #968: Arrow function with multiple arguments
+$result = array_map(
+	static fn($a, $b) => $a + $b,
+	$array1,
+	$array2
+);
+
+// Issue #968: Nested arrow function
+$result = array_map(
+	static fn($x) => array_filter(
+		$x,
+		static fn($y) => $y > 0
+	),
+	$data
+);
+
 /* ADD NEW TESTS ABOVE THIS LINE AND MAKE SURE THAT THE 1 (space-based) AND 2 (tab-based) FILES ARE IN SYNC! */
 ?>
 

src/Standards/Generic/Tests/WhiteSpace/ScopeIndentUnitTest.2.inc.fixed

@@ -1620,6 +1620,34 @@ function test() {
 		from [ 3, 4 ];
 }
 
+// Issue #968: Arrow function in function call argument
+return json_encode(
+	array_filter(
+		[
+			'foo' => 42,
+			'bar' => null,
+		],
+		static fn(mixed $value) => $value !== null
+	),
+	JSON_THROW_ON_ERROR
+);
+
+// Issue #968: Arrow function with multiple arguments
+$result = array_map(
+	static fn($a, $b) => $a + $b,
+	$array1,
+	$array2
+);
+
+// Issue #968: Nested arrow function
+$result = array_map(
+	static fn($x) => array_filter(
+		$x,
+		static fn($y) => $y > 0
+	),
+	$data
+);
+
 /* ADD NEW TESTS ABOVE THIS LINE AND MAKE SURE THAT THE 1 (space-based) AND 2 (tab-based) FILES ARE IN SYNC! */
 ?>
 

src/Standards/Generic/Tests/WhiteSpace/ScopeIndentUnitTest.php

@@ -169,10 +169,10 @@ public function getErrorList($testFile = '')
             1527 => 1,
             1529 => 1,
             1530 => 1,
-            1631 => 1,
-            1632 => 1,
-            1633 => 1,
-            1634 => 1,
+            1659 => 1,
+            1660 => 1,
+            1661 => 1,
+            1662 => 1,
         ];
     }