diff --git a/src/main/kotlin/org/domaframework/doma/intellij/formatter/processor/SqlPostProcessor.kt b/src/main/kotlin/org/domaframework/doma/intellij/formatter/processor/SqlPostProcessor.kt
index 5bf3e992..618b11f2 100644
--- a/src/main/kotlin/org/domaframework/doma/intellij/formatter/processor/SqlPostProcessor.kt
+++ b/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 ""
 }
diff --git a/src/test/testData/sql/formatter/CreateTable_format.sql b/src/test/testData/sql/formatter/CreateTable_format.sql
index cf9a670f..280d97e3 100644
--- a/src/test/testData/sql/formatter/CreateTable_format.sql
+++ b/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
-  ) 
+  )
diff --git a/src/test/testData/sql/formatter/CreateView_format.sql b/src/test/testData/sql/formatter/CreateView_format.sql
index 6b8ae76d..cdc697f2 100644
--- a/src/test/testData/sql/formatter/CreateView_format.sql
+++ b/src/test/testData/sql/formatter/CreateView_format.sql
@@ -5,4 +5,4 @@ AS
          , lastname
          , hiredate
     FROM employee
-   WHERE salary > 50000 
+   WHERE salary > 50000
diff --git a/src/test/testData/sql/formatter/DeleteReturning_format.sql b/src/test/testData/sql/formatter/DeleteReturning_format.sql
index 6bd091a9..fe858472 100644
--- a/src/test/testData/sql/formatter/DeleteReturning_format.sql
+++ b/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
diff --git a/src/test/testData/sql/formatter/Delete_format.sql b/src/test/testData/sql/formatter/Delete_format.sql
index e802d411..60bfa6f0 100644
--- a/src/test/testData/sql/formatter/Delete_format.sql
+++ b/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' )
diff --git a/src/test/testData/sql/formatter/InsertConflictNothing_format.sql b/src/test/testData/sql/formatter/InsertConflictNothing_format.sql
index dc5224ba..fa44cf31 100644
--- a/src/test/testData/sql/formatter/InsertConflictNothing_format.sql
+++ b/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
diff --git a/src/test/testData/sql/formatter/InsertConflictUpdateWithOutTable_format.sql b/src/test/testData/sql/formatter/InsertConflictUpdateWithOutTable_format.sql
index f82b4aca..e6c83a32 100644
--- a/src/test/testData/sql/formatter/InsertConflictUpdateWithOutTable_format.sql
+++ b/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
diff --git a/src/test/testData/sql/formatter/InsertConflictUpdate_format.sql b/src/test/testData/sql/formatter/InsertConflictUpdate_format.sql
index 16c1891e..3085690b 100644
--- a/src/test/testData/sql/formatter/InsertConflictUpdate_format.sql
+++ b/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
diff --git a/src/test/testData/sql/formatter/InsertReturning_format.sql b/src/test/testData/sql/formatter/InsertReturning_format.sql
index e3ff8853..62945b62 100644
--- a/src/test/testData/sql/formatter/InsertReturning_format.sql
+++ b/src/test/testData/sql/formatter/InsertReturning_format.sql
@@ -18,4 +18,4 @@ INSERT INTO /*# tableName */
               , 1
               , /* @maxDateTime() */'9999-12-31' )
 RETURNING x1
-          , x2 
+          , x2
diff --git a/src/test/testData/sql/formatter/InsertWithBindVariable_format.sql b/src/test/testData/sql/formatter/InsertWithBindVariable_format.sql
index 0b57cf90..5edfb89a 100644
--- a/src/test/testData/sql/formatter/InsertWithBindVariable_format.sql
+++ b/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' )
diff --git a/src/test/testData/sql/formatter/Insert_format.sql b/src/test/testData/sql/formatter/Insert_format.sql
index 0b57cf90..5edfb89a 100644
--- a/src/test/testData/sql/formatter/Insert_format.sql
+++ b/src/test/testData/sql/formatter/Insert_format.sql
@@ -16,4 +16,4 @@ INSERT INTO /*# tableName */
               , /* @userId() */1
               , x6
               , 1
