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

New J2K: correctly remove redundant property type in a case of nullable initializer

Browse Source
This commit is contained in:
Ilya Kirillov
2019-05-20 01:15:28 +03:00
parent 8f5c690cdd
commit 54432448e3
1 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
nj2k/nj2k-services/src/org/jetbrains/kotlin/nj2k/NewJ2kPostProcessings.kt
+4 -6
View File
@@ -499,13 +499,11 @@ object NewJ2KPostProcessingRegistrar {
if (needLocalVariablesTypes && element.isLocal) return false if (needLocalVariablesTypes && element.isLocal) return false
if (needFieldTypes && element.isMember) return false if (needFieldTypes && element.isMember) return false
val initializer = element.initializer ?: return false val initializer = element.initializer ?: return false
val withoutExpectedType = initializer.analyzeInContext(initializer.getResolutionScope()) val withoutExpectedType =
initializer.analyzeInContext(initializer.getResolutionScope()).getType(initializer) ?: return false
val descriptor = element.resolveToDescriptorIfAny() as? CallableDescriptor ?: return false val descriptor = element.resolveToDescriptorIfAny() as? CallableDescriptor ?: return false
return when (withoutExpectedType.getType(initializer)) { return if (element.isVar) withoutExpectedType == descriptor.returnType
descriptor.returnType -> true else withoutExpectedType.makeNotNullable() == descriptor.returnType?.makeNotNullable()
descriptor.returnType?.makeNotNullable() -> !element.isVar
else -> false
}
} }
if (!check(element)) { if (!check(element)) {