Update to use 1.13.0

ze · ze · commit 53f216cd030a · 2022-02-02T21:56:25.000-05:00
diff --git a/idea_plugin/build.gradle b/idea_plugin/build.gradle
@@ -15,15 +15,15 @@
  */
 
 plugins {
-  id "org.jetbrains.intellij" version "1.3.0"
+  id "org.jetbrains.intellij" version "1.3.1"
 }
 
 repositories {
   mavenCentral()
 }
 
 ext {
-  googleJavaFormatVersion = '1.13.0'
+  googleJavaFormatVersion = "1.13.0"
 }
 
 apply plugin: "org.jetbrains.intellij"
@@ -35,7 +35,7 @@ targetCompatibility = JavaVersion.VERSION_11
 intellij {
   pluginName = "google-java-format"
   plugins = ["java"]
-  version = "2020.3"
+  version = "221.3427-EAP-CANDIDATE-SNAPSHOT"
 }
 
 patchPluginXml {
diff --git a/idea_plugin/src/com/google/googlejavaformat/intellij/CodeStyleManagerDecorator.java b/idea_plugin/src/com/google/googlejavaformat/intellij/CodeStyleManagerDecorator.java
@@ -91,7 +91,7 @@ public void reformatText(@NotNull PsiFile file, int startOffset, int endOffset)
   }
 
   @Override
-  public void reformatText(@NotNull PsiFile file, @NotNull Collection<TextRange> ranges)
+  public void reformatText(@NotNull PsiFile file, @NotNull Collection<? extends TextRange> ranges)
       throws IncorrectOperationException {
     delegate.reformatText(file, ranges);
   }
@@ -104,7 +104,7 @@ public void reformatTextWithContext(
   }
 
   @Override
-  public void reformatTextWithContext(@NotNull PsiFile file, @NotNull Collection<TextRange> ranges)
+  public void reformatTextWithContext(@NotNull PsiFile file, @NotNull Collection<? extends TextRange> ranges)
       throws IncorrectOperationException {
     delegate.reformatTextWithContext(file, ranges);
   }
diff --git a/idea_plugin/src/com/google/googlejavaformat/intellij/GoogleJavaFormatCodeStyleManager.java b/idea_plugin/src/com/google/googlejavaformat/intellij/GoogleJavaFormatCodeStyleManager.java
@@ -63,7 +63,7 @@ public void reformatText(@NotNull PsiFile file, int startOffset, int endOffset)
   }
 
   @Override
-  public void reformatText(@NotNull PsiFile file, @NotNull Collection<TextRange> ranges)
+  public void reformatText(@NotNull PsiFile file, @NotNull Collection<? extends TextRange> ranges)
       throws IncorrectOperationException {
     if (overrideFormatterForFile(file)) {
       formatInternal(file, ranges);
@@ -85,7 +85,7 @@ public void reformatTextWithContext(@NotNull PsiFile file, @NotNull ChangedRange
 
   @Override
   public void reformatTextWithContext(
-      @NotNull PsiFile file, @NotNull Collection<TextRange> ranges) {
+      @NotNull PsiFile file, @NotNull Collection<? extends TextRange> ranges) {
     if (overrideFormatterForFile(file)) {
       formatInternal(file, ranges);
     } else {

Original file line number	Diff line number	Diff line change
`@@ -15,15 +15,15 @@`
`15`	`15`	`*/`
`16`	`16`
`17`	`17`	`plugins {`
`18`		`- id "org.jetbrains.intellij" version "1.3.0"`
	`18`	`+ id "org.jetbrains.intellij" version "1.3.1"`
`19`	`19`	`}`
`20`	`20`
`21`	`21`	`repositories {`
`22`	`22`	`mavenCentral()`
`23`	`23`	`}`
`24`	`24`
`25`	`25`	`ext {`
`26`		`- googleJavaFormatVersion = '1.13.0'`
	`26`	`+ googleJavaFormatVersion = "1.13.0"`
`27`	`27`	`}`
`28`	`28`
`29`	`29`	`apply plugin: "org.jetbrains.intellij"`
`@@ -35,7 +35,7 @@ targetCompatibility = JavaVersion.VERSION_11`
`35`	`35`	`intellij {`
`36`	`36`	`pluginName = "google-java-format"`
`37`	`37`	`plugins = ["java"]`
`38`		`- version = "2020.3"`
	`38`	`+ version = "221.3427-EAP-CANDIDATE-SNAPSHOT"`
`39`	`39`	`}`
`40`	`40`
`41`	`41`	`patchPluginXml {`
Original file line number	Diff line number	Diff line change
`@@ -91,7 +91,7 @@ public void reformatText(@NotNull PsiFile file, int startOffset, int endOffset)`
`91`	`91`	`}`
`92`	`92`
`93`	`93`	`@Override`
`94`		`- public void reformatText(@NotNull PsiFile file, @NotNull Collection<TextRange> ranges)`
	`94`	`+ public void reformatText(@NotNull PsiFile file, @NotNull Collection<? extends TextRange> ranges)`
`95`	`95`	`throws IncorrectOperationException {`
`96`	`96`	`delegate.reformatText(file, ranges);`
`97`	`97`	`}`
`@@ -104,7 +104,7 @@ public void reformatTextWithContext(`
`104`	`104`	`}`
`105`	`105`
`106`	`106`	`@Override`
`107`		`- public void reformatTextWithContext(@NotNull PsiFile file, @NotNull Collection<TextRange> ranges)`
	`107`	`+ public void reformatTextWithContext(@NotNull PsiFile file, @NotNull Collection<? extends TextRange> ranges)`
`108`	`108`	`throws IncorrectOperationException {`
`109`	`109`	`delegate.reformatTextWithContext(file, ranges);`
`110`	`110`	`}`