Add tests and improve formatting for ORDER BY with condition directives

Author: xterao

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

@@ -274,6 +274,10 @@ class SqlFormatterTest : BasePlatformTestCase() {
         formatSqlFile("OrderByGroup.sql", "OrderByGroup$formatDataPrefix.sql")
     }
 
+    fun testOrderByGroupWithConditionDirectiveFormatter() {
+        formatSqlFile("OrderByGroupWithConditionDirective.sql", "OrderByGroupWithConditionDirective$formatDataPrefix.sql")
+    }
+
     private fun formatSqlFile(
         beforeFile: String,
         afterFile: String,

src/test/testData/sql/formatter/OrderByGroupWithConditionDirective.sql

@@ -1,6 +1,6 @@
 SELECT e.id
         -- with condition
-         , ROW_NUMBER() OVER(/*%if order */ORDER BY e.manager_id DESC/*%end*/) AS row_num
+         , ROW_NUMBER() /*%if order */OVER(ORDER BY e.manager_id DESC)/*%end*/ AS row_num
        , RANK() OVER(PARTITION BY department_id
 /*%if order */ORDER BY e.manager_id DESC/*%end */
 ROWS BETWEEN UNBOUNDED PRECEDING AND UNBOUNDED FOLLOWING) AS rank_num

src/test/testData/sql/formatter/OrderByGroupWithConditionDirective_format.sql

@@ -1,8 +1,10 @@
 SELECT e.id
        -- with condition
-       , ROW_NUMBER() OVER(/*%if order */
-                           ORDER BY e.manager_id DESC
-                           /*%end*/) AS row_num
+       , ROW_NUMBER()
+         /*%if order */
+         OVER(ORDER BY e.manager_id DESC)
+         /*%end*/
+         AS row_num
        , RANK() OVER(PARTITION BY department_id
                      /*%if order */
                      ORDER BY e.manager_id DESC
@@ -24,14 +26,14 @@ SELECT e.id
                        ROWS BETWEEN 1 PRECEDING AND 1 FOLLOWING
                        /*%end*/)
        , FIRST_VALUE(salary) IGNORE NULLS OVER(PARTITION BY department_id
-ORDER BY e.id ASC, e.manager_id ASC, created_at DESC)
+                                               ORDER BY e.id ASC, e.manager_id ASC, created_at DESC)
        , LAST_VALUE() OVER(ORDER BY e.manager_id ASC
                            /*%if rows */
                            ROWS BETWEEN UNBOUNDED PRECEDING AND UNBOUNDED FOLLOWING
                            /*%end*/) AS bottom_salary
        , LISTAGG(e.name
-                 , ', ') 
-         /*%if filter */         
+                 , ', ')
+         /*%if filter */
          WITHIN GROUP (ORDER BY name DESC)
          /*%end*/
   FROM employees e

src/test/testData/sql/formatter/OrderByGroup_format.sql

@@ -16,7 +16,7 @@ SELECT e.id
                            ROWS BETWEEN UNBOUNDED PRECEDING AND UNBOUNDED FOLLOWING) AS bottom_salary
        , COUNT(*) FILTER(WHERE gender = 'F') AS female_count
        , LISTAGG(e.name
-                 , ', ') WITHIN GROUP(ORDER BY name DESC)
+                 , ', ') WITHIN GROUP (ORDER BY name DESC)
   FROM employees e
  WHERE e.status = 1
  ORDER BY e.id