Skip to content

Space Adjustment Within Directive Blocks #337

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 1 commit into from
Jul 25, 2025
Merged

Space Adjustment Within Directive Blocks #337

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
20 changes: 20 additions & 0 deletions src/main/kotlin/org/domaframework/doma/intellij/formatter/block/SqlFileBlock.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -424,6 +424,26 @@ class SqlFileBlock(
SqlTypes.BLOCK_COMMENT_START,
SqlTypes.BLOCK_COMMENT_CONTENT,
Spacing.createSpacing(0, 0, 0, true, 0),
).withSpacing(
SqlTypes.BLOCK_COMMENT_START,
SqlTypes.EL_ID_EXPR,
Spacing.createSpacing(1, 1, 0, true, 0),
).withSpacing(
SqlTypes.BLOCK_COMMENT_START,
SqlTypes.EL_PRIMARY_EXPR,
Spacing.createSpacing(1, 1, 0, true, 0),
).withSpacing(
SqlTypes.BLOCK_COMMENT_START,
SqlTypes.EL_STRING,
Spacing.createSpacing(1, 1, 0, true, 0),
).withSpacing(
SqlTypes.BLOCK_COMMENT_START,
SqlTypes.EL_NUMBER,
Spacing.createSpacing(1, 1, 0, true, 0),
).withSpacing(
SqlTypes.BLOCK_COMMENT_START,
SqlTypes.BOOLEAN,
Spacing.createSpacing(1, 1, 0, true, 0),
).withSpacing(
SqlTypes.BLOCK_COMMENT_CONTENT,
SqlTypes.BLOCK_COMMENT_END,
Expand Down
2 changes: 2 additions & 0 deletions src/test/testData/sql/formatter/Select.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,5 +50,7 @@ AS nearest
OR n.neighbormode = 'Primary')
AND ( (x.TYPE = 'Star'
AND x.TYPE = 'Galaxy') OR x.modelmag_g BETWEEN 10 AND 21)
OR status =
/* status */'active'
GROUP BY n.objid ) AS nbor ON o.objid = nbor.objid
WHERE o.objid IN /* params */(1, 2, 3)
1 change: 1 addition & 0 deletions src/test/testData/sql/formatter/Select_format.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,7 @@ SELECT COUNT(DISTINCT x) AS count_x
AND ((x.TYPE = 'Star'
AND x.TYPE = 'Galaxy')
OR x.modelmag_g BETWEEN 10 AND 21)
OR status = /* status */'active'
GROUP BY n.objid ) AS nbor
ON o.objid = nbor.objid
WHERE o.objid IN /* params */(1, 2, 3)
Loading