Skip to content

Fix formatter spacing for JSON path operators (->, ->>) #637

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

Open
Sea-n wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix formatter spacing for JSON path operators (->, ->>) #637

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 2 additions & 0 deletions src/Context.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,6 +124,8 @@ final class Context
')' => 16,
'.' => 16,
',' => 16,
'->' => 16,
'->>' => 16,
';' => 16,
];

Expand Down
11 changes: 7 additions & 4 deletions src/Utils/Formatter.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -518,12 +518,15 @@ public function formatList(TokensList $list): string
} elseif (
$prev->keyword === 'DELIMITER'
|| ! (
($prev->type === TokenType::Operator && ($prev->value === '.' || $prev->value === '('))
// No space after . (
($prev->type === TokenType::Operator
&& ($prev->value === '.' || $prev->value === '('
|| $prev->value === '->' || $prev->value === '->>'))
// No space after punctuation and JSON operators.
|| ($curr->type === TokenType::Operator
&& ($curr->value === '.' || $curr->value === ','
|| $curr->value === '(' || $curr->value === ')'))
// No space before . , ( )
|| $curr->value === '(' || $curr->value === ')'
|| $curr->value === '->' || $curr->value === '->>'))
// No space before punctuation and JSON operators.
|| $curr->type === TokenType::Delimiter && mb_strlen((string) $curr->value, 'UTF-8') < 2
)
) {
Expand Down
15 changes: 15 additions & 0 deletions tests/Utils/FormatterTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -317,6 +317,21 @@ public static function formatQueriesProviders(): array
'<span class="sql-reserved">WHERE</span><br/>' .
'&nbsp;&nbsp;&nbsp;&nbsp;<span class="sql-number">1</span>',
],
'json operator' => [
'query' => 'SELECT details->\'$."first_name"\' FROM users',
'text' => 'SELECT' . "\n" .
' details->\'$."first_name"\'' . "\n" .
'FROM' . "\n" .
' users',
'cli' => "\x1b[35mSELECT\n" .
" \x1b[39mdetails->\x1b[91m'$.\"first_name\"'\n" .
"\x1b[35mFROM\n" .
" \x1b[39musers\x1b[0m",
'html' => '<span class="sql-reserved">SELECT</span><br/>' .
'&nbsp;&nbsp;&nbsp;&nbsp;details-&gt;<span class="sql-string">\'$."first_name"\'</span><br/>' .
'<span class="sql-reserved">FROM</span><br/>' .
'&nbsp;&nbsp;&nbsp;&nbsp;users',
],
'typical' => [
'query' => 'SELECT id, if(id=1,"Si","No") from `tbl` where id = 0 or ' .
'id = 1 group by id order by id desc limit 1 offset 0',
Expand Down