jlengrand/kotlin
1
0
Fork 0
mirror of https://github.com/jlengrand/kotlin.git synced 2026-04-18 08:31:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

FoldInitializerAndIfToElvisInspection: don't add explicit type if var is used as non-nullable

Browse Source 
#KT-38349 Fixed
This commit is contained in:
Toshiaki Kameyama
2020-06-01 08:44:57 +09:00
committed by Yan Zhulanow
parent 3e632d074e
commit bb7d4c224f
5 changed files with 26 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
idea/src/org/jetbrains/kotlin/idea/inspections/FoldInitializerAndIfToElvisInspection.kt
View File

@@ -84,7 +84,20 @@ class FoldInitializerAndIfToElvisInspection : AbstractApplicabilityBasedInspecti
val explicitTypeToSet = when {
// for var with no explicit type, add it so that the actual change won't change
declaration.isVar && declaration.typeReference == null -> initializer.analyze(BodyResolveMode.PARTIAL).getType(initializer)
declaration.isVar && declaration.typeReference == null -> {
if (element.condition is KtBinaryExpression) {
val ifEndOffset = element.endOffset
val context = element.analyze()
val isUsedAsNotNullable = ReferencesSearch.search(declaration, LocalSearchScope(declaration.parent)).any {
if (it.element.startOffset <= ifEndOffset) return@any false
val type = it.element.safeAs<KtExpression>()?.getType(context) ?: return@any false
!type.isNullable()
}
if (isUsedAsNotNullable) null else context.getType(initializer)
} else {
initializer.analyze(BodyResolveMode.PARTIAL).getType(initializer)
}
}
// for val with explicit type, change it to non-nullable
!declaration.isVar && declaration.typeReference != null -> initializer.analyze(BodyResolveMode.PARTIAL).getType(initializer)
@@ -153,15 +166,6 @@ class FoldInitializerAndIfToElvisInspection : AbstractApplicabilityBasedInspecti
val checkedType = ifExpression.analyze(BodyResolveMode.PARTIAL)[BindingContext.TYPE, typeReference]
val variableType = (prevStatement.resolveToDescriptorIfAny() as? VariableDescriptor)?.type
if (checkedType != null && variableType != null && !checkedType.isSubtypeOf(variableType)) return null
} else if (prevStatement.isVar && operationExpression is KtBinaryExpression) {
val ifEndOffset = ifExpression.endOffset
val context = ifExpression.analyze()
val isUsedAsNotNullable = ReferencesSearch.search(prevStatement, LocalSearchScope(prevStatement.parent)).any {
if (it.element.startOffset <= ifEndOffset) return@any false
val type = it.element.safeAs<KtExpression>()?.getType(context) ?: return@any false
!type.isNullable()
}
if (isUsedAsNotNullable) return null
}
val statement = if (then is KtBlockExpression) then.statements.singleOrNull() else then

1
idea/testData/inspectionsLocal/foldInitializerAndIfToElvis/VarUsedAsNotNullable.kt vendored
View File

@@ -1,4 +1,3 @@
// PROBLEM: none
fun test(foo: Int?, bar: Int): Int {
var i = foo
<caret>if (i == null) {

4
idea/testData/inspectionsLocal/foldInitializerAndIfToElvis/VarUsedAsNotNullable.kt.after vendored Normal file
View File

@@ -0,0 +1,4 @@
fun test(foo: Int?, bar: Int): Int {
var i = foo ?: return bar
return i
}

1
idea/testData/inspectionsLocal/foldInitializerAndIfToElvis/VarUsedAsNotNullable2.kt vendored
View File

@@ -1,4 +1,3 @@
// PROBLEM: none
fun test(foo: Int?, bar: Int): Int {
var i = foo
<caret>if (i == null) {

8
idea/testData/inspectionsLocal/foldInitializerAndIfToElvis/VarUsedAsNotNullable2.kt.after vendored Normal file
View File

@@ -0,0 +1,8 @@
fun test(foo: Int?, bar: Int): Int {
var i = foo ?: return bar
baz(i)
val j = i + 1
return j
}
fun baz(i: Int?) {}