Merge pull request #274 from Trivadis/bugfix/issue-267-spaces-in-grant

Bugfix/issue 267 spaces in grant

Author: PhilippSalvisberg

settings/sql_developer/trivadis_custom_format.arbori

@@ -1851,7 +1851,7 @@ a8_one_space_after:
     | a8_update
 -> {
     var node = tuple.get("node");
-    if (!hasCommentsBetweenPos(node.from, node.to)) {
+    if (overrideIndents(node.from) && !hasCommentsBetweenPos(node.from, node.to)) {
         struct.putNewline(node.to, " ");
         var content = target.src.get(node.from).content;
         logger.fine(struct.getClass(), "a8_one_space_after: <" + content + "> at " + node.to + ".");

standalone/src/test/java/com/trivadis/plsql/formatter/settings/tests/grammar/plsql/Compile_clause.java

@@ -27,7 +27,8 @@ public void alter_function() throws IOException {
         var actual = getFormatter().format(input);
         var expected = """
                 alter
-                 function f
+                 function
+                  f
                    compile
                     reuse
                      settings;

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

@@ -0,0 +1,45 @@
+package com.trivadis.plsql.formatter.settings.tests.issues;
+
+import com.trivadis.plsql.formatter.settings.ConfiguredTestFormatter;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestInstance;
+
+@TestInstance(TestInstance.Lifecycle.PER_CLASS)
+public class Issue_267_spaces_in_grant extends ConfiguredTestFormatter {
+    @Test
+    public void keep_spaces_in_grant_statements() {
+        var input = """
+                grant   debug     connect       session   to scott;
+                grant   debug     any         procedure   to scott;
+                grant   execute   on    dbms_debug_jdwp   to scott;
+                """;
+        formatAndAssert(input);
+    }
+
+    @Test
+    public void keep_spaces_in_grant_statements_one_token_per_line() {
+        var input = """
+                grant
+                debug
+                connect
+                session
+                to
+                scott;
+
+                grant
+                debug
+                any
+                procedure
+                to
+                scott;
+
+                grant
+                execute
+                on
+                dbms_debug_jdwp
+                to
+                scott;
+                """;
+        formatAndAssert(input);
+    }
+}