-              , /* @maxDateTime() */'9999-12-31' ) 
+              , /* @maxDateTime() */'9999-12-31' )
diff --git a/src/test/testData/sql/formatter/NestedDirectives_format.sql b/src/test/testData/sql/formatter/NestedDirectives_format.sql
index 4ff0c40a..ef7e7ce9 100644
--- a/src/test/testData/sql/formatter/NestedDirectives_format.sql
+++ b/src/test/testData/sql/formatter/NestedDirectives_format.sql
@@ -48,4 +48,4 @@ SELECT e.id
    /*%end */ -- END2
  /*%else */ -- ELSE1
  e.id ASC
- /*%end */ -- END1 
+ /*%end */ -- END1
diff --git a/src/test/testData/sql/formatter/SelectCaseEndWithCondition_format.sql b/src/test/testData/sql/formatter/SelectCaseEndWithCondition_format.sql
index 38c3ab7a..5ce394dd 100644
--- a/src/test/testData/sql/formatter/SelectCaseEndWithCondition_format.sql
+++ b/src/test/testData/sql/formatter/SelectCaseEndWithCondition_format.sql
@@ -8,4 +8,4 @@ SELECT CASE WHEN div = 'A' THEN 'AAA'
             /*%end*/
             ELSE 'CCC'
         END AS divName
-  FROM users 
+  FROM users
diff --git a/src/test/testData/sql/formatter/SelectCaseEnd_format.sql b/src/test/testData/sql/formatter/SelectCaseEnd_format.sql
index d738f099..c852791c 100644
--- a/src/test/testData/sql/formatter/SelectCaseEnd_format.sql
+++ b/src/test/testData/sql/formatter/SelectCaseEnd_format.sql
@@ -2,4 +2,4 @@ SELECT CASE WHEN div = 'A' THEN 'AAA'
             WHEN div = 'B' THEN 'BBB'
             ELSE 'CCC'
         END AS divName
-  FROM users 
+  FROM users
diff --git a/src/test/testData/sql/formatter/SelectEscapeFunctionName_format.sql b/src/test/testData/sql/formatter/SelectEscapeFunctionName_format.sql
index f16c526a..ee551236 100644
--- a/src/test/testData/sql/formatter/SelectEscapeFunctionName_format.sql
+++ b/src/test/testData/sql/formatter/SelectEscapeFunctionName_format.sql
@@ -3,4 +3,4 @@ DELETE FROM x "div"
                       , id
                  FROM x2
                 WHERE id > 101
-                  AND `div`."age$a" = 't' ) 
+                  AND `div`."age$a" = 't' )
diff --git a/src/test/testData/sql/formatter/SelectFromLateralSecond_format.sql b/src/test/testData/sql/formatter/SelectFromLateralSecond_format.sql
index b8afc132..6332d783 100644
--- a/src/test/testData/sql/formatter/SelectFromLateralSecond_format.sql
+++ b/src/test/testData/sql/formatter/SelectFromLateralSecond_format.sql
@@ -4,4 +4,4 @@ SELECT u.name
        , LATERAL ( SELECT *
                      FROM post
                     WHERE content = 'XXX' ) AS tag
-       , employee 
+       , employee
diff --git a/src/test/testData/sql/formatter/SelectFromLateral_format.sql b/src/test/testData/sql/formatter/SelectFromLateral_format.sql
index 0c288221..fddae6a7 100644
--- a/src/test/testData/sql/formatter/SelectFromLateral_format.sql
+++ b/src/test/testData/sql/formatter/SelectFromLateral_format.sql
@@ -5,4 +5,4 @@ SELECT u.name
        , ( SELECT tag
              FROM post
             WHERE u.usr_id = auther ) AS tag
-       , employee 
+       , employee
diff --git a/src/test/testData/sql/formatter/SelectFromValuesUserDirective_format.sql b/src/test/testData/sql/formatter/SelectFromValuesUserDirective_format.sql
index 1db324d9..16551280 100644
--- a/src/test/testData/sql/formatter/SelectFromValuesUserDirective_format.sql
+++ b/src/test/testData/sql/formatter/SelectFromValuesUserDirective_format.sql
@@ -4,4 +4,4 @@ SELECT user_id
            FROM employee emp
                 , ( VALUES
                     /*# usersList */
-                  ) T (user_id, name) ) u 
+                  ) T (user_id, name) ) u
diff --git a/src/test/testData/sql/formatter/SelectFromValues_format.sql b/src/test/testData/sql/formatter/SelectFromValues_format.sql
index f2f7ddda..cfcf05bc 100644
--- a/src/test/testData/sql/formatter/SelectFromValues_format.sql
+++ b/src/test/testData/sql/formatter/SelectFromValues_format.sql
@@ -6,4 +6,4 @@ SELECT user_id
                     (20000000001, 'John')
                     , (20000000002 'Tom')
                     , (20000000003, 'Anna')
