Add aosp option to IntelliJ plugin

MOE_MIGRATED_REVID=133885010

Author: soumya92

idea_plugin/src/com/google/googlejavaformat/intellij/GoogleJavaFormatCodeStyleManager.java

@@ -21,6 +21,7 @@
 import com.google.common.collect.Range;
 import com.google.googlejavaformat.java.Formatter;
 import com.google.googlejavaformat.java.FormatterException;
+import com.google.googlejavaformat.java.JavaFormatterOptions;
 import com.google.googlejavaformat.java.Replacement;
 import com.intellij.openapi.application.ApplicationManager;
 import com.intellij.openapi.command.WriteCommandAction;
@@ -45,10 +46,16 @@
  */
 public class GoogleJavaFormatCodeStyleManager extends CodeStyleManagerDecorator {
 
-  private final Formatter formatter = new Formatter();
+  private final Formatter formatter;
 
   public GoogleJavaFormatCodeStyleManager(@NotNull CodeStyleManager original) {
+    this(original, JavaFormatterOptions.defaultOptions());
+  }
+
+  public GoogleJavaFormatCodeStyleManager(
+      @NotNull CodeStyleManager original, @NotNull JavaFormatterOptions formatterOptions) {
     super(original);
+    formatter = new Formatter(formatterOptions);
   }
 
   @Override

idea_plugin/src/com/google/googlejavaformat/intellij/GoogleJavaFormatInstaller.java

@@ -16,6 +16,7 @@
 
 package com.google.googlejavaformat.intellij;
 
+import com.google.googlejavaformat.java.JavaFormatterOptions;
 import com.intellij.openapi.project.Project;
 import com.intellij.psi.codeStyle.CodeStyleManager;
 import org.picocontainer.MutablePicoContainer;
@@ -30,14 +31,17 @@ public final class GoogleJavaFormatInstaller {
 
   private GoogleJavaFormatInstaller() {}
 
-  public static void installFormatter(Project project, boolean useGoogleFormatter) {
+  public static void installFormatter(
+      Project project, boolean useGoogleFormatter, JavaFormatterOptions javaFormatterOptions) {
     CodeStyleManager currentManager = CodeStyleManager.getInstance(project);
     CodeStyleManager newManager = null;
 
     if (useGoogleFormatter) {
-      if (!(currentManager instanceof GoogleJavaFormatCodeStyleManager)) {
-        newManager = new GoogleJavaFormatCodeStyleManager(currentManager);
+      if (currentManager instanceof GoogleJavaFormatCodeStyleManager) {
+        // Recreate from delegate, updating the javaFormatterOptions as needed.
+        currentManager = ((GoogleJavaFormatCodeStyleManager) currentManager).getDelegate();
       }
+      newManager = new GoogleJavaFormatCodeStyleManager(currentManager, javaFormatterOptions);
     } else {
       if (currentManager instanceof GoogleJavaFormatCodeStyleManager) {
         newManager = ((GoogleJavaFormatCodeStyleManager) currentManager).getDelegate();
@@ -50,4 +54,8 @@ public static void installFormatter(Project project, boolean useGoogleFormatter)
       container.registerComponentInstance(CODE_STYLE_MANAGER_KEY, newManager);
     }
   }
+
+  public static void installFormatter(Project project, boolean useGoogleFormatter) {
+    installFormatter(project, useGoogleFormatter, JavaFormatterOptions.defaultOptions());
+  }
 }