feature: BlankLineBetweenImportGroupsFixer - keep indent (#7122)

PHP-CS-Fixer · Jul 5, 2023 · 6db6a98 · 6db6a98
1 parent 734f765
commit 6db6a98
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 20 deletions.
diff --git a/src/Fixer/Whitespace/BlankLineBetweenImportGroupsFixer.php b/src/Fixer/Whitespace/BlankLineBetweenImportGroupsFixer.php
@@ -19,8 +19,8 @@
 use PhpCsFixer\FixerDefinition\CodeSample;
 use PhpCsFixer\FixerDefinition\FixerDefinition;
 use PhpCsFixer\FixerDefinition\FixerDefinitionInterface;
+use PhpCsFixer\Tokenizer\Analyzer\WhitespacesAnalyzer;
 use PhpCsFixer\Tokenizer\CT;
-use PhpCsFixer\Tokenizer\Token;
 use PhpCsFixer\Tokenizer\Tokens;
 use PhpCsFixer\Tokenizer\TokensAnalyzer;
 
@@ -154,12 +154,9 @@ private function ensureLine(Tokens $tokens, int $index): void
         }
 
         $index = $this->getInsertIndex($tokens, $index);
+        $indent = WhitespacesAnalyzer::detectIndent($tokens, $index);
 
-        if ($tokens[$index]->isWhitespace()) {
-            $tokens[$index] = new Token([T_WHITESPACE, $lineEnding]);
-        } else {
-            $tokens->insertSlices([$index + 1 => [new Token([T_WHITESPACE, $lineEnding])]]);
-        }
+        $tokens->ensureWhitespaceAtIndex($index, 1, $lineEnding.$indent);
     }
 
     private function getInsertIndex(Tokens $tokens, int $index): int

diff --git a/tests/Fixer/Whitespace/BlankLineBetweenImportGroupsFixerTest.php b/tests/Fixer/Whitespace/BlankLineBetweenImportGroupsFixerTest.php
@@ -428,23 +428,23 @@ public static function provideFixTypesOrderAndNewlinesCases(): iterable
 namespace A\B6 {
     use C1\B1;
 
-use const C6\Z1;
+    use const C6\Z1;
 
-use C2\B2;
+    use C2\B2;
 
-use const C7\Z2;
+    use const C7\Z2;
 
-use C3\B3;
+    use C3\B3;
 
-use const C8\Z3;
+    use const C8\Z3;
 
-use C4\B4;
+    use C4\B4;
 
-use const C9\Z4;
+    use const C9\Z4;
 
-use C5\B5;
+    use C5\B5;
 
-use const C0\Z5;
+    use const C0\Z5;
 }
             ',
             '<?php
@@ -463,27 +463,27 @@ public static function provideFixTypesOrderAndNewlinesCases(): iterable
 namespace A\B1 {
     use C\B;
 
-use const C\Z;
+    use const C\Z;
 }
 namespace A\B2 {
     use C\B;
 
-use const C\Z;
+    use const C\Z;
 }
 namespace A\B3 {
     use C\B;
 
-use const C\Z;
+    use const C\Z;
 }
 namespace A\B4 {
     use C\B;
 
-use const C\Z;
+    use const C\Z;
 }
 namespace A\B5 {
     use C\B;
 
-use const C\Z;
+    use const C\Z;
 }
             ',
             '<?php