Merge pull request #15 from Salling-Group/rebase-v1-15-0

Rebase v1 15 0

Author: casper-la-cour-sg

.github/dependabot.yml

@@ -0,0 +1,6 @@
+version: 2
+updates:
+  - package-ecosystem: "maven"
+    directory: "/"
+    schedule:
+      interval: "daily"

.github/workflows/ci.yml

@@ -29,25 +29,17 @@ jobs:
       fail-fast: false
       matrix:
         os: [ ubuntu-latest ]
-        java: [ 17, 14, 11 ]
+        java: [ 19, 17, 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: 17
-            experimental: false
-          - os: windows-latest
-            java: 17
-            experimental: false
           - os: ubuntu-latest
-            java: 18-ea
+            java: 20-ea
             experimental: true
     runs-on: ${{ matrix.os }}
     continue-on-error: ${{ matrix.experimental }}
     steps:
       - name: Cancel previous
-        uses: styfle/cancel-workflow-action@0.8.0
+        uses: styfle/cancel-workflow-action@0.9.1
         with:
           access_token: ${{ github.token }}
       - name: 'Check out repository'
@@ -64,26 +56,3 @@ jobs:
       - name: 'Test'
         shell: bash
         run: mvn test -B
-
-  publish_snapshot:
-    name: 'Publish snapshot'
-    needs: test
-    if: github.event_name == 'push' && github.repository == 'google/google-java-format' && github.ref == 'refs/heads/master'
-    runs-on: ubuntu-latest
-    steps:
-      - name: 'Check out repository'
-        uses: actions/checkout@v2
-      - name: 'Set up JDK 15'
-        uses: actions/setup-java@v2
-        with:
-          java-version: 15
-          distribution: 'zulu'
-          cache: 'maven'
-          server-id: sonatype-nexus-snapshots
-          server-username: CI_DEPLOY_USERNAME
-          server-password: CI_DEPLOY_PASSWORD
-      - name: 'Publish'
-        env:
-          CI_DEPLOY_USERNAME: ${{ secrets.CI_DEPLOY_USERNAME }}
-          CI_DEPLOY_PASSWORD: ${{ secrets.CI_DEPLOY_PASSWORD }}
-        run: mvn source:jar deploy -B -DskipTests=true -Dinvoker.skip=true -Dmaven.javadoc.skip=true

.mvn/jvm.config

@@ -0,0 +1,10 @@
+--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.main=ALL-UNNAMED
+--add-exports=jdk.compiler/com.sun.tools.javac.model=ALL-UNNAMED
+--add-exports=jdk.compiler/com.sun.tools.javac.parser=ALL-UNNAMED
+--add-exports=jdk.compiler/com.sun.tools.javac.processing=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-opens=jdk.compiler/com.sun.tools.javac.code=ALL-UNNAMED
+--add-opens=jdk.compiler/com.sun.tools.javac.comp=ALL-UNNAMED

core/pom.xml

@@ -77,10 +77,15 @@
       <groupId>com.google.truth</groupId>
       <artifactId>truth</artifactId>
     </dependency>
+    <dependency>
+      <groupId>com.google.truth.extensions</groupId>
+      <artifactId>truth-java8-extension</artifactId>
+      <scope>test</scope>
+    </dependency>
     <dependency>
       <groupId>com.google.testing.compile</groupId>
       <artifactId>compile-testing</artifactId>
-      <version>0.15</version>
+      <version>0.19</version>
       <scope>test</scope>
     </dependency>
   </dependencies>
@@ -121,7 +126,7 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-shade-plugin</artifactId>
-        <version>2.4.3</version>
+        <version>3.2.4</version>
         <executions>
           <execution>
             <id>shade-all-deps</id>
@@ -197,7 +202,7 @@
       <plugin>
         <groupId>org.codehaus.mojo</groupId>
         <artifactId>build-helper-maven-plugin</artifactId>
-        <version>3.0.0</version>
+        <version>3.3.0</version>
         <executions>
           <execution>
             <id>add-source</id>
@@ -228,7 +233,7 @@
     <profile>
       <id>jdk11</id>
       <activation>
-        <jdk>(,14)</jdk>
+        <jdk>(,17)</jdk>
       </activation>
       <build>
         <plugins>
@@ -237,14 +242,54 @@
             <artifactId>maven-compiler-plugin</artifactId>
             <configuration>
               <excludes>
-                <exclude>**/Java14InputAstVisitor.java</exclude>
+                <exclude>**/Java17InputAstVisitor.java</exclude>
               </excludes>
             </configuration>
           </plugin>
           <plugin>
             <artifactId>maven-javadoc-plugin</artifactId>
             <configuration>
-              <excludePackageNames>com.google.googlejavaformat.java.java14</excludePackageNames>
+              <excludePackageNames>com.google.googlejavaformat.java.java17</excludePackageNames>
+            </configuration>
+          </plugin>
+        </plugins>
+      </build>
+    </profile>
+    <profile>
+      <id>native</id>
+      <build>
+        <plugins>
+          <plugin>
+            <groupId>org.graalvm.buildtools</groupId>
+            <artifactId>native-maven-plugin</artifactId>
+            <version>0.9.13</version>
+            <extensions>true</extensions>
+            <executions>
+              <execution>
+                <id>build-native</id>
+                <goals>
+                  <goal>build</goal>
+                </goals>
+                <phase>package</phase>
+              </execution>
+              <execution>
+                <id>test-native</id>
+                <goals>
+                  <goal>test</goal>
+                </goals>
+                <phase>test</phase>
+              </execution>
+            </executions>
+            <configuration>
+              <imageName>google-java-format</imageName>
+              <classpath>
+                <param>${project.build.directory}/${project.artifactId}-${project.version}-all-deps.jar</param>
+              </classpath>
+              <buildArgs>
+                <buildArg>-H:IncludeResourceBundles=com.sun.tools.javac.resources.compiler</buildArg>
+                <buildArg>--no-fallback</buildArg>
+                <buildArg>--initialize-at-build-time=com.sun.tools.javac.file.Locations</buildArg>
+              </buildArgs>
             </configuration>
           </plugin>
         </plugins>

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

@@ -14,6 +14,10 @@
 
 package com.google.googlejavaformat;
 
+import com.google.googlejavaformat.Input.Tok;
+import java.util.Optional;
+import java.util.regex.Pattern;
+
 /**
  * Rewrite comments. This interface is implemented by {@link
  * com.google.googlejavaformat.java.JavaCommentsHelper JavaCommentsHelper}.
@@ -28,4 +32,19 @@ public interface CommentsHelper {
    * @return the rewritten comment
    */
   String rewrite(Input.Tok tok, int maxWidth, int column0);
+
+  static Optional<String> reformatParameterComment(Tok tok) {
+    if (!tok.isSlashStarComment()) {
+      return Optional.empty();
+    }
+    var match = PARAMETER_COMMENT.matcher(tok.getOriginalText());
+    if (!match.matches()) {
+      return Optional.empty();
+    }
+    return Optional.of(String.format("/* %s= */", match.group(1)));
+  }
+
+  Pattern PARAMETER_COMMENT =
+      Pattern.compile(
+          "/\\*\\s*(\\p{javaJavaIdentifierStart}\\p{javaJavaIdentifierPart}*(\\Q...\\E)?)\\s*=\\s*\\*/");
 }

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

