New format config for skipping white spaces before and after block pa…

…renthese
hogimn · Apr 15, 2024 · 21bc903 · 21bc903
1 parent 2dc6a7d
commit 21bc903
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 4 deletions.
diff --git a/SQL.Formatter/Core/AbstractFormatter.cs b/SQL.Formatter/Core/AbstractFormatter.cs
@@ -191,7 +191,10 @@ private string FormatOpeningParentheses(Token token, string query)
             if (!inlineBlock.IsActive())
             {
                 indentation.IncreaseBlockLevel();
-                query = AddNewline(query);
+                if (!cfg.skipWhitespaceNearBlockParentheses)
+                {
+                    query = AddNewline(query);
+                }
             }
 
             return query;
@@ -207,7 +210,13 @@ private string FormatClosingParentheses(Token token, string query)
             else
             {
                 indentation.DecreaseBlockLevel();
-                return FormatWithSpaces(token, AddNewline(query));
+
+                if (!cfg.skipWhitespaceNearBlockParentheses)
+                {
+                    return FormatWithSpaces(token, AddNewline(query));
+                }
+
+                return FormatWithoutSpaces(token, query);
             }
         }
 

diff --git a/SQL.Formatter/Core/FormatConfig.cs b/SQL.Formatter/Core/FormatConfig.cs
@@ -12,19 +12,22 @@ public class FormatConfig
         public readonly Params parameters;
         public readonly bool uppercase;
         public readonly int linesBetweenQueries;
+        public readonly bool skipWhitespaceNearBlockParentheses;
 
         public FormatConfig(
             string indent,
             int maxColumnLength,
             Params parameters,
             bool uppercase,
-            int linesBetweenQueries)
+            int linesBetweenQueries,
+            bool skipWhitespaceNearBlockParentheses)
         {
             this.indent = indent;
             this.maxColumnLength = maxColumnLength;
             this.parameters = parameters == null ? Params.Empty : parameters;
             this.uppercase = uppercase;
             this.linesBetweenQueries = linesBetweenQueries;
+            this.skipWhitespaceNearBlockParentheses = skipWhitespaceNearBlockParentheses;
         }
 
         public static FormatConfigBuilder Builder()
@@ -39,6 +42,7 @@ public class FormatConfigBuilder
             private Params parameters;
             private bool uppercase;
             private int linesBetweenQueries;
+            private bool skipWhitespaceNearBlockParentheses;
 
             public FormatConfigBuilder()
             {
@@ -84,10 +88,21 @@ public FormatConfigBuilder LinesBetweenQueries(int linesBetweenQueries)
                 return this;
             }
 
+            public FormatConfigBuilder SkipWhitespaceNearBlockParentheses(bool skipWhitespaceNearBlockParentheses)
+            {
+                this.skipWhitespaceNearBlockParentheses = skipWhitespaceNearBlockParentheses;
+                return this;
+            }
+
             public FormatConfig Build()
             {
                 return new FormatConfig(
-                    indent, maxColumnLength, parameters, uppercase, linesBetweenQueries);
+                    indent,
+                    maxColumnLength,
+                    parameters,
+                    uppercase,
+                    linesBetweenQueries,
+                    skipWhitespaceNearBlockParentheses);
             }
         }
     }