jlengrand/kotlin
1
0
Fork 0
mirror of https://github.com/jlengrand/kotlin.git synced 2026-03-10 08:31:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

KT-29586: Add android.annotation annotations

Browse Source 
KT-29586 Fixed
This commit is contained in:
Tor Norbye
2019-01-16 13:54:17 -08:00
committed by Denis Zharkov
parent f1f2d5b4d3
commit a42406f2aa
9 changed files with 153 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
compiler/testData/foreignAnnotations/tests/androidSdk.kt vendored Normal file
View File

@@ -0,0 +1,42 @@
// !DIAGNOSTICS: -UNUSED_VARIABLE -UNUSED_PARAMETER
// FILE: A.java
import android.annotation.*;
public class A<T> {
@Nullable public String field = null;
@Nullable
public String foo(@NonNull String x, @Nullable CharSequence y) {
return "";
}
@NonNull
public String bar() {
return "";
}
@Nullable
public T baz(@NonNull T x) { return x; }
}
// FILE: main.kt
fun main(a: A<String>, a1: A<String?>) {
a.foo("", null)?.length
a.foo("", null)<!UNSAFE_CALL!>.<!>length
a.foo(<!NULL_FOR_NONNULL_TYPE!>null<!>, "")<!UNSAFE_CALL!>.<!>length
a.bar().length
a.bar()<!UNNECESSARY_NOT_NULL_ASSERTION!>!!<!>.length
a.field?.length
a.field<!UNSAFE_CALL!>.<!>length
a.baz("")<!UNSAFE_CALL!>.<!>length
a.baz("")?.length
a.baz(<!NULL_FOR_NONNULL_TYPE!>null<!>)<!UNSAFE_CALL!>.<!>length
a1.baz("")!!.length
a1.baz(<!NULL_FOR_NONNULL_TYPE!>null<!>)!!.length
}

14
compiler/testData/foreignAnnotations/tests/androidSdk.txt vendored Normal file
View File

@@ -0,0 +1,14 @@
package
public fun main(/*0*/ a: A<kotlin.String>, /*1*/ a1: A<kotlin.String?>): kotlin.Unit
public open class A</*0*/ T : kotlin.Any!> {
public constructor A</*0*/ T : kotlin.Any!>()
@android.annotation.Nullable public final var field: kotlin.String?
@android.annotation.NonNull public open fun bar(): kotlin.String
@android.annotation.Nullable public open fun baz(/*0*/ @android.annotation.NonNull x: T): T?
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
@android.annotation.Nullable public open fun foo(/*0*/ @android.annotation.NonNull x: kotlin.String, /*1*/ @android.annotation.Nullable y: kotlin.CharSequence?): kotlin.String?
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
}

5
compiler/tests/org/jetbrains/kotlin/checkers/ForeignAnnotationsNoAnnotationInClasspathTestGenerated.java generated
View File

