Implement line break formatting rule for FROM following WHERE DISTINCT.

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/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.dropLast(1).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/processor/SqlSetParentGroupProcessor.kt

@@ -155,6 +155,17 @@ class SqlSetParentGroupProcessor(
                 return@setParentGroups lastGroupBlock
             }
         } else if (lastIndentLevel == currentIndentLevel) {
+            val prevKeyword = lastGroupBlock.childBlocks.findLast { it is SqlKeywordBlock }
+            prevKeyword?.let { prev ->
+                if (SqlKeywordUtil.isSetLineKeyword(childBlock.getNodeText(), prev.getNodeText())) {
+                    updateGroupBlockLastGroupParentAddGroup(
+                        lastGroupBlock,
+                        childBlock,
+                    )
+                    return
+                }
+            }
+
             blockBuilder.removeLastGroupTopNodeIndexHistory()
             updateGroupBlockLastGroupParentAddGroup(
                 lastGroupBlock,

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

@@ -296,7 +296,7 @@ class SqlKeywordUtil {
         private val SET_LINE_KEYWORDS =
             mapOf(
                 "into" to setOf("insert"),
-                "from" to setOf("delete"),
+                "from" to setOf("delete", "distinct"),
                 "distinct" to setOf("select"),
                 "table" to setOf("create", "alter", "rename", "truncate", "drop"),
                 "index" to setOf("create", "alter", "rename", "truncate", "drop"),

src/test/testData/sql/formatter/InsertConflictUpdate.sql

@@ -1,3 +1,8 @@
-insert into users (username, email)
-values ('user', '[email protected]')
-on CONFLICT(username) ON constraint do update set email = EXCLUDED.email, created_at = CURRENT_TIMESTAMP 
+insert into employees (name, manager_id)
+SELECT name, user_id
+FROM user_settings
+WHERE user_id = /*employee.id*/0  AND name = /*employee.name*/'name'
+on conflict (id) do 
+update set name = EXCLUDED.name
+WHERE employees.name is Distinct from EXCLUDED.name
+returning id, manager_id, name

src/test/testData/sql/formatter/InsertConflictUpdate_format.sql

@@ -1,9 +1,16 @@
-INSERT INTO users
-            (username
-             , email)
-     VALUES ('user'
-             , '[email protected]')
-ON CONFLICT (username) ON CONSTRAINT
+INSERT INTO employees
+            (name
+             , manager_id)
+SELECT name
+       , user_id
+  FROM user_settings
+ WHERE user_id = /*employee.id*/0
+   AND name = /*employee.name*/'name'
+ON CONFLICT (id)
 DO UPDATE
-      SET email = EXCLUDED.email
-          , created_at = CURRENT_TIMESTAMP 
+      SET name = EXCLUDED.name
+    WHERE employees.name IS DISTINCT
+     FROM EXCLUDED.name
+RETURNING id
+          , manager_id
+          , name