Pass the latest block while ignoring conditional and loop directive blocks.

Author: xterao

src/main/kotlin/org/domaframework/doma/intellij/formatter/handler/NotQueryGroupHandler.kt

@@ -18,7 +18,6 @@ package org.domaframework.doma.intellij.formatter.handler
 import com.intellij.lang.ASTNode
 import org.domaframework.doma.intellij.formatter.block.SqlBlock
 import org.domaframework.doma.intellij.formatter.block.SqlCommaBlock
-import org.domaframework.doma.intellij.formatter.block.comment.SqlElConditionLoopCommentBlock
 import org.domaframework.doma.intellij.formatter.block.conflict.SqlConflictClauseBlock
 import org.domaframework.doma.intellij.formatter.block.conflict.SqlConflictExpressionSubGroupBlock
 import org.domaframework.doma.intellij.formatter.block.group.keyword.condition.SqlConditionKeywordGroupBlock
@@ -46,19 +45,17 @@ object NotQueryGroupHandler {
         lastGroup: SqlBlock?,
         child: ASTNode,
         sqlBlockFormattingCtx: SqlBlockFormattingContext,
-        groups: List<SqlBlock>,
     ): SqlBlock? =
         when {
             hasInKeyword(lastGroup) -> SqlParallelListBlock(child, sqlBlockFormattingCtx)
-            lastGroupParentConditionKeywordGroup(groups) -> createConditionalExpressionGroup(child, sqlBlockFormattingCtx)
+            lastGroupParentConditionKeywordGroup(lastGroup) -> createConditionalExpressionGroup(child, sqlBlockFormattingCtx)
             hasFunctionOrAliasContext(lastGroup) -> createFunctionOrValueBlock(lastGroup, child, sqlBlockFormattingCtx)
             lastGroup is SqlConflictClauseBlock -> SqlConflictExpressionSubGroupBlock(child, sqlBlockFormattingCtx)
             hasValuesContext(lastGroup) -> SqlValuesParamGroupBlock(child, sqlBlockFormattingCtx)
             else -> null
         }
 
-    private fun lastGroupParentConditionKeywordGroup(groups: List<SqlBlock>): Boolean =
-        groups.lastOrNull { it !is SqlElConditionLoopCommentBlock } is SqlConditionKeywordGroupBlock
+    private fun lastGroupParentConditionKeywordGroup(lastGroup: SqlBlock?): Boolean = lastGroup is SqlConditionKeywordGroupBlock
 
     /**
      * Creates a keyword group block for specific keywords.

src/main/kotlin/org/domaframework/doma/intellij/formatter/util/SqlBlockGenerator.kt

@@ -345,6 +345,7 @@ class SqlBlockGenerator(
         child: ASTNode,
         groups: List<SqlBlock>,
     ): SqlBlock {
+        val ignoreConditionLoopLastBlock = groups.lastOrNull { it !is SqlElConditionLoopCommentBlock }
         when (lastGroup) {
             is SqlKeywordGroupBlock -> {
                 CreateClauseHandler
@@ -368,7 +369,7 @@ class SqlBlockGenerator(
 
                 // List-type test data for IN clause
                 NotQueryGroupHandler
-                    .getSubGroup(lastGroup, child, sqlBlockFormattingCtx, groups)
+                    .getSubGroup(ignoreConditionLoopLastBlock, child, sqlBlockFormattingCtx)
                     ?.let { return it }
 
                 return SqlSubQueryGroupBlock(child, sqlBlockFormattingCtx)
@@ -385,7 +386,11 @@ class SqlBlockGenerator(
                 }
 
                 NotQueryGroupHandler
-                    .getSubGroup(lastGroup, child, sqlBlockFormattingCtx, groups)
+                    .getSubGroup(ignoreConditionLoopLastBlock, child, sqlBlockFormattingCtx)
+                    ?.let { return it }
+
+                NotQueryGroupHandler
+                    .getSubGroup(lastGroup, child, sqlBlockFormattingCtx)
                     ?.let { return it }
 
                 return SqlSubQueryGroupBlock(child, sqlBlockFormattingCtx)