Merge pull request #201 from Trivadis/bugfix/issue-198-indent-return

Bugfix/issue 198 indent return

Author: PhilippSalvisberg

settings/sql_developer/trivadis_custom_format.arbori

@@ -550,7 +550,8 @@ i5_define_global_functions:
            "merge",
            "block_stmt",
            "pkg_body",
-           "create_plsql"
+           "create_plsql",
+           "stmt"
         ]);
     }
 
@@ -1124,10 +1125,19 @@ a13_short_nodes:
         return false;
     }
 
+    var containsCase = function(node) {
+        for (var i=node.from+1; i < node.to; i++) {
+            if (target.src.get(i).content.toLowerCase() == 'case') {
+                return true;
+            }
+        }
+        return false;
+    }
+
     var maxLen = maxCharLineSize / 2;
     var node = tuple.get("node");
     if (getNodeLength(node) <= maxLen) {
-        if (breaksConcat == Format$Breaks.None || !containsConcat(node)) {
+        if ((breaksConcat == Format$Breaks.None || !containsConcat(node)) && !containsCase(node)) {
             reduceNodeIndents(node);
         }
     }
@@ -2783,6 +2793,7 @@ r2_common:
     | [node^) bulk_loop_stmt & ![node) 'FORALL'
     | [node) analytic_clause & ![node^) over_clause
     | [node) 'RETURN' & [node^) subprg_spec
+    | [node-1) 'RETURN' & [node^) stmt
     | [node) plsql_declarations & ([node^) with_clause | [node^) with_clause[12,20))
 ;
 
@@ -3160,6 +3171,22 @@ r2_fix_indent_for_subquery_in_paren:
     }
 }
 
+r2_fix_indent_for_case_expr:
+     ([parent) case_expr | [parent) case_expression)
+   & [endcase) 'END'
+   & endcase^ = parent
+-> {
+    var parent = tuple.get("parent");
+    if (getIndent(parent.from).indexOf("\n") == -1) {
+        var endcase = tuple.get("endcase");
+        var marginDiff = getColumn(parent.from) - getColumn(endcase.from);
+        if (marginDiff > 0) {
+            addIndent(parent, marginDiff);
+            logger.fine(struct.getClass(), "r2_fix_indent_for_case_expr: at " + parent.from + ".");
+        }
+    }
+}
+
 -- --------------------------------------------------------------------------------------------------------------------
 -- R7: SQL keywords are right aligned within a SQL command.
 -- --------------------------------------------------------------------------------------------------------------------

standalone/src/test/java/com/trivadis/plsql/formatter/settings/tests/issues/Issue_198_indent_return.java

@@ -0,0 +1,94 @@
+package com.trivadis.plsql.formatter.settings.tests.issues;
+
+import com.trivadis.plsql.formatter.settings.ConfiguredTestFormatter;
+import org.junit.jupiter.api.Test;
+
+import java.io.IOException;
+
+public class Issue_198_indent_return extends ConfiguredTestFormatter {
+
+    @Test
+    public void line_break_after_return() throws IOException {
+        var input = """
+                function bool_to_int(in_bool in boolean) return integer
+                      deterministic
+                   is
+                begin
+                   return
+                      case
+                         when in_bool then
+                            1
+                         else
+                            0
+                      end;
+                end bool_to_int;
+                """;
+        var expected = """
+                function bool_to_int(in_bool in boolean) return integer
+                      deterministic
+                   is
+                begin
+                   return case
+                             when in_bool then
+                                1
+                             else
+                                0
+                          end;
+                end bool_to_int;
+                """;
+        var actual = formatter.format(input);
+        assertEquals(expected, actual);
+    }
+
+    @Test
+    public void parenthesis_after_return() {
+        var sql = """
+                function bool_to_int(in_bool in boolean) return integer
+                      deterministic
+                   is
+                begin
+                   return (
+                         case
+                            when in_bool then
+                               1
+                            else
+                               0
+                         end
+                      );
+                end bool_to_int;
+                """;
+        formatAndAssert(sql);
+    }
+
+    @Test
+    public void terse_min_max_select() {
+        var sql = """
+                select max(min(case
+                                  when job = 'CLERK' then
+                                     sal
+                                  else
+                                     null
+                               end))
+                  from emp;
+                """;
+        formatAndAssert(sql);
+    }
+
+    @Test
+    public void verbose_min_max_select() {
+        var sql = """
+                select max(
+                          min(
+                             case
+                                when job = 'CLERK' then
+                                   sal
+                                else
+                                   null
+                             end
+                          )
+                       )
+                  from emp;
+                """;
+        formatAndAssert(sql);
+    }
+}