Skip to content

Fix/formatter line comment indent #156

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 12, 2025
Merged

Fix/formatter line comment indent #156

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
177d449
Fix indentation calculation in SqlLineCommentBlock
xterao May 9, 2025
0b83719
Add indented line comments test case
xterao May 12, 2025
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: 1 addition & 1 deletion src/main/kotlin/org/domaframework/doma/intellij/formatter/block/SqlLineCommentBlock.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ open class SqlLineCommentBlock(
return it.indent.groupIndentLen.minus(2)
}
}
return 1
return it.indent.indentLen
}
return 1
}
Expand Down
4 changes: 4 additions & 0 deletions src/test/testData/sql/formatter/FormattedSelect.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,9 @@ SELECT COUNT(DISTINCT (x))
, ISNULL(s.fiberid
, 0) AS fiberid
FROM phototag p
-- Line1
JOIN usno u
-- Line2
ON p.objid = u.objid
/** Join */
LEFT OUTER JOIN specobj s
Expand All @@ -24,9 +26,11 @@ SELECT COUNT(DISTINCT (x))
AND p.plate = s.plate
/** Where */
WHERE p.TYPE = DBO.FPHOTOTYPE('Star')
-- Line3
OR (p.flags & DBO.FPHOTOFLAGS('EDGE') = 0
AND (p.psfmag_g - p.extinction_g) BETWEEN 15 AND 20)
/*%if status == 2 */
-- Line4
AND u.propermotion > 2.
/** And Group */
AND (p.psfmag_g - p.extinction_g + 5 * LOG(u.propermotion / 100.) + 5 > 16.136 + 2.727 * (p.psfmag_g - p.extinction_g - (p.psfmag_i - p.extinction_i))
Expand Down
7 changes: 4 additions & 3 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 @@ -15,21 +15,22 @@ SELECT COUNT( DISTINCT (x)),o.*
, 0) AS fiberid

FROM phototag p

-- Line1
JOIN usno u

-- Line2
ON p.objid = u.objid
/** Join */
LEFT OUTER JOIN specobj s
/** ON */
ON p.objid = s.bestobjid AND p.plate = s.plate
/** Where */
WHERE p.TYPE = DBO.FPHOTOTYPE('Star')

-- Line3
OR (p.flags & DBO.FPHOTOFLAGS('EDGE') = 0

AND (p.psfmag_g - p.extinction_g) BETWEEN 15 AND 20)
/*%if status == 2 */
-- Line4
AND u.propermotion > 2.
/** And Group */
AND (p.psfmag_g - p.extinction_g + 5 * LOG(u.propermotion / 100.) + 5 > 16.136 + 2.727 * (p.psfmag_g - p.extinction_g - (p.psfmag_i - p.extinction_i))
Expand Down