.github/workflows/ci.yml

@@ -43,6 +43,9 @@ jobs:
           - os: ubuntu-latest
             java: 20-ea
             experimental: true
+          - os: ubuntu-latest
+            java: 21-ea
+            experimental: true
     runs-on: ${{ matrix.os }}
     continue-on-error: ${{ matrix.experimental }}
     steps:

README.md

@@ -44,14 +44,25 @@ presented when you first open a project offering to do this for you.)
 To enable it by default in new projects, use `File→Other Settings→Default
 Settings...`.
 
-When enabled, it will replace the normal `Reformat Code` action, which can be
-triggered from the `Code` menu or with the Ctrl-Alt-L (by default) keyboard
-shortcut.
+When enabled, it will replace the normal `Reformat Code` and `Optimize Imports`
+actions.
 
-The import ordering is not handled by this plugin, unfortunately. To fix the
-import order, download the
-[IntelliJ Java Google Style file](https://github.com/raw/google/styleguide/gh-pages/intellij-java-google-style.xml)
-and import it into File→Settings→Editor→Code Style.
+#### IntelliJ JRE Config
+
+The google-java-format plugin uses some internal classes that aren't available
+without extra configuration. To use the plugin, go to `Help→Edit Custom VM
+Options...` and paste in these lines:
+
+```
+--add-exports=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED
+--add-exports=jdk.compiler/com.sun.tools.javac.code=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
+```
+
+Once you've done that, restart the IDE.
 
 ### Eclipse
 
@@ -94,11 +105,12 @@ following JVM flags are required when running on JDK 16 and newer, due to
 [JEP 396: Strongly Encapsulate JDK Internals by Default](https://openjdk.java.net/jeps/396):
 
 ```
---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
+--add-exports=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED
+--add-exports=jdk.compiler/com.sun.tools.javac.code=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
 ```
 
 #### Maven

core/pom.xml

@@ -22,7 +22,7 @@
   <parent>
     <groupId>com.google.googlejavaformat</groupId>
     <artifactId>google-java-format-parent</artifactId>
-  <version>HEAD-SNAPSHOT</version>
+  <version>1.17.0</version>
   </parent>
 
   <artifactId>google-java-format</artifactId>
@@ -102,13 +102,12 @@
             <link>https://docs.oracle.com/en/java/javase/11/docs/api</link>
           </links>
           <additionalJOptions>
+            <additionalJOption>--add-exports=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED,com.google.googlejavaformat</additionalJOption>
+            <additionalJOption>--add-exports=jdk.compiler/com.sun.tools.javac.code=ALL-UNNAMED,com.google.googlejavaformat</additionalJOption>
             <additionalJOption>--add-exports=jdk.compiler/com.sun.tools.javac.file=ALL-UNNAMED,com.google.googlejavaformat</additionalJOption>
-            <additionalJOption>--add-exports=jdk.compiler/com.sun.tools.javac.main=ALL-UNNAMED,com.google.googlejavaformat</additionalJOption>
             <additionalJOption>--add-exports=jdk.compiler/com.sun.tools.javac.parser=ALL-UNNAMED,com.google.googlejavaformat</additionalJOption>
             <additionalJOption>--add-exports=jdk.compiler/com.sun.tools.javac.tree=ALL-UNNAMED,com.google.googlejavaformat</additionalJOption>
             <additionalJOption>--add-exports=jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED,com.google.googlejavaformat</additionalJOption>
-            <additionalJOption>--add-exports=jdk.compiler/com.sun.tools.javac.code=ALL-UNNAMED,com.google.googlejavaformat</additionalJOption>
-            <additionalJOption>--add-exports=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED,com.google.googlejavaformat</additionalJOption>
           </additionalJOptions>
         </configuration>
         <executions>

core/src/main/java/com/google/googlejavaformat/OpsBuilder.java

@@ -159,7 +159,7 @@ public BlankLineWanted merge(BlankLineWanted other) {
   int depth = 0;
 
   /** Add an {@link Op}, and record open/close ops for later validation of unclosed levels. */
-  private void add(Op op) {
+  public final void add(Op op) {
     if (op instanceof OpenOp) {
       depth++;
     } else if (op instanceof CloseOp) {

core/src/main/java/com/google/googlejavaformat/java/JavaOutput.java

@@ -111,7 +111,7 @@ public void append(String text, Range<Integer> range) {
        * there's a blank line here and it's a comment.
        */
       BlankLineWanted wanted = blankLines.getOrDefault(lastK, BlankLineWanted.NO);
-      if (isComment(text) ? sawNewlines : wanted.wanted().orElse(sawNewlines)) {
+      if ((sawNewlines && isComment(text)) || wanted.wanted().orElse(sawNewlines)) {
         ++newlinesPending;
       }
     }

core/src/main/java/com/google/googlejavaformat/java/RemoveUnusedImports.java

@@ -49,7 +49,6 @@
 import com.sun.tools.javac.tree.JCTree;
 import com.sun.tools.javac.tree.JCTree.JCCompilationUnit;
 import com.sun.tools.javac.tree.JCTree.JCFieldAccess;
-import com.sun.tools.javac.tree.JCTree.JCIdent;
 import com.sun.tools.javac.tree.JCTree.JCImport;
 import com.sun.tools.javac.util.Context;
 import com.sun.tools.javac.util.Log;
@@ -293,9 +292,7 @@ private static RangeMap<Integer, String> buildReplacements(
   }
 
   private static String getSimpleName(JCImport importTree) {
-    return importTree.getQualifiedIdentifier() instanceof JCIdent
-        ? ((JCIdent) importTree.getQualifiedIdentifier()).getName().toString()
-        : ((JCFieldAccess) importTree.getQualifiedIdentifier()).getIdentifier().toString();
+    return getQualifiedIdentifier(importTree).getIdentifier().toString();
   }
 
   private static boolean isUnused(
@@ -304,18 +301,15 @@ private static boolean isUnused(
       Multimap<String, Range<Integer>> usedInJavadoc,
       JCImport importTree,
       String simpleName) {
-    String qualifier =
-        ((JCFieldAccess) importTree.getQualifiedIdentifier()).getExpression().toString();
+    JCFieldAccess qualifiedIdentifier = getQualifiedIdentifier(importTree);
+    String qualifier = qualifiedIdentifier.getExpression().toString();
     if (qualifier.equals("java.lang")) {
       return true;
     }
     if (unit.getPackageName() != null && unit.getPackageName().toString().equals(qualifier)) {
       return true;
     }
-    if (importTree.getQualifiedIdentifier() instanceof JCFieldAccess
-        && ((JCFieldAccess) importTree.getQualifiedIdentifier())
-            .getIdentifier()
-            .contentEquals("*")) {
+    if (qualifiedIdentifier.getIdentifier().contentEquals("*")) {
       return false;
     }
 
@@ -328,6 +322,15 @@ private static boolean isUnused(
     return true;
   }
 
+  private static JCFieldAccess getQualifiedIdentifier(JCImport importTree) {
+    // Use reflection because the return type is JCTree in some versions and JCFieldAccess in others
+    try {
+      return (JCFieldAccess) JCImport.class.getMethod("getQualifiedIdentifier").invoke(importTree);
+    } catch (ReflectiveOperationException e) {
+      throw new LinkageError(e.getMessage(), e);
+    }
+  }
+
   /** Applies the replacements to the given source, and re-format any edited javadoc. */
   private static String applyReplacements(String source, RangeMap<Integer, String> replacements) {
     // save non-empty fixed ranges for reformatting after fixes are applied

core/src/test/java/com/google/googlejavaformat/java/MainTest.java

@@ -54,13 +54,12 @@ public class MainTest {
 
   private static final ImmutableList<String> ADD_EXPORTS =
       ImmutableList.of(
+          "--add-exports=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED",
+          "--add-exports=jdk.compiler/com.sun.tools.javac.code=ALL-UNNAMED",
           "--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");
+          "--add-exports=jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED");
 
   @Test
   public void testUsageOutput() {

core/src/test/java/com/google/googlejavaformat/java/PartialFormattingTest.java

@@ -679,6 +679,7 @@ public void noTokensOnLine() throws Exception {
     String input =
         lines(
             "    package com.google.googlejavaformat.java;",
+            "",
             "/*",
             " * Copyright 2015 Google Inc.",
             " *",

core/src/test/resources/com/google/googlejavaformat/java/testdata/B27246427.output

@@ -6,6 +6,7 @@ enum TrailingComment {
 
   /** a */
   Object a;
+
   /** b */
   Object b;
 }

core/src/test/resources/com/google/googlejavaformat/java/testdata/Fields.input

@@ -1,5 +1,12 @@
 class Fields {
 
+  int a = 1;
+  int b = 1;
+
+  int c = 1;
+  /** Javadoc */
+  int d = 1;
+
   int x = 1;
 
   int y = 1;

core/src/test/resources/com/google/googlejavaformat/java/testdata/Fields.output

@@ -1,5 +1,13 @@
 class Fields {
 
+  int a = 1;
+  int b = 1;
+
+  int c = 1;
+
+  /** Javadoc */
+  int d = 1;
+
   int x = 1;
 
   int y = 1;

idea_plugin/build.gradle.kts

@@ -0,0 +1,66 @@
+/*
+ * Copyright 2017 Google Inc. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+plugins { id("org.jetbrains.intellij") version "1.13.3" }
+
+apply(plugin = "org.jetbrains.intellij")
+
+apply(plugin = "java")
+
+repositories { mavenCentral() }
+
+val googleJavaFormatVersion = "1.16.0"
+
+java {
+  sourceCompatibility = JavaVersion.VERSION_11
+  targetCompatibility = JavaVersion.VERSION_11
+}
+
+intellij {
+  pluginName.set("google-java-format")
+  plugins.set(listOf("java"))
+  version.set("2021.3")
+}
+
+tasks {
+  patchPluginXml {
+    version.set("${googleJavaFormatVersion}.2")
+    sinceBuild.set("213")
+    untilBuild.set("")
+  }
+
+  publishPlugin {
+    val jetbrainsPluginRepoToken: String by project
+    token.set(jetbrainsPluginRepoToken)
+  }
+
+  withType<Test>().configureEach {
+    jvmArgs(
+      "--add-exports jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED",
+      "--add-exports jdk.compiler/com.sun.tools.javac.code=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",
+    )
+  }
+}
+
+dependencies {
+  implementation("com.google.googlejavaformat:google-java-format:${googleJavaFormatVersion}")
+  testImplementation("junit:junit:4.13.2")
+  testImplementation("com.google.truth:truth:1.1.3")
+}