-                  ) T (user_id, name) ) u 
+                  ) T (user_id, name) ) u
diff --git a/src/test/testData/sql/formatter/SelectJoinLateral_format.sql b/src/test/testData/sql/formatter/SelectJoinLateral_format.sql
index 1e4fa386..d9dba397 100644
--- a/src/test/testData/sql/formatter/SelectJoinLateral_format.sql
+++ b/src/test/testData/sql/formatter/SelectJoinLateral_format.sql
@@ -13,4 +13,4 @@ SELECT u.user_id
                             ORDER BY o.order_date DESC
                             LIMIT 1 ) o
               ON true
-             AND false 
+             AND false
diff --git a/src/test/testData/sql/formatter/Select_format.sql b/src/test/testData/sql/formatter/Select_format.sql
index a3469c7c..bbf30765 100644
--- a/src/test/testData/sql/formatter/Select_format.sql
+++ b/src/test/testData/sql/formatter/Select_format.sql
@@ -56,4 +56,4 @@ SELECT COUNT(DISTINCT x) AS count_x
                                   OR x.modelmag_g BETWEEN 10 AND 21)
                           GROUP BY n.objid ) AS nbor
                     ON o.objid = nbor.objid
- WHERE o.objid IN /* params */(1, 2, 3) 
+ WHERE o.objid IN /* params */(1, 2, 3)
diff --git a/src/test/testData/sql/formatter/UpdateBindVariable_format.sql b/src/test/testData/sql/formatter/UpdateBindVariable_format.sql
index 7443393a..310f2b71 100644
--- a/src/test/testData/sql/formatter/UpdateBindVariable_format.sql
+++ b/src/test/testData/sql/formatter/UpdateBindVariable_format.sql
@@ -5,4 +5,4 @@ UPDATE /*# tableName */
        /*%for entity : entities */
        , /*# entity.itemIdentifier */ = /* entity.value */'abc'
        /*%end*/
- WHERE X = /* reportId */1 
+ WHERE X = /* reportId */1
diff --git a/src/test/testData/sql/formatter/UpdateBulkAssignment_format.sql b/src/test/testData/sql/formatter/UpdateBulkAssignment_format.sql
index 1f1399b3..86eedeae 100644
--- a/src/test/testData/sql/formatter/UpdateBulkAssignment_format.sql
+++ b/src/test/testData/sql/formatter/UpdateBulkAssignment_format.sql
@@ -12,4 +12,4 @@ UPDATE /*# tableName */
            /*%for entity : entities */
            , /* entity.value */'abc'
            /*%end*/ )
- WHERE x = /* reportId */1 
+ WHERE x = /* reportId */1
diff --git a/src/test/testData/sql/formatter/UpdateReturning_format.sql b/src/test/testData/sql/formatter/UpdateReturning_format.sql
index 6afedd0d..1e1b56ee 100644
--- a/src/test/testData/sql/formatter/UpdateReturning_format.sql
+++ b/src/test/testData/sql/formatter/UpdateReturning_format.sql
@@ -4,4 +4,4 @@ UPDATE user
  WHERE id = /* user.id */1
 RETURNING id
           , name
-          , rank 
+          , rank
diff --git a/src/test/testData/sql/formatter/Update_format.sql b/src/test/testData/sql/formatter/Update_format.sql
index d1e262d6..cbe5324f 100644
--- a/src/test/testData/sql/formatter/Update_format.sql
+++ b/src/test/testData/sql/formatter/Update_format.sql
@@ -1,4 +1,4 @@
 UPDATE user
    SET name = /* user.name */'name'
        , rank = /*user.rank */3
