Merge pull request #69 from hemlac/master

new format config for skipping white spaces before and after block pa…
vertical-blank · Apr 4, 2024 · 86233c3 · 86233c3
2 parents e563edf + bef5380
commit 86233c3
Show file tree

Hide file tree

Showing 2 changed files with 30 additions and 4 deletions.
diff --git a/src/main/java/com/github/vertical_blank/sqlformatter/core/AbstractFormatter.java b/src/main/java/com/github/vertical_blank/sqlformatter/core/AbstractFormatter.java
@@ -167,7 +167,9 @@ private String formatOpeningParentheses(Token token, String query) {
 
     if (!this.inlineBlock.isActive()) {
       this.indentation.increaseBlockLevel();
-      query = this.addNewline(query);
+      if (!cfg.skipWhitespaceNearBlockParentheses) {
+        query = this.addNewline(query);
+      }
     }
     return query;
   }
@@ -179,7 +181,11 @@ private String formatClosingParentheses(Token token, String query) {
       return this.formatWithSpaceAfter(token, query);
     } else {
       this.indentation.decreaseBlockLevel();
-      return this.formatWithSpaces(token, this.addNewline(query));
+      if (!cfg.skipWhitespaceNearBlockParentheses) {
+        return this.formatWithSpaces(token, this.addNewline(query));
+      } else {
+        return this.formatWithoutSpaces(token, query);
+      }
     }
   }
 

diff --git a/src/main/java/com/github/vertical_blank/sqlformatter/core/FormatConfig.java b/src/main/java/com/github/vertical_blank/sqlformatter/core/FormatConfig.java
@@ -14,18 +14,21 @@ public class FormatConfig {
   public final Params params;
   public final boolean uppercase;
   public final Integer linesBetweenQueries;
+  public final boolean skipWhitespaceNearBlockParentheses;
 
   FormatConfig(
       String indent,
       int maxColumnLength,
       Params params,
       boolean uppercase,
-      Integer linesBetweenQueries) {
+      Integer linesBetweenQueries,
+      boolean skipWhitespaceNearBlockParentheses) {
     this.indent = indent;
     this.maxColumnLength = maxColumnLength;
     this.params = params == null ? Params.EMPTY : params;
     this.uppercase = uppercase;
     this.linesBetweenQueries = linesBetweenQueries;
+    this.skipWhitespaceNearBlockParentheses = skipWhitespaceNearBlockParentheses;
   }
 
   /**
@@ -44,6 +47,7 @@ public static class FormatConfigBuilder {
     private Params params;
     private boolean uppercase;
     private Integer linesBetweenQueries;
+    private boolean skipWhitespaceNearBlockParentheses;
 
     FormatConfigBuilder() {}
 
@@ -108,14 +112,30 @@ public FormatConfigBuilder linesBetweenQueries(int linesBetweenQueries) {
       return this;
     }
 
+    /**
+     * @param skipWhitespaceNearBlockParentheses skip adding whitespace before and after block
+     *     Parentheses
+     * @return This
+     */
+    public FormatConfigBuilder skipWhitespaceNearBlockParentheses(
+        boolean skipWhitespaceNearBlockParentheses) {
+      this.skipWhitespaceNearBlockParentheses = skipWhitespaceNearBlockParentheses;
+      return this;
+    }
+
     /**
      * Returns an instance of FormatConfig created from the fields set on this builder.
      *
      * @return FormatConfig
      */
     public FormatConfig build() {
       return new FormatConfig(
-          this.indent, this.maxColumnLength, this.params, this.uppercase, this.linesBetweenQueries);
+          this.indent,
+          this.maxColumnLength,
+          this.params,
+          this.uppercase,
+          this.linesBetweenQueries,
+          this.skipWhitespaceNearBlockParentheses);
     }
   }
 }