Merge branch 'master' of https://github.com/typetools/checker-framework into 6990

Author: kelloggm

build.gradle

@@ -15,7 +15,7 @@ plugins {
   // Code formatting; defines targets "spotlessApply" and "spotlessCheck".
   // https://github.com/diffplug/spotless/tags ; see tags starting "gradle/"
   // Only works on JDK 11+ (even including the plugin crashes Gradle on JDK 8).
-  id 'com.diffplug.spotless' version '6.25.0'
+  id 'com.diffplug.spotless' version '7.0.2'
 }
 
 // There is another `repositories { ... }` block below; if you change this one, change that one as well.
@@ -51,7 +51,8 @@ ext {
 
   versions = [
     autoValue       : '1.11.0',
-    googleJavaFormat : '1.19.2',
+    // NOTE: Google Java Format requires JDK 17 or higher as of version 1.25.0.
+    googleJavaFormat : '1.25.2',
     lombok          : '1.18.36',
     hashmapUtil : '0.0.1',
     reflectionUtil : '1.1.4',
@@ -62,7 +63,7 @@ ext {
     //  * Temporarily comment out "-Werror" elsewhere in this file
     //  * Repeatedly run `./gradlew clean compileJava` and fix all errors
     //  * Uncomment "-Werror"
-    errorprone : '2.36.0',
+    errorprone : '2.37.0',
   ]
 }
 
@@ -256,7 +257,7 @@ allprojects { currentProj ->
       target '*.md', '*.tex', '.gitignore', 'Makefile'
       targetExclude doNotFormat
       // define the steps to apply to those files
-      indentWithSpaces(2)
+      leadingTabsToSpaces(2)
       trimTrailingWhitespace()
       // endWithNewline() // Don't want to end empty files with a newline
     }
@@ -298,9 +299,9 @@ allprojects { currentProj ->
         targetExclude doNotFormat
         greclipse()  // which formatter Spotless should use to format .gradle files.
         if (project.hasProperty('eisopFormatting')) {
-          indentWithSpaces(4)
+          leadingTabsToSpaces(4)
         } else {
-          indentWithSpaces(2)
+          leadingTabsToSpaces(2)
         }
         trimTrailingWhitespace()
         // endWithNewline() // Don't want to end empty files with a newline
@@ -313,7 +314,7 @@ allprojects { currentProj ->
         // removes semicolons at the end of lines
         removeSemicolons()
         greclipse()
-        indentWithSpaces(2)
+        leadingTabsToSpaces(2)
         trimTrailingWhitespace()
       }
     }

checker/bin-devel/test-misc.sh

@@ -16,7 +16,7 @@ status=0
 
 ## Code style and formatting
 JAVA_VER=$(java -version 2>&1 | head -1 | cut -d'"' -f2 | sed '/^1\./s///' | cut -d'.' -f1 | sed 's/-ea//')
-if [ "${JAVA_VER}" != "8" ] ; then
+if [ "${JAVA_VER}" != "8" ] && [ "${JAVA_VER}" != "11" ] ; then
   ./gradlew spotlessCheck --console=plain --warning-mode=all
 fi
 if grep -n -r --exclude-dir=build --exclude-dir=examples --exclude-dir=jtreg --exclude-dir=tests --exclude="*.astub" --exclude="*.tex" '^\(import static \|import .*\*;$\)'; then

checker/src/main/java/org/checkerframework/checker/formatter/FormatterVisitor.java

@@ -127,10 +127,10 @@ public Void visitMethodInvocation(MethodInvocationTree tree, Void p) {
             if (!isWrappedFormatCall(fc, enclosingMethod)) {
               ftu.warning(invc, "format.indirect.arguments");
             }
-            // TODO:  If it is explict array construction, such as "new Object[] {
-            // ... }", then we could treat it like the VARARGS case, analyzing each
-            // argument.  "new array" is probably rare, in the varargs position.
-            // fall through
+          // TODO:  If it is explict array construction, such as "new Object[] {
+          // ... }", then we could treat it like the VARARGS case, analyzing each
+          // argument.  "new array" is probably rare, in the varargs position.
+          // fall through
           case NULLARRAY:
             for (ConversionCategory cat : formatCats) {
               if (cat == ConversionCategory.NULL) {

checker/src/main/java/org/checkerframework/checker/i18nformatter/I18nFormatterVisitor.java

@@ -101,7 +101,7 @@ private void checkInvocationFormatFor(I18nFormatCall fc) {
             }
             break;
           case NULLARRAY:
-            // fall-through
+          // fall-through
           case ARRAY:
             for (I18nConversionCategory cat : formatCats) {
               if (cat == I18nConversionCategory.UNUSED) {

checker/src/main/java/org/checkerframework/checker/index/upperbound/UpperBoundTransfer.java

@@ -141,9 +141,7 @@ public TransferResult<CFValue, CFStore> visitAssignment(
         (expNode instanceof TypeCastNode) ? ((TypeCastNode) expNode).getOperand() : expNode;
     // null if right-hand-side is not an array creation expression
     ArrayCreationNode acNode =
-        (expNodeSansCast instanceof ArrayCreationNode)
-            ? acNode = (ArrayCreationNode) expNodeSansCast
-            : null;
+        (expNodeSansCast instanceof ArrayCreationNode) ? (ArrayCreationNode) expNodeSansCast : null;
 
     if (acNode != null) {
       // Right-hand side of assignment is an array creation expression

checker/src/main/java/org/checkerframework/checker/mustcall/MustCallAnnotatedTypeFactory.java

@@ -346,6 +346,15 @@ public ExecutableElement getMustCallValueElement() {
     return mustCallValueElement;
   }
 
+  /**
+   * Returns the {@link InheritableMustCall#value} element.
+   *
+   * @return the {@link InheritableMustCall#value} element
+   */
+  public ExecutableElement getInheritableMustCallValueElement() {
+    return inheritableMustCallValueElement;
+  }
+
   /** Support @InheritableMustCall meaning @MustCall on all subtype elements. */
   private class MustCallDefaultQualifierForUseTypeAnnotator
       extends DefaultQualifierForUseTypeAnnotator {

checker/src/main/java/org/checkerframework/checker/nullness/NullnessVisitor.java

@@ -191,7 +191,7 @@ protected boolean commonAssignmentCheck(
             || !((IdentifierTree) receiver).getName().contentEquals("this")) {
           return null;
         }
-        // fallthrough
+      // fallthrough
       case IDENTIFIER:
         TreePath path = getCurrentPath();
         if (TreePathUtil.inConstructor(path)) {