Merge pull request #33 from ogirardot/master

Add a FormatConfig parameter to change max column length default

Author: vertical-blank

src/main/java/com/github/vertical_blank/sqlformatter/core/FormatConfig.java

@@ -3,12 +3,15 @@
 public class FormatConfig {
 
 	public static final String DEFAULT_INDENT = "  ";
+	public static final int DEFAULT_COLUMN_MAX_LENGTH = 50;
 
 	public final String indent;
+	public final int maxColumnLength;
 	public final Params.Holder params;
 
-	FormatConfig(String indent, Params.Holder params) {
+	FormatConfig(String indent, int maxColumnLength, Params.Holder params) {
 		this.indent = indent;
+		this.maxColumnLength = maxColumnLength;
 		this.params = params;
 	}
 
@@ -18,6 +21,7 @@ public static FormatConfigBuilder builder() {
 
 	public static class FormatConfigBuilder {
 		private String indent;
+		private int maxColumnLength = DEFAULT_COLUMN_MAX_LENGTH;
 		private Params.Holder params;
 
 		FormatConfigBuilder() {
@@ -28,13 +32,19 @@ public FormatConfigBuilder indent(String indent) {
 			return this;
 		}
 
+
+		public FormatConfigBuilder maxColumnLength(int maxColumnLength) {
+			this.maxColumnLength = maxColumnLength;
+			return this;
+		}
+
 		public FormatConfigBuilder params(Params.Holder params) {
 			this.params = params;
 			return this;
 		}
 
 		public FormatConfig build() {
-			return new FormatConfig(indent, params);
+			return new FormatConfig(indent, maxColumnLength, params);
 		}
 	}
 }

src/main/java/com/github/vertical_blank/sqlformatter/core/Formatter.java

@@ -22,7 +22,7 @@ public class Formatter {
 	 */
 	public Formatter(FormatConfig cfg, Tokenizer tokenizer) {
 		this.indentation = new Indentation(cfg.indent);
-		this.inlineBlock = new InlineBlock();
+		this.inlineBlock = new InlineBlock(cfg.maxColumnLength);
 		this.params = new Params(cfg.params);
 		this.tokenizer = tokenizer;
 		this.previousReservedWord = null;

src/main/java/com/github/vertical_blank/sqlformatter/core/InlineBlock.java

@@ -6,17 +6,17 @@
 /**
  * Bookkeeper for inline blocks.
  * <p>
- * Inline blocks are parenthized expressions that are shorter than INLINE_MAX_LENGTH.
+ * Inline blocks are parenthized expressions that are shorter than maxColumnLength.
  * These blocks are formatted on a single line, unlike longer parenthized
  * expressions where open-parenthesis causes newline and increase of indentation.
  */
 class InlineBlock {
 
-	private static final int INLINE_MAX_LENGTH = 50;
-
 	private int level;
+	private final int maxColumnLength;
 
-	InlineBlock() {
+	InlineBlock(int maxColumnLength) {
+		this.maxColumnLength = maxColumnLength;
 		this.level = 0;
 	}
 
@@ -65,7 +65,7 @@ private boolean isInlineBlock(List<Token> tokens, int index) {
 			length += token.value.length();
 
 			// Overran max length
-			if (length > INLINE_MAX_LENGTH) {
+			if (length > maxColumnLength) {
 				return false;
 			}