commit d24deb9d982eaae896a57313f7486aaf130bf5aa
author cpovirk <cpovirk@google.com> Fri Jan 06 08:20:43 2023 -0800
committer google-java-format Team <google-java-format-dev+copybara@google.com> Fri Jan 06 14:33:41 2023 -0800
tree 7fdb87a95b91e6b3059e377edce46f7835f37185
parent d9ddb94db1d90a240f901949514f35df4e4c3fc4

Recognize a couple `@NonNull` annotations as type-use annotations.

PiperOrigin-RevId: 500180559

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

diff --git a/core/src/main/java/com/google/googlejavaformat/java/JavaInputAstVisitor.java b/core/src/main/java/com/google/googlejavaformat/java/JavaInputAstVisitor.java
index 9b6283e..394d396 100644
--- a/core/src/main/java/com/google/googlejavaformat/java/JavaInputAstVisitor.java
+++ b/core/src/main/java/com/google/googlejavaformat/java/JavaInputAstVisitor.java
@@ -285,8 +285,10 @@
     ImmutableSetMultimap.Builder<String, String> result = ImmutableSetMultimap.builder();
     for (String annotation :
         ImmutableList.of(
+            "org.jspecify.annotations.NonNull",
             "org.jspecify.annotations.Nullable",
             "org.jspecify.nullness.Nullable",
+            "org.checkerframework.checker.nullness.qual.NonNull",
             "org.checkerframework.checker.nullness.qual.Nullable")) {
       String simpleName = annotation.substring(annotation.lastIndexOf('.') + 1);
       result.put(simpleName, annotation);