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

Reformat: context (Java resolve)

Browse Source
This commit is contained in:
Mikhail Glukhikh
2019-02-19 12:36:42 +03:00
parent 6740cdabac
commit 8ac34e1a0f
1 changed files with 74 additions and 78 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/descriptors.jvm/src/org/jetbrains/kotlin/load/java/lazy/context.kt
+6 -10
View File
@@ -95,12 +95,8 @@ interface JavaResolverSettings {
private typealias QualifierByApplicabilityType = EnumMap<AnnotationTypeQualifierResolver.QualifierApplicabilityType, NullabilityQualifierWithMigrationStatus?> private typealias QualifierByApplicabilityType = EnumMap<AnnotationTypeQualifierResolver.QualifierApplicabilityType, NullabilityQualifierWithMigrationStatus?>
class JavaTypeQualifiersByElementType( class JavaTypeQualifiersByElementType(internal val nullabilityQualifiers: QualifierByApplicabilityType) {
internal val nullabilityQualifiers: QualifierByApplicabilityType operator fun get(applicabilityType: AnnotationTypeQualifierResolver.QualifierApplicabilityType?): JavaTypeQualifiers? {
) {
operator fun get(
applicabilityType: AnnotationTypeQualifierResolver.QualifierApplicabilityType?
): JavaTypeQualifiers? {
val nullabilityQualifierWithMigrationStatus = nullabilityQualifiers[applicabilityType] ?: return null val nullabilityQualifierWithMigrationStatus = nullabilityQualifiers[applicabilityType] ?: return null
return JavaTypeQualifiers( return JavaTypeQualifiers(
@@ -226,10 +222,10 @@ fun LazyJavaResolverContext.childForClassOrPackage(
fun LazyJavaResolverContext.copyWithNewDefaultTypeQualifiers( fun LazyJavaResolverContext.copyWithNewDefaultTypeQualifiers(
additionalAnnotations: Annotations additionalAnnotations: Annotations
) = if (additionalAnnotations.isEmpty()) ) = when {
this additionalAnnotations.isEmpty() -> this
else else -> LazyJavaResolverContext(
LazyJavaResolverContext(
components, typeParameterResolver, components, typeParameterResolver,
lazy(LazyThreadSafetyMode.NONE) { computeNewDefaultTypeQualifiers(additionalAnnotations) } lazy(LazyThreadSafetyMode.NONE) { computeNewDefaultTypeQualifiers(additionalAnnotations) }
) )
}