diff --git a/core/descriptors.jvm/src/org/jetbrains/kotlin/load/java/JvmAnnotationNames.kt b/core/descriptors.jvm/src/org/jetbrains/kotlin/load/java/JvmAnnotationNames.kt index c644a8989b5..f237a3b5ec5 100644 --- a/core/descriptors.jvm/src/org/jetbrains/kotlin/load/java/JvmAnnotationNames.kt +++ b/core/descriptors.jvm/src/org/jetbrains/kotlin/load/java/JvmAnnotationNames.kt @@ -19,33 +19,33 @@ package org.jetbrains.kotlin.load.java import org.jetbrains.kotlin.name.FqName val NULLABLE_ANNOTATIONS = listOf( - JvmAnnotationNames.JETBRAINS_NULLABLE_ANNOTATION, - FqName("androidx.annotation.Nullable"), - FqName("android.support.annotation.Nullable"), - FqName("com.android.annotations.Nullable"), - FqName("org.eclipse.jdt.annotation.Nullable"), - FqName("org.checkerframework.checker.nullness.qual.Nullable"), - FqName("javax.annotation.Nullable"), - FqName("javax.annotation.CheckForNull"), - FqName("edu.umd.cs.findbugs.annotations.CheckForNull"), - FqName("edu.umd.cs.findbugs.annotations.Nullable"), - FqName("edu.umd.cs.findbugs.annotations.PossiblyNull"), - FqName("io.reactivex.annotations.Nullable") + JvmAnnotationNames.JETBRAINS_NULLABLE_ANNOTATION, + FqName("androidx.annotation.Nullable"), + FqName("android.support.annotation.Nullable"), + FqName("com.android.annotations.Nullable"), + FqName("org.eclipse.jdt.annotation.Nullable"), + FqName("org.checkerframework.checker.nullness.qual.Nullable"), + FqName("javax.annotation.Nullable"), + FqName("javax.annotation.CheckForNull"), + FqName("edu.umd.cs.findbugs.annotations.CheckForNull"), + FqName("edu.umd.cs.findbugs.annotations.Nullable"), + FqName("edu.umd.cs.findbugs.annotations.PossiblyNull"), + FqName("io.reactivex.annotations.Nullable") ) val JAVAX_NONNULL_ANNOTATION = FqName("javax.annotation.Nonnull") val JAVAX_CHECKFORNULL_ANNOTATION = FqName("javax.annotation.CheckForNull") val NOT_NULL_ANNOTATIONS = listOf( - JvmAnnotationNames.JETBRAINS_NOT_NULL_ANNOTATION, - FqName("edu.umd.cs.findbugs.annotations.NonNull"), - FqName("androidx.annotation.NonNull"), - FqName("android.support.annotation.NonNull"), - FqName("com.android.annotations.NonNull"), - FqName("org.eclipse.jdt.annotation.NonNull"), - FqName("org.checkerframework.checker.nullness.qual.NonNull"), - FqName("lombok.NonNull"), - FqName("io.reactivex.annotations.NonNull") + JvmAnnotationNames.JETBRAINS_NOT_NULL_ANNOTATION, + FqName("edu.umd.cs.findbugs.annotations.NonNull"), + FqName("androidx.annotation.NonNull"), + FqName("android.support.annotation.NonNull"), + FqName("com.android.annotations.NonNull"), + FqName("org.eclipse.jdt.annotation.NonNull"), + FqName("org.checkerframework.checker.nullness.qual.NonNull"), + FqName("lombok.NonNull"), + FqName("io.reactivex.annotations.NonNull") ) val NULLABILITY_ANNOTATIONS = NULLABLE_ANNOTATIONS + JAVAX_NONNULL_ANNOTATION + NOT_NULL_ANNOTATIONS @@ -54,11 +54,11 @@ val COMPATQUAL_NULLABLE_ANNOTATION = FqName("org.checkerframework.checker.nullne val COMPATQUAL_NONNULL_ANNOTATION = FqName("org.checkerframework.checker.nullness.compatqual.NonNullDecl") val READ_ONLY_ANNOTATIONS = listOf( - JvmAnnotationNames.JETBRAINS_READONLY_ANNOTATION, - JvmAnnotationNames.READONLY_ANNOTATION + JvmAnnotationNames.JETBRAINS_READONLY_ANNOTATION, + JvmAnnotationNames.READONLY_ANNOTATION ) val MUTABLE_ANNOTATIONS = listOf( - JvmAnnotationNames.JETBRAINS_MUTABLE_ANNOTATION, - JvmAnnotationNames.MUTABLE_ANNOTATION + JvmAnnotationNames.JETBRAINS_MUTABLE_ANNOTATION, + JvmAnnotationNames.MUTABLE_ANNOTATION ) diff --git a/core/descriptors.jvm/src/org/jetbrains/kotlin/load/java/typeEnhancement/signatureEnhancement.kt b/core/descriptors.jvm/src/org/jetbrains/kotlin/load/java/typeEnhancement/signatureEnhancement.kt index 745afe05123..c7200f7a715 100644 --- a/core/descriptors.jvm/src/org/jetbrains/kotlin/load/java/typeEnhancement/signatureEnhancement.kt +++ b/core/descriptors.jvm/src/org/jetbrains/kotlin/load/java/typeEnhancement/signatureEnhancement.kt @@ -168,9 +168,10 @@ class SignatureEnhancement( || returnTypeEnhancement.wereChanges || valueParameterEnhancements.any { it.wereChanges } ) { @Suppress("UNCHECKED_CAST") - return this.enhance(receiverTypeEnhancement?.type, - valueParameterEnhancements.map { ValueParameterData(it.type, it.hasDefaultValue) }, - returnTypeEnhancement.type + return this.enhance( + receiverTypeEnhancement?.type, + valueParameterEnhancements.map { ValueParameterData(it.type, it.hasDefaultValue) }, + returnTypeEnhancement.type ) as D }