Fix typos in MySQL and Oracle function tokens and streamline token addition

Author: xterao

src/main/java/org/domaframework/doma/intellij/tokens/MySqlFunctionToken.java

@@ -98,7 +98,7 @@ public class MySqlFunctionToken {
               "atan",
               "atan2",
               "ceil",
-              "celing",
+              "ceiling",
               "conv",
               "cos",
               "cot",

src/main/java/org/domaframework/doma/intellij/tokens/OracleFunctionToken.java

@@ -25,17 +25,7 @@ public class OracleFunctionToken {
   static {
     // Mathematical Functions
     {
-      TOKENS.addAll(
-          Set.of(
-              "abs",
-              "ceil",
-              "floor",
-              "mod",
-              "power",
-              "sqrt",
-              "sign",
-              "trunc"
-          ));
+      TOKENS.addAll(Set.of("abs", "ceil", "floor", "mod", "power", "sqrt", "sign", "trunc"));
     }
     // Conversion Functions
     {
@@ -54,41 +44,19 @@ public class OracleFunctionToken {
               "to_char",
               "to_date",
               "to_number",
-              "unistr"
-          ));
+              "unistr"));
     }
     // String Functions
     {
-      TOKENS.addAll(
-          Set.of(
-              "substr",
-              "substrb",
-              "substr4"
-          ));
+      TOKENS.addAll(Set.of("substr", "substrb", "substr4"));
     }
     // Lob Functions
     {
-      TOKENS.addAll(
-          Set.of(
-              "empty_blob",
-              "empty_clob",
-              "to_blob",
-              "to_clob",
-              "to_lob",
-              "to_nclob"
-          ));
+      TOKENS.addAll(Set.of("empty_blob", "empty_clob", "to_blob", "to_clob", "to_lob", "to_nclob"));
     }
     // Comparison functions
     {
-      TOKENS.addAll(
-          Set.of(
-              "decode",
-              "greatest",
-              "least",
-              "coalesce",
-              "nullif",
-              "nvl"
-          ));
+      TOKENS.addAll(Set.of("decode", "greatest", "least", "coalesce", "nullif", "nvl"));
     }
     // Date/Time Functions
     {
@@ -102,8 +70,7 @@ public class OracleFunctionToken {
               "getdate",
               "timestampadd",
               "timestampdiff",
-              "to_date"
-          ));
+              "to_date"));
     }
   }
 

src/main/java/org/domaframework/doma/intellij/tokens/SqlFunctionToken.java

@@ -34,7 +34,6 @@ public class SqlFunctionToken {
             "max",
             "min",
             "log",
-            "subset",
             "substring",
             "trim",
             "ltrim",

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

@@ -129,10 +129,6 @@ class SqlFormattingModelBuilder : FormattingModelBuilder {
                 SqlTypes.ASTERISK,
                 TokenType.WHITE_SPACE,
                 SqlCustomSpacingBuilder.nonSpacing,
-            ).withSpacing(
-                SqlTypes.FUNCTION_NAME,
-                SqlTypes.LEFT_PAREN,
-                SqlCustomSpacingBuilder.nonSpacing,
             )
             // Table And Column Rules
             // WORD And OTHER Rules