Try to remove whitespace when fixing single line array

Also refactor whitespace a little
squizlabs · Mar 16, 2020 · 6c31390 · 6c31390
1 parent 2914011
commit 6c31390
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 8 deletions.
diff --git a/src/Standards/Squiz/Sniffs/Arrays/ArrayDeclarationSniff.php b/src/Standards/Squiz/Sniffs/Arrays/ArrayDeclarationSniff.php
@@ -243,7 +243,13 @@ public function processSingleLineArray($phpcsFile, $stackPtr, $arrayStart, $arra
                 if ($fix === true) {
                     $phpcsFile->fixer->beginChangeset();
                     $phpcsFile->fixer->addNewline($arrayStart);
-                    $phpcsFile->fixer->addNewlineBefore($arrayEnd);
+
+                    if ($tokens[($arrayEnd - 1)]['code'] === T_WHITESPACE) {
+                        $phpcsFile->fixer->replaceToken(($arrayEnd - 1), $phpcsFile->eolChar);
+                    } else {
+                        $phpcsFile->fixer->addNewlineBefore($arrayEnd);
+                    }
+
                     $phpcsFile->fixer->endChangeset();
                 }
 
@@ -394,9 +400,7 @@ public function processMultiLineArray($phpcsFile, $stackPtr, $arrayStart, $array
                 continue;
             }//end if
 
-            if ($tokens[$nextToken]['code'] !== T_DOUBLE_ARROW
-                && $tokens[$nextToken]['code'] !== T_COMMA
-            ) {
+            if ($tokens[$nextToken]['code'] !== T_DOUBLE_ARROW && $tokens[$nextToken]['code'] !== T_COMMA) {
                 continue;
             }
 

diff --git a/src/Standards/Squiz/Tests/Arrays/ArrayDeclarationUnitTest.1.inc.fixed b/src/Standards/Squiz/Tests/Arrays/ArrayDeclarationUnitTest.1.inc.fixed
@@ -370,12 +370,12 @@ $a = array
 // comment
 (
       'a',
-      'b', 
+      'b',
      );
 
 $a = array /* comment */ (
       'a',
-      'b', 
+      'b',
      );
 
 $x = array('a' => false);

diff --git a/src/Standards/Squiz/Tests/Arrays/ArrayDeclarationUnitTest.2.inc b/src/Standards/Squiz/Tests/Arrays/ArrayDeclarationUnitTest.2.inc
@@ -179,7 +179,7 @@ $listItems[$aliasPath] = [
                           'itemContent' => implode('<br/>', $aliases)
                          ];
 
-$x = 
+$x =
      [
       $x,
       $y,

diff --git a/src/Standards/Squiz/Tests/Arrays/ArrayDeclarationUnitTest.2.inc.fixed b/src/Standards/Squiz/Tests/Arrays/ArrayDeclarationUnitTest.2.inc.fixed
@@ -186,7 +186,7 @@ $listItems[$aliasPath] = [
                           'itemContent' => implode('<br/>', $aliases),
                          ];
 
-$x = 
+$x =
      [
       $x,
       $y,
-Original file line number
+Diff line change
@@ Expand Up / @@ -370,12 +370,12 @@ $a = array @@
     // comment
     (
           'a',
-          'b',
+          'b',
          );
     $a = array /* comment */ (
           'a',
-          'b',
+          'b',
          );
     $x = array('a' => false);
@@ Expand Down @@