Skip to content

Fix non-converging indentation of adjacent string constants #411

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
darold merged 2 commits into from
Sep 19, 2026
Merged

Fix non-converging indentation of adjacent string constants #411

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9cb9a35
Fix non-converging indentation of adjacent string constants
edjubert Sep 12, 2026
68fa307
Merge branch 'master' into fix/adjacent-constants-idempotency
darold Sep 19, 2026
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
7 changes: 6 additions & 1 deletion lib/pgFormatter/Beautify.pm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4751,7 +4751,12 @@ sub _add_token {
{
if ( $token !~ /^['"].*['"]$/ or $last_token ne ':' ) {
if ( $token =~ /AAKEYWCONST\d+AA\s+AAKEYWCONST\d+AA/ ) {
$token =~ s/(AAKEYWCONST\d+AA)/$sp$1/gs;
# Rebuild the separators, the tokenizer kept them verbatim
my $nl_sp = $self->{'space'} x
( $self->{'spaces'} * ( $self->{'_level'} // 0 ) );
$token =~ s/[ \t]+(AAKEYWCONST\d+AA)/ $1/gs;
$token =~ s/ ?\n ?(AAKEYWCONST\d+AA)/\n$nl_sp$1/gs;
$token =~ s/^(AAKEYWCONST\d+AA)/$sp$1/s;
}
else {
$self->{'content'} .= $sp
Expand Down
17 changes: 17 additions & 0 deletions t/test-files/ex85.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,20 @@
SELECT 'a'
'b' AS lit
FROM t;

SELECT concat('CLOTURE AVGLI PROP LOCATAIRE ' , l.imme_no , ' AU '
'2024-12-31') AS libelle
FROM locataires l;

SELECT 'one'
'two'
'three' AS parts
FROM t;

SELECT *
FROM t
WHERE t.code = 'pre'
'fix';
INSERT INTO labo.peri_budgets
WITH bud AS -- CBT selection des soldes des budgets
(
Expand Down
26 changes: 26 additions & 0 deletions t/test-files/expected/ex85.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,29 @@
SELECT
'a'
'b' AS lit
FROM
t;

SELECT
concat('CLOTURE AVGLI PROP LOCATAIRE ', l.imme_no, ' AU '
'2024-12-31') AS libelle
FROM
locataires l;

SELECT
'one'
'two'
'three' AS parts
FROM
t;

SELECT
*
FROM
t
WHERE
t.code = 'pre'
'fix';
INSERT INTO labo.peri_budgets
WITH bud AS -- CBT selection des soldes des budgets
(
Expand Down
Loading