@@ -15,6 +15,7 @@
 package com.google.googlejavaformat;
 
 import static com.google.common.collect.Iterables.getLast;
+import static com.google.googlejavaformat.CommentsHelper.reformatParameterComment;
 import static java.lang.Math.max;
 
 import com.google.common.base.MoreObjects;
@@ -727,7 +728,7 @@ float computeWidth() {
           // Account for line comments with missing spaces, see computeFlat.
           return tok.length() + 1;
         } else {
-          return tok.length();
+          return reformatParameterComment(tok).map(String::length).orElse(tok.length());
         }
       }
       return idx != -1 ? Float.POSITIVE_INFINITY : (float) tok.length();
@@ -741,7 +742,7 @@ String computeFlat() {
       if (tok.isSlashSlashComment() && !tok.getOriginalText().startsWith("// ")) {
         return "// " + tok.getOriginalText().substring("//".length());
       }
-      return tok.getOriginalText();
+      return reformatParameterComment(tok).orElse(tok.getOriginalText());
     }
 
     @Override

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

@@ -14,8 +14,6 @@
 
 package com.google.googlejavaformat.java;
 
-import static com.google.common.base.StandardSystemProperty.JAVA_CLASS_VERSION;
-import static com.google.common.base.StandardSystemProperty.JAVA_SPECIFICATION_VERSION;
 import static java.nio.charset.StandardCharsets.UTF_8;
 
 import com.google.common.collect.ImmutableList;
@@ -42,7 +40,6 @@
 import com.sun.tools.javac.util.Options;
 import java.io.IOError;
 import java.io.IOException;
