From 45fb41a7bac3dfe0726601ceb87d1c17bbf494ec Mon Sep 17 00:00:00 2001
From: google-java-format Team <java-team-github-bot@google.com>
Date: Mon, 13 Jul 2020 06:41:23 -0700
Subject: [PATCH] Fix the google-java-format IDEA plugin for 2020.2 IDEs.

PiperOrigin-RevId: 320945302
---
 idea_plugin/build.gradle                                     | 4 ++--
 idea_plugin/resources/META-INF/plugin.xml                    | 2 ++
 .../googlejavaformat/intellij/CodeStyleManagerDecorator.java | 5 +++++
 3 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/idea_plugin/build.gradle b/idea_plugin/build.gradle
index f7b54f18b..d74957d66 100644
--- 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
index 938a02f53..5b313cf62 100644
--- 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
index ee28e1bc8..c70ba1751 100644
--- 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);
+  }
 }