Merge branch 'develop' of github.com:palantir/palantir-java-format into okelvin/cc-test

Author: kelvinou01

build.gradle

@@ -10,13 +10,13 @@ buildscript {
         classpath 'com.palantir.baseline:gradle-baseline-java:6.32.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

@@ -113,5 +113,5 @@ tasks.named("test").configure {
 }
 
 gradleTestUtils {
-    gradleVersions = ['7.6.4', '8.8', '8.12.1']
+    gradleVersions = ['7.6.5', '8.14.2']
 }

gradle-palantir-java-format/build.gradle

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.2-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

gradle/wrapper/gradle-wrapper.properties

@@ -120,7 +120,11 @@ private void visitBindingPattern(ModifiersTree modifiers, Tree type, Name name)
         if (modifiers != null) {
             builder.addAll(visitModifiers(modifiers, Direction.HORIZONTAL, Optional.empty()));
         }
-        scan(type, null);
+        if (type == null) {
+            token("var");
+        } else {
+            scan(type, null);
+        }
         builder.breakOp(" ");
         if (name.isEmpty()) {
             token("_");

palantir-java-format/src/main/java/com/palantir/javaformat/java/java14/Java14InputAstVisitor.java

@@ -50,7 +50,14 @@ public final class FileBasedTests {
                     .putAll(15, "I603")
                     .putAll(16, "I588")
                     .putAll(17, "I683", "I684", "I696")
-                    .putAll(21, "SwitchGuardClause", "SwitchRecord", "SwitchDouble", "SwitchUnderscore", "I880")
+                    .putAll(
+                            21,
+                            "SwitchGuardClause",
+                            "SwitchRecord",
+                            "SwitchDouble",
+                            "SwitchUnderscore",
+                            "I880",
+                            "I1309")
                     .build();
 
     private final Class<?> testClass;

palantir-java-format/src/test/java/com/palantir/javaformat/java/FileBasedTests.java

@@ -0,0 +1,9 @@
+public class I1309 {
+  void x(Object o) {
+    if (o instanceof Record(Nested(var i), var j)) {}
+    switch (o) {
+      case Record(Nested(var i), var j, int k, char l, java.lang.String m, var n, var o, var p, var q, var r, var s, var t, var u, var v, var w, var x, var y, var z):
+      default:
+    }
+  }
+}

palantir-java-format/src/test/resources/com/palantir/javaformat/java/testdata/I1309.input

@@ -0,0 +1,27 @@
+public class I1309 {
+    void x(Object o) {
+        if (o instanceof Record(Nested(var i), var j)) {}
+        switch (o) {
+            case Record(
+                    Nested(var i),
+                    var j,
+                    int k,
+                    char l,
+                    java.lang.String m,
+                    var n,
+                    var o,
+                    var p,
+                    var q,
+                    var r,
+                    var s,
+                    var t,
+                    var u,
+                    var v,
+                    var w,
+                    var x,
+                    var y,
+                    var z):
+            default:
+        }
+    }
+}