Update the google-java-format plugin to support 2018.2 EAP builds.

plumpy · cushon · commit 357e407d6345 · 2018-06-26T14:28:57.000-07:00
MOE_MIGRATED_REVID=199176520
diff --git a/idea_plugin/build.gradle b/idea_plugin/build.gradle
@@ -15,7 +15,7 @@
  */
 
 plugins {
-  id "org.jetbrains.intellij" version "0.3.1"
+  id "org.jetbrains.intellij" version "0.3.2"
 }
 
 repositories {
@@ -32,7 +32,7 @@ apply plugin: 'java'
 intellij {
   pluginName = "google-java-format"
   updateSinceUntilBuild = true
-  version = "2018.1"
+  version = "IC-182.2757.3"
 }
 
 patchPluginXml {
diff --git a/idea_plugin/src/com/google/googlejavaformat/intellij/CodeStyleManagerDecorator.java b/idea_plugin/src/com/google/googlejavaformat/intellij/CodeStyleManagerDecorator.java
@@ -100,6 +100,12 @@ public void reformatTextWithContext(PsiFile psiFile, ChangedRangesInfo changedRa
     delegate.reformatTextWithContext(psiFile, changedRangesInfo);
   }
 
+  @Override
+  public void reformatTextWithContext(PsiFile file, Collection<TextRange> ranges)
+      throws IncorrectOperationException {
+    delegate.reformatTextWithContext(file, ranges);
+  }
+
   @Override
   public void adjustLineIndent(PsiFile file, TextRange rangeToAdjust)
       throws IncorrectOperationException {
@@ -127,6 +133,12 @@ public String getLineIndent(PsiFile file, int offset) {
     return delegate.getLineIndent(file, offset);
   }
 
+  @Override
+  @Nullable
+  public String getLineIndent(PsiFile file, int offset, FormattingMode mode) {
+    return delegate.getLineIndent(file, offset, mode);
+  }
+
   @Override
   @Nullable
   public String getLineIndent(Document document, int offset) {
@@ -185,6 +197,18 @@ public int getMinLineFeeds(PsiFile file, int offset) {
     return delegate.getMinLineFeeds(file, offset);
   }
 
+  @Override
+  public void runWithDocCommentFormattingDisabled(PsiFile file, Runnable runnable) {
+    delegate.runWithDocCommentFormattingDisabled(file, runnable);
+  }
+
+  @Override
+  public DocCommentSettings getDocCommentSettings(PsiFile file) {
+    return delegate.getDocCommentSettings(file);
+  }
+
+  // From FormattingModeAwareIndentAdjuster
+
   /** Uses same fallback as {@link CodeStyleManager#getCurrentFormattingMode}. */
   @Override
   public FormattingMode getCurrentFormattingMode() {
@@ -203,14 +227,4 @@ public int adjustLineIndent(final Document document, final int offset, Formattin
     }
     return offset;
   }
-
-  @Override
-  public void runWithDocCommentFormattingDisabled(PsiFile file, Runnable runnable) {
-    delegate.runWithDocCommentFormattingDisabled(file, runnable);
-  }
-
-  @Override
-  public DocCommentSettings getDocCommentSettings(PsiFile file) {
-    return delegate.getDocCommentSettings(file);
-  }
 }

Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,7 @@`
`15`	`15`	`*/`
`16`	`16`
`17`	`17`	`plugins {`
`18`		`- id "org.jetbrains.intellij" version "0.3.1"`
	`18`	`+ id "org.jetbrains.intellij" version "0.3.2"`
`19`	`19`	`}`
`20`	`20`
`21`	`21`	`repositories {`
`@@ -32,7 +32,7 @@ apply plugin: 'java'`
`32`	`32`	`intellij {`
`33`	`33`	`pluginName = "google-java-format"`
`34`	`34`	`updateSinceUntilBuild = true`
`35`		`- version = "2018.1"`
	`35`	`+ version = "IC-182.2757.3"`
`36`	`36`	`}`
`37`	`37`
`38`	`38`	`patchPluginXml {`