@@ -22,6 +22,7 @@ import org.domaframework.doma.intellij.formatter.block.SqlRightPatternBlock
2222import org.domaframework.doma.intellij.formatter.block.comment.SqlDefaultCommentBlock
2323import org.domaframework.doma.intellij.formatter.block.comment.SqlElConditionLoopCommentBlock
2424import org.domaframework.doma.intellij.formatter.block.conflict.SqlDoGroupBlock
25+ import org.domaframework.doma.intellij.formatter.block.group.SqlNewGroupBlock
2526import org.domaframework.doma.intellij.formatter.block.group.column.SqlColumnDefinitionRawGroupBlock
2627import org.domaframework.doma.intellij.formatter.block.group.column.SqlColumnRawGroupBlock
2728import org.domaframework.doma.intellij.formatter.block.group.keyword.SqlKeywordGroupBlock
@@ -89,9 +90,9 @@ class SqlBlockRelationBuilder(
8990 )
9091 val lastGroup = blockBuilder.getLastGroupTopNodeIndexHistory()
9192 if (lastGroup is SqlElConditionLoopCommentBlock ) {
92- updateParentGroupLastConditionLoop(
93- lastGroup, context, false ) { block ->
94- block.indent.indentLevel < childBlock.indent.indentLevel
93+ updateParentGroupLastConditionLoop(lastGroup, context, false ) { block ->
94+ block.indent.indentLevel < childBlock.indent.indentLevel ||
95+ block is SqlNewGroupBlock
9596 }
9697 return
9798 }
@@ -471,10 +472,13 @@ class SqlBlockRelationBuilder(
471472 handleConditionLoopParentAssignment(lastGroupBlock, context, findParent)
472473 }
473474
474- private fun findParentForConditionLoop (findDefaultParent : (SqlBlock ) -> Boolean ,findSubGroup : Boolean =false): SqlBlock ? =
475+ private fun findParentForConditionLoop (
476+ findDefaultParent : (SqlBlock ) -> Boolean ,
477+ findSubGroup : Boolean = false,
478+ ): SqlBlock ? =
475479 blockBuilder.getGroupTopNodeIndexHistory().lastOrNull { block ->
476480 findDefaultParent(block) ||
477- findSubGroup && block is SqlSubGroupBlock ||
481+ findSubGroup && block is SqlSubGroupBlock ||
478482 (block is SqlElConditionLoopCommentBlock && block.parentBlock != null )
479483 }
480484
0 commit comments