Skip to content

Use constants for the indentation block type #112

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 20, 2024
Merged

Use constants for the indentation block type #112

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bc8a55b
use constants for the indentation block type
goetas May 20, 2024
ba0bca7
Do not use constants in comments
goetas May 20, 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
15 changes: 9 additions & 6 deletions src/SqlFormatter.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,9 @@ final class SqlFormatter
private readonly Highlighter $highlighter;
private readonly Tokenizer $tokenizer;

private const INDENT_TYPE_BLOCK = 'block';
private const INDENT_TYPE_SPECIAL = 'special';

public function __construct(Highlighter|null $highlighter = null)
{
$this->tokenizer = new Tokenizer();
Expand Down Expand Up @@ -77,14 +80,14 @@ public function format(string $string, string $indentString = ' '): string
if ($increaseSpecialIndent) {
$indentLevel++;
$increaseSpecialIndent = false;
array_unshift($indentTypes, 'special');
array_unshift($indentTypes, self::INDENT_TYPE_SPECIAL);
}

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

// If we need a new line before the token
Expand Down Expand Up @@ -207,7 +210,7 @@ public function format(string $string, string $indentString = ' '): string

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

Expand All @@ -230,9 +233,9 @@ public function format(string $string, string $indentString = ' '): string
// Top level reserved words start a new line and increase the special indent level
$increaseSpecialIndent = true;

// If the last indent type was 'special', decrease the special indent for this round
// If the last indent type was special, decrease the special indent for this round
reset($indentTypes);
if (current($indentTypes) === 'special') {
if (current($indentTypes) === self::INDENT_TYPE_SPECIAL) {
$indentLevel--;
array_shift($indentTypes);
}
Expand Down Expand Up @@ -341,7 +344,7 @@ public function format(string $string, string $indentString = ' '): string
}

// If there are unmatched parentheses
if (array_search('block', $indentTypes) !== false) {
if (array_search(self::INDENT_TYPE_BLOCK, $indentTypes) !== false) {
$return = rtrim($return, ' ');
$return .= $this->highlighter->highlightErrorMessage(
'WARNING: unclosed parentheses or section',
Expand Down