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

New J2K: Take parameter in data class iff constructor parameter type is subtype of property type in data class conversion

Browse Source
This commit is contained in:
Ilya Kirillov
2019-01-11 15:47:13 +03:00
committed by Ilya Kirillov
parent fc504c6fdc
commit 53fcf31f23
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/src/org/jetbrains/kotlin/idea/j2k/postProcessing/ConvertDataClass.kt
+4 -2
View File
@@ -18,6 +18,7 @@ import org.jetbrains.kotlin.psi.addRemoveModifier.setModifierList
import org.jetbrains.kotlin.psi.psiUtil.asAssignment import org.jetbrains.kotlin.psi.psiUtil.asAssignment
import org.jetbrains.kotlin.psi.psiUtil.containingClass import org.jetbrains.kotlin.psi.psiUtil.containingClass
import org.jetbrains.kotlin.resolve.diagnostics.Diagnostics import org.jetbrains.kotlin.resolve.diagnostics.Diagnostics
import org.jetbrains.kotlin.types.typeUtil.isSubtypeOf
class ConvertDataClass : J2kPostProcessing { class ConvertDataClass : J2kPostProcessing {
override val writeActionNeeded: Boolean = true override val writeActionNeeded: Boolean = true
@@ -55,8 +56,9 @@ class ConvertDataClass : J2kPostProcessing {
?.takeIf { ?.takeIf {
it.containingClass() == klass && !it.hasValOrVar() it.containingClass() == klass && !it.hasValOrVar()
} ?: return@mapNotNull null } ?: return@mapNotNull null
val constructorParameterType = constructorParameter.type() ?: return@mapNotNull null
if (constructorParameter.type() != property.type()) return@mapNotNull null val propertyType = property.type() ?: return@mapNotNull null
if (!constructorParameterType.isSubtypeOf(propertyType)) return@mapNotNull null
DataClassInfo(constructorParameter, property, statement) DataClassInfo(constructorParameter, property, statement)
}.toList() }.toList()