Skip to content

Dedup indent level decrease code #115

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
May 23, 2024
Merged

Dedup indent level decrease code #115

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f22558a
Fix slow array_unshift/shift, appending is faster
mvorisek May 22, 2024
a89a573
Dedup indent level decrease
mvorisek May 21, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
49 changes: 20 additions & 29 deletions src/SqlFormatter.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,13 +11,12 @@

namespace Doctrine\SqlFormatter;

use function array_pop;
use function array_search;
use function array_shift;
use function array_unshift;
use function assert;
use function end;
use function in_array;
use function preg_replace;
use function reset;
use function rtrim;
use function str_repeat;
use function str_replace;
Expand Down Expand Up @@ -68,7 +67,7 @@ public function format(string $string, string $indentString = ' '): string
$inlineIndented = false;
$clauseLimit = false;

$appendNewLineIfNotAddedFx = static function () use (&$addedNewline, &$return, $tab, &$indentLevel): void {
$appendNewLineIfNotAddedFx = static function () use (&$addedNewline, &$return, $tab, &$indentLevel): void {
// Add a newline if not already added
if ($addedNewline) { // @phpstan-ignore if.alwaysFalse
return;
Expand All @@ -77,7 +76,10 @@ public function format(string $string, string $indentString = ' '): string
$return = rtrim($return, ' ' . $tab);
$return .= "\n" . str_repeat($tab, $indentLevel);
};
$redoIndentationFx = static function () use (&$return, $tab, &$indentLevel): void {
$decreaseIndentationLevelFx = static function () use (&$return, &$indentTypes, $tab, &$indentLevel): void {
array_pop($indentTypes);
$indentLevel--;

// Redo the indentation since it may be different now
$lastPossiblyIndentLine = substr($return, -($indentLevel + 2));
if (rtrim($lastPossiblyIndentLine, $tab) !== "\n") {
Expand All @@ -101,14 +103,14 @@ public function format(string $string, string $indentString = ' '): string
if ($increaseSpecialIndent) {
$indentLevel++;
$increaseSpecialIndent = false;
array_unshift($indentTypes, self::INDENT_TYPE_SPECIAL);
$indentTypes[] = self::INDENT_TYPE_SPECIAL;
}

// If we are increasing the block indent level now
if ($increaseBlockIndent) {
$indentLevel++;
$increaseBlockIndent = false;
array_unshift($indentTypes, self::INDENT_TYPE_BLOCK);
$indentTypes[] = self::INDENT_TYPE_BLOCK;
}

// If we need a new line before the token
Expand Down Expand Up @@ -141,8 +143,8 @@ public function format(string $string, string $indentString = ' '): string
$return = rtrim($return, ' ');

if ($inlineIndented) {
array_shift($indentTypes);
$indentLevel--;
$decreaseIndentationLevelFx();

$return = rtrim($return, ' ');
$return .= "\n" . str_repeat($tab, $indentLevel);
}
Expand Down Expand Up @@ -227,17 +229,12 @@ public function format(string $string, string $indentString = ' '): string
// Remove whitespace before the closing parentheses
$return = rtrim($return, ' ');

$indentLevel--;

// Reset indent level
while ($j = array_shift($indentTypes)) {
if ($j !== self::INDENT_TYPE_SPECIAL) {
break;
}

$indentLevel--;
while (end($indentTypes) === self::INDENT_TYPE_SPECIAL) {
$decreaseIndentationLevelFx();
}

$decreaseIndentationLevelFx();

if ($indentLevel < 0) {
// This is an error
$indentLevel = 0;
Expand All @@ -252,10 +249,8 @@ public function format(string $string, string $indentString = ' '): string
$increaseSpecialIndent = true;

// If the last indent type was special, decrease the special indent for this round
if (reset($indentTypes) === self::INDENT_TYPE_SPECIAL) {
$indentLevel--;
array_shift($indentTypes);
$redoIndentationFx();
if (end($indentTypes) === self::INDENT_TYPE_SPECIAL) {
$decreaseIndentationLevelFx();
}

// Add a newline after the top level reserved word
Expand All @@ -273,10 +268,8 @@ public function format(string $string, string $indentString = ' '): string
}
} elseif ($token->value() === ';') {
// If the last indent type was special, decrease the special indent for this round
if (reset($indentTypes) === self::INDENT_TYPE_SPECIAL) {
$indentLevel--;
array_shift($indentTypes);
$redoIndentationFx();
if (end($indentTypes) === self::INDENT_TYPE_SPECIAL) {
$decreaseIndentationLevelFx();
}

$newline = true;
Expand All @@ -287,9 +280,7 @@ public function format(string $string, string $indentString = ' '): string
$increaseBlockIndent = true;
} elseif (in_array(strtoupper($token->value()), ['WHEN', 'THEN', 'ELSE', 'END'], true)) {
if (strtoupper($token->value()) !== 'THEN') {
array_shift($indentTypes);
$indentLevel--;
$redoIndentationFx();
$decreaseIndentationLevelFx();

$prevNotWhitespaceToken = $cursor->subCursor()->previous(Token::TOKEN_TYPE_WHITESPACE);
if ($prevNotWhitespaceToken !== null && strtoupper($prevNotWhitespaceToken->value()) !== 'CASE') {
Expand Down