Skip to content

Commit

Permalink
Merge pull request #110 from mvorisek/fix_semicolon_toplevel
Browse files Browse the repository at this point in the history 
Fix semicolon must decrease special indentation level
  • Loading branch information
@greg0ire
greg0ire authored May 20, 2024
2 parents 6eb85e0 + 0590175 commit 51e2d67
Show file tree
Hide file tree
Showing 7 changed files with 122 additions and 0 deletions.
9 changes: 9 additions & 0 deletions src/SqlFormatter.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -256,6 +256,15 @@ public function format(string $string, string $indentString = ' '): string
if ($token->value() === 'LIMIT' && ! $inlineParentheses) {
$clauseLimit = true;
}
} elseif ($token->value() === ';') {
// If the last indent type was 'special', decrease the special indent for this round
reset($indentTypes);
if (current($indentTypes) === 'special') {
$indentLevel--;
array_shift($indentTypes);
}

$newline = true;
} elseif (
$clauseLimit &&
$token->value() !== ',' &&
Expand Down
25 changes: 25 additions & 0 deletions tests/clihighlight.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1009,3 +1009,28 @@
---
SELECT
1 :: text;
---
-- 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
FROM
(
SELECT
1 as x
);
MY_NON_TOP_LEVEL_KEYWORD_FX_6();
END;
2 changes: 2 additions & 0 deletions tests/compress.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -93,3 +93,5 @@ WITH cte1 AS (SELECT a, b FROM table1), cte2 AS (SELECT c, d FROM table2) SELECT
SELECT a, GROUP_CONCAT(b, '.') OVER (ORDER BY c GROUPS BETWEEN UNBOUNDED PRECEDING AND CURRENT ROW EXCLUDE NO OTHERS) AS no_others, GROUP_CONCAT(b, '.') OVER (ORDER BY c GROUPS BETWEEN UNBOUNDED PRECEDING AND CURRENT ROW EXCLUDE CURRENT ROW) AS current_row, GROUP_CONCAT(b, '.') OVER (ORDER BY c GROUPS BETWEEN UNBOUNDED PRECEDING AND CURRENT ROW EXCLUDE GROUP) AS grp, GROUP_CONCAT(b, '.') OVER (ORDER BY c GROUPS BETWEEN UNBOUNDED PRECEDING AND CURRENT ROW EXCLUDE TIES) AS tie, GROUP_CONCAT(b, '.') FILTER (WHERE c != 'two') OVER (ORDER BY a) AS filtered, CONVERT(VARCHAR(20), AVG(SalesYTD) OVER (PARTITION BY TerritoryID ORDER BY DATEPART(yy, ModifiedDate)), 1) AS MovingAvg, AVG(starting_salary) OVER w2 AVG, MIN(starting_salary) OVER w2 MIN_STARTING_SALARY, MAX(starting_salary) OVER (w1 ORDER BY hire_date), LISTAGG(arg, ',') OVER (PARTITION BY part ORDER BY ord ROWS BETWEEN 1 PRECEDING AND 1 FOLLOWING) AS LISTAGG_ROWS, LISTAGG(arg, ',') OVER (PARTITION BY part ORDER BY ord RANGE BETWEEN 1 PRECEDING AND 1 FOLLOWING) AS LISTAGG_RANGE, MIN(Revenue) OVER (PARTITION BY DepartmentID ORDER BY RevenueYear ROWS BETWEEN CURRENT ROW AND UNBOUNDED FOLLOWING) AS MinRevenueBeyond FROM t1 WINDOW w1 AS (PARTITION BY department, division), w2 AS (w1 ORDER BY hire_date);
---
SELECT 1::text;
---
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 FROM (SELECT 1 as x); MY_NON_TOP_LEVEL_KEYWORD_FX_6(); END;
25 changes: 25 additions & 0 deletions tests/format-highlight.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1009,3 +1009,28 @@
---
<pre style="color: black; background-color: white;"><span style="font-weight:bold;">SELECT</span>
<span style="color: green;">1</span> <span >::</span> <span style="color: #333;">text</span><span >;</span></pre>
---
<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>
<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_6</span>()<span >;</span>
<span style="font-weight:bold;">END</span><span >;</span></pre>
25 changes: 25 additions & 0 deletions tests/format.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1007,3 +1007,28 @@ WINDOW
---
SELECT
1 :: text;
---
-- 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
FROM
(
SELECT
1 as x
);
MY_NON_TOP_LEVEL_KEYWORD_FX_6();
END;
18 changes: 18 additions & 0 deletions tests/highlight.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -304,3 +304,21 @@
<span style="font-weight:bold;">WINDOW</span> <span style="color: #333;">w1</span> <span style="font-weight:bold;">AS</span> (<span style="font-weight:bold;">PARTITION BY</span> <span style="color: #333;">department</span><span >,</span> <span style="color: #333;">division</span>)<span >,</span> <span style="color: #333;">w2</span> <span style="font-weight:bold;">AS</span> (<span style="color: #333;">w1</span> <span style="font-weight:bold;">ORDER BY</span> <span style="color: #333;">hire_date</span>)<span >;</span></pre>
---
<pre style="color: black; background-color: white;"><span style="font-weight:bold;">SELECT</span> <span style="color: green;">1</span><span >::</span><span style="color: #333;">text</span><span >;</span></pre>
---
<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>
<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_6</span>()<span >;</span>
<span style="font-weight:bold;">END</span><span >;</span></pre>
18 changes: 18 additions & 0 deletions tests/sql.sql
View file
Original file line number Diff line number Diff line change
Expand Up @@ -304,3 +304,21 @@ FROM t1
WINDOW w1 AS (PARTITION BY department, division), w2 AS (w1 ORDER BY hire_date);
---
SELECT 1::text;
---
-- 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
FROM
(SELECT 1 as x);
MY_NON_TOP_LEVEL_KEYWORD_FX_6();
END;

0 comments on commit 51e2d67

Please sign in to comment.