azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Minor. Reformat signature enhancement parts

Browse Source
This commit is contained in:
Denis Zharkov
2018-05-14 12:17:10 +03:00
parent 6daabca90b
commit e0f09e5571
2 changed files with 29 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/descriptors.jvm/src/org/jetbrains/kotlin/load/java/JvmAnnotationNames.kt
+25 -25
View File
@@ -19,33 +19,33 @@ package org.jetbrains.kotlin.load.java
import org.jetbrains.kotlin.name.FqName import org.jetbrains.kotlin.name.FqName
val NULLABLE_ANNOTATIONS = listOf( val NULLABLE_ANNOTATIONS = listOf(
JvmAnnotationNames.JETBRAINS_NULLABLE_ANNOTATION, JvmAnnotationNames.JETBRAINS_NULLABLE_ANNOTATION,
FqName("androidx.annotation.Nullable"), FqName("androidx.annotation.Nullable"),
FqName("android.support.annotation.Nullable"), FqName("android.support.annotation.Nullable"),
FqName("com.android.annotations.Nullable"), FqName("com.android.annotations.Nullable"),
FqName("org.eclipse.jdt.annotation.Nullable"), FqName("org.eclipse.jdt.annotation.Nullable"),
FqName("org.checkerframework.checker.nullness.qual.Nullable"), FqName("org.checkerframework.checker.nullness.qual.Nullable"),
FqName("javax.annotation.Nullable"), FqName("javax.annotation.Nullable"),
FqName("javax.annotation.CheckForNull"), FqName("javax.annotation.CheckForNull"),
FqName("edu.umd.cs.findbugs.annotations.CheckForNull"), FqName("edu.umd.cs.findbugs.annotations.CheckForNull"),
FqName("edu.umd.cs.findbugs.annotations.Nullable"), FqName("edu.umd.cs.findbugs.annotations.Nullable"),
FqName("edu.umd.cs.findbugs.annotations.PossiblyNull"), FqName("edu.umd.cs.findbugs.annotations.PossiblyNull"),
FqName("io.reactivex.annotations.Nullable") FqName("io.reactivex.annotations.Nullable")
) )
val JAVAX_NONNULL_ANNOTATION = FqName("javax.annotation.Nonnull") val JAVAX_NONNULL_ANNOTATION = FqName("javax.annotation.Nonnull")
val JAVAX_CHECKFORNULL_ANNOTATION = FqName("javax.annotation.CheckForNull") val JAVAX_CHECKFORNULL_ANNOTATION = FqName("javax.annotation.CheckForNull")
val NOT_NULL_ANNOTATIONS = listOf( val NOT_NULL_ANNOTATIONS = listOf(
JvmAnnotationNames.JETBRAINS_NOT_NULL_ANNOTATION, JvmAnnotationNames.JETBRAINS_NOT_NULL_ANNOTATION,
FqName("edu.umd.cs.findbugs.annotations.NonNull"), FqName("edu.umd.cs.findbugs.annotations.NonNull"),
FqName("androidx.annotation.NonNull"), FqName("androidx.annotation.NonNull"),
FqName("android.support.annotation.NonNull"), FqName("android.support.annotation.NonNull"),
FqName("com.android.annotations.NonNull"), FqName("com.android.annotations.NonNull"),
FqName("org.eclipse.jdt.annotation.NonNull"), FqName("org.eclipse.jdt.annotation.NonNull"),
FqName("org.checkerframework.checker.nullness.qual.NonNull"), FqName("org.checkerframework.checker.nullness.qual.NonNull"),
FqName("lombok.NonNull"), FqName("lombok.NonNull"),
FqName("io.reactivex.annotations.NonNull") FqName("io.reactivex.annotations.NonNull")
) )
val NULLABILITY_ANNOTATIONS = NULLABLE_ANNOTATIONS + JAVAX_NONNULL_ANNOTATION + NOT_NULL_ANNOTATIONS 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 COMPATQUAL_NONNULL_ANNOTATION = FqName("org.checkerframework.checker.nullness.compatqual.NonNullDecl")
val READ_ONLY_ANNOTATIONS = listOf( val READ_ONLY_ANNOTATIONS = listOf(
JvmAnnotationNames.JETBRAINS_READONLY_ANNOTATION, JvmAnnotationNames.JETBRAINS_READONLY_ANNOTATION,
JvmAnnotationNames.READONLY_ANNOTATION JvmAnnotationNames.READONLY_ANNOTATION
) )
val MUTABLE_ANNOTATIONS = listOf( val MUTABLE_ANNOTATIONS = listOf(
JvmAnnotationNames.JETBRAINS_MUTABLE_ANNOTATION, JvmAnnotationNames.JETBRAINS_MUTABLE_ANNOTATION,
JvmAnnotationNames.MUTABLE_ANNOTATION JvmAnnotationNames.MUTABLE_ANNOTATION
) )
core/descriptors.jvm/src/org/jetbrains/kotlin/load/java/typeEnhancement/signatureEnhancement.kt
+4 -3
View File
@@ -168,9 +168,10 @@ class SignatureEnhancement(
|| returnTypeEnhancement.wereChanges || valueParameterEnhancements.any { it.wereChanges } || returnTypeEnhancement.wereChanges || valueParameterEnhancements.any { it.wereChanges }
) { ) {
@Suppress("UNCHECKED_CAST") @Suppress("UNCHECKED_CAST")
return this.enhance(receiverTypeEnhancement?.type, return this.enhance(
valueParameterEnhancements.map { ValueParameterData(it.type, it.hasDefaultValue) }, receiverTypeEnhancement?.type,
returnTypeEnhancement.type valueParameterEnhancements.map { ValueParameterData(it.type, it.hasDefaultValue) },
returnTypeEnhancement.type
) as D ) as D
} }