Sql Format Official Version

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

@@ -29,19 +29,24 @@ import org.domaframework.doma.intellij.psi.SqlTypes;
       "as",
       "asc",
       "between",
+      "breadth",
       "by",
       "case",
       "change",
       "check",
+      "conflict",
+      "constraint",
       "column",
       "comment",
       "create",
       "cross",
+      "cycle",
       "database",
       "default",
       "delete",
       "desc",
       "distinct",
+      "do",
       "drop",
       "else",
       "end",
@@ -67,7 +72,9 @@ import org.domaframework.doma.intellij.psi.SqlTypes;
       "like",
       "limit",
       "not",
+      "nothing",
       "null",
+      "materialized",
       "modify",
       "offset",
       "on",
@@ -77,7 +84,10 @@ import org.domaframework.doma.intellij.psi.SqlTypes;
       "primary",
       "references",
       "rename",
+      "returning",
+      "recursive",
       "right",
+      "search",
       "select",
       "set",
       "table",
@@ -88,10 +98,12 @@ import org.domaframework.doma.intellij.psi.SqlTypes;
       "union",
       "unique",
       "update",
+      "using",
       "values",
       "view",
       "when",
-      "where"
+      "where",
+      "with"
   );
 
   // COLUMN DataTypes
@@ -124,6 +136,7 @@ import org.domaframework.doma.intellij.psi.SqlTypes;
    );
 
   private static boolean isKeyword(CharSequence word) {
+    // TODO Reads plugin settings and allows users to register arbitrary keywords
       return KEYWORDS.contains(word.toString().toLowerCase());
   }
 

src/main/kotlin/org/domaframework/doma/intellij/common/util/TypeUtil.kt

@@ -24,6 +24,8 @@ import org.domaframework.doma.intellij.extension.getJavaClazz
 import org.domaframework.doma.intellij.extension.psi.getClassAnnotation
 import org.domaframework.doma.intellij.extension.psi.isDomain
 import org.domaframework.doma.intellij.extension.psi.isEntity
+import org.domaframework.doma.intellij.formatter.block.SqlBlock
+import kotlin.reflect.KClass
 
 object TypeUtil {
     /**
@@ -94,4 +96,15 @@ object TypeUtil {
         if (type == null) return false
         return PsiTypeChecker.isBaseClassType(type) || DomaClassName.isOptionalWrapperType(type.canonicalText)
     }
+
+    /**
+     * Determines whether the specified class instance matches.
+     */
+    fun isExpectedClassType(
+        expectedClasses: List<KClass<*>>,
+        childBlock: SqlBlock?,
+    ): Boolean =
+        expectedClasses.any { clazz ->
+            clazz.isInstance(childBlock)
+        }
 }