syncmjava
diff --git a/‎core/src/main/java/com/google/googlejavaformat/java/CommandLineOptions.java‎
Lines changed: 16 additions & 2 deletions b/‎core/src/main/java/com/google/googlejavaformat/java/CommandLineOptions.java‎
Lines changed: 16 additions & 2 deletions
diff --git a/‎core/src/main/java/com/google/googlejavaformat/java/CommandLineOptionsParser.java‎
Lines changed: 3 additions & 0 deletions b/‎core/src/main/java/com/google/googlejavaformat/java/CommandLineOptionsParser.java‎
Lines changed: 3 additions & 0 deletions
diff --git a/‎core/src/main/java/com/google/googlejavaformat/java/FormatFileCallable.java‎
Lines changed: 3 additions & 0 deletions b/‎core/src/main/java/com/google/googlejavaformat/java/FormatFileCallable.java‎
Lines changed: 3 additions & 0 deletions
diff --git a/‎core/src/main/java/com/google/googlejavaformat/java/Formatter.java‎
Lines changed: 3 additions & 1 deletion b/‎core/src/main/java/com/google/googlejavaformat/java/Formatter.java‎
Lines changed: 3 additions & 1 deletion
@@ -41,6 +41,7 @@ final class CommandLineOptions {
   private final boolean dryRun;
   private final boolean setExitIfChanged;
   private final Optional<String> assumeFilename;
+  private final boolean reflowLongStrings;
 
   CommandLineOptions(
       ImmutableList<String> files,
@@ -57,7 +58,8 @@ final class CommandLineOptions {
       boolean removeUnusedImports,
       boolean dryRun,
       boolean setExitIfChanged,
-      Optional<String> assumeFilename) {
+      Optional<String> assumeFilename,
+      boolean reflowLongStrings) {
     this.files = files;
     this.inPlace = inPlace;
     this.lines = lines;
@@ -73,6 +75,7 @@ final class CommandLineOptions {
     this.dryRun = dryRun;
     this.setExitIfChanged = setExitIfChanged;
     this.assumeFilename = assumeFilename;
+    this.reflowLongStrings = reflowLongStrings;
   }
 
   /** The files to format. */
@@ -152,6 +155,10 @@ Optional<String> assumeFilename() {
     return assumeFilename;
   }
 
+  boolean reflowLongStrings() {
+    return reflowLongStrings;
+  }
+
   /** Returns true if partial formatting was selected. */
   boolean isSelection() {
     return !lines().isEmpty() || !offsets().isEmpty() || !lengths().isEmpty();
@@ -178,6 +185,7 @@ static class Builder {
     private boolean dryRun = false;
     private boolean setExitIfChanged = false;
     private Optional<String> assumeFilename = Optional.empty();
+    private boolean reflowLongStrings = true;
 
     ImmutableList.Builder<String> filesBuilder() {
       return files;
@@ -252,6 +260,11 @@ Builder assumeFilename(String assumeFilename) {
       return this;
     }
 
+    Builder reflowLongStrings(boolean reflowLongStrings) {
+      this.reflowLongStrings = reflowLongStrings;
+      return this;
+    }
+
     CommandLineOptions build() {
       return new CommandLineOptions(
           files.build(),
@@ -268,7 +281,8 @@ CommandLineOptions build() {
           removeUnusedImports,
           dryRun,
           setExitIfChanged,
-          assumeFilename);
+          assumeFilename,
+          reflowLongStrings);
     }
   }
 }
@@ -105,6 +105,9 @@ static CommandLineOptions parse(Iterable<String> options) {
         case "--skip-removing-unused-imports":
           optionsBuilder.removeUnusedImports(false);
           break;
+        case "--skip-reflowing-long-strings":
+          optionsBuilder.reflowLongStrings(false);
+          break;
         case "-":
           optionsBuilder.stdin(true);
           break;
 
@@ -44,6 +44,9 @@ public String call() throws FormatterException {
     String formatted =
         new Formatter(options).formatSource(input, characterRanges(input).asRanges());
     formatted = fixImports(formatted);
+    if (parameters.reflowLongStrings()) {
+      formatted = StringWrapper.wrap(options.maxLineLength(), formatted);
+    }
     return formatted;
   }
 
 
@@ -217,7 +217,9 @@ public String formatSource(String input) throws FormatterException {
   public String formatSourceAndFixImports(String input) throws FormatterException {
     input = ImportOrderer.reorderImports(input);
     input = RemoveUnusedImports.removeUnusedImports(input);
-    return formatSource(input);
+    String formatted = formatSource(input);
+    formatted = StringWrapper.wrap(formatted);
+    return formatted;
   }
 
   /**
Original file line number	Diff line number	Diff line change
`@@ -44,6 +44,9 @@ public String call() throws FormatterException {`
`44`	`44`	`String formatted =`
`45`	`45`	`new Formatter(options).formatSource(input, characterRanges(input).asRanges());`
`46`	`46`	`formatted = fixImports(formatted);`
	`47`	`+ if (parameters.reflowLongStrings()) {`
	`48`	`+ formatted = StringWrapper.wrap(options.maxLineLength(), formatted);`
	`49`	`+ }`
`47`	`50`	`return formatted;`
`48`	`51`	`}`
`49`	`52`