Refactor max line length handling

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=244858188

Author: cushon

core/src/main/java/com/google/googlejavaformat/java/FormatFileCallable.java

@@ -45,7 +45,7 @@ public String call() throws FormatterException {
         new Formatter(options).formatSource(input, characterRanges(input).asRanges());
     formatted = fixImports(formatted);
     if (parameters.reflowLongStrings()) {
-      formatted = StringWrapper.wrap(options.maxLineLength(), formatted);
+      formatted = StringWrapper.wrap(Formatter.MAX_LINE_LENGTH, formatted);
     }
     return formatted;
   }

core/src/main/java/com/google/googlejavaformat/java/Formatter.java

@@ -87,6 +87,8 @@
 @Immutable
 public final class Formatter {
 
+  public static final int MAX_LINE_LENGTH = 100;
+
   static final Range<Integer> EMPTY_RANGE = Range.closedOpen(-1, -1);
 
   private final JavaFormatterOptions options;
@@ -156,8 +158,7 @@ public CharSequence getCharContent(boolean ignoreEncodingErrors) throws IOExcept
     builder.sync(javaInput.getText().length());
     builder.drain();
     Doc doc = new DocBuilder().withOps(builder.build()).build();
-    doc.computeBreaks(
-        javaOutput.getCommentsHelper(), options.maxLineLength(), new Doc.State(+0, 0));
+    doc.computeBreaks(javaOutput.getCommentsHelper(), MAX_LINE_LENGTH, new Doc.State(+0, 0));
     doc.write(javaOutput);
     javaOutput.flush();
   }

core/src/main/java/com/google/googlejavaformat/java/JavaCommentsHelper.java

