Skip to content

Fix Indentation Issues for Injected SQL and Correct Java Indent Size Retrieval #422

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
Aug 26, 2025
Merged

Fix Indentation Issues for Injected SQL and Correct Java Indent Size Retrieval #422

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
90c32a1
Fix SQL annotation formatting to use correct indent options for Java …
xterao Aug 25, 2025
179b036
Fix SQL annotation formatting to dynamically adjust base indent based…
xterao Aug 25, 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
3 changes: 2 additions & 1 deletion src/main/kotlin/org/domaframework/doma/intellij/formatter/processor/InjectionSqlFormatter.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
package org.domaframework.doma.intellij.formatter.processor

import com.intellij.application.options.CodeStyle
import com.intellij.ide.highlighter.JavaFileType
import com.intellij.lang.injection.InjectedLanguageManager
import com.intellij.openapi.command.WriteCommandAction
import com.intellij.openapi.editor.Document
Expand Down Expand Up @@ -45,7 +46,7 @@ class InjectionSqlFormatter(

private fun createSpaceIndent(project: Project): String {
val settings = CodeStyle.getSettings(project)
val java = settings.indentOptions
val java = settings.getIndentOptions(JavaFileType.INSTANCE)
val indentSize = java.INDENT_SIZE
val prefixLen = "@Sql(\"\"\"".length
return StringUtil.SINGLE_SPACE.repeat(indentSize.plus(prefixLen))
Expand Down
Loading