Fix the google-java-format IDEA plugin for 2020.2 IDEs.

java-team-github-bot · google-java-format Team · commit 45fb41a7bac3 · 2020-07-13T06:41:53.000-07:00
PiperOrigin-RevId: 320945302
diff --git a/idea_plugin/build.gradle b/idea_plugin/build.gradle
@@ -31,13 +31,13 @@ apply plugin: 'java'
 
 intellij {
   pluginName = "google-java-format"
-  version = "2020.1"
+  version = "202.6250.13-EAP-SNAPSHOT"
 }
 
 patchPluginXml {
   pluginDescription = "Formats source code using the google-java-format tool. This version of " +
                       "the plugin uses version ${googleJavaFormatVersion} of the tool."
-  version = "${googleJavaFormatVersion}.0.0"
+  version = "${googleJavaFormatVersion}.0.1"
   sinceBuild = '201'
   untilBuild = ''
 }
diff --git a/idea_plugin/resources/META-INF/plugin.xml b/idea_plugin/resources/META-INF/plugin.xml
@@ -28,6 +28,8 @@
 
   <change-notes><![CDATA[
     <dl>
+      <dt>1.8.0.1</dt>
+      <dd>Fixed support for 2020.2 IDEs.<dd>
       <dt>1.8.0.0</dt>
       <dd>Updated to use google-java-format 1.8.<dd>
       <dt>1.7.0.5</dt>
diff --git a/idea_plugin/src/com/google/googlejavaformat/intellij/CodeStyleManagerDecorator.java b/idea_plugin/src/com/google/googlejavaformat/intellij/CodeStyleManagerDecorator.java
@@ -231,4 +231,9 @@ public int adjustLineIndent(final Document document, final int offset, Formattin
     }
     return offset;
   }
+
+  @Override
+  public void scheduleReformatWhenSettingsComputed(PsiFile file) {
+    delegate.scheduleReformatWhenSettingsComputed(file);
+  }
 }

Original file line number	Diff line number	Diff line change
`@@ -31,13 +31,13 @@ apply plugin: 'java'`
`31`	`31`
`32`	`32`	`intellij {`
`33`	`33`	`pluginName = "google-java-format"`
`34`		`- version = "2020.1"`
	`34`	`+ version = "202.6250.13-EAP-SNAPSHOT"`
`35`	`35`	`}`
`36`	`36`
`37`	`37`	`patchPluginXml {`
`38`	`38`	`pluginDescription = "Formats source code using the google-java-format tool. This version of " +`
`39`	`39`	`"the plugin uses version ${googleJavaFormatVersion} of the tool."`
`40`		`- version = "${googleJavaFormatVersion}.0.0"`
	`40`	`+ version = "${googleJavaFormatVersion}.0.1"`
`41`	`41`	`sinceBuild = '201'`
`42`	`42`	`untilBuild = ''`
`43`	`43`	`}`
Original file line number	Diff line number	Diff line change
`@@ -231,4 +231,9 @@ public int adjustLineIndent(final Document document, final int offset, Formattin`
`231`	`231`	`}`
`232`	`232`	`return offset;`
`233`	`233`	`}`
	`234`	`+`
	`235`	`+ @Override`
	`236`	`+ public void scheduleReformatWhenSettingsComputed(PsiFile file) {`
	`237`	`+ delegate.scheduleReformatWhenSettingsComputed(file);`
	`238`	`+ }`
`234`	`239`	`}`