From 42d3e228936121bc2a9b0e47b4e63ca121a7887e Mon Sep 17 00:00:00 2001 From: Tor Norbye Date: Mon, 9 Jul 2018 14:34:48 -0700 Subject: [PATCH] Add RecentlyNullable and RecentlyNonNull to nullable list These two new magic names are also known to the Kotlin compiler as nullness annotations representing recently migrated nulls, which will be treated as warnings rather than errors when violated. --- .../src/com/intellij/codeInsight/NullableNotNullManager.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/java/java-psi-api/src/com/intellij/codeInsight/NullableNotNullManager.java b/java/java-psi-api/src/com/intellij/codeInsight/NullableNotNullManager.java index 852416427888..c8ee30e64cc1 100644 --- a/java/java-psi-api/src/com/intellij/codeInsight/NullableNotNullManager.java +++ b/java/java-psi-api/src/com/intellij/codeInsight/NullableNotNullManager.java @@ -40,6 +40,7 @@ public abstract class NullableNotNullManager { "edu.umd.cs.findbugs.annotations.Nullable", "android.support.annotation.Nullable", "androidx.annotation.Nullable", + "androidx.annotation.RecentlyNullable", "org.checkerframework.checker.nullness.qual.Nullable", "org.checkerframework.checker.nullness.compatqual.NullableDecl", "org.checkerframework.checker.nullness.compatqual.NullableType" @@ -51,6 +52,7 @@ public abstract class NullableNotNullManager { "edu.umd.cs.findbugs.annotations.NonNull", "android.support.annotation.NonNull", "androidx.annotation.NonNull", + "androidx.annotation.RecentlyNonNull", "org.checkerframework.checker.nullness.qual.NonNull", "org.checkerframework.checker.nullness.compatqual.NonNullDecl", "org.checkerframework.checker.nullness.compatqual.NonNullType"