- WHERE id = /* user.id */1 
+ WHERE id = /* user.id */1
diff --git a/src/test/testData/sql/formatter/WithDelete_format.sql b/src/test/testData/sql/formatter/WithDelete_format.sql
index 207dc1e6..d3ca3624 100644
--- a/src/test/testData/sql/formatter/WithDelete_format.sql
+++ b/src/test/testData/sql/formatter/WithDelete_format.sql
@@ -5,4 +5,4 @@ WITH deleted_posts AS (
     RETURNING id
 )
 SELECT *
-  FROM deleted_posts 
+  FROM deleted_posts
diff --git a/src/test/testData/sql/formatter/WithInsert_format.sql b/src/test/testData/sql/formatter/WithInsert_format.sql
index 01d60886..123715c8 100644
--- a/src/test/testData/sql/formatter/WithInsert_format.sql
+++ b/src/test/testData/sql/formatter/WithInsert_format.sql
@@ -12,4 +12,4 @@ INSERT INTO user_profiles
              , bio)
 SELECT id
        , name
-  FROM new_user 
+  FROM new_user
diff --git a/src/test/testData/sql/formatter/WithMultiQuery_format.sql b/src/test/testData/sql/formatter/WithMultiQuery_format.sql
index 213b8de3..12e424de 100644
--- a/src/test/testData/sql/formatter/WithMultiQuery_format.sql
+++ b/src/test/testData/sql/formatter/WithMultiQuery_format.sql
@@ -21,4 +21,4 @@ SELECT user_id
   FROM users
  WHERE suspended = TRUE
  ORDER BY name ASC
- LIMIT 100 OFFSET 10 
+ LIMIT 100 OFFSET 10
diff --git a/src/test/testData/sql/formatter/WithOptional_format.sql b/src/test/testData/sql/formatter/WithOptional_format.sql
index d33ce8fd..063223c3 100644
--- a/src/test/testData/sql/formatter/WithOptional_format.sql
+++ b/src/test/testData/sql/formatter/WithOptional_format.sql
@@ -11,4 +11,4 @@ WITH RECURSIVE org_tree (emp_id
 )
 SEARCH BREADTH FIRST BY emp_id SET order_seq
 CYCLE emp_id SET is_cycle TO TRUE DEFAULT FALSE USING path_ids
-SELECT * FROM org_tree;
\ No newline at end of file
+SELECT * FROM org_tree
diff --git a/src/test/testData/sql/formatter/WithRecursive_format.sql b/src/test/testData/sql/formatter/WithRecursive_format.sql
index d019f857..6a501672 100644
--- a/src/test/testData/sql/formatter/WithRecursive_format.sql
+++ b/src/test/testData/sql/formatter/WithRecursive_format.sql
@@ -18,4 +18,4 @@ WITH RECURSIVE org_tree (emp_id
              ON e.manager_id = ot.emp_id
 )
 SELECT *
-  FROM org_tree 
+  FROM org_tree
diff --git a/src/test/testData/sql/formatter/WithSelect_format.sql b/src/test/testData/sql/formatter/WithSelect_format.sql
index d6cc495e..448e898c 100644
--- a/src/test/testData/sql/formatter/WithSelect_format.sql
+++ b/src/test/testData/sql/formatter/WithSelect_format.sql
@@ -7,4 +7,4 @@ WITH users AS (
 SELECT user_id
        , name
   FROM users
- WHERE suspended = TRUE 
+ WHERE suspended = TRUE
diff --git a/src/test/testData/sql/formatter/WithUnionAll_format.sql b/src/test/testData/sql/formatter/WithUnionAll_format.sql
index 05808026..14e679bd 100644
--- a/src/test/testData/sql/formatter/WithUnionAll_format.sql
+++ b/src/test/testData/sql/formatter/WithUnionAll_format.sql
@@ -23,4 +23,4 @@ SELECT query.id3
              AND query.pre_as3 = q2.sub_id
  WHERE query.id3 = /* id */1
  ORDER BY query.id3
-          , query.pre_as3 
+          , query.pre_as3
diff --git a/src/test/testData/sql/formatter/WithUpdate_format.sql b/src/test/testData/sql/formatter/WithUpdate_format.sql
index a0288a00..18645709 100644
--- a/src/test/testData/sql/formatter/WithUpdate_format.sql
+++ b/src/test/testData/sql/formatter/WithUpdate_format.sql
@@ -12,4 +12,4 @@ WITH recent_activity AS (
     RETURNING id
 )
 SELECT *
-  FROM updated_users 
+  FROM updated_users