Fix installing the formatter for users with the defaults.

plumpy · cushon · commit dac314ea0a64 · 2018-04-09T18:29:00.000-07:00
If they're using the defaults, there won't be a settings file, so
loadState() is never called.

MOE_MIGRATED_REVID=190972759
diff --git a/idea_plugin/resources/META-INF/plugin.xml b/idea_plugin/resources/META-INF/plugin.xml
@@ -21,7 +21,7 @@
   <project-components>
     <component>
       <implementation-class>
-        com.google.googlejavaformat.intellij.GoogleJavaFormatSettings
+        com.google.googlejavaformat.intellij.GoogleJavaFormatInstaller
       </implementation-class>
       <loadForDefaultProject/>
     </component>
@@ -31,6 +31,7 @@
     <projectConfigurable instance="com.google.googlejavaformat.intellij.GoogleJavaFormatConfigurable"
                          id="google-java-format.settings"
                          displayName="google-java-format Settings"/>
+    <projectService serviceImplementation="com.google.googlejavaformat.intellij.GoogleJavaFormatSettings"/>
   </extensions>
 
 </idea-plugin>
diff --git a/idea_plugin/src/com/google/googlejavaformat/intellij/GoogleJavaFormatInstaller.java b/idea_plugin/src/com/google/googlejavaformat/intellij/GoogleJavaFormatInstaller.java
@@ -16,21 +16,31 @@
 
 package com.google.googlejavaformat.intellij;
 
+import com.intellij.openapi.components.ProjectComponent;
 import com.intellij.openapi.project.Project;
 import com.intellij.psi.codeStyle.CodeStyleManager;
 import org.picocontainer.MutablePicoContainer;
 
 /**
- * A utility class to replace (and revert) the default IntelliJ {@link CodeStyleManager} with one
- * that formats via google-java-format.
+ * A component that replaces the default IntelliJ {@link CodeStyleManager} with one that formats via
+ * google-java-format.
  */
-final class GoogleJavaFormatInstaller {
+final class GoogleJavaFormatInstaller implements ProjectComponent {
 
   private static final String CODE_STYLE_MANAGER_KEY = CodeStyleManager.class.getName();
 
-  private GoogleJavaFormatInstaller() {}
+  private final Project project;
 
-  public static void installFormatter(Project project) {
+  private GoogleJavaFormatInstaller(Project project) {
+    this.project = project;
+  }
+
+  @Override
+  public void projectOpened() {
+    installFormatter(project);
+  }
+
+  private static void installFormatter(Project project) {
     CodeStyleManager currentManager = CodeStyleManager.getInstance(project);
 
     if (currentManager instanceof GoogleJavaFormatCodeStyleManager) {
@@ -40,13 +50,6 @@ public static void installFormatter(Project project) {
     setManager(project, new GoogleJavaFormatCodeStyleManager(currentManager));
   }
 
-  public static void removeFormatter(Project project) {
-    CodeStyleManager currentManager = CodeStyleManager.getInstance(project);
-    if (currentManager instanceof GoogleJavaFormatCodeStyleManager) {
-      setManager(project, ((GoogleJavaFormatCodeStyleManager) currentManager).getDelegate());
-    }
-  }
-
   private static void setManager(Project project, CodeStyleManager newManager) {
     if (newManager != null) {
       MutablePicoContainer container = (MutablePicoContainer) project.getPicoContainer();
diff --git a/idea_plugin/src/com/google/googlejavaformat/intellij/GoogleJavaFormatSettings.java b/idea_plugin/src/com/google/googlejavaformat/intellij/GoogleJavaFormatSettings.java
@@ -17,9 +17,8 @@
 package com.google.googlejavaformat.intellij;
 
 import com.google.googlejavaformat.java.JavaFormatterOptions;
-import com.intellij.lifecycle.PeriodicalTasksCloser;
-import com.intellij.openapi.components.AbstractProjectComponent;
 import com.intellij.openapi.components.PersistentStateComponent;
+import com.intellij.openapi.components.ServiceManager;
 import com.intellij.openapi.components.State;
 import com.intellij.openapi.components.Storage;
 import com.intellij.openapi.project.Project;
@@ -29,18 +28,12 @@
   name = "GoogleJavaFormatSettings",
   storages = {@Storage("google-java-format.xml")}
 )
-class GoogleJavaFormatSettings extends AbstractProjectComponent
-    implements PersistentStateComponent<GoogleJavaFormatSettings.State> {
+class GoogleJavaFormatSettings implements PersistentStateComponent<GoogleJavaFormatSettings.State> {
 
   private State state = new State();
 
-  protected GoogleJavaFormatSettings(Project project) {
-    super(project);
-  }
-
   static GoogleJavaFormatSettings getInstance(Project project) {
-    return PeriodicalTasksCloser.getInstance()
-        .safeGetComponent(project, GoogleJavaFormatSettings.class);
+    return ServiceManager.getService(project, GoogleJavaFormatSettings.class);
   }
 
   @Nullable
@@ -52,7 +45,6 @@ public State getState() {
   @Override
   public void loadState(State state) {
     this.state = state;
-    updateFormatterState();
   }
 
   boolean isEnabled() {
@@ -69,15 +61,6 @@ JavaFormatterOptions.Style getStyle() {
 
   void setStyle(JavaFormatterOptions.Style style) {
     state.style = style;
-    updateFormatterState();
-  }
-
-  private void updateFormatterState() {
-    if (state.enabled) {
-      GoogleJavaFormatInstaller.installFormatter(myProject);
-    } else {
-      GoogleJavaFormatInstaller.removeFormatter(myProject);
-    }
   }
 
   static class State {
