Merge pull request #336 from domaframework/feature/sql-format-support-remove-trailing-spaces

Remove Trailing Spaces

Author: xterao

src/main/kotlin/org/domaframework/doma/intellij/formatter/processor/SqlPostProcessor.kt

@@ -23,10 +23,6 @@ import com.intellij.psi.impl.source.codeStyle.PostFormatProcessor
 import org.domaframework.doma.intellij.common.util.StringUtil
 
 abstract class SqlPostProcessor : PostFormatProcessor {
-    companion object {
-        private const val FILE_END_PADDING = " ${StringUtil.LINE_SEPARATE}"
-    }
-
     private val trailingSpacesRegex = Regex(" +(\r?\n)")
 
     override fun processElement(
@@ -55,5 +51,5 @@ abstract class SqlPostProcessor : PostFormatProcessor {
         isEndSpace: Boolean,
     ): String =
         text.trimEnd() +
-            if (isEndSpace) FILE_END_PADDING else ""
+            if (isEndSpace) StringUtil.LINE_SEPARATE else ""
 }

src/test/testData/sql/formatter/CreateTable_format.sql

@@ -3,4 +3,4 @@ CREATE TABLE departments
          id INT PRIMARY KEY
      , name VARCHAR(100)
      ,  loc INT NOT NULL
-  ) 
+  )

src/test/testData/sql/formatter/CreateView_format.sql

@@ -5,4 +5,4 @@ AS
          , lastname
          , hiredate
     FROM employee
-   WHERE salary > 50000 
+   WHERE salary > 50000

src/test/testData/sql/formatter/DeleteReturning_format.sql

@@ -5,4 +5,4 @@ DELETE FROM x
                 WHERE id > /* id */101
                   AND div = 't' )
 RETURNING id
-          , name 
+          , name

src/test/testData/sql/formatter/Delete_format.sql

@@ -2,4 +2,4 @@ DELETE FROM x
  WHERE id IN ( SELECT id
                  FROM x2
                 WHERE id > /* id */101
-                  AND div = 't' ) 
+                  AND div = 't' )

src/test/testData/sql/formatter/InsertConflictNothing_format.sql

@@ -4,4 +4,4 @@ INSERT INTO employee
      VALUES ( /* employees.id */0
               , /* employees.name */'name' )
 ON CONFLICT (username) ON CONSTRAINT
-DO NOTHING 
+DO NOTHING

src/test/testData/sql/formatter/InsertConflictUpdateWithOutTable_format.sql

@@ -6,4 +6,4 @@ INSERT INTO users
 ON CONFLICT ON CONSTRAINT
 DO UPDATE
       SET email = EXCLUDED.email
-          , created_at = CURRENT_TIMESTAMP 
+          , created_at = CURRENT_TIMESTAMP

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

@@ -13,4 +13,4 @@ DO UPDATE
     WHERE employees.name IS DISTINCT FROM EXCLUDED.name
 RETURNING id
           , manager_id
-          , name 
+          , name

src/test/testData/sql/formatter/InsertReturning_format.sql

@@ -18,4 +18,4 @@ INSERT INTO /*# tableName */
               , 1
               , /* @maxDateTime() */'9999-12-31' )
 RETURNING x1
-          , x2 
+          , x2

src/test/testData/sql/formatter/InsertWithBindVariable_format.sql

@@ -16,4 +16,4 @@ INSERT INTO /*# tableName */
               , /* @userId() */1
               , x6
               , 1
-              , /* @maxDateTime() */'9999-12-31' ) 
+              , /* @maxDateTime() */'9999-12-31' )