LATERAL formatting rule implementation

Author: xterao

src/main/java/org/domaframework/doma/intellij/Sql.flex

@@ -69,6 +69,7 @@ import org.domaframework.doma.intellij.psi.SqlTypes;
       "is",
       "join",
       "key",
+      "lateral",
       "left",
       "like",
       "limit",

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

@@ -60,5 +60,14 @@ open class SqlJoinGroupBlock(
             ?.groupIndentLen
             ?.plus(1) ?: 1
 
+    override fun createGroupIndentLen(): Int =
+        indent.indentLen
+            .plus(
+                topKeywordBlocks
+                    .drop(1)
+                    .filter { it.getNodeText() != "lateral" }
+                    .sumOf { it.getNodeText().length.plus(1) },
+            ).plus(getNodeText().length)
+
     override fun isSaveSpace(lastGroup: SqlBlock?): Boolean = true
 }

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

@@ -85,13 +85,8 @@ open class SqlKeywordGroupBlock(
         if (preChildBlock.indent.indentLevel == this.indent.indentLevel &&
             !SqlKeywordUtil.isSetLineKeyword(getNodeText(), preChildBlock.getNodeText())
         ) {
-            if (indent.indentLevel == IndentType.SECOND) {
-                val diffPreBlockTextLen = getNodeText().length.minus(preChildBlock.getNodeText().length)
-                return preChildBlock.indent.indentLen.minus(diffPreBlockTextLen)
-            } else {
-                val diffPretextLen = getNodeText().length.minus(preChildBlock.getNodeText().length)
-                return preChildBlock.indent.indentLen.minus(diffPretextLen)
-            }
+            val diffPretextLen = getNodeText().length.minus(preChildBlock.getNodeText().length)
+            return preChildBlock.indent.indentLen.minus(diffPretextLen)
         } else {
             return createBlockIndentLen(preChildBlock)
         }

src/main/kotlin/org/domaframework/doma/intellij/formatter/block/group/keyword/top/SqlSelectQueryGroupBlock.kt

@@ -42,17 +42,6 @@ class SqlSelectQueryGroupBlock(
         indent.groupIndentLen = createGroupIndentLen()
     }
 
-    override fun getBaseIndentLen(
-        preChildBlock: SqlBlock?,
-        lastGroup: SqlBlock?,
-    ): Int {
-        if (parentBlock is SqlSubGroupBlock) {
-            return parentBlock?.indent?.groupIndentLen
-                ?: createBlockIndentLen(preChildBlock)
-        }
-        return createBlockIndentLen(preChildBlock)
-    }
-
     override fun createGroupIndentLen(): Int {
         parentBlock?.let { parent ->
             if (parent is SqlSubQueryGroupBlock) {

src/main/kotlin/org/domaframework/doma/intellij/formatter/block/group/subgroup/SqlSubQueryGroupBlock.kt

@@ -18,6 +18,8 @@ package org.domaframework.doma.intellij.formatter.block.group.subgroup
 import com.intellij.lang.ASTNode
 import com.intellij.psi.formatter.common.AbstractBlock
 import org.domaframework.doma.intellij.formatter.block.SqlBlock
+import org.domaframework.doma.intellij.formatter.block.comment.SqlBlockCommentBlock
+import org.domaframework.doma.intellij.formatter.block.comment.SqlLineCommentBlock
 import org.domaframework.doma.intellij.formatter.block.group.keyword.condition.SqlConditionalExpressionGroupBlock
 import org.domaframework.doma.intellij.formatter.block.group.keyword.top.SqlJoinQueriesGroupBlock
 import org.domaframework.doma.intellij.formatter.block.group.keyword.with.SqlWithCommonTableGroupBlock
@@ -52,7 +54,13 @@ open class SqlSubQueryGroupBlock(
             } else if (parent is SqlWithQuerySubGroupBlock) {
                 parent.indent.groupIndentLen
             } else {
-                parent.indent.groupIndentLen.plus(1)
+                parent.indent.indentLen
+                    .plus(
+                        parent
+                            .getChildBlocksDropLast()
+                            .filter { it !is SqlLineCommentBlock && it !is SqlBlockCommentBlock }
+                            .sumOf { it.getNodeText().length.plus(1) },
+                    ).plus(parent.getNodeText().length.plus(1))
             }
         } ?: offset
 

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

@@ -94,7 +94,6 @@ class SqlKeywordUtil {
                 "having",
                 "limit",
                 "values",
-                "lateral",
                 "returning",
             )
 
@@ -273,6 +272,7 @@ class SqlKeywordUtil {
                 "first",
                 "to",
                 "using",
+                "lateral",
             )
 
         fun isOptionSqlKeyword(keyword: String): Boolean = OPTION_SQL_KEYWORDS.contains(keyword.lowercase())

src/test/kotlin/org/domaframework/doma/intellij/formatter/SqlFormatterTest.kt

@@ -54,6 +54,14 @@ class SqlFormatterTest : BasePlatformTestCase() {
         formatSqlFile("Select.sql", "Select$formatDataPrefix.sql")
     }
 
+    fun testSelectFromLateralFormatter() {
+        formatSqlFile("SelectFromLateral.sql", "SelectFromLateral$formatDataPrefix.sql")
+    }
+
+    fun testSelectJoinLateralFormatter() {
+        formatSqlFile("SelectJoinLateral.sql", "SelectJoinLateral$formatDataPrefix.sql")
+    }
+
     fun testCreateTableFormatter() {
         formatSqlFile("CreateTable.sql", "CreateTable$formatDataPrefix.sql")
     }

src/test/testData/sql/formatter/SelectFromLateral.sql

@@ -0,0 +1,3 @@
+SELECT u.name, tag
+  FROM users u , LATERAL ( SELECT *
+FROM post WHERE content = 'XXX' ) AS tag , employee

src/test/testData/sql/formatter/SelectFromLateral_format.sql

@@ -0,0 +1,7 @@
+SELECT u.name
+       , tag
+  FROM users u
+       , LATERAL ( SELECT *
+                     FROM post
+                    WHERE content = 'XXX' ) AS tag
+       , employee 

src/test/testData/sql/formatter/SelectJoinLateral.sql

@@ -0,0 +1,5 @@
+SELECT u.user_id,
+u.name , o.order_id AS latest_order_id  , o.order_date
+  FROM users u  LEFT JOIN lateral ( SELECT *
+                     FROM orders o  WHERE o.order_id = u.user_id  ORDER BY o.order_date DESC
+                    LIMIT 1 ) o  ON true