Merge pull request #305 from domaframework/feature/sql-format-support-conflict-options

Optional Keyword Support for ON CONFLICT Syntax

Author: xterao

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

@@ -37,6 +37,7 @@ import org.domaframework.doma.intellij.psi.SqlTypes;
       "conflict",
       "constraint",
       "column",
+      "collate",
       "comment",
       "create",
       "cross",

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

@@ -89,6 +89,8 @@ open class SqlBlock(
     open var parentBlock: SqlBlock? = null
     open val childBlocks = mutableListOf<SqlBlock>()
 
+    fun getChildBlocksDropLast(dropIndex: Int = 1): List<SqlBlock> = childBlocks.dropLast(dropIndex)
+
     open val indent: ElementIndent =
         ElementIndent(
             IndentType.FILE,

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

@@ -41,7 +41,7 @@ open class SqlLineCommentBlock(
     override fun createBlockIndentLen(): Int {
         parentBlock?.let { parent ->
             if (parent is SqlSubQueryGroupBlock) {
-                if (parent.childBlocks.dropLast(1).isEmpty()) {
+                if (parent.getChildBlocksDropLast().isEmpty()) {
                     return 0
                 }
                 if (parent.isFirstLineComment) {

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

@@ -130,7 +130,7 @@ open class SqlElBlockCommentBlock(
     override fun createBlockIndentLen(): Int {
         parentBlock?.let {
             if (it is SqlSubQueryGroupBlock) {
-                if (it.childBlocks.dropLast(1).isEmpty()) {
+                if (it.getChildBlocksDropLast().isEmpty()) {
                     return 0
                 }
                 if (it.isFirstLineComment) {

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

@@ -16,7 +16,7 @@
 package org.domaframework.doma.intellij.formatter.block.group.keyword.insert
 
 import com.intellij.lang.ASTNode
-import org.domaframework.doma.intellij.formatter.block.group.keyword.SqlValuesGroupBlock
+import org.domaframework.doma.intellij.formatter.block.group.keyword.second.SqlValuesGroupBlock
 import org.domaframework.doma.intellij.formatter.block.group.keyword.top.SqlTopQueryGroupBlock
 import org.domaframework.doma.intellij.formatter.util.SqlBlockFormattingContext
 

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

@@ -0,0 +1,31 @@
+/*
+ * 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 SqlReturningGroupBlock(
+    node: ASTNode,
+    context: SqlBlockFormattingContext,
+) : SqlSecondKeywordBlock(node, context) {
+    override fun createBlockIndentLen(): Int {
+        parentBlock?.let { parent ->
+            return parent.indent.indentLen
+        }
+        return 0
+    }
+}

src/main/kotlin/org/domaframework/doma/intellij/formatter/block/group/keyword/SqlSecondKeywordBlock.kt renamed to src/main/kotlin/org/domaframework/doma/intellij/formatter/block/group/keyword/second/SqlSecondKeywordBlock.kt

@@ -13,10 +13,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.domaframework.doma.intellij.formatter.block.group.keyword
+package org.domaframework.doma.intellij.formatter.block.group.keyword.second
 
 import com.intellij.lang.ASTNode
 import org.domaframework.doma.intellij.formatter.block.SqlBlock
+import org.domaframework.doma.intellij.formatter.block.SqlKeywordBlock
+import org.domaframework.doma.intellij.formatter.block.group.keyword.SqlKeywordGroupBlock
 import org.domaframework.doma.intellij.formatter.util.IndentType
 import org.domaframework.doma.intellij.formatter.util.SqlBlockFormattingContext
 import org.domaframework.doma.intellij.formatter.util.SqlKeywordUtil
@@ -46,8 +48,12 @@ open class SqlSecondKeywordBlock(
     }
 
     override fun isSaveSpace(lastGroup: SqlBlock?): Boolean {
-        lastGroup?.let {
-            return !SqlKeywordUtil.isSetLineKeyword(getNodeText(), lastGroup.getNodeText())
+        lastGroup?.let { last ->
+            val prevKeyword = last.childBlocks.findLast { it is SqlKeywordBlock }
+            prevKeyword?.let { prev ->
+                return !SqlKeywordUtil.isSetLineKeyword(getNodeText(), prev.getNodeText())
+            }
+            return !SqlKeywordUtil.isSetLineKeyword(getNodeText(), last.getNodeText())
         }
         return true
     }

src/main/kotlin/org/domaframework/doma/intellij/formatter/block/group/keyword/SqlValuesGroupBlock.kt renamed to src/main/kotlin/org/domaframework/doma/intellij/formatter/block/group/keyword/second/SqlValuesGroupBlock.kt

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.domaframework.doma.intellij.formatter.block.group.keyword
+package org.domaframework.doma.intellij.formatter.block.group.keyword.second
 
 import com.intellij.lang.ASTNode
 import org.domaframework.doma.intellij.formatter.block.SqlBlock

src/main/kotlin/org/domaframework/doma/intellij/formatter/block/group/keyword/SqlJoinQueriesGroupBlock.kt renamed to src/main/kotlin/org/domaframework/doma/intellij/formatter/block/group/keyword/top/SqlJoinQueriesGroupBlock.kt

@@ -13,10 +13,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.domaframework.doma.intellij.formatter.block.group.keyword
+package org.domaframework.doma.intellij.formatter.block.group.keyword.top
 
 import com.intellij.lang.ASTNode
 import org.domaframework.doma.intellij.formatter.block.SqlBlock
+import org.domaframework.doma.intellij.formatter.block.group.keyword.SqlKeywordGroupBlock
 import org.domaframework.doma.intellij.formatter.block.group.keyword.with.SqlWithQuerySubGroupBlock
 import org.domaframework.doma.intellij.formatter.util.IndentType
 import org.domaframework.doma.intellij.formatter.util.SqlBlockFormattingContext

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

@@ -65,7 +65,7 @@ class SqlSelectQueryGroupBlock(
     override fun isSaveSpace(lastGroup: SqlBlock?): Boolean {
         lastGroup?.let { lastBlock ->
             if (lastGroup is SqlWithQuerySubGroupBlock) return true
-            if (lastBlock is SqlSubGroupBlock) return lastBlock.childBlocks.dropLast(1).isNotEmpty()
+            if (lastBlock is SqlSubGroupBlock) return lastBlock.getChildBlocksDropLast().isNotEmpty()
         }
         return true
     }