Merge pull request #200 from Trivadis/bugfix/issue-197-case-when-indent

Bugfix/issue 197 case when indent

Author: PhilippSalvisberg

settings/sql_developer/trivadis_custom_format.arbori

@@ -885,6 +885,7 @@ i9_remove_duplicate_spaces_in_scope:
 -- - O11: Line Breaks: On subqueries. Options: true; false. (breakOnSubqueries).
 -- - A16: Line break if the parent element uses multiple lines.
 -- - R5: Commas in front of separated elements.
+-- - A23: Enforce line break after single line comments.
 -- - R2: 3 space indention.
 -- - R7: SQL keywords are right aligned within a SQL command.
 -- - A11: Align parameter names.
@@ -2593,6 +2594,28 @@ r5_commas:
     addSpacesAroundComma(node);
 }
 
+-- --------------------------------------------------------------------------------------------------------------------
+-- A23: Enforce line break after single line comments.
+-- --------------------------------------------------------------------------------------------------------------------
+
+a23_enforce_line_break_after_single_line_comment:
+    runOnce
+-> {
+    var keys = newlinePositions.keySet().stream().collect(Collectors.toList()).toArray();
+    for (var i in keys) {
+        var key = keys[i];
+        if (key > 0) {
+            var comment = getLastCommentBetweenPos(key-1, key);
+            if (comment != null && comment.indexOf("--") == 0) {
+                if (value.indexOf("\n") == -1) {
+                    struct.putNewline(key, theLineSeparator);
+                    logger.fine(struct.getClass(), "a23_enforce_line_break_after_single_line_comment" + ": at " + key + ".");
+                }
+            }
+        }
+    }
+}
+
 -- --------------------------------------------------------------------------------------------------------------------
 -- R2: 3 space indention.
 -- --------------------------------------------------------------------------------------------------------------------

standalone/src/test/java/com/trivadis/plsql/formatter/settings/tests/rules/A23_enforce_line_break_after_single_line_comment.java

@@ -0,0 +1,53 @@
+package com.trivadis.plsql.formatter.settings.tests.rules;
+
+import com.trivadis.plsql.formatter.settings.ConfiguredTestFormatter;
+import org.junit.jupiter.api.Nested;
+import org.junit.jupiter.api.Test;
+
+public class A23_enforce_line_break_after_single_line_comment extends ConfiguredTestFormatter {
+
+    @Nested
+    class case_expression {
+
+        @Test
+        public void comment_before_then() {
+            var sql = """
+                    select empno,
+                           ename,
+                           case
+                              when 'JOB' = 'SALESMAN' -- make gender-neutral
+                              then
+                                 'SALESPERSON'
+                              else
+                                 job
+                           end as job,
+                           sal
+                      from emp;
+                    """;
+            formatAndAssert(sql);
+        }
+
+        @Test
+        public void comment_after_every_token() {
+            var sql = """
+                    select empno,
+                           ename,
+                           case
+                              when              -- comment 1
+                                 'JOB'          -- comment 2
+                                 =              -- comment 3
+                                 'SALESMAN'     -- comment 4
+                              then              -- comment 5
+                                 'SALESPERSON'  -- comment 6
+                              else              -- comment 7
+                                 job            -- comment 8
+                           end                  -- comment 9
+                           as                   -- comment 10
+                           job,
+                           sal
+                      from emp;
+                    """;
+            formatAndAssert(sql);
+        }
+    }
+}