Merge pull request #199 from Trivadis/bugfix/issue-196-space-in-negative-number

Bugfix/issue 196 space in negative number

Author: PhilippSalvisberg

settings/sql_developer/trivadis_custom_format.arbori

@@ -862,6 +862,7 @@ i9_remove_duplicate_spaces_in_scope:
 -- - A2: Remove trailing spaces.
 -- - A3: Do not format code between @formatter:off and @formatter:on comments.
 -- - O2: White Space: Around operators. Options: true; false. (spaceAroundOperators).
+-- - A22: No space between sign and digits.
 -- - A13: Keep short nodes on the same line.
 -- - A5: No space before node.
 -- - A6: No space after node.
@@ -1013,6 +1014,21 @@ o2_whitespace_around_operators:
     }
 }
 
+-- --------------------------------------------------------------------------------------------------------------------
+-- A22: No space between sign and digits.
+-- --------------------------------------------------------------------------------------------------------------------
+
+a22_no_space_between_sign_and_digits:
+       ([node) '-' | [node) '+')
+     & ![node) binary_add_op
+     & [node+1) digits
+     & ![node-1) digits
+     & ![node-1) expr
+-> {
+    struct.putNewline(node.to, "");
+    logger.fine(struct.getClass(), "a22_no_space_between_sign_and_digits: at " + node.to + ".");
+}
+
 -- --------------------------------------------------------------------------------------------------------------------
 -- A13: Keep short nodes on the same line.
 -- --------------------------------------------------------------------------------------------------------------------

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

@@ -0,0 +1,54 @@
+package com.trivadis.plsql.formatter.settings.tests.rules;
+
+import com.trivadis.plsql.formatter.settings.ConfiguredTestFormatter;
+import org.junit.jupiter.api.Test;
+
+public class A22_no_space_between_sign_and_digits extends ConfiguredTestFormatter {
+
+    @Test
+    public void insert_negative_number() {
+        var sql = """
+                insert into dept (deptno, dname, loc)
+                values (-1, 'Testing', 'Winterthur');
+                """;
+        formatAndAssert(sql);
+    }
+
+    @Test
+    public void insert_positive_number() {
+        var sql = """
+                insert into dept (deptno, dname, loc)
+                values (+1, 'Testing', 'Winterthur');
+                """;
+        formatAndAssert(sql);
+    }
+
+    @Test
+    public void insert_expression_with_negative_number() {
+        var sql = """
+                insert into dept (deptno, dname, loc)
+                values ((a + b / 2) + -1, 'Testing', 'Winterthur');
+                """;
+        formatAndAssert(sql);
+    }
+
+    @Test
+    public void assignment_with_negative_number() {
+        var sql = """
+                begin
+                   a := b - 1;
+                end;
+                """;
+        formatAndAssert(sql);
+    }
+
+    @Test
+    public void assignment_with_positive_number() {
+        var sql = """
+                begin
+                   x := p1(1) + p1(2) + 17;
+                end;
+                """;
+        formatAndAssert(sql);
+    }
+}