Merge branch 'finlayw/cc' of github.com:palantir/palantir-java-format into finlayw/cc

Author: FinlayRJW

build.gradle

@@ -7,16 +7,16 @@ buildscript {
     dependencies {
         classpath 'com.palantir.jakartapackagealignment:jakarta-package-alignment:0.6.0'
         classpath 'com.gradle.publish:plugin-publish-plugin:1.3.1'
-        classpath 'com.palantir.baseline:gradle-baseline-java:6.32.0'
+        classpath 'com.palantir.baseline:gradle-baseline-java:6.34.0'
         classpath 'com.palantir.gradle.consistentversions:gradle-consistent-versions:2.34.0'
         classpath 'com.palantir.gradle.externalpublish:gradle-external-publish-plugin:1.19.0'
-        classpath 'com.palantir.gradle.failure-reports:gradle-failure-reports:1.13.0'
+        classpath 'com.palantir.gradle.failure-reports:gradle-failure-reports:1.14.0'
         classpath 'com.palantir.gradle.gitversion:gradle-git-version:3.3.0'
         classpath 'com.palantir.gradle.idea-configuration:gradle-idea-configuration:0.4.0'
         classpath 'com.palantir.gradle.jdks:gradle-jdks:0.67.0'
         classpath 'com.palantir.gradle.jdkslatest:gradle-jdks-latest:0.18.0'
         classpath 'com.palantir.gradle.plugintesting:gradle-plugin-testing:0.6.0'
-        classpath 'com.palantir.javaformat:gradle-palantir-java-format:2.67.0'
+        classpath 'com.palantir.javaformat:gradle-palantir-java-format:2.68.0'
         classpath 'com.palantir.gradle.revapi:gradle-revapi:1.8.0'
         classpath 'com.palantir.suppressible-error-prone:gradle-suppressible-error-prone:2.9.0'
         classpath 'gradle.plugin.org.inferred:gradle-processors:3.7.0'

changelog/@unreleased/pr-1298.v2.yml changelog/2.68.0/pr-1298.v2.ymlchangelog/@unreleased/pr-1298.v2.yml renamed to changelog/2.68.0/pr-1298.v2.yml

@@ -0,0 +1,5 @@
+type: fix
+fix:
+  description: Support for var in record patterns
+  links:
+  - https://github.com/palantir/palantir-java-format/pull/1312

changelog/2.68.0/pr-1312.v2.yml

@@ -60,6 +60,7 @@ public String createIndentationString(int indentationLevel) {
     }
 
     /** Runs the Google Java formatter on the given source, with only the given ranges specified. */
+    @SuppressWarnings({"for-rollout:DefaultLocale", "for-rollout:StatementSwitchToExpressionSwitch"})
     @Nullable
     private TextEdit formatInternal(int kind, String source, IRegion[] regions, int initialIndent) {
         try {
@@ -82,6 +83,7 @@ private TextEdit formatInternal(int kind, String source, IRegion[] regions, int
                 default:
                     throw new IllegalArgumentException(String.format("Unknown snippet kind: %d", kind));
             }
+            @SuppressWarnings("for-rollout:PreferredInterfaceType")
             List<Replacement> replacements = new SnippetFormatter()
                     .format(snippetKind, source, rangesFromRegions(regions), initialIndent, includeComments);
             if (idempotent(source, regions, replacements)) {

eclipse_plugin/src/main/java/com/palantir/javaformat/java/PalantirJavaFormatter.java

@@ -153,6 +153,7 @@ private static List<Replacement> toReplacements(String source, String replacemen
         return replacements;
     }
 
+    @SuppressWarnings({"for-rollout:StatementSwitchToExpressionSwitch", "for-rollout:UnnecessaryDefaultInEnumSwitch"})
     private SnippetWrapper snippetWrapper(SnippetKind kind, String source, int initialIndent) {
         /*
          * Synthesize a dummy class around the code snippet provided by Eclipse. The

eclipse_plugin/src/main/java/com/palantir/javaformat/java/SnippetFormatter.java

@@ -41,11 +41,13 @@
  */
 public abstract class ExecutableTransform implements TransformAction<TransformParameters.None> {
 
+    @SuppressWarnings("for-rollout:NonFinalStaticField")
     private static Logger logger = Logging.getLogger(ExecutableTransform.class);
 
     @InputArtifact
     public abstract Provider<FileSystemLocation> getInputArtifact();
 
+    @SuppressWarnings("for-rollout:ThrowSpecificExceptions")
     @Override
     public void transform(TransformOutputs outputs) {
         File inputFile = getInputArtifact().get().getAsFile();
@@ -58,6 +60,7 @@ public void transform(TransformOutputs outputs) {
         }
     }
 
+    @SuppressWarnings("for-rollout:ThrowSpecificExceptions")
     private static void makeFileExecutable(Path pathToExe) {
         try {
             Set<PosixFilePermission> existingPermissions = Files.getPosixFilePermissions(pathToExe);

gradle-palantir-java-format/src/main/java/com/palantir/javaformat/gradle/ExecutableTransform.java

@@ -69,6 +69,7 @@ public static void formatDiff(Path dirToFormat, FormatterService formatter)
     }
 
     /** Parses the filenames and edited ranges out of `git diff -U0`. */
+    @SuppressWarnings("for-rollout:SystemOut")
     @VisibleForTesting
     static Stream<SingleFileDiff> parseGitDiffOutput(String gitOutput) {
         return Streams.stream(Splitter.on(SEPARATOR).omitEmptyStrings().split(gitOutput))
@@ -96,6 +97,7 @@ static Stream<SingleFileDiff> parseGitDiffOutput(String gitOutput) {
                 });
     }
 
+    @SuppressWarnings("for-rollout:SystemOut")
     private static void format(FormatterService formatter, SingleFileDiff diff) {
         String input;
         try {
@@ -161,6 +163,7 @@ private static RangeSet<Integer> lineRangesToCharRanges(String input, RangeSet<I
         Iterators.addAll(lines, new LineOffsetIterator(input));
         lines.add(input.length() + 1);
 
+        @SuppressWarnings("for-rollout:UnnecessaryFinal")
         final RangeSet<Integer> characterRanges = TreeRangeSet.create();
         for (Range<Integer> lineRange :
                 lineRanges.subRangeSet(Range.closedOpen(0, lines.size() - 1)).asRanges()) {

gradle-palantir-java-format/src/main/java/com/palantir/javaformat/gradle/FormatDiff.java

@@ -41,6 +41,7 @@ public FormatterService serviceLoad() {
 
     @SuppressWarnings("for-rollout:NullAway")
     private FormatterService serviceLoadInternal() {
+        @SuppressWarnings("for-rollout:ThrowSpecificExceptions")
         URL[] jarUris = configuration.getFiles().stream()
                 .map(file -> {
                     try {
@@ -51,6 +52,7 @@ private FormatterService serviceLoadInternal() {
                 })
                 .toArray(URL[]::new);
 
+        @SuppressWarnings("for-rollout:BanClassLoader")
         ClassLoader classLoader = new URLClassLoader(jarUris, FormatterService.class.getClassLoader());
         return Iterables.getOnlyElement(ServiceLoader.load(FormatterService.class, classLoader));
     }

gradle-palantir-java-format/src/main/java/com/palantir/javaformat/gradle/JavaFormatExtension.java

@@ -29,6 +29,7 @@
  * {@link com.palantir.javaformat.gradle.PalantirJavaFormatSpotlessPlugin} even if spotless is not on the classpath.
  */
 final class SpotlessInterop {
+    @SuppressWarnings("for-rollout:NonFinalStaticField")
     private static Logger logger = Logging.getLogger(SpotlessInterop.class);
 
     private SpotlessInterop() {}

gradle-palantir-java-format/src/main/java/com/palantir/javaformat/gradle/SpotlessInterop.java

@@ -84,6 +84,7 @@ FormatterFunc createFormat() {
         }
     }
 
+    @SuppressWarnings("for-rollout:ThrowSpecificExceptions")
     private static void ensureImplementationNotDirectlyLoadable() {
         try {
             PalantirJavaFormatStep.class.getClassLoader().loadClass(IMPL_CLASS);