From 24ec96c942a04b89c181df24d80b27c44128b2bf Mon Sep 17 00:00:00 2001
From: Liam Miller-Cushon <cushon@google.com>
Date: Fri, 22 Jan 2021 10:48:11 -0800
Subject: [PATCH 01/17] Use more inclusive language in tests

https://developers.google.com/style/inclusive-documentation

PiperOrigin-RevId: 353273794
---
 .../com/google/googlejavaformat/java/testdata/B20535125.input | 2 +-
 .../google/googlejavaformat/java/testdata/B20535125.output    | 2 +-
 .../com/google/googlejavaformat/java/testdata/B20701054.input | 4 ++--
 .../google/googlejavaformat/java/testdata/B20701054.output    | 4 ++--
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/core/src/test/resources/com/google/googlejavaformat/java/testdata/B20535125.input b/core/src/test/resources/com/google/googlejavaformat/java/testdata/B20535125.input
index 30c232b56..9408235da 100644
--- a/core/src/test/resources/com/google/googlejavaformat/java/testdata/B20535125.input
+++ b/core/src/test/resources/com/google/googlejavaformat/java/testdata/B20535125.input
@@ -5,7 +5,7 @@ class Test {
     if (!metadata.ignoreOutputTransformations()
         && Producers.isListenableFutureMapKey(outputKey)) {
       ImmutableList<ProducerNode<?>> nodes = createMapNodes((ProducerNode) node);
-      checkCollectionNodesAgainstWhitelist(nodes, whitelist);
+      checkCollectionNodesAgainstAllowlist(nodes, allowlist);
       return nodes;
 
     } else if (!metadata.ignoreOutputTransformations()
diff --git a/core/src/test/resources/com/google/googlejavaformat/java/testdata/B20535125.output b/core/src/test/resources/com/google/googlejavaformat/java/testdata/B20535125.output
index 950f4eb0a..aeb36b82c 100644
--- a/core/src/test/resources/com/google/googlejavaformat/java/testdata/B20535125.output
+++ b/core/src/test/resources/com/google/googlejavaformat/java/testdata/B20535125.output
@@ -4,7 +4,7 @@ class Test {
   void m() {
     if (!metadata.ignoreOutputTransformations() && Producers.isListenableFutureMapKey(outputKey)) {
       ImmutableList<ProducerNode<?>> nodes = createMapNodes((ProducerNode) node);
-      checkCollectionNodesAgainstWhitelist(nodes, whitelist);
+      checkCollectionNodesAgainstAllowlist(nodes, allowlist);
       return nodes;
 
     } else if (!metadata.ignoreOutputTransformations()
diff --git a/core/src/test/resources/com/google/googlejavaformat/java/testdata/B20701054.input b/core/src/test/resources/com/google/googlejavaformat/java/testdata/B20701054.input
index 957c2df57..de746bb77 100644
--- a/core/src/test/resources/com/google/googlejavaformat/java/testdata/B20701054.input
+++ b/core/src/test/resources/com/google/googlejavaformat/java/testdata/B20701054.input
@@ -1,8 +1,8 @@
 class B20701054 {
   void m() {
     ImmutableList<String> x = ImmutableList.builder().add(1).build();
-    OptionalBinder.<ASD>newOptionalBinder(binder(), InputWhitelist.class).setBinding().to(
-        AllInputWhitelist.class);
+    OptionalBinder.<ASD>newOptionalBinder(binder(), InputAllowlist.class).setBinding().to(
+        AllInputAllowlist.class);
 
     Foo z = Foo.INSTANCE.field;
     Foo z = Foo.INSTANCE.field.field;
diff --git a/core/src/test/resources/com/google/googlejavaformat/java/testdata/B20701054.output b/core/src/test/resources/com/google/googlejavaformat/java/testdata/B20701054.output
index 7ce6fdad7..2fd9a9af7 100644
--- a/core/src/test/resources/com/google/googlejavaformat/java/testdata/B20701054.output
+++ b/core/src/test/resources/com/google/googlejavaformat/java/testdata/B20701054.output
@@ -1,9 +1,9 @@
 class B20701054 {
   void m() {
     ImmutableList<String> x = ImmutableList.builder().add(1).build();
-    OptionalBinder.<ASD>newOptionalBinder(binder(), InputWhitelist.class)
+    OptionalBinder.<ASD>newOptionalBinder(binder(), InputAllowlist.class)
         .setBinding()
-        .to(AllInputWhitelist.class);
+        .to(AllInputAllowlist.class);
 
     Foo z = Foo.INSTANCE.field;
     Foo z = Foo.INSTANCE.field.field;

From 69ba30fd9242eb52446edf18655d190e653348b6 Mon Sep 17 00:00:00 2001
From: David Momenso <momenso@gmail.com>
Date: Wed, 27 Jan 2021 09:06:53 -0800
Subject: [PATCH 02/17] Fixes before commit reformatting option for IntelliJ
 IDEA

Runs the plugin formatter instead of the default IDE Code Style formatting when "Reformat Code" is enabled in the Before Commit options.

Fixes #228.

Fixes #557

COPYBARA_INTEGRATE_REVIEW=https://github.com/google/google-java-format/pull/557 from momenso:bugfix-228 bd995d9360c29a54aebd2895e338ac1f637a2ea4
PiperOrigin-RevId: 354103277
---
 .../intellij/GoogleJavaFormatCodeStyleManager.java        | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/idea_plugin/src/com/google/googlejavaformat/intellij/GoogleJavaFormatCodeStyleManager.java b/idea_plugin/src/com/google/googlejavaformat/intellij/GoogleJavaFormatCodeStyleManager.java
index 52424c2c8..73e981384 100644
--- a/idea_plugin/src/com/google/googlejavaformat/intellij/GoogleJavaFormatCodeStyleManager.java
+++ b/idea_plugin/src/com/google/googlejavaformat/intellij/GoogleJavaFormatCodeStyleManager.java
@@ -30,10 +30,12 @@
 import com.intellij.psi.PsiDocumentManager;
 import com.intellij.psi.PsiElement;
 import com.intellij.psi.PsiFile;
+import com.intellij.psi.codeStyle.ChangedRangesInfo;
 import com.intellij.psi.codeStyle.CodeStyleManager;
 import com.intellij.psi.impl.CheckUtil;
 import com.intellij.util.IncorrectOperationException;
 import java.util.Collection;
+import java.util.Collections;
 import java.util.Map;
 import java.util.Map.Entry;
 import java.util.TreeMap;
@@ -69,6 +71,12 @@ public void reformatText(PsiFile file, Collection<TextRange> ranges)
     }
   }
 
+  @Override
+  public void reformatTextWithContext(PsiFile file, ChangedRangesInfo changedRangesInfo)
+      throws IncorrectOperationException {
+    reformatTextWithContext(file, Collections.singletonList(file.getTextRange()));
+  }
+
   @Override
   public void reformatTextWithContext(PsiFile file, Collection<TextRange> ranges) {
     if (overrideFormatterForFile(file)) {

From b9fd8d2242869ea7c9efd10cbbe7278c4b6611b1 Mon Sep 17 00:00:00 2001
From: google-java-format Team <java-team-github-bot@google.com>
Date: Wed, 10 Feb 2021 03:16:08 -0800
Subject: [PATCH 03/17] Fix an off-by-one issue on the reflowing of string
 literals.

During the initial width calculation, it seems we are off by one.

The existing tests where actually also wrong (wrapped at 99).

PiperOrigin-RevId: 356697501
---
 .../googlejavaformat/java/StringWrapper.java  | 14 +++--
 .../java/FormatterIntegrationTest.java        |  4 +-
 .../googlejavaformat/java/MainTest.java       |  4 +-
 .../java/testdata/B173808510.input            |  8 +++
 .../java/testdata/B173808510.output           |  9 +++
 .../java/testdata/LiteralReflow.input         | 44 +++++++++++++++
 .../java/testdata/LiteralReflow.output        | 55 +++++++++++++++++++
 7 files changed, 130 insertions(+), 8 deletions(-)
 create mode 100644 core/src/test/resources/com/google/googlejavaformat/java/testdata/B173808510.input
 create mode 100644 core/src/test/resources/com/google/googlejavaformat/java/testdata/B173808510.output
 create mode 100644 core/src/test/resources/com/google/googlejavaformat/java/testdata/LiteralReflow.input
 create mode 100644 core/src/test/resources/com/google/googlejavaformat/java/testdata/LiteralReflow.output

diff --git a/core/src/main/java/com/google/googlejavaformat/java/StringWrapper.java b/core/src/main/java/com/google/googlejavaformat/java/StringWrapper.java
index 063843622..c0f16e9b5 100644
--- a/core/src/main/java/com/google/googlejavaformat/java/StringWrapper.java
+++ b/core/src/main/java/com/google/googlejavaformat/java/StringWrapper.java
@@ -239,9 +239,10 @@ static int hasEscapedNewlineAt(String input, int idx) {
    * @param separator the line separator
    * @param columnLimit the number of columns to wrap at
    * @param startColumn the column position of the beginning of the original text
-   * @param trailing extra space to leave after the last line
-   * @param components the text to reflow
-   * @param first0 true if the text includes the beginning of its enclosing concat chain, i.e. a
+   * @param trailing extra space to leave after the last line, to accommodate a ; or )
+   * @param components the text to reflow. This is a list of “words” of a single literal. Its first
+   *     and last quotes have been stripped
+   * @param first0 true if the text includes the beginning of its enclosing concat chain
    */
   private static String reflow(
       String separator,
@@ -251,7 +252,7 @@ private static String reflow(
       ImmutableList<String> components,
       boolean first0) {
     // We have space between the start column and the limit to output the first line.
-    // Reserve two spaces for the quotes.
+    // Reserve two spaces for the start and end quotes.
     int width = columnLimit - startColumn - 2;
     Deque<String> input = new ArrayDeque<>(components);
     List<String> lines = new ArrayList<>();
@@ -259,10 +260,13 @@ private static String reflow(
     while (!input.isEmpty()) {
       int length = 0;
       List<String> line = new ArrayList<>();
+      // If we know this is going to be the last line, then remove a bit of width to account for the
+      // trailing characters.
       if (input.stream().mapToInt(String::length).sum() <= width) {
+        // This isn’t quite optimal, but arguably good enough. See b/179561701
         width -= trailing;
       }
-      while (!input.isEmpty() && (length <= 4 || (length + input.peekFirst().length()) < width)) {
+      while (!input.isEmpty() && (length <= 4 || (length + input.peekFirst().length()) <= width)) {
         String text = input.removeFirst();
         line.add(text);
         length += text.length();
diff --git a/core/src/test/java/com/google/googlejavaformat/java/FormatterIntegrationTest.java b/core/src/test/java/com/google/googlejavaformat/java/FormatterIntegrationTest.java
index 44ba63925..fdcf6f8a8 100644
--- a/core/src/test/java/com/google/googlejavaformat/java/FormatterIntegrationTest.java
+++ b/core/src/test/java/com/google/googlejavaformat/java/FormatterIntegrationTest.java
@@ -125,7 +125,9 @@ public FormatterIntegrationTest(String name, String input, String expected) {
   @Test
   public void format() {
     try {
-      String output = new Formatter().formatSource(input);
+      Formatter formatter = new Formatter();
+      String output = formatter.formatSource(input);
+      output = StringWrapper.wrap(output, formatter);
       assertEquals("bad output for " + name, expected, output);
     } catch (FormatterException e) {
       fail(String.format("Formatter crashed on %s: %s", name, e.getMessage()));
diff --git a/core/src/test/java/com/google/googlejavaformat/java/MainTest.java b/core/src/test/java/com/google/googlejavaformat/java/MainTest.java
index fa23486fd..a7e10fee7 100644
--- a/core/src/test/java/com/google/googlejavaformat/java/MainTest.java
+++ b/core/src/test/java/com/google/googlejavaformat/java/MainTest.java
@@ -525,8 +525,8 @@ public void reflowLongStrings() throws Exception {
       "class T {",
       "  String s =",
       "      \"one long incredibly unbroken sentence moving from topic to topic so that no one had"
-          + " a\"",
-      "          + \" chance to interrupt\";",
+          + " a chance\"",
+      "          + \" to interrupt\";",
       "}",
       "",
     };
diff --git a/core/src/test/resources/com/google/googlejavaformat/java/testdata/B173808510.input b/core/src/test/resources/com/google/googlejavaformat/java/testdata/B173808510.input
new file mode 100644
index 000000000..e3e849399
--- /dev/null
+++ b/core/src/test/resources/com/google/googlejavaformat/java/testdata/B173808510.input
@@ -0,0 +1,8 @@
+class B173808510 {
+  // b/173808510
+  @FlagSpec(
+      name = "myFlag",
+      help =
+          "areallyreallyreallyreallyreallyreallyreallyreallyreallyreallyreallyreallyloongword word1 word2")
+  Flag<Integer> dummy = null;
+}
diff --git a/core/src/test/resources/com/google/googlejavaformat/java/testdata/B173808510.output b/core/src/test/resources/com/google/googlejavaformat/java/testdata/B173808510.output
new file mode 100644
index 000000000..45a939efb
--- /dev/null
+++ b/core/src/test/resources/com/google/googlejavaformat/java/testdata/B173808510.output
@@ -0,0 +1,9 @@
+class B173808510 {
+  // b/173808510
+  @FlagSpec(
+      name = "myFlag",
+      help =
+          "areallyreallyreallyreallyreallyreallyreallyreallyreallyreallyreallyreallyloongword word1"
+              + " word2")
+  Flag<Integer> dummy = null;
+}
diff --git a/core/src/test/resources/com/google/googlejavaformat/java/testdata/LiteralReflow.input b/core/src/test/resources/com/google/googlejavaformat/java/testdata/LiteralReflow.input
new file mode 100644
index 000000000..2aa4de330
--- /dev/null
+++ b/core/src/test/resources/com/google/googlejavaformat/java/testdata/LiteralReflow.input
@@ -0,0 +1,44 @@
+class LiteralReflow {
+  static class TestLineBreak {
+    String doesNotBreakAt100 = "A very long long long long long long long long long loong sentence";
+    String breaksAt101 = "A very long long long long long long long long long long loooong sentence";
+  }
+
+  static class TestReflowLimit {
+    String doesNotReflowAt100 =
+        "A very long long long long long long long long long long long long long looooong sentence";
+    String reflowsWhenLongerThan100 =
+        "A very long long long long long long long long long long long long long long long sentence";
+  }
+
+  static class TestReflowLocation {
+    String accommodatesWordsUpTo100 =
+        "A very long long long long long long long long long long long long long long long looooong sentence";
+    String breaksBeforeWordsReach101 =
+        "A very long long long long long long long long long long long long long long long loooooong sentence";
+  }
+
+  static class Test2LineReflowLimit {
+    String doesNotReflowEitherLinesAt100 =
+        "A very long long long long long long long long long long long long long looooong sentence. And a second very long long long long long long long long long long loong sentence";
+    String reflowsLastLineAt101 =
+        "A very long long long long long long long long long long long long long looooong sentence. And a second very long long long long long long long long long long looong sentence";
+  }
+
+  static class TestWithTrailingCharacters {
+    String fitsLastLineUpTo100WithTrailingCharacters =
+        f(
+            f(
+                "A very long long long long long long long long long long long long loong sentence. And a second very long long long long long long long long loong sentence"));
+    String reflowsLastLineToAccommodateTrailingCharacters =
+        f(
+            f(
+                "A very long long long long long long long long long long long long loong sentence. And a second very long long long long long long long long looong sentence"));
+    // Tests an off-by-one issue, but see b/179561701 for a similar issue that is not yet fixed
+    String doesNotOverTriggerLastLineReflow =
+        f(
+            f(
+                "A very long long long long long long long long long long long long loong sentence."
+                    + " And a second very loong sentence with trailing a a a a a a a a a a a a a a a"));
+  }
+}
diff --git a/core/src/test/resources/com/google/googlejavaformat/java/testdata/LiteralReflow.output b/core/src/test/resources/com/google/googlejavaformat/java/testdata/LiteralReflow.output
new file mode 100644
index 000000000..50ed7bda1
--- /dev/null
+++ b/core/src/test/resources/com/google/googlejavaformat/java/testdata/LiteralReflow.output
@@ -0,0 +1,55 @@
+class LiteralReflow {
+  static class TestLineBreak {
+    String doesNotBreakAt100 = "A very long long long long long long long long long loong sentence";
+    String breaksAt101 =
+        "A very long long long long long long long long long long loooong sentence";
+  }
+
+  static class TestReflowLimit {
+    String doesNotReflowAt100 =
+        "A very long long long long long long long long long long long long long looooong sentence";
+    String reflowsWhenLongerThan100 =
+        "A very long long long long long long long long long long long long long long long"
+            + " sentence";
+  }
+
+  static class TestReflowLocation {
+    String accommodatesWordsUpTo100 =
+        "A very long long long long long long long long long long long long long long long looooong"
+            + " sentence";
+    String breaksBeforeWordsReach101 =
+        "A very long long long long long long long long long long long long long long long"
+            + " loooooong sentence";
+  }
+
+  static class Test2LineReflowLimit {
+    String doesNotReflowEitherLinesAt100 =
+        "A very long long long long long long long long long long long long long looooong sentence."
+            + " And a second very long long long long long long long long long long loong sentence";
+    String reflowsLastLineAt101 =
+        "A very long long long long long long long long long long long long long looooong sentence."
+            + " And a second very long long long long long long long long long long looong"
+            + " sentence";
+  }
+
+  static class TestWithTrailingCharacters {
+    String fitsLastLineUpTo100WithTrailingCharacters =
+        f(
+            f(
+                "A very long long long long long long long long long long long long loong sentence."
+                    + " And a second very long long long long long long long long loong sentence"));
+    String reflowsLastLineToAccommodateTrailingCharacters =
+        f(
+            f(
+                "A very long long long long long long long long long long long long loong sentence."
+                    + " And a second very long long long long long long long long looong"
+                    + " sentence"));
+    // Tests an off-by-one issue, but see b/179561701 for a similar issue that is not yet fixed
+    String doesNotOverTriggerLastLineReflow =
+        f(
+            f(
+                "A very long long long long long long long long long long long long loong sentence."
+                    + " And a second very loong sentence with trailing a a a a a a a a a a a a a a"
+                    + " a"));
+  }
+}

From 506875dc3f0f1018676c764e5fe58c9a8c216900 Mon Sep 17 00:00:00 2001
From: Liam Miller-Cushon <cushon@google.com>
Date: Tue, 16 Feb 2021 21:53:15 -0800
Subject: [PATCH 04/17] Update Error Prone version

and get tests passing with latest JDK 16 EA.

https://github.com/google/google-java-format/issues/538

PiperOrigin-RevId: 357875378
---
 .../googlejavaformat/java/MainTest.java       | 58 ++++++++++++-------
 pom.xml                                       | 20 ++++++-
 2 files changed, 54 insertions(+), 24 deletions(-)

diff --git a/core/src/test/java/com/google/googlejavaformat/java/MainTest.java b/core/src/test/java/com/google/googlejavaformat/java/MainTest.java
index a7e10fee7..575153efe 100644
--- a/core/src/test/java/com/google/googlejavaformat/java/MainTest.java
+++ b/core/src/test/java/com/google/googlejavaformat/java/MainTest.java
@@ -52,6 +52,16 @@ public class MainTest {
   // PrintWriter instances used below are hard-coded to use system-default line separator.
   private final Joiner joiner = Joiner.on(System.lineSeparator());
 
+  private static final ImmutableList<String> ADD_EXPORTS =
+      ImmutableList.of(
+          "--add-exports=jdk.compiler/com.sun.tools.javac.file=ALL-UNNAMED",
+          "--add-exports=jdk.compiler/com.sun.tools.javac.main=ALL-UNNAMED",
+          "--add-exports=jdk.compiler/com.sun.tools.javac.parser=ALL-UNNAMED",
+          "--add-exports=jdk.compiler/com.sun.tools.javac.tree=ALL-UNNAMED",
+          "--add-exports=jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED",
+          "--add-exports=jdk.compiler/com.sun.tools.javac.code=ALL-UNNAMED",
+          "--add-exports=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED");
+
   @Test
   public void testUsageOutput() {
     StringWriter out = new StringWriter();
@@ -109,11 +119,13 @@ public void preserveOriginalFile() throws Exception {
   public void testMain() throws Exception {
     Process process =
         new ProcessBuilder(
-                ImmutableList.of(
-                    Paths.get(JAVA_HOME.value()).resolve("bin/java").toString(),
-                    "-cp",
-                    JAVA_CLASS_PATH.value(),
-                    Main.class.getName()))
+                ImmutableList.<String>builder()
+                    .add(Paths.get(JAVA_HOME.value()).resolve("bin/java").toString())
+                    .addAll(ADD_EXPORTS)
+                    .add("-cp")
+                    .add(JAVA_CLASS_PATH.value())
+                    .add(Main.class.getName())
+                    .build())
             .redirectError(Redirect.PIPE)
             .redirectOutput(Redirect.PIPE)
             .start();
@@ -435,14 +447,16 @@ public void exitIfChangedStdin() throws Exception {
     Files.write(path, "class Test {\n}\n".getBytes(UTF_8));
     Process process =
         new ProcessBuilder(
-                ImmutableList.of(
-                    Paths.get(JAVA_HOME.value()).resolve("bin/java").toString(),
-                    "-cp",
-                    JAVA_CLASS_PATH.value(),
-                    Main.class.getName(),
-                    "-n",
-                    "--set-exit-if-changed",
-                    "-"))
+                ImmutableList.<String>builder()
+                    .add(Paths.get(JAVA_HOME.value()).resolve("bin/java").toString())
+                    .addAll(ADD_EXPORTS)
+                    .add("-cp")
+                    .add(JAVA_CLASS_PATH.value())
+                    .add(Main.class.getName())
+                    .add("-n")
+                    .add("--set-exit-if-changed")
+                    .add("-")
+                    .build())
             .redirectInput(path.toFile())
             .redirectError(Redirect.PIPE)
             .redirectOutput(Redirect.PIPE)
@@ -461,14 +475,16 @@ public void exitIfChangedFiles() throws Exception {
     Files.write(path, "class Test {\n}\n".getBytes(UTF_8));
     Process process =
         new ProcessBuilder(
-                ImmutableList.of(
-                    Paths.get(JAVA_HOME.value()).resolve("bin/java").toString(),
-                    "-cp",
-                    JAVA_CLASS_PATH.value(),
-                    Main.class.getName(),
-                    "-n",
-                    "--set-exit-if-changed",
-                    path.toAbsolutePath().toString()))
+                ImmutableList.<String>builder()
+                    .add(Paths.get(JAVA_HOME.value()).resolve("bin/java").toString())
+                    .addAll(ADD_EXPORTS)
+                    .add("-cp")
+                    .add(JAVA_CLASS_PATH.value())
+                    .add(Main.class.getName())
+                    .add("-n")
+                    .add("--set-exit-if-changed")
+                    .add(path.toAbsolutePath().toString())
+                    .build())
             .redirectError(Redirect.PIPE)
             .redirectOutput(Redirect.PIPE)
             .start();
diff --git a/pom.xml b/pom.xml
index 87049dec4..42f5f86f5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -118,7 +118,7 @@
       <dependency>
         <groupId>com.google.errorprone</groupId>
         <artifactId>error_prone_annotations</artifactId>
-        <version>2.0.8</version>
+        <version>2.5.1</version>
       </dependency>
 
       <!-- Test dependencies -->
@@ -180,7 +180,21 @@
         <configuration>
           <source>${java.version}</source>
           <target>${java.version}</target>
+          <encoding>UTF-8</encoding>
+          <fork>true</fork>
           <compilerArgs>
+            <!-- runtime arguments for Error Prone -->
+            <arg>-J--add-exports=jdk.compiler/com.sun.tools.javac.file=ALL-UNNAMED</arg>
+            <arg>-J--add-exports=jdk.compiler/com.sun.tools.javac.main=ALL-UNNAMED</arg>
+            <arg>-J--add-exports=jdk.compiler/com.sun.tools.javac.processing=ALL-UNNAMED</arg>
+            <arg>-J--add-exports=jdk.compiler/com.sun.tools.javac.parser=ALL-UNNAMED</arg>
+            <arg>-J--add-exports=jdk.compiler/com.sun.tools.javac.tree=ALL-UNNAMED</arg>
+            <arg>-J--add-exports=jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED</arg>
+            <arg>-J--add-exports=jdk.compiler/com.sun.tools.javac.code=ALL-UNNAMED</arg>
+            <arg>-J--add-exports=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED</arg>
+            <arg>-J--add-opens=jdk.compiler/com.sun.tools.javac.comp=ALL-UNNAMED</arg>
+            <arg>-J--add-opens=jdk.compiler/com.sun.tools.javac.code=ALL-UNNAMED</arg>
+            <!-- compile-time arguments for google-java-format -->
             <arg>-XDcompilePolicy=simple</arg>
             <arg>-Xplugin:ErrorProne</arg>
             <arg>--add-exports=jdk.compiler/com.sun.tools.javac.file=ALL-UNNAMED</arg>
@@ -195,7 +209,7 @@
             <path>
               <groupId>com.google.errorprone</groupId>
               <artifactId>error_prone_core</artifactId>
-              <version>2.3.2</version>
+              <version>2.5.1</version>
             </path>
           </annotationProcessorPaths>
         </configuration>
@@ -245,7 +259,7 @@
         <version>2.18</version>
         <configuration>
           <!-- set heap size to work around http://github.com/travis-ci/travis-ci/issues/3396 -->
-          <argLine>-Xmx1024m</argLine>
+          <argLine>-Xmx1024m --illegal-access=permit</argLine>
         </configuration>
       </plugin>
     </plugins>

From 189c381d7f2c4a9e6f5a5d698a006da22a774c56 Mon Sep 17 00:00:00 2001
From: Liam Miller-Cushon <cushon@google.com>
Date: Fri, 12 Mar 2021 14:21:14 -0800
Subject: [PATCH 05/17] Improve GitHub Actions hygiene

context: unknown commit, https://github.com/google/go-github/pull/1821
PiperOrigin-RevId: 362600035
---
 .github/workflows/ci.yml | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 14d29b090..f5fced4bd 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -14,7 +14,13 @@
 
 name: CI
 
-on: [ push, pull_request ]
+on:
+  push:
+    branches:
+    - master
+  pull_request:
+    branches:
+    - master
 
 jobs:
   test:
@@ -40,6 +46,10 @@ jobs:
     runs-on: ${{ matrix.os }}
     continue-on-error: ${{ matrix.experimental }}
     steps:
+      - name: Cancel previous
+        uses: styfle/cancel-workflow-action@0.8.0
+        with:
+          access_token: ${{ github.token }}
       - name: 'Check out repository'
         uses: actions/checkout@v2
       - name: 'Cache local Maven repository'

From 6da736d786ac71a134ed6cc43e9cd825c83de0fd Mon Sep 17 00:00:00 2001
From: Liam Miller-Cushon <cushon@google.com>
Date: Thu, 25 Mar 2021 10:00:51 -0700
Subject: [PATCH 06/17] Add a space between unary minus and negative literals

PiperOrigin-RevId: 365063449
---
 .../java/JavaInputAstVisitor.java             | 29 ++++++++++++++-----
 .../java/testdata/B183431894.input            |  4 +++
 .../java/testdata/B183431894.output           |  4 +++
 3 files changed, 30 insertions(+), 7 deletions(-)
 create mode 100644 core/src/test/resources/com/google/googlejavaformat/java/testdata/B183431894.input
 create mode 100644 core/src/test/resources/com/google/googlejavaformat/java/testdata/B183431894.output

diff --git a/core/src/main/java/com/google/googlejavaformat/java/JavaInputAstVisitor.java b/core/src/main/java/com/google/googlejavaformat/java/JavaInputAstVisitor.java
index f84e228f1..89f33fa06 100644
--- a/core/src/main/java/com/google/googlejavaformat/java/JavaInputAstVisitor.java
+++ b/core/src/main/java/com/google/googlejavaformat/java/JavaInputAstVisitor.java
@@ -1599,11 +1599,7 @@ public Void visitMemberSelect(MemberSelectTree node, Void unused) {
   public Void visitLiteral(LiteralTree node, Void unused) {
     sync(node);
     String sourceForNode = getSourceForNode(node, getCurrentPath());
-    // A negative numeric literal -n is usually represented as unary minus on n,
-    // but that doesn't work for integer or long MIN_VALUE. The parser works
-    // around that by representing it directly as a signed literal (with no
-    // unary minus), but the lexer still expects two tokens.
-    if (sourceForNode.startsWith("-")) {
+    if (isUnaryMinusLiteral(sourceForNode)) {
       token("-");
       sourceForNode = sourceForNode.substring(1).trim();
     }
@@ -1611,6 +1607,14 @@ public Void visitLiteral(LiteralTree node, Void unused) {
     return null;
   }
 
+  // A negative numeric literal -n is usually represented as unary minus on n,
+  // but that doesn't work for integer or long MIN_VALUE. The parser works
+  // around that by representing it directly as a signed literal (with no
+  // unary minus), but the lexer still expects two tokens.
+  private static boolean isUnaryMinusLiteral(String literalTreeSource) {
+    return literalTreeSource.startsWith("-");
+  }
+
   private void visitPackage(
       ExpressionTree packageName, List<? extends AnnotationTree> packageAnnotations) {
     if (!packageAnnotations.isEmpty()) {
@@ -1696,10 +1700,10 @@ private boolean ambiguousUnaryOperator(UnaryTree node, String operatorName) {
       default:
         return false;
     }
-    if (!(node.getExpression() instanceof UnaryTree)) {
+    JCTree.Tag tag = unaryTag(node.getExpression());
+    if (tag == null) {
       return false;
     }
-    JCTree.Tag tag = ((JCTree) node.getExpression()).getTag();
     if (tag.isPostUnaryOp()) {
       return false;
     }
@@ -1709,6 +1713,17 @@ private boolean ambiguousUnaryOperator(UnaryTree node, String operatorName) {
     return true;
   }
 
+  private JCTree.Tag unaryTag(ExpressionTree expression) {
+    if (expression instanceof UnaryTree) {
+      return ((JCTree) expression).getTag();
+    }
+    if (expression instanceof LiteralTree
+        && isUnaryMinusLiteral(getSourceForNode(expression, getCurrentPath()))) {
+      return JCTree.Tag.MINUS;
+    }
+    return null;
+  }
+
   @Override
   public Void visitPrimitiveType(PrimitiveTypeTree node, Void unused) {
     sync(node);
diff --git a/core/src/test/resources/com/google/googlejavaformat/java/testdata/B183431894.input b/core/src/test/resources/com/google/googlejavaformat/java/testdata/B183431894.input
new file mode 100644
index 000000000..7c220d519
--- /dev/null
+++ b/core/src/test/resources/com/google/googlejavaformat/java/testdata/B183431894.input
@@ -0,0 +1,4 @@
+class B183431894 {
+  int a = - -1;
+  int d = + +1;
+}
diff --git a/core/src/test/resources/com/google/googlejavaformat/java/testdata/B183431894.output b/core/src/test/resources/com/google/googlejavaformat/java/testdata/B183431894.output
new file mode 100644
index 000000000..7c220d519
--- /dev/null
+++ b/core/src/test/resources/com/google/googlejavaformat/java/testdata/B183431894.output
@@ -0,0 +1,4 @@
+class B183431894 {
+  int a = - -1;
+  int d = + +1;
+}

From cc7bd81df738f95249bc881c5dbcc11447432ce6 Mon Sep 17 00:00:00 2001
From: Cameron Samak <csamak@google.com>
Date: Thu, 25 Mar 2021 17:13:32 -0700
Subject: [PATCH 07/17] Fix getToken(int k) javadoc to clarify that k is the
 Tok, not Token, index.

Now it's consistent with the comment on kToToken

PiperOrigin-RevId: 365156881
---
 core/src/main/java/com/google/googlejavaformat/Input.java       | 2 +-
 .../main/java/com/google/googlejavaformat/java/JavaInput.java   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/core/src/main/java/com/google/googlejavaformat/Input.java b/core/src/main/java/com/google/googlejavaformat/Input.java
index 9e17c2bf6..4bc75dc33 100644
--- a/core/src/main/java/com/google/googlejavaformat/Input.java
+++ b/core/src/main/java/com/google/googlejavaformat/Input.java
@@ -121,7 +121,7 @@ public interface Token {
   /**
    * Get the Token by index.
    *
-   * @param k the token index
+   * @param k the Tok index
    */
   public abstract Token getToken(int k);
 
diff --git a/core/src/main/java/com/google/googlejavaformat/java/JavaInput.java b/core/src/main/java/com/google/googlejavaformat/java/JavaInput.java
index 999c8fb7f..9956c856e 100644
--- a/core/src/main/java/com/google/googlejavaformat/java/JavaInput.java
+++ b/core/src/main/java/com/google/googlejavaformat/java/JavaInput.java
@@ -604,7 +604,7 @@ public int getkN() {
   /**
    * Get the Token by index.
    *
-   * @param k the token index
+   * @param k the Tok index
    */
   @Override
   public Token getToken(int k) {

From 5fc0c82a6e43c795d5be567c609b7cfa5c54f070 Mon Sep 17 00:00:00 2001
From: google-java-format Team <java-team-github-bot@google.com>
Date: Wed, 31 Mar 2021 15:45:33 -0700
Subject: [PATCH 08/17] Update javadoc for getkN to specify that it excludes,
 not includes, the EOF tok

The comment on the kN field directly contradicted the getkN javadoc.

kN is the index of the EOF tok, so kN refers to the count excluding the EOF tok

PiperOrigin-RevId: 366132866
---
 core/src/main/java/com/google/googlejavaformat/Input.java       | 2 +-
 .../main/java/com/google/googlejavaformat/java/JavaInput.java   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/core/src/main/java/com/google/googlejavaformat/Input.java b/core/src/main/java/com/google/googlejavaformat/Input.java
index 4bc75dc33..fb71e047c 100644
--- a/core/src/main/java/com/google/googlejavaformat/Input.java
+++ b/core/src/main/java/com/google/googlejavaformat/Input.java
@@ -114,7 +114,7 @@ public interface Token {
   /**
    * Get the number of toks.
    *
-   * @return the number of toks, including the EOF tok
+   * @return the number of toks, excluding the EOF tok
    */
   public abstract int getkN();
 
diff --git a/core/src/main/java/com/google/googlejavaformat/java/JavaInput.java b/core/src/main/java/com/google/googlejavaformat/java/JavaInput.java
index 9956c856e..d07d003ef 100644
--- a/core/src/main/java/com/google/googlejavaformat/java/JavaInput.java
+++ b/core/src/main/java/com/google/googlejavaformat/java/JavaInput.java
@@ -594,7 +594,7 @@ Range<Integer> characterRangeToTokenRange(int offset, int length) throws Formatt
   /**
    * Get the number of toks.
    *
-   * @return the number of toks, including the EOF tok
+   * @return the number of toks, excluding the EOF tok
    */
   @Override
   public int getkN() {

From 8044120cdb2172abc5df7af01264f6af6132f9a0 Mon Sep 17 00:00:00 2001
From: Liam Miller-Cushon <cushon@google.com>
Date: Wed, 31 Mar 2021 16:26:05 -0700
Subject: [PATCH 09/17] Use `HEAD-SNAPSHOT` versions for `g-j-f` development

and update release instructions to push tagged commits with release versions,
instead of committing them to master, as we're doing for other projects.

PiperOrigin-RevId: 366140430
---
 core/pom.xml | 2 +-
 pom.xml      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/core/pom.xml b/core/pom.xml
index e2d015316..faa94d627 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>com.google.googlejavaformat</groupId>
     <artifactId>google-java-format-parent</artifactId>
-    <version>1.10-SNAPSHOT</version>
+  <version>HEAD-SNAPSHOT</version>
   </parent>
 
   <artifactId>google-java-format</artifactId>
diff --git a/pom.xml b/pom.xml
index 42f5f86f5..396d7c0f9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -28,7 +28,7 @@
   <groupId>com.google.googlejavaformat</groupId>
   <artifactId>google-java-format-parent</artifactId>
   <packaging>pom</packaging>
-  <version>1.10-SNAPSHOT</version>
+  <version>HEAD-SNAPSHOT</version>
 
   <modules>
     <module>core</module>

From d8fd4cf0351eb4284e6d6eafaca9a8994c99d7f8 Mon Sep 17 00:00:00 2001
From: Liam Miller-Cushon <cushon@google.com>
Date: Thu, 1 Apr 2021 15:03:53 -0700
Subject: [PATCH 10/17] Rev version numbers in README

PiperOrigin-RevId: 366338635
---
 README.md | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/README.md b/README.md
index 6f7d5c654..5645e27bc 100644
--- a/README.md
+++ b/README.md
@@ -13,7 +13,7 @@
 and run it with:
 
 ```
-java -jar /path/to/google-java-format-1.9-all-deps.jar <options> [files...]
+java -jar /path/to/google-java-format-1.10-all-deps.jar <options> [files...]
 ```
 
 The formatter can act on whole files, on limited lines (`--lines`), on specific
@@ -98,7 +98,7 @@ configuration.
 <dependency>
   <groupId>com.google.googlejavaformat</groupId>
   <artifactId>google-java-format</artifactId>
-  <version>1.9</version>
+  <version>1.10</version>
 </dependency>
 ```
 
@@ -106,7 +106,7 @@ configuration.
 
 ```groovy
 dependencies {
-  compile 'com.google.googlejavaformat:google-java-format:1.9'
+  compile 'com.google.googlejavaformat:google-java-format:1.10'
 }
 ```
 

From 7b74047c8f721cd91d1c09f29d3a42ec8ef2acca Mon Sep 17 00:00:00 2001
From: Liam Miller-Cushon <cushon@google.com>
Date: Fri, 2 Apr 2021 12:25:11 -0700
Subject: [PATCH 11/17] Fix version numbers

and add a note about JDK 16 flags.

fixes https://github.com/google/google-java-format/issues/581

PiperOrigin-RevId: 366491372
---
 README.md | 21 ++++++++++++++++++---
 1 file changed, 18 insertions(+), 3 deletions(-)

diff --git a/README.md b/README.md
index 5645e27bc..5bbf5e5a1 100644
--- a/README.md
+++ b/README.md
@@ -13,7 +13,7 @@
 and run it with:
 
 ```
-java -jar /path/to/google-java-format-1.10-all-deps.jar <options> [files...]
+java -jar /path/to/google-java-format-1.10.0-all-deps.jar <options> [files...]
 ```
 
 The formatter can act on whole files, on limited lines (`--lines`), on specific
@@ -27,6 +27,21 @@ To reformat changed lines in a specific patch, use
 formatting. This is a deliberate design decision to unify our code formatting on
 a single format.*
 
+#### JDK 16
+
+The following flags are required when running on JDK 16, due to
+[JEP 396: Strongly Encapsulate JDK Internals by Default](https://openjdk.java.net/jeps/396):
+
+```
+java \
+  --add-exports jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED \
+  --add-exports jdk.compiler/com.sun.tools.javac.file=ALL-UNNAMED \
+  --add-exports jdk.compiler/com.sun.tools.javac.parser=ALL-UNNAMED \
+  --add-exports jdk.compiler/com.sun.tools.javac.tree=ALL-UNNAMED \
+  --add-exports jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED \
+  -jar google-java-format-1.10.0-all-deps.jar <options> [files...]
+```
+
 ### IntelliJ, Android Studio, and other JetBrains IDEs
 
 A
@@ -98,7 +113,7 @@ configuration.
 <dependency>
   <groupId>com.google.googlejavaformat</groupId>
   <artifactId>google-java-format</artifactId>
-  <version>1.10</version>
+  <version>1.10.0</version>
 </dependency>
 ```
 
@@ -106,7 +121,7 @@ configuration.
 
 ```groovy
 dependencies {
-  compile 'com.google.googlejavaformat:google-java-format:1.10'
+  compile 'com.google.googlejavaformat:google-java-format:1.10.0'
 }
 ```
 

From 8a3b882f2cf29becc3eeb2c0839b09bcb627bea0 Mon Sep 17 00:00:00 2001
From: Michael Plump <plumpy@google.com>
Date: Tue, 6 Apr 2021 10:32:11 -0700
Subject: [PATCH 12/17] Update the IntelliJ plugin to gjf 1.10.0.

Also, compile against 2021.1, which just adds wildcards to a few `Collection<TextRange>` parameters.

And mark the plugin as requiring a restart. Probably I need to fix up `GoogleJavaFormatInstaller` to make it work without restarting, but I'm not going to investigate that right now.

PiperOrigin-RevId: 367035081
---
 idea_plugin/build.gradle                                  | 8 ++++----
 idea_plugin/resources/META-INF/plugin.xml                 | 4 +++-
 .../intellij/CodeStyleManagerDecorator.java               | 4 ++--
 .../google/googlejavaformat/intellij/FormatterUtil.java   | 4 ++--
 .../intellij/GoogleJavaFormatCodeStyleManager.java        | 8 ++++----
 5 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/idea_plugin/build.gradle b/idea_plugin/build.gradle
index 6ec1c210d..3d807af01 100644
--- a/idea_plugin/build.gradle
+++ b/idea_plugin/build.gradle
@@ -15,7 +15,7 @@
  */
 
 plugins {
-  id "org.jetbrains.intellij" version "0.4.22"
+  id "org.jetbrains.intellij" version "0.7.2"
 }
 
 repositories {
@@ -23,7 +23,7 @@ repositories {
 }
 
 ext {
-  googleJavaFormatVersion = '1.9'
+  googleJavaFormatVersion = '1.10.0'
 }
 
 apply plugin: 'org.jetbrains.intellij'
@@ -31,13 +31,13 @@ apply plugin: 'java'
 
 intellij {
   pluginName = "google-java-format"
-  version = "2020.2.2"
+  version = "211.6693.65-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"
   sinceBuild = '201'
   untilBuild = ''
 }
diff --git a/idea_plugin/resources/META-INF/plugin.xml b/idea_plugin/resources/META-INF/plugin.xml
index 5996dba68..9b75eda40 100644
--- a/idea_plugin/resources/META-INF/plugin.xml
+++ b/idea_plugin/resources/META-INF/plugin.xml
@@ -14,7 +14,7 @@
   limitations under the License.
 -->
 
-<idea-plugin url="https://github.com/google/google-java-format/tree/master/idea_plugin">
+<idea-plugin url="https://github.com/google/google-java-format/tree/master/idea_plugin" require-restart="true">
   <id>google-java-format</id>
   <name>google-java-format</name>
   <vendor url="https://github.com/google/google-java-format">
@@ -28,6 +28,8 @@
 
   <change-notes><![CDATA[
     <dl>
+      <dt>1.10.0.0</dt>
+      <dd>Updated to use google-java-format 1.10.<dd>
       <dt>1.9.0.0</dt>
       <dd>Updated to use google-java-format 1.9.<dd>
       <dt>1.8.0.1</dt>
diff --git a/idea_plugin/src/com/google/googlejavaformat/intellij/CodeStyleManagerDecorator.java b/idea_plugin/src/com/google/googlejavaformat/intellij/CodeStyleManagerDecorator.java
index c70ba1751..fc335ad63 100644
--- a/idea_plugin/src/com/google/googlejavaformat/intellij/CodeStyleManagerDecorator.java
+++ b/idea_plugin/src/com/google/googlejavaformat/intellij/CodeStyleManagerDecorator.java
@@ -89,7 +89,7 @@ public void reformatText(PsiFile file, int startOffset, int endOffset)
   }
 
   @Override
-  public void reformatText(PsiFile file, Collection<TextRange> ranges)
+  public void reformatText(PsiFile file, Collection<? extends TextRange> ranges)
       throws IncorrectOperationException {
     delegate.reformatText(file, ranges);
   }
@@ -101,7 +101,7 @@ public void reformatTextWithContext(PsiFile psiFile, ChangedRangesInfo changedRa
   }
 
   @Override
-  public void reformatTextWithContext(PsiFile file, Collection<TextRange> ranges)
+  public void reformatTextWithContext(PsiFile file, Collection<? extends TextRange> ranges)
       throws IncorrectOperationException {
     delegate.reformatTextWithContext(file, ranges);
   }
diff --git a/idea_plugin/src/com/google/googlejavaformat/intellij/FormatterUtil.java b/idea_plugin/src/com/google/googlejavaformat/intellij/FormatterUtil.java
index b6e21f78b..9939bbade 100644
--- a/idea_plugin/src/com/google/googlejavaformat/intellij/FormatterUtil.java
+++ b/idea_plugin/src/com/google/googlejavaformat/intellij/FormatterUtil.java
@@ -33,7 +33,7 @@ final class FormatterUtil {
   private FormatterUtil() {}
 
   static Map<TextRange, String> getReplacements(
-      Formatter formatter, String text, Collection<TextRange> ranges) {
+      Formatter formatter, String text, Collection<? extends TextRange> ranges) {
     try {
       ImmutableMap.Builder<TextRange, String> replacements = ImmutableMap.builder();
       formatter
@@ -49,7 +49,7 @@ static Map<TextRange, String> getReplacements(
     }
   }
 
-  private static Collection<Range<Integer>> toRanges(Collection<TextRange> textRanges) {
+  private static Collection<Range<Integer>> toRanges(Collection<? extends TextRange> textRanges) {
     return textRanges
         .stream()
         .map(textRange -> Range.closedOpen(textRange.getStartOffset(), textRange.getEndOffset()))
diff --git a/idea_plugin/src/com/google/googlejavaformat/intellij/GoogleJavaFormatCodeStyleManager.java b/idea_plugin/src/com/google/googlejavaformat/intellij/GoogleJavaFormatCodeStyleManager.java
index 73e981384..be0eac4a2 100644
--- a/idea_plugin/src/com/google/googlejavaformat/intellij/GoogleJavaFormatCodeStyleManager.java
+++ b/idea_plugin/src/com/google/googlejavaformat/intellij/GoogleJavaFormatCodeStyleManager.java
@@ -62,7 +62,7 @@ public void reformatText(PsiFile file, int startOffset, int endOffset)
   }
 
   @Override
-  public void reformatText(PsiFile file, Collection<TextRange> ranges)
+  public void reformatText(PsiFile file, Collection<? extends TextRange> ranges)
       throws IncorrectOperationException {
     if (overrideFormatterForFile(file)) {
       formatInternal(file, ranges);
@@ -78,7 +78,7 @@ public void reformatTextWithContext(PsiFile file, ChangedRangesInfo changedRange
   }
 
   @Override
-  public void reformatTextWithContext(PsiFile file, Collection<TextRange> ranges) {
+  public void reformatTextWithContext(PsiFile file, Collection<? extends TextRange> ranges) {
     if (overrideFormatterForFile(file)) {
       formatInternal(file, ranges);
     } else {
@@ -107,7 +107,7 @@ private boolean overrideFormatterForFile(PsiFile file) {
         && GoogleJavaFormatSettings.getInstance(getProject()).isEnabled();
   }
 
-  private void formatInternal(PsiFile file, Collection<TextRange> ranges) {
+  private void formatInternal(PsiFile file, Collection<? extends TextRange> ranges) {
     ApplicationManager.getApplication().assertWriteAccessAllowed();
     PsiDocumentManager documentManager = PsiDocumentManager.getInstance(getProject());
     documentManager.commitAllDocuments();
@@ -133,7 +133,7 @@ private void formatInternal(PsiFile file, Collection<TextRange> ranges) {
    * <p>Overriding methods will need to modify the document with the result of the external
    * formatter (usually using {@link #performReplacements(Document, Map)}.
    */
-  private void format(Document document, Collection<TextRange> ranges) {
+  private void format(Document document, Collection<? extends TextRange> ranges) {
     Style style = GoogleJavaFormatSettings.getInstance(getProject()).getStyle();
     Formatter formatter = new Formatter(JavaFormatterOptions.builder().style(style).build());
     performReplacements(

From 5defb58fca4bc29b73d33a8aaae1d65e02a4591d Mon Sep 17 00:00:00 2001
From: Michael Plump <plumpy@google.com>
Date: Wed, 7 Apr 2021 14:50:49 -0700
Subject: [PATCH 13/17] Fix the HTML markup in the release notes.

PiperOrigin-RevId: 367302861
---
 idea_plugin/resources/META-INF/plugin.xml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/idea_plugin/resources/META-INF/plugin.xml b/idea_plugin/resources/META-INF/plugin.xml
index 9b75eda40..b089ad603 100644
--- a/idea_plugin/resources/META-INF/plugin.xml
+++ b/idea_plugin/resources/META-INF/plugin.xml
@@ -29,13 +29,13 @@
   <change-notes><![CDATA[
     <dl>
       <dt>1.10.0.0</dt>
-      <dd>Updated to use google-java-format 1.10.<dd>
+      <dd>Updated to use google-java-format 1.10.</dd>
       <dt>1.9.0.0</dt>
-      <dd>Updated to use google-java-format 1.9.<dd>
+      <dd>Updated to use google-java-format 1.9.</dd>
       <dt>1.8.0.1</dt>
-      <dd>Fixed support for 2020.2 IDEs.<dd>
+      <dd>Fixed support for 2020.2 IDEs.</dd>
       <dt>1.8.0.0</dt>
-      <dd>Updated to use google-java-format 1.8.<dd>
+      <dd>Updated to use google-java-format 1.8.</dd>
       <dt>1.7.0.5</dt>
       <dd>Added a version for 2020.1+ IDEs.</dd>
       <dt>1.7.0.4</dt>

From 2396d08437672d3c1c79093d1ffd039b7be4fd34 Mon Sep 17 00:00:00 2001
From: Liam Miller-Cushon <cushon@google.com>
Date: Mon, 12 Apr 2021 16:51:14 -0700
Subject: [PATCH 14/17] Update google-java-format CI

JDK 16 is now released, so mark it non-experimental and add a build for JDK
17-EA. Also add a JDK 14 build back, to prevent regressions in some Java >= 14
features that are handled differently between 14 and 16.

PiperOrigin-RevId: 368111853
---
 .github/workflows/ci.yml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index f5fced4bd..6e73bdb0e 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -29,19 +29,19 @@ jobs:
       fail-fast: false
       matrix:
         os: [ ubuntu-latest ]
-        java: [ 15, 11 ]
+        java: [ 16, 14, 11 ]
         experimental: [ false ]
         include:
           # Only test on macos and windows with a single recent JDK to avoid a
           # combinatorial explosion of test configurations.
           - os: macos-latest
-            java: 15
+            java: 16
             experimental: false
           - os: windows-latest
-            java: 15
+            java: 16
             experimental: false
           - os: ubuntu-latest
-            java: 16-ea
+            java: 17-ea
             experimental: true
     runs-on: ${{ matrix.os }}
     continue-on-error: ${{ matrix.experimental }}

From fe5ac46e6741ae66fea51ac892f20d7a2bdbac79 Mon Sep 17 00:00:00 2001
From: Liam Miller-Cushon <cushon@google.com>
Date: Mon, 12 Apr 2021 17:22:50 -0700
Subject: [PATCH 15/17] Handle `final` variables in `instanceof` patterns

Fixes https://github.com/google/google-java-format/issues/588

PiperOrigin-RevId: 368117115
---
 .../java/java14/Java14InputAstVisitor.java            | 11 ++++++++---
 .../java/FormatterIntegrationTest.java                |  7 ++++++-
 .../google/googlejavaformat/java/testdata/I588.input  |  8 ++++++++
 .../google/googlejavaformat/java/testdata/I588.output |  8 ++++++++
 4 files changed, 30 insertions(+), 4 deletions(-)
 create mode 100644 core/src/test/resources/com/google/googlejavaformat/java/testdata/I588.input
 create mode 100644 core/src/test/resources/com/google/googlejavaformat/java/testdata/I588.output

diff --git a/core/src/main/java/com/google/googlejavaformat/java/java14/Java14InputAstVisitor.java b/core/src/main/java/com/google/googlejavaformat/java/java14/Java14InputAstVisitor.java
index 2a90b939d..a9273ce7b 100644
--- a/core/src/main/java/com/google/googlejavaformat/java/java14/Java14InputAstVisitor.java
+++ b/core/src/main/java/com/google/googlejavaformat/java/java14/Java14InputAstVisitor.java
@@ -27,6 +27,7 @@
 import com.sun.source.tree.ClassTree;
 import com.sun.source.tree.ExpressionTree;
 import com.sun.source.tree.InstanceOfTree;
+import com.sun.source.tree.ModifiersTree;
 import com.sun.source.tree.SwitchExpressionTree;
 import com.sun.source.tree.Tree;
 import com.sun.source.tree.VariableTree;
@@ -56,12 +57,13 @@ public Void visitBindingPattern(BindingPatternTree node, Void unused) {
     try {
       VariableTree variableTree =
           (VariableTree) BindingPatternTree.class.getMethod("getVariable").invoke(node);
-      visitBindingPattern(variableTree.getType(), variableTree.getName());
+      visitBindingPattern(
+          variableTree.getModifiers(), variableTree.getType(), variableTree.getName());
     } catch (ReflectiveOperationException e1) {
       try {
         Tree type = (Tree) BindingPatternTree.class.getMethod("getType").invoke(node);
         Name name = (Name) BindingPatternTree.class.getMethod("getName").invoke(node);
-        visitBindingPattern(type, name);
+        visitBindingPattern(/* modifiers= */ null, type, name);
       } catch (ReflectiveOperationException e2) {
         e2.addSuppressed(e1);
         throw new LinkageError(e2.getMessage(), e2);
@@ -70,7 +72,10 @@ public Void visitBindingPattern(BindingPatternTree node, Void unused) {
     return null;
   }
 
-  private void visitBindingPattern(Tree type, Name name) {
+  private void visitBindingPattern(ModifiersTree modifiers, Tree type, Name name) {
+    if (modifiers != null) {
+      builder.addAll(visitModifiers(modifiers, Direction.HORIZONTAL, Optional.empty()));
+    }
     scan(type, null);
     builder.breakOp(" ");
     visit(name);
diff --git a/core/src/test/java/com/google/googlejavaformat/java/FormatterIntegrationTest.java b/core/src/test/java/com/google/googlejavaformat/java/FormatterIntegrationTest.java
index fdcf6f8a8..39f31e484 100644
--- a/core/src/test/java/com/google/googlejavaformat/java/FormatterIntegrationTest.java
+++ b/core/src/test/java/com/google/googlejavaformat/java/FormatterIntegrationTest.java
@@ -50,6 +50,8 @@ public class FormatterIntegrationTest {
   private static final ImmutableSet<String> JAVA14_TESTS =
       ImmutableSet.of("I477", "Records", "RSLs", "Var", "ExpressionSwitch");
 
+  private static final ImmutableSet<String> JAVA16_TESTS = ImmutableSet.of("I588");
+
   @Parameters(name = "{index}: {0}")
   public static Iterable<Object[]> data() throws IOException {
     Path testDataPath = Paths.get("com/google/googlejavaformat/java/testdata");
@@ -76,7 +78,7 @@ public static Iterable<Object[]> data() throws IOException {
           case "output":
             outputs.put(baseName, contents);
             break;
-          default:
+          default: // fall out
         }
       }
     }
@@ -90,6 +92,9 @@ public static Iterable<Object[]> data() throws IOException {
       if (JAVA14_TESTS.contains(fileName) && getMajor() < 14) {
         continue;
       }
+      if (JAVA16_TESTS.contains(fileName) && getMajor() < 16) {
+        continue;
+      }
       testInputs.add(new Object[] {fileName, input, expectedOutput});
     }
     return testInputs;
diff --git a/core/src/test/resources/com/google/googlejavaformat/java/testdata/I588.input b/core/src/test/resources/com/google/googlejavaformat/java/testdata/I588.input
new file mode 100644
index 000000000..9c8f992ea
--- /dev/null
+++ b/core/src/test/resources/com/google/googlejavaformat/java/testdata/I588.input
@@ -0,0 +1,8 @@
+class T {
+  int f(Object x) {
+    if (x instanceof final Integer i) {
+      return i;
+    }
+    return -1;
+  }
+}
\ No newline at end of file
diff --git a/core/src/test/resources/com/google/googlejavaformat/java/testdata/I588.output b/core/src/test/resources/com/google/googlejavaformat/java/testdata/I588.output
new file mode 100644
index 000000000..37ff2f50d
--- /dev/null
+++ b/core/src/test/resources/com/google/googlejavaformat/java/testdata/I588.output
@@ -0,0 +1,8 @@
+class T {
+  int f(Object x) {
+    if (x instanceof final Integer i) {
+      return i;
+    }
+    return -1;
+  }
+}

From 5104d0b27888f3bfab7113f5606374cda5632102 Mon Sep 17 00:00:00 2001
From: Liam Miller-Cushon <cushon@google.com>
Date: Mon, 12 Apr 2021 18:14:28 -0700
Subject: [PATCH 16/17] Fix handling of annotations in compact record
 constructors

Fixes https://github.com/google/google-java-format/issues/574

PiperOrigin-RevId: 368124032
---
 .../java/java14/Java14InputAstVisitor.java        | 15 +--------------
 .../java/FormatterIntegrationTest.java            |  2 +-
 .../googlejavaformat/java/testdata/I574.input     |  6 ++++++
 .../googlejavaformat/java/testdata/I574.output    |  6 ++++++
 4 files changed, 14 insertions(+), 15 deletions(-)
 create mode 100644 core/src/test/resources/com/google/googlejavaformat/java/testdata/I574.input
 create mode 100644 core/src/test/resources/com/google/googlejavaformat/java/testdata/I574.output

diff --git a/core/src/main/java/com/google/googlejavaformat/java/java14/Java14InputAstVisitor.java b/core/src/main/java/com/google/googlejavaformat/java/java14/Java14InputAstVisitor.java
index a9273ce7b..3517c3511 100644
--- a/core/src/main/java/com/google/googlejavaformat/java/java14/Java14InputAstVisitor.java
+++ b/core/src/main/java/com/google/googlejavaformat/java/java14/Java14InputAstVisitor.java
@@ -15,7 +15,6 @@
 package com.google.googlejavaformat.java.java14;
 
 import static com.google.common.collect.ImmutableList.toImmutableList;
-import static com.google.common.collect.MoreCollectors.toOptional;
 
 import com.google.common.base.Verify;
 import com.google.common.collect.ImmutableList;
@@ -34,7 +33,6 @@
 import com.sun.source.tree.YieldTree;
 import com.sun.tools.javac.code.Flags;
 import com.sun.tools.javac.tree.JCTree;
-import com.sun.tools.javac.tree.JCTree.JCMethodDecl;
 import com.sun.tools.javac.tree.JCTree.JCVariableDecl;
 import com.sun.tools.javac.tree.TreeInfo;
 import java.util.List;
@@ -141,10 +139,7 @@ public void visitRecordDeclaration(ClassTree node) {
       if (!node.getTypeParameters().isEmpty()) {
         typeParametersRest(node.getTypeParameters(), hasSuperInterfaceTypes ? plusFour : ZERO);
       }
-      ImmutableList<JCVariableDecl> parameters =
-          compactRecordConstructor(node)
-              .map(m -> ImmutableList.copyOf(m.getParameters()))
-              .orElseGet(() -> recordVariables(node));
+      ImmutableList<JCVariableDecl> parameters = recordVariables(node);
       token("(");
       if (!parameters.isEmpty()) {
         // Break before args.
@@ -183,14 +178,6 @@ public void visitRecordDeclaration(ClassTree node) {
     dropEmptyDeclarations();
   }
 
-  private static Optional<JCMethodDecl> compactRecordConstructor(ClassTree node) {
-    return node.getMembers().stream()
-        .filter(JCMethodDecl.class::isInstance)
-        .map(JCMethodDecl.class::cast)
-        .filter(m -> (m.mods.flags & COMPACT_RECORD_CONSTRUCTOR) == COMPACT_RECORD_CONSTRUCTOR)
-        .collect(toOptional());
-  }
-
   private static ImmutableList<JCVariableDecl> recordVariables(ClassTree node) {
     return node.getMembers().stream()
         .filter(JCVariableDecl.class::isInstance)
diff --git a/core/src/test/java/com/google/googlejavaformat/java/FormatterIntegrationTest.java b/core/src/test/java/com/google/googlejavaformat/java/FormatterIntegrationTest.java
index 39f31e484..b6549f4a8 100644
--- a/core/src/test/java/com/google/googlejavaformat/java/FormatterIntegrationTest.java
+++ b/core/src/test/java/com/google/googlejavaformat/java/FormatterIntegrationTest.java
@@ -48,7 +48,7 @@
 public class FormatterIntegrationTest {
 
   private static final ImmutableSet<String> JAVA14_TESTS =
-      ImmutableSet.of("I477", "Records", "RSLs", "Var", "ExpressionSwitch");
+      ImmutableSet.of("I477", "Records", "RSLs", "Var", "ExpressionSwitch", "I574");
 
   private static final ImmutableSet<String> JAVA16_TESTS = ImmutableSet.of("I588");
 
diff --git a/core/src/test/resources/com/google/googlejavaformat/java/testdata/I574.input b/core/src/test/resources/com/google/googlejavaformat/java/testdata/I574.input
new file mode 100644
index 000000000..27d23d040
--- /dev/null
+++ b/core/src/test/resources/com/google/googlejavaformat/java/testdata/I574.input
@@ -0,0 +1,6 @@
+public record Record(@NotNull Object o) {
+
+  public Record {
+    this.o = o;
+  }
+}
\ No newline at end of file
diff --git a/core/src/test/resources/com/google/googlejavaformat/java/testdata/I574.output b/core/src/test/resources/com/google/googlejavaformat/java/testdata/I574.output
new file mode 100644
index 000000000..b0deb2d10
--- /dev/null
+++ b/core/src/test/resources/com/google/googlejavaformat/java/testdata/I574.output
@@ -0,0 +1,6 @@
+public record Record(@NotNull Object o) {
+
+  public Record {
+    this.o = o;
+  }
+}

From 32b63aa2e4675cb03fb853ea84cbc37792e442a4 Mon Sep 17 00:00:00 2001
From: Liam Miller-Cushon <cushon@google.com>
Date: Thu, 15 Apr 2021 14:41:27 -0700
Subject: [PATCH 17/17] Fix a crash in `instanceof` pattern handling

Fixes https://github.com/google/google-java-format

PiperOrigin-RevId: 368720966
---
 .../java/java14/Java14InputAstVisitor.java                 | 2 +-
 .../googlejavaformat/java/FormatterIntegrationTest.java    | 2 +-
 .../com/google/googlejavaformat/java/testdata/I594.input   | 7 +++++++
 .../com/google/googlejavaformat/java/testdata/I594.output  | 7 +++++++
 4 files changed, 16 insertions(+), 2 deletions(-)
 create mode 100644 core/src/test/resources/com/google/googlejavaformat/java/testdata/I594.input
 create mode 100644 core/src/test/resources/com/google/googlejavaformat/java/testdata/I594.output

diff --git a/core/src/main/java/com/google/googlejavaformat/java/java14/Java14InputAstVisitor.java b/core/src/main/java/com/google/googlejavaformat/java/java14/Java14InputAstVisitor.java
index 3517c3511..8293fd4b0 100644
--- a/core/src/main/java/com/google/googlejavaformat/java/java14/Java14InputAstVisitor.java
+++ b/core/src/main/java/com/google/googlejavaformat/java/java14/Java14InputAstVisitor.java
@@ -60,7 +60,7 @@ public Void visitBindingPattern(BindingPatternTree node, Void unused) {
     } catch (ReflectiveOperationException e1) {
       try {
         Tree type = (Tree) BindingPatternTree.class.getMethod("getType").invoke(node);
-        Name name = (Name) BindingPatternTree.class.getMethod("getName").invoke(node);
+        Name name = (Name) BindingPatternTree.class.getMethod("getBinding").invoke(node);
         visitBindingPattern(/* modifiers= */ null, type, name);
       } catch (ReflectiveOperationException e2) {
         e2.addSuppressed(e1);
diff --git a/core/src/test/java/com/google/googlejavaformat/java/FormatterIntegrationTest.java b/core/src/test/java/com/google/googlejavaformat/java/FormatterIntegrationTest.java
index b6549f4a8..31d59f171 100644
--- a/core/src/test/java/com/google/googlejavaformat/java/FormatterIntegrationTest.java
+++ b/core/src/test/java/com/google/googlejavaformat/java/FormatterIntegrationTest.java
@@ -48,7 +48,7 @@
 public class FormatterIntegrationTest {
 
   private static final ImmutableSet<String> JAVA14_TESTS =
-      ImmutableSet.of("I477", "Records", "RSLs", "Var", "ExpressionSwitch", "I574");
+      ImmutableSet.of("I477", "Records", "RSLs", "Var", "ExpressionSwitch", "I574", "I594");
 
   private static final ImmutableSet<String> JAVA16_TESTS = ImmutableSet.of("I588");
 
diff --git a/core/src/test/resources/com/google/googlejavaformat/java/testdata/I594.input b/core/src/test/resources/com/google/googlejavaformat/java/testdata/I594.input
new file mode 100644
index 000000000..98f667e39
--- /dev/null
+++ b/core/src/test/resources/com/google/googlejavaformat/java/testdata/I594.input
@@ -0,0 +1,7 @@
+public class I594 {
+  public void thisIsNotFormattedCorrectly(Object something){
+    if(something instanceof String somethingAsString){
+      return;
+    }
+  }
+}
diff --git a/core/src/test/resources/com/google/googlejavaformat/java/testdata/I594.output b/core/src/test/resources/com/google/googlejavaformat/java/testdata/I594.output
new file mode 100644
index 000000000..7c519a2d9
--- /dev/null
+++ b/core/src/test/resources/com/google/googlejavaformat/java/testdata/I594.output
@@ -0,0 +1,7 @@
+public class I594 {
+  public void thisIsNotFormattedCorrectly(Object something) {
+    if (something instanceof String somethingAsString) {
+      return;
+    }
+  }
+}