Add extra new line between queries

doctrine · Jun 5, 2024 · 027ca22 · 027ca22
1 parent 15b7420
commit 027ca22
Show file tree

Hide file tree

Showing 4 changed files with 30 additions and 1 deletion.
diff --git a/src/SqlFormatter.php b/src/SqlFormatter.php
@@ -115,7 +115,15 @@ public function format(string $string, string $indentString = '  '): string
 
             // If we need a new line before the token
             if ($newline) {
-                $return       = rtrim($return, ' ');
+                $return = rtrim($return, ' ');
+
+                if ($indentLevel === 0) {
+                    $prevNotWhitespaceToken = $cursor->subCursor()->previous(Token::TOKEN_TYPE_WHITESPACE);
+                    if ($prevNotWhitespaceToken !== null && $prevNotWhitespaceToken->value() === ';') {
+                        $return .= "\n";
+                    }
+                }
+
                 $return      .= "\n" . str_repeat($tab, $indentLevel);
                 $newline      = false;
                 $addedNewline = true;

diff --git a/tests/clihighlight.txt b/tests/clihighlight.txt
@@ -798,6 +798,7 @@
   *[0m
 [37mLIMIT[0m
   [32;1m1[0m;[0m
+
 [37mSELECT[0m
   a[0m,[0m
   b[0m,[0m
@@ -807,6 +808,7 @@
   e[0m
 [37mLIMIT[0m
   [32;1m1[0m,[0m [32;1m2[0m;[0m
+
 [37mSELECT[0m
   [32;1m1[0m,[0m
   [32;1m2[0m,[0m
@@ -1014,19 +1016,24 @@
 ---
 [30;1m-- semicolon must decrease special indentation level[0m
 MY_NON_TOP_LEVEL_KEYWORD_FX_1[0m();[0m
+
 MY_NON_TOP_LEVEL_KEYWORD_FX_2[0m();[0m
+
 [37mSELECT[0m
   x[0m
 [37mFROM[0m
   (
     [37mSELECT[0m
       [32;1m1[0m [37mas[0m x[0m
   );[0m
+
 MY_NON_TOP_LEVEL_KEYWORD_FX_3[0m();[0m
+
 [37mBEGIN[0m
   MY_NON_TOP_LEVEL_KEYWORD_FX_4[0m();[0m
   MY_NON_TOP_LEVEL_KEYWORD_FX_5[0m();[0m
 [37mEND[0m;[0m
+
 [37mBEGIN[0m
   [37mSELECT[0m
     x[0m

diff --git a/tests/format-highlight.html b/tests/format-highlight.html
@@ -798,6 +798,7 @@
   <span >*</span>
 <span style="font-weight:bold;">LIMIT</span>
   <span style="color: green;">1</span><span >;</span>
+
 <span style="font-weight:bold;">SELECT</span>
   <span style="color: #333;">a</span><span >,</span>
   <span style="color: #333;">b</span><span >,</span>
@@ -807,6 +808,7 @@
   <span style="color: #333;">e</span>
 <span style="font-weight:bold;">LIMIT</span>
   <span style="color: green;">1</span><span >,</span> <span style="color: green;">2</span><span >;</span>
+
 <span style="font-weight:bold;">SELECT</span>
   <span style="color: green;">1</span><span >,</span>
   <span style="color: green;">2</span><span >,</span>
@@ -1014,19 +1016,24 @@
 ---
 <pre style="color: black; background-color: white;"><span style="color: #aaa;">-- semicolon must decrease special indentation level</span>
 <span style="color: #333;">MY_NON_TOP_LEVEL_KEYWORD_FX_1</span>()<span >;</span>
+
 <span style="color: #333;">MY_NON_TOP_LEVEL_KEYWORD_FX_2</span>()<span >;</span>
+
 <span style="font-weight:bold;">SELECT</span>
   <span style="color: #333;">x</span>
 <span style="font-weight:bold;">FROM</span>
   (
     <span style="font-weight:bold;">SELECT</span>
       <span style="color: green;">1</span> <span style="font-weight:bold;">as</span> <span style="color: #333;">x</span>
   )<span >;</span>
+
 <span style="color: #333;">MY_NON_TOP_LEVEL_KEYWORD_FX_3</span>()<span >;</span>
+
 <span style="font-weight:bold;">BEGIN</span>
   <span style="color: #333;">MY_NON_TOP_LEVEL_KEYWORD_FX_4</span>()<span >;</span>
   <span style="color: #333;">MY_NON_TOP_LEVEL_KEYWORD_FX_5</span>()<span >;</span>
 <span style="font-weight:bold;">END</span><span >;</span>
+
 <span style="font-weight:bold;">BEGIN</span>
   <span style="font-weight:bold;">SELECT</span>
     <span style="color: #333;">x</span>

diff --git a/tests/format.txt b/tests/format.txt
@@ -796,6 +796,7 @@ SELECT
   *
 LIMIT
   1;
+
 SELECT
   a,
   b,
@@ -805,6 +806,7 @@ FROM
   e
 LIMIT
   1, 2;
+
 SELECT
   1,
   2,
@@ -1012,19 +1014,24 @@ SELECT
 ---
 -- semicolon must decrease special indentation level
 MY_NON_TOP_LEVEL_KEYWORD_FX_1();
+
 MY_NON_TOP_LEVEL_KEYWORD_FX_2();
+
 SELECT
   x
 FROM
   (
     SELECT
       1 as x
   );
+
 MY_NON_TOP_LEVEL_KEYWORD_FX_3();
+
 BEGIN
   MY_NON_TOP_LEVEL_KEYWORD_FX_4();
   MY_NON_TOP_LEVEL_KEYWORD_FX_5();
 END;
+
 BEGIN
   SELECT
     x