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

New J2K: Do not remove redundant nullability in post precessing for variable if initializer is nullable

Browse Source
This commit is contained in:
Ilya Kirillov
2018-12-24 12:12:43 +03:00
committed by Ilya Kirillov
parent bbbadb0431
commit 841cd9c749
1 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/src/org/jetbrains/kotlin/idea/j2k/NewJ2kPostProcessings.kt
+4
View File
@@ -406,6 +406,10 @@ object NewJ2KPostProcessingRegistrarImpl : J2KPostProcessingRegistrar {
if (!element.isLocal) return false if (!element.isLocal) return false
val typeReference = element.typeReference val typeReference = element.typeReference
if (typeReference == null || typeReference.typeElement !is KtNullableType) return false if (typeReference == null || typeReference.typeElement !is KtNullableType) return false
val initializerType = element.initializer?.let {
it.analyzeInContext(element.getResolutionScope()).getType(it)
}
if (initializerType?.isNullable() == true) return false
return ReferencesSearch.search(element, element.useScope).findAll().mapNotNull { ref -> return ReferencesSearch.search(element, element.useScope).findAll().mapNotNull { ref ->
val parent = (ref.element.parent as? KtExpression)?.asAssignment() val parent = (ref.element.parent as? KtExpression)?.asAssignment()