Adjust keyword group indentation within conditional directives

Author: xterao

src/main/kotlin/org/domaframework/doma/intellij/formatter/block/group/keyword/second/SqlWhereGroupBlock.kt

@@ -0,0 +1,26 @@
+/*
+ * Copyright Doma Tools Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.domaframework.doma.intellij.formatter.block.group.keyword.second
+
+import com.intellij.lang.ASTNode
+import org.domaframework.doma.intellij.formatter.util.SqlBlockFormattingContext
+
+class SqlWhereGroupBlock(
+    node: ASTNode,
+    context: SqlBlockFormattingContext,
+) : SqlSecondKeywordBlock(node, context) {
+    override fun createGroupIndentLen(): Int = indent.indentLen.plus(getNodeText().length)
+}

src/main/kotlin/org/domaframework/doma/intellij/formatter/block/group/keyword/with/SqlWithCommonTableGroupBlock.kt

@@ -77,7 +77,7 @@ class SqlWithCommonTableGroupBlock(
         parentBlock?.let { parent ->
             val prevBlock =
                 parent
-                    .getChildBlocksDropLast()
+                    .getChildBlocksDropLast(skipConditionLoopCommentBlock = false)
                     .lastOrNull()
             return if (prevBlock is SqlElConditionLoopCommentBlock) 4 else 0
         }

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

@@ -138,11 +138,27 @@ class SqlBlockRelationBuilder(
         val context = SetParentContext(childBlock, blockBuilder)
         if (lastGroupBlock is SqlElConditionLoopCommentBlock) {
             handleConditionLoopParent(lastGroupBlock, context, childBlock)
-        } else if (childBlock.indent.indentLevel == IndentType.TOP) {
+            return
+        }
+        if (childBlock.indent.indentLevel == IndentType.TOP) {
             handleTopLevelKeyword(lastGroupBlock, childBlock, context)
-        } else {
-            handleNonTopLevelKeyword(lastGroupBlock, lastIndentLevel, childBlock, context)
+            return
+        }
+        if (lastGroupBlock !is SqlSubGroupBlock) {
+            if (lastIndentLevel > childBlock.indent.indentLevel) {
+                val findLastGroup =
+                    blockBuilder.getGroupTopNodeIndexHistory().findLast {
+                        it.indent.indentLevel < childBlock.indent.indentLevel ||
+                            it is
+                                SqlElConditionLoopCommentBlock
+                    }
+                if (findLastGroup is SqlElConditionLoopCommentBlock) {
+                    handleConditionLoopParent(findLastGroup, context, childBlock)
+                    return
+                }
+            }
         }
+        handleNonTopLevelKeyword(lastGroupBlock, lastIndentLevel, childBlock, context)
     }
 
     private fun handleConditionLoopParent(

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

@@ -51,6 +51,7 @@ import org.domaframework.doma.intellij.formatter.block.group.keyword.option.SqlS
 import org.domaframework.doma.intellij.formatter.block.group.keyword.second.SqlFromGroupBlock
 import org.domaframework.doma.intellij.formatter.block.group.keyword.second.SqlSecondKeywordBlock
 import org.domaframework.doma.intellij.formatter.block.group.keyword.second.SqlValuesGroupBlock
+import org.domaframework.doma.intellij.formatter.block.group.keyword.second.SqlWhereGroupBlock
 import org.domaframework.doma.intellij.formatter.block.group.keyword.top.SqlDeleteQueryGroupBlock
 import org.domaframework.doma.intellij.formatter.block.group.keyword.top.SqlJoinQueriesGroupBlock
 import org.domaframework.doma.intellij.formatter.block.group.keyword.top.SqlSelectQueryGroupBlock
@@ -271,6 +272,12 @@ class SqlBlockGenerator(
                             sqlBlockFormattingCtx,
                         )
                     }
+                    "where" -> {
+                        SqlWhereGroupBlock(
+                            child,
+                            sqlBlockFormattingCtx,
+                        )
+                    }
 
                     "values" ->
                         SqlValuesGroupBlock(

src/test/testData/sql/formatter/ConditionalWhereClause.sql

@@ -14,9 +14,10 @@ AND p.category_id IN /* categoryIds */(1, 2, 3)
 /*%end*/
 /*%if status != null */
 /*%if status == "available" */
-AND p.stock_quantity > IN /* quantitys */(0, 1, 2) AND p.is_active = true
+AND p.stock_quantitys  IN /* quantitys */(0, 1, 2) or p.is_active = true
 /*%elseif status == "outofstock" */
-AND p.stock_quantity = IN /* quantitys */(0, 1, 2)
+OR p.is_active = true
+AND p.stock_quantitys  IN /* quantitys */(0, 1, 2)
 /*%else*/
 AND p.is_active = false
 /*%end*/

src/test/testData/sql/formatter/ConditionalWhereClause_format.sql

@@ -15,9 +15,10 @@ SELECT *
    /*%end*/
    /*%if status != null */
      /*%if status == "available" */
-     AND p.stock_quantity > IN /* quantitys */(0, 1, 2)
-     AND p.is_active = true
+     AND p.stock_quantitys IN /* quantitys */(0, 1, 2)
+     OR p.is_active = true
      /*%elseif status == "outofstock" */
+     OR p.is_active = true
      AND p.stock_quantitys IN /* quantitys */(0, 1, 2)
      /*%else*/
      AND p.is_active = false