Skip to content

Commit cff367e

Browse files
committed
Refactor: Organize and clean up SQL block imports in SqlFileBlock and SqlBlockBuilder
1 parent cac6613 commit cff367e

File tree

2 files changed

+23
-5
lines changed

2 files changed

+23
-5
lines changed

src/main/kotlin/org/domaframework/doma/intellij/formatter/block/SqlFileBlock.kt

Lines changed: 23 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,14 @@
1515
*/
1616
package org.domaframework.doma.intellij.formatter.block
1717

18-
import com.intellij.formatting.*
18+
import com.intellij.formatting.Alignment
19+
import com.intellij.formatting.Block
20+
import com.intellij.formatting.ChildAttributes
21+
import com.intellij.formatting.FormattingMode
22+
import com.intellij.formatting.Indent
23+
import com.intellij.formatting.Spacing
24+
import com.intellij.formatting.SpacingBuilder
25+
import com.intellij.formatting.Wrap
1926
import com.intellij.lang.ASTNode
2027
import com.intellij.psi.PsiElement
2128
import com.intellij.psi.PsiWhiteSpace
@@ -25,7 +32,11 @@ import com.intellij.psi.util.elementType
2532
import org.domaframework.doma.intellij.common.util.StringUtil
2633
import org.domaframework.doma.intellij.common.util.TypeUtil
2734
import org.domaframework.doma.intellij.formatter.block.comma.SqlCommaBlock
28-
import org.domaframework.doma.intellij.formatter.block.comment.*
35+
import org.domaframework.doma.intellij.formatter.block.comment.SqlCommentBlock
36+
import org.domaframework.doma.intellij.formatter.block.comment.SqlDefaultCommentBlock
37+
import org.domaframework.doma.intellij.formatter.block.comment.SqlElBlockCommentBlock
38+
import org.domaframework.doma.intellij.formatter.block.comment.SqlElConditionLoopCommentBlock
39+
import org.domaframework.doma.intellij.formatter.block.comment.SqlLineCommentBlock
2940
import org.domaframework.doma.intellij.formatter.block.expr.SqlElAtSignBlock
3041
import org.domaframework.doma.intellij.formatter.block.expr.SqlElSymbolBlock
3142
import org.domaframework.doma.intellij.formatter.block.group.SqlNewGroupBlock
@@ -42,10 +53,18 @@ import org.domaframework.doma.intellij.formatter.block.group.keyword.update.SqlU
4253
import org.domaframework.doma.intellij.formatter.block.group.keyword.with.SqlWithColumnGroupBlock
4354
import org.domaframework.doma.intellij.formatter.block.group.keyword.with.SqlWithCommonTableGroupBlock
4455
import org.domaframework.doma.intellij.formatter.block.group.keyword.with.SqlWithQueryGroupBlock
45-
import org.domaframework.doma.intellij.formatter.block.group.subgroup.*
56+
import org.domaframework.doma.intellij.formatter.block.group.subgroup.SqlArrayListGroupBlock
57+
import org.domaframework.doma.intellij.formatter.block.group.subgroup.SqlDataTypeParamBlock
58+
import org.domaframework.doma.intellij.formatter.block.group.subgroup.SqlFunctionParamBlock
59+
import org.domaframework.doma.intellij.formatter.block.group.subgroup.SqlSubGroupBlock
60+
import org.domaframework.doma.intellij.formatter.block.group.subgroup.SqlSubQueryGroupBlock
4661
import org.domaframework.doma.intellij.formatter.block.other.SqlEscapeBlock
4762
import org.domaframework.doma.intellij.formatter.block.other.SqlOtherBlock
48-
import org.domaframework.doma.intellij.formatter.block.word.*
63+
import org.domaframework.doma.intellij.formatter.block.word.SqlAliasBlock
64+
import org.domaframework.doma.intellij.formatter.block.word.SqlArrayWordBlock
65+
import org.domaframework.doma.intellij.formatter.block.word.SqlFunctionGroupBlock
66+
import org.domaframework.doma.intellij.formatter.block.word.SqlTableBlock
67+
import org.domaframework.doma.intellij.formatter.block.word.SqlWordBlock
4968
import org.domaframework.doma.intellij.formatter.builder.SqlBlockBuilder
5069
import org.domaframework.doma.intellij.formatter.builder.SqlBlockRelationBuilder
5170
import org.domaframework.doma.intellij.formatter.builder.SqlCustomSpacingBuilder

src/main/kotlin/org/domaframework/doma/intellij/formatter/builder/SqlBlockBuilder.kt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@ import org.domaframework.doma.intellij.formatter.block.comment.SqlDefaultComment
2020
import org.domaframework.doma.intellij.formatter.block.comment.SqlElConditionLoopCommentBlock
2121

2222
open class SqlBlockBuilder {
23-
2423
private val groupTopNodeIndexHistory = mutableListOf<SqlBlock>()
2524

2625
private val commentBlocks = mutableListOf<SqlDefaultCommentBlock>()

0 commit comments

Comments
 (0)