@@ -34,6 +34,11 @@ public class ForeignAnnotationsNoAnnotationInClasspathTestGenerated extends Abst
runTest("compiler/testData/foreignAnnotations/tests/androidRecently.kt");
}
@TestMetadata("androidSdk.kt")
public void testAndroidSdk() throws Exception {
runTest("compiler/testData/foreignAnnotations/tests/androidSdk.kt");
}
@TestMetadata("android_support.kt")
public void testAndroid_support() throws Exception {
runTest("compiler/testData/foreignAnnotations/tests/android_support.kt");

5
compiler/tests/org/jetbrains/kotlin/checkers/ForeignAnnotationsNoAnnotationInClasspathWithFastClassReadingTestGenerated.java generated
View File

@@ -34,6 +34,11 @@ public class ForeignAnnotationsNoAnnotationInClasspathWithFastClassReadingTestGe
runTest("compiler/testData/foreignAnnotations/tests/androidRecently.kt");
}
@TestMetadata("androidSdk.kt")
public void testAndroidSdk() throws Exception {
runTest("compiler/testData/foreignAnnotations/tests/androidSdk.kt");
}
@TestMetadata("android_support.kt")
public void testAndroid_support() throws Exception {
runTest("compiler/testData/foreignAnnotations/tests/android_support.kt");

5
compiler/tests/org/jetbrains/kotlin/checkers/ForeignAnnotationsTestGenerated.java generated
View File

@@ -34,6 +34,11 @@ public class ForeignAnnotationsTestGenerated extends AbstractForeignAnnotationsT
runTest("compiler/testData/foreignAnnotations/tests/androidRecently.kt");
}
@TestMetadata("androidSdk.kt")
public void testAndroidSdk() throws Exception {
runTest("compiler/testData/foreignAnnotations/tests/androidSdk.kt");
}
@TestMetadata("android_support.kt")
public void testAndroid_support() throws Exception {
runTest("compiler/testData/foreignAnnotations/tests/android_support.kt");

5
compiler/tests/org/jetbrains/kotlin/checkers/javac/JavacForeignAnnotationsTestGenerated.java generated
View File

@@ -34,6 +34,11 @@ public class JavacForeignAnnotationsTestGenerated extends AbstractJavacForeignAn
runTest("compiler/testData/foreignAnnotations/tests/androidRecently.kt");
}
@TestMetadata("androidSdk.kt")
public void testAndroidSdk() throws Exception {
runTest("compiler/testData/foreignAnnotations/tests/androidSdk.kt");
}
@TestMetadata("android_support.kt")
public void testAndroid_support() throws Exception {
runTest("compiler/testData/foreignAnnotations/tests/android_support.kt");

2
core/descriptors.jvm/src/org/jetbrains/kotlin/load/java/JvmAnnotationNames.kt
View File

@@ -22,6 +22,7 @@ val NULLABLE_ANNOTATIONS = listOf(
JvmAnnotationNames.JETBRAINS_NULLABLE_ANNOTATION,
FqName("androidx.annotation.Nullable"),
FqName("android.support.annotation.Nullable"),
FqName("android.annotation.Nullable"),
FqName("com.android.annotations.Nullable"),
FqName("org.eclipse.jdt.annotation.Nullable"),
FqName("org.checkerframework.checker.nullness.qual.Nullable"),
@@ -41,6 +42,7 @@ val NOT_NULL_ANNOTATIONS = listOf(
FqName("edu.umd.cs.findbugs.annotations.NonNull"),
FqName("androidx.annotation.NonNull"),
FqName("android.support.annotation.NonNull"),
FqName("android.annotation.NonNull"),
FqName("com.android.annotations.NonNull"),
FqName("org.eclipse.jdt.annotation.NonNull"),
FqName("org.checkerframework.checker.nullness.qual.NonNull"),

34
third-party/annotations/android/annotation/NonNull.java vendored Normal file
View File

@@ -0,0 +1,34 @@
/*
* Copyright (C) 2013 The Android Open Source Project
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package android.annotation;
import java.lang.annotation.Retention;
import java.lang.annotation.Target;
import static java.lang.annotation.ElementType.FIELD;
import static java.lang.annotation.ElementType.METHOD;
import static java.lang.annotation.ElementType.PARAMETER;
import static java.lang.annotation.RetentionPolicy.CLASS;
/**
* Denotes that a parameter, field or method return value can never be null.
* <p>
* This is a marker annotation and it has no specific attributes.
*/
@Retention(CLASS)
@Target({METHOD, PARAMETER, FIELD})
public @interface NonNull {
}

41
third-party/annotations/android/annotation/Nullable.java vendored Normal file
View File

@@ -0,0 +1,41 @@
/*
* Copyright (C) 2013 The Android Open Source Project
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package android.annotation;
import java.lang.annotation.Retention;
import java.lang.annotation.Target;
import static java.lang.annotation.ElementType.FIELD;
import static java.lang.annotation.ElementType.METHOD;
import static java.lang.annotation.ElementType.PARAMETER;
import static java.lang.annotation.RetentionPolicy.CLASS;
/**
* Denotes that a parameter, field or method return value can be null.
* <p>
* When decorating a method call parameter, this denotes that the parameter can
* legitimately be null and the method will gracefully deal with it. Typically
* used on optional parameters.
* <p>
* When decorating a method, this denotes the method might legitimately return
* null.
* <p>
* This is a marker annotation and it has no specific attributes.
*/
@Retention(CLASS)
@Target({METHOD, PARAMETER, FIELD})
public @interface Nullable {
}