-import java.lang.reflect.Method;
 import java.net.URI;
 import java.util.ArrayList;
 import java.util.Collection;
@@ -139,9 +136,9 @@ public CharSequence getCharContent(boolean ignoreEncodingErrors) throws IOExcept
     JavacParser parser =
         parserFactory.newParser(
             javaInput.getText(),
-            /*keepDocComments=*/ true,
-            /*keepEndPos=*/ true,
-            /*keepLineMap=*/ true);
+            /* keepDocComments= */ true,
+            /* keepEndPos= */ true,
+            /* keepLineMap= */ true);
     unit = parser.parseCompilationUnit();
     unit.sourcefile = source;
 
@@ -154,10 +151,10 @@ public CharSequence getCharContent(boolean ignoreEncodingErrors) throws IOExcept
     OpsBuilder builder = new OpsBuilder(javaInput, javaOutput);
     // Output the compilation unit.
     JavaInputAstVisitor visitor;
-    if (getMajor() >= 14) {
+    if (Runtime.version().feature() >= 17) {
       try {
         visitor =
-            Class.forName("com.google.googlejavaformat.java.java14.Java14InputAstVisitor")
+            Class.forName("com.google.googlejavaformat.java.java17.Java17InputAstVisitor")
                 .asSubclass(JavaInputAstVisitor.class)
                 .getConstructor(OpsBuilder.class, JavaFormatterOptions.class)
                 .newInstance(builder, options);
@@ -177,23 +174,6 @@ public CharSequence getCharContent(boolean ignoreEncodingErrors) throws IOExcept
     javaOutput.flush();
   }
 
-  // Runtime.Version was added in JDK 9, so use reflection to access it to preserve source
-  // compatibility with Java 8.
-  private static int getMajor() {
-    try {
-      Method versionMethod = Runtime.class.getMethod("version");
-      Object version = versionMethod.invoke(null);
-      return (int) version.getClass().getMethod("major").invoke(version);
-    } catch (Exception e) {
-      // continue below
-    }
-    int version = (int) Double.parseDouble(JAVA_CLASS_VERSION.value());
-    if (49 <= version && version <= 52) {
-      return version - (49 - 5);
-    }
-    throw new IllegalStateException("Unknown Java version: " + JAVA_SPECIFICATION_VERSION.value());
-  }
-
   static boolean errorDiagnostic(Diagnostic<?> input) {
     if (input.getKind() != Diagnostic.Kind.ERROR) {
       return false;

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

@@ -53,11 +53,13 @@ public String rewrite(Tok tok, int maxWidth, int column0) {
     }
     if (tok.isSlashSlashComment()) {
       return indentLineComments(lines, column0);
-    } else if (javadocShaped(lines)) {
-      return indentJavadoc(lines, column0);
-    } else {
-      return preserveIndentation(lines, column0);
     }
+    return CommentsHelper.reformatParameterComment(tok)
+        .orElseGet(
+            () ->
+                javadocShaped(lines)
+                    ? indentJavadoc(lines, column0)
+                    : preserveIndentation(lines, column0));
   }
 
   // For non-javadoc-shaped block comments, shift the entire block to the correct

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

@@ -49,6 +49,7 @@
 import javax.tools.Diagnostic;
 import javax.tools.DiagnosticCollector;
 import javax.tools.DiagnosticListener;
+import javax.tools.JavaFileManager;
 import javax.tools.JavaFileObject;
 import javax.tools.JavaFileObject.Kind;
 import javax.tools.SimpleJavaFileObject;
@@ -311,7 +312,7 @@ private static ImmutableMap<Integer, Integer> makePositionToColumnMap(List<Tok>
     for (Tok tok : toks) {
       builder.put(tok.getPosition(), tok.getColumn());
     }
-    return builder.build();
+    return builder.buildOrThrow();
   }
 
   /**
@@ -349,7 +350,8 @@ static ImmutableList<Tok> buildToks(String text, ImmutableSet<TokenKind> stopTok
     stopTokens = ImmutableSet.<TokenKind>builder().addAll(stopTokens).add(TokenKind.EOF).build();
     Context context = new Context();
     Options.instance(context).put("--enable-preview", "true");
-    new JavacFileManager(context, true, UTF_8);
+    JavaFileManager fileManager = new JavacFileManager(context, false, UTF_8);
+    context.put(JavaFileManager.class, fileManager);
     DiagnosticCollector<JavaFileObject> diagnosticCollector = new DiagnosticCollector<>();
     context.put(DiagnosticListener.class, diagnosticCollector);
     Log log = Log.instance(context);