Fix BEGIN/END indentation

Ensure we never have negative indentation

Signed-off-by: Michal Čihař <[email protected]>

Author: nijel

src/Utils/Formatter.php

@@ -378,7 +378,7 @@ public function formatList($list)
                 if ($tmp = static::isClause($curr)) {
                     if ($tmp == 2 || $this->options['clause_newline']) {
                         $lineEnded = true;
-                        if ($this->options['parts_newline']) {
+                        if ($this->options['parts_newline'] && $indent > 0) {
                             --$indent;
                         }
                     }
@@ -442,11 +442,6 @@ public function formatList($list)
 
                 // Finishing the line.
                 if ($lineEnded) {
-                    if ($indent < 0) {
-                        // TODO: Make sure this never occurs and delete it.
-                        $indent = 0;
-                    }
-
                     $ret .= $this->options['line_ending']
                         . str_repeat($this->options['indentation'], $indent);
 

tests/Utils/FormatterTest.php

@@ -406,26 +406,26 @@ public function formatQueries()
                 'text' => 'CREATE' . "\n" .
                     'PROCEDURE test_procedure()' . "\n" .
                     'BEGIN' . "\n" .
-                    'FROM' . "\n" .
-                    '    tbl' . "\n" .
-                    'SELECT' . "\n" .
-                    '    *;' . "\n" .
+                    '    FROM' . "\n" .
+                    '        tbl' . "\n" .
+                    '    SELECT' . "\n" .
+                    '        *;' . "\n" .
                     'END',
                 'cli' => "\x1b[35mCREATE" . "\n" .
                     "\x1b[35mPROCEDURE \x1b[39mtest_procedure\x1b[39m(\x1b[39m)\n" .
                     "\x1b[95mBEGIN" . "\n" .
-                    "\x1b[35mFROM" . "\n" .
-                    "    \x1b[39mtbl" . "\n" .
-                    "\x1b[35mSELECT" . "\n" .
-                    "    \x1b[39m*\x1b[39m;\n" .
+                    "    \x1b[35mFROM" . "\n" .
+                    "        \x1b[39mtbl" . "\n" .
+                    "    \x1b[35mSELECT" . "\n" .
+                    "        \x1b[39m*\x1b[39m;\n" .
                     "\x1b[95mEND" . "\x1b[0m",
                 'html' => '<span class="sql-reserved">CREATE</span>' . '<br/>' .
                     '<span class="sql-reserved">PROCEDURE</span> test_procedure()' . '<br/>' .
                     '<span class="sql-keyword">BEGIN</span>' . '<br/>' .
-                    '<span class="sql-reserved">FROM</span>' . '<br/>' .
-                    '&nbsp;&nbsp;&nbsp;&nbsp;tbl' . '<br/>' .
-                    '<span class="sql-reserved">SELECT</span>' . '<br/>' .
-                    '&nbsp;&nbsp;&nbsp;&nbsp;*;' . '<br/>' .
+                    '&nbsp;&nbsp;&nbsp;&nbsp;<span class="sql-reserved">FROM</span>' . '<br/>' .
+                    '&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;tbl' . '<br/>' .
+                    '&nbsp;&nbsp;&nbsp;&nbsp;<span class="sql-reserved">SELECT</span>' . '<br/>' .
+                    '&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;*;' . '<br/>' .
                     '<span class="sql-keyword">END</span>',
             ),
             'insert' => array(