From 53f216cd030a553c8200c75606168de0a8039e1a Mon Sep 17 00:00:00 2001
From: Zakaria Elkatani <zelkatani@gmail.com>
Date: Wed, 2 Feb 2022 21:56:25 -0500
Subject: [PATCH] Update to use 1.13.0

---
 idea_plugin/build.gradle                                    | 6 +++---
 .../intellij/CodeStyleManagerDecorator.java                 | 4 ++--
 .../intellij/GoogleJavaFormatCodeStyleManager.java          | 4 ++--
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/idea_plugin/build.gradle b/idea_plugin/build.gradle
index 5efc92c04..d9f769d47 100644
--- a/idea_plugin/build.gradle
+++ b/idea_plugin/build.gradle
@@ -15,7 +15,7 @@
  */
 
 plugins {
-  id "org.jetbrains.intellij" version "1.3.0"
+  id "org.jetbrains.intellij" version "1.3.1"
 }
 
 repositories {
@@ -23,7 +23,7 @@ repositories {
 }
 
 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
index 7ffccf663..e5d3f7a07 100644
--- 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
index 81c53d5c5..3d56743ee 100644
--- 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 {