Also within query statement block

Author: mvorisek

src/SqlFormatter.php

@@ -86,7 +86,12 @@ public function format(string $string, string $indentString = '  '): string
                 return;
             }
 
-            $return = substr($return, 0, -($indentLevel + 1)) . str_repeat($tab, $indentLevel);
+            $rtrimLength = $indentLevel + 1;
+            while (substr($return, -($rtrimLength + 2), 1) === "\n") {
+                $rtrimLength++;
+            }
+
+            $return = substr($return, 0, -$rtrimLength) . str_repeat($tab, $indentLevel);
         };
 
         // Tokenize String
@@ -117,11 +122,9 @@ public function format(string $string, string $indentString = '  '): string
             if ($newline) {
                 $return = rtrim($return, ' ');
 
-                if ($indentLevel === 0) {
-                    $prevNotWhitespaceToken = $cursor->subCursor()->previous(Token::TOKEN_TYPE_WHITESPACE);
-                    if ($prevNotWhitespaceToken !== null && $prevNotWhitespaceToken->value() === ';') {
-                        $return .= "\n";
-                    }
+                $prevNotWhitespaceToken = $cursor->subCursor()->previous(Token::TOKEN_TYPE_WHITESPACE);
+                if ($prevNotWhitespaceToken !== null && $prevNotWhitespaceToken->value() === ';') {
+                    $return .= "\n";
                 }
 
                 $return      .= "\n" . str_repeat($tab, $indentLevel);

tests/clihighlight.txt

@@ -1031,6 +1031,7 @@ MY_NON_TOP_LEVEL_KEYWORD_FX_3();
 
 BEGIN
   MY_NON_TOP_LEVEL_KEYWORD_FX_4();
+
   MY_NON_TOP_LEVEL_KEYWORD_FX_5();
 END;
 
@@ -1042,6 +1043,7 @@ MY_NON_TOP_LEVEL_KEYWORD_FX_3();
       SELECT
         1 as x
     );
+
   MY_NON_TOP_LEVEL_KEYWORD_FX_6();
 END;
 ---
@@ -1150,16 +1152,19 @@ MY_NON_TOP_LEVEL_KEYWORD_FX_3();
   catch if ERROR_NUMBER() = 544 begin
     set
       IDENTITY_INSERT [t] on;
+
     begin
       try insert into [t] ([name], [int], [float], [null])
       values
         (N 'Ewa', 1, 1.0, null);
+
       set
         IDENTITY_INSERT [t] off;
     end try begin
       catch
       set
         IDENTITY_INSERT [t] off;
+
       throw;
     end catch
   end

tests/format-highlight.html

@@ -1031,6 +1031,7 @@
 
 <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>
 
@@ -1042,6 +1043,7 @@
       <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_6</span>()<span >;</span>
 <span style="font-weight:bold;">END</span><span >;</span></pre>
 ---
@@ -1150,16 +1152,19 @@
   <span style="color: #333;">catch</span> <span style="font-weight:bold;">if</span> <span style="color: #333;">ERROR_NUMBER</span>() <span >=</span> <span style="color: green;">544</span> <span style="font-weight:bold;">begin</span>
     <span style="font-weight:bold;">set</span>
       <span style="color: #333;">IDENTITY_INSERT</span> <span style="color: purple;">[t]</span> <span style="font-weight:bold;">on</span><span >;</span>
+
     <span style="font-weight:bold;">begin</span>
       <span style="color: #333;">try</span> <span style="font-weight:bold;">insert</span> <span style="font-weight:bold;">into</span> <span style="color: purple;">[t]</span> (<span style="color: purple;">[name]</span><span >,</span> <span style="color: purple;">[int]</span><span >,</span> <span style="color: purple;">[float]</span><span >,</span> <span style="color: purple;">[null]</span>)
       <span style="font-weight:bold;">values</span>
         (<span style="color: #333;">N</span> <span style="color: blue;">'Ewa'</span><span >,</span> <span style="color: green;">1</span><span >,</span> <span style="color: green;">1.0</span><span >,</span> <span style="font-weight:bold;">null</span>)<span >;</span>
+
       <span style="font-weight:bold;">set</span>
         <span style="color: #333;">IDENTITY_INSERT</span> <span style="color: purple;">[t]</span> <span style="color: #333;">off</span><span >;</span>
     <span style="font-weight:bold;">end</span> <span style="color: #333;">try</span> <span style="font-weight:bold;">begin</span>
       <span style="color: #333;">catch</span>
       <span style="font-weight:bold;">set</span>
         <span style="color: #333;">IDENTITY_INSERT</span> <span style="color: purple;">[t]</span> <span style="color: #333;">off</span><span >;</span>
+
       <span style="color: #333;">throw</span><span >;</span>
     <span style="font-weight:bold;">end</span> <span style="color: #333;">catch</span>
   <span style="font-weight:bold;">end</span>

tests/format.txt

@@ -1029,6 +1029,7 @@ MY_NON_TOP_LEVEL_KEYWORD_FX_3();
 
 BEGIN
   MY_NON_TOP_LEVEL_KEYWORD_FX_4();
+
   MY_NON_TOP_LEVEL_KEYWORD_FX_5();
 END;
 
@@ -1040,6 +1041,7 @@ BEGIN
       SELECT
         1 as x
     );
+
   MY_NON_TOP_LEVEL_KEYWORD_FX_6();
 END;
 ---
@@ -1148,16 +1150,19 @@ end try begin
   catch if ERROR_NUMBER() = 544 begin
     set
       IDENTITY_INSERT [t] on;
+
     begin
       try insert into [t] ([name], [int], [float], [null])
       values
         (N 'Ewa', 1, 1.0, null);
+
       set
         IDENTITY_INSERT [t] off;
     end try begin
       catch
       set
         IDENTITY_INSERT [t] off;
+
       throw;
     end catch
   end