@@ -29,12 +29,10 @@
 /** {@code JavaCommentsHelper} extends {@link CommentsHelper} to rewrite Java comments. */
 public final class JavaCommentsHelper implements CommentsHelper {
 
-  private final JavaFormatterOptions options;
   private final String lineSeparator;
 
   public JavaCommentsHelper(String lineSeparator, JavaFormatterOptions options) {
     this.lineSeparator = lineSeparator;
-    this.options = options;
   }
 
   @Override
@@ -44,7 +42,7 @@ public String rewrite(Tok tok, int maxWidth, int column0) {
     }
     String text = tok.getOriginalText();
     if (tok.isJavadocComment()) {
-      text = JavadocFormatter.formatJavadoc(text, column0, options);
+      text = JavadocFormatter.formatJavadoc(text, column0);
     }
     List<String> lines = new ArrayList<>();
     Iterator<String> it = Newlines.lineIterator(text);
@@ -92,7 +90,7 @@ private String preserveIndentation(List<String> lines, int column0) {
 
   // Wraps and re-indents line comments.
   private String indentLineComments(List<String> lines, int column0) {
-    lines = wrapLineComments(lines, column0, options);
+    lines = wrapLineComments(lines, column0);
     StringBuilder builder = new StringBuilder();
     builder.append(lines.get(0).trim());
     String indentString = Strings.repeat(" ", column0);
@@ -107,8 +105,7 @@ private String indentLineComments(List<String> lines, int column0) {
   private static final Pattern LINE_COMMENT_MISSING_SPACE_PREFIX =
       Pattern.compile("^(//+)(?!noinspection|\\$NON-NLS-\\d+\\$)[^\\s/]");
 
-  private List<String> wrapLineComments(
-      List<String> lines, int column0, JavaFormatterOptions options) {
+  private List<String> wrapLineComments(List<String> lines, int column0) {
     List<String> result = new ArrayList<>();
     for (String line : lines) {
       // Add missing leading spaces to line comments: `//foo` -> `// foo`.
@@ -122,8 +119,8 @@ private List<String> wrapLineComments(
         result.add(line);
         continue;
       }
-      while (line.length() + column0 > options.maxLineLength()) {
-        int idx = options.maxLineLength() - column0;
+      while (line.length() + column0 > Formatter.MAX_LINE_LENGTH) {
+        int idx = Formatter.MAX_LINE_LENGTH - column0;
         // only break on whitespace characters, and ignore the leading `// `
         while (idx >= 2 && !CharMatcher.whitespace().matches(line.charAt(idx))) {
           idx--;

core/src/main/java/com/google/googlejavaformat/java/JavaFormatterOptions.java

@@ -15,7 +15,6 @@
 package com.google.googlejavaformat.java;
 
 import com.google.errorprone.annotations.Immutable;
-import com.google.googlejavaformat.java.javadoc.JavadocOptions;
 
 /**
  * Options for a google-java-format invocation.
@@ -28,9 +27,7 @@
  * preferences, and in fact it would work directly against our primary goals.
  */
 @Immutable
-public class JavaFormatterOptions implements JavadocOptions {
-
-  static final int DEFAULT_MAX_LINE_LENGTH = 100;
+public class JavaFormatterOptions {
 
   public enum Style {
 
@@ -57,12 +54,6 @@ private JavaFormatterOptions(Style style) {
     this.style = style;
   }
 
-  /** Returns the maximum formatted width */
-  @Override
-  public int maxLineLength() {
-    return DEFAULT_MAX_LINE_LENGTH;
-  }
-
   /** Returns the multiplier for the unit of indent */
   public int indentationMultiplier() {
     return style.indentationMultiplier();

core/src/main/java/com/google/googlejavaformat/java/StringWrapper.java

@@ -64,7 +64,7 @@
 public final class StringWrapper {
   /** Reflows long string literals in the given Java source code. */
   public static String wrap(String input) throws FormatterException {
-    return StringWrapper.wrap(JavaFormatterOptions.defaultOptions().maxLineLength(), input);
+    return StringWrapper.wrap(Formatter.MAX_LINE_LENGTH, input);
   }
 
   /**

core/src/main/java/com/google/googlejavaformat/java/javadoc/JavadocFormatter.java

@@ -35,23 +35,26 @@
  * single blank line if it's empty.
  */
 public final class JavadocFormatter {
+
+  static final int MAX_LINE_LENGTH = 100;
+
   /**
    * Formats the given Javadoc comment, which must start with ∕✱✱ and end with ✱∕. The output will
    * start and end with the same characters.
    */
-  public static String formatJavadoc(String input, int blockIndent, JavadocOptions options) {
+  public static String formatJavadoc(String input, int blockIndent) {
     ImmutableList<Token> tokens;
     try {
       tokens = lex(input);
     } catch (LexException e) {
       return input;
     }
-    String result = render(tokens, blockIndent, options);
-    return makeSingleLineIfPossible(blockIndent, result, options);
+    String result = render(tokens, blockIndent);
+    return makeSingleLineIfPossible(blockIndent, result);
   }
 
-  private static String render(List<Token> input, int blockIndent, JavadocOptions options) {
-    JavadocWriter output = new JavadocWriter(blockIndent, options);
+  private static String render(List<Token> input, int blockIndent) {
+    JavadocWriter output = new JavadocWriter(blockIndent);
     for (Token token : input) {
       switch (token.getType()) {
         case BEGIN_JAVADOC:
@@ -162,9 +165,8 @@ private static Token standardize(Token token, Token standardToken) {
    * Returns the given string or a one-line version of it (e.g., "∕✱✱ Tests for foos. ✱∕") if it
    * fits on one line.
    */
-  private static String makeSingleLineIfPossible(
-      int blockIndent, String input, JavadocOptions options) {
-    int oneLinerContentLength = options.maxLineLength() - "/**  */".length() - blockIndent;
+  private static String makeSingleLineIfPossible(int blockIndent, String input) {
+    int oneLinerContentLength = MAX_LINE_LENGTH - "/**  */".length() - blockIndent;
     Matcher matcher = ONE_CONTENT_LINE_PATTERN.matcher(input);
     if (matcher.matches() && matcher.group(1).isEmpty()) {
       return "/** */";

core/src/main/java/com/google/googlejavaformat/java/javadoc/JavadocOptions.java

@@ -40,7 +40,6 @@
  */
 final class JavadocWriter {
   private final int blockIndent;
-  private final JavadocOptions options;
   private final StringBuilder output = new StringBuilder();
   /**
    * Whether we are inside an {@code <li>} element, excluding the case in which the {@code <li>}
@@ -60,9 +59,8 @@ final class JavadocWriter {
   private int indentForMoeEndStripComment;
   private boolean wroteAnythingSignificant;
 
-  JavadocWriter(int blockIndent, JavadocOptions options) {
+  JavadocWriter(int blockIndent) {
     this.blockIndent = blockIndent;
-    this.options = checkNotNull(options);
   }
 
   /**
@@ -375,7 +373,7 @@ private void writeNewline(AutoIndent autoIndent) {
     appendSpaces(blockIndent + 1);
     output.append("*");
     appendSpaces(1);
-    remainingOnLine = options.maxLineLength() - blockIndent - 3;
+    remainingOnLine = JavadocFormatter.MAX_LINE_LENGTH - blockIndent - 3;
     if (autoIndent == AUTO_INDENT) {
       appendSpaces(innerIndent());
       remainingOnLine -= innerIndent();