BracesFixer: allows empty lines before else, elseif, catch & finally

stanislav-janu · Oct 29, 2020 · 888670a · 888670a
1 parent c572609
commit 888670a
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/src/Fixer/Basic/BracesFixer.php b/src/Fixer/Basic/BracesFixer.php
@@ -367,7 +367,10 @@ static function ($item) {
             $indent = $this->detectIndent($tokens, $index);
 
             // fix indent near closing brace
-            $tokens->ensureWhitespaceAtIndex($endBraceIndex - 1, 1, $this->whitespacesConfig->getLineEnding().$indent);
+            $endBraceNextNonWhitespaceIndex = $tokens->getNextNonWhitespace($endBraceIndex);
+            if ($endBraceNextNonWhitespaceIndex === NULL || !$tokens[$endBraceNextNonWhitespaceIndex]->isGivenKind([T_ELSE, T_ELSEIF, T_CATCH, T_FINALLY])) {
+                $tokens->ensureWhitespaceAtIndex($endBraceIndex - 1, 1, $this->whitespacesConfig->getLineEnding().$indent);
+            }
 
             // fix indent between braces
             $lastCommaIndex = $tokens->getPrevTokenOfKind($endBraceIndex - 1, [';', '}']);