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

Add quick fix for PROPERTY_TYPE_MISMATCH_ON_OVERRIDE on constructor parameter

Browse Source 
#KT-29934 Fixed
This commit is contained in:
Toshiaki Kameyama
2019-12-20 17:29:58 +09:00
committed by Vladimir Dolzhenko
parent e2a7170b2f
commit 1b0fac4a67
6 changed files with 67 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/src/org/jetbrains/kotlin/idea/quickfix/ChangeVariableTypeFix.kt
+33 -34
View File
@@ -39,7 +39,7 @@ import org.jetbrains.kotlin.types.KotlinType
import org.jetbrains.kotlin.types.checker.KotlinTypeChecker import org.jetbrains.kotlin.types.checker.KotlinTypeChecker
import java.util.* import java.util.*
open class ChangeVariableTypeFix(element: KtVariableDeclaration, type: KotlinType) : KotlinQuickFixAction<KtVariableDeclaration>(element) { open class ChangeVariableTypeFix(element: KtCallableDeclaration, type: KotlinType) : KotlinQuickFixAction<KtCallableDeclaration>(element) {
private val typeContainsError = ErrorUtils.containsErrorType(type) private val typeContainsError = ErrorUtils.containsErrorType(type)
private val typePresentation = IdeDescriptorRenderers.SOURCE_CODE_TYPES_WITH_SHORT_NAMES.renderType(type) private val typePresentation = IdeDescriptorRenderers.SOURCE_CODE_TYPES_WITH_SHORT_NAMES.renderType(type)
private val typeSourceCode = IdeDescriptorRenderers.SOURCE_CODE_TYPES.renderType(type) private val typeSourceCode = IdeDescriptorRenderers.SOURCE_CODE_TYPES.renderType(type)
@@ -67,7 +67,7 @@ open class ChangeVariableTypeFix(element: KtVariableDeclaration, type: KotlinTyp
} }
} }
class OnType(element: KtVariableDeclaration, type: KotlinType) : ChangeVariableTypeFix(element, type), HighPriorityAction { class OnType(element: KtCallableDeclaration, type: KotlinType) : ChangeVariableTypeFix(element, type), HighPriorityAction {
override fun variablePresentation() = null override fun variablePresentation() = null
} }
@@ -122,45 +122,44 @@ open class ChangeVariableTypeFix(element: KtVariableDeclaration, type: KotlinTyp
override fun doCreateActions(diagnostic: Diagnostic): List<IntentionAction> { override fun doCreateActions(diagnostic: Diagnostic): List<IntentionAction> {
val actions = LinkedList<IntentionAction>() val actions = LinkedList<IntentionAction>()
if (diagnostic.psiElement is KtProperty) { val element = diagnostic.psiElement as? KtCallableDeclaration
val property = diagnostic.psiElement as KtProperty if (element !is KtProperty && element !is KtParameter) return actions
val descriptor = property.resolveToDescriptorIfAny(BodyResolveMode.FULL) as? PropertyDescriptor ?: return actions val descriptor = element.resolveToDescriptorIfAny(BodyResolveMode.FULL) as? PropertyDescriptor ?: return actions
var lowerBoundOfOverriddenPropertiesTypes = QuickFixUtil.findLowerBoundOfOverriddenCallablesReturnTypes(descriptor) var lowerBoundOfOverriddenPropertiesTypes = QuickFixUtil.findLowerBoundOfOverriddenCallablesReturnTypes(descriptor)
val propertyType = descriptor.returnType ?: error("Property type cannot be null if it mismatches something") val propertyType = descriptor.returnType ?: error("Property type cannot be null if it mismatches something")
val overriddenMismatchingProperties = LinkedList<PropertyDescriptor>() val overriddenMismatchingProperties = LinkedList<PropertyDescriptor>()
var canChangeOverriddenPropertyType = true var canChangeOverriddenPropertyType = true
for (overriddenProperty in descriptor.overriddenDescriptors) { for (overriddenProperty in descriptor.overriddenDescriptors) {
val overriddenPropertyType = overriddenProperty.returnType val overriddenPropertyType = overriddenProperty.returnType
if (overriddenPropertyType != null) { if (overriddenPropertyType != null) {
if (!KotlinTypeChecker.DEFAULT.isSubtypeOf(propertyType, overriddenPropertyType)) { if (!KotlinTypeChecker.DEFAULT.isSubtypeOf(propertyType, overriddenPropertyType)) {
overriddenMismatchingProperties.add(overriddenProperty) overriddenMismatchingProperties.add(overriddenProperty)
} else if (overriddenProperty.isVar && !KotlinTypeChecker.DEFAULT.equalTypes( } else if (overriddenProperty.isVar && !KotlinTypeChecker.DEFAULT.equalTypes(
overriddenPropertyType, overriddenPropertyType,
propertyType propertyType
) )
) { ) {
canChangeOverriddenPropertyType = false canChangeOverriddenPropertyType = false
} }
if (overriddenProperty.isVar && lowerBoundOfOverriddenPropertiesTypes != null && if (overriddenProperty.isVar && lowerBoundOfOverriddenPropertiesTypes != null &&
!KotlinTypeChecker.DEFAULT.equalTypes(lowerBoundOfOverriddenPropertiesTypes, overriddenPropertyType) !KotlinTypeChecker.DEFAULT.equalTypes(lowerBoundOfOverriddenPropertiesTypes, overriddenPropertyType)
) { ) {
lowerBoundOfOverriddenPropertiesTypes = null lowerBoundOfOverriddenPropertiesTypes = null
}
} }
} }
}
if (lowerBoundOfOverriddenPropertiesTypes != null) { if (lowerBoundOfOverriddenPropertiesTypes != null) {
actions.add(OnType(property, lowerBoundOfOverriddenPropertiesTypes)) actions.add(OnType(element, lowerBoundOfOverriddenPropertiesTypes))
} }
if (overriddenMismatchingProperties.size == 1 && canChangeOverriddenPropertyType) { if (overriddenMismatchingProperties.size == 1 && canChangeOverriddenPropertyType) {
val overriddenProperty = DescriptorToSourceUtils.descriptorToDeclaration(overriddenMismatchingProperties.single()) val overriddenProperty = DescriptorToSourceUtils.descriptorToDeclaration(overriddenMismatchingProperties.single())
if (overriddenProperty is KtProperty) { if (overriddenProperty is KtProperty) {
actions.add(ForOverridden(overriddenProperty, propertyType)) actions.add(ForOverridden(overriddenProperty, propertyType))
}
} }
} }
idea/testData/quickfix/override/typeMismatchOnOverride/changeOverriddenPropertyTypeFromCtorParameter.kt
Vendored
+6
View File
@@ -0,0 +1,6 @@
// "Change type of base property 'A.x' to 'Any'" "true"
interface A {
val x: CharSequence
}
class B(override val x: Any<caret>) : A
idea/testData/quickfix/override/typeMismatchOnOverride/changeOverriddenPropertyTypeFromCtorParameter.kt.after
Vendored
+6
View File
@@ -0,0 +1,6 @@
// "Change type of base property 'A.x' to 'Any'" "true"
interface A {
val x: Any
}
class B(override val x: Any) : A
idea/testData/quickfix/override/typeMismatchOnOverride/changeOverridingCtorParameterType.kt
Vendored
+6
View File
@@ -0,0 +1,6 @@
// "Change type to 'CharSequence'" "true"
interface A {
val x: CharSequence
}
class B(override val x: Any<caret>) : A
idea/testData/quickfix/override/typeMismatchOnOverride/changeOverridingCtorParameterType.kt.after
Vendored
+6
View File
@@ -0,0 +1,6 @@
// "Change type to 'CharSequence'" "true"
interface A {
val x: CharSequence
}
class B(override val x: CharSequence) : A
idea/tests/org/jetbrains/kotlin/idea/quickfix/QuickFixTestGenerated.java
Generated
+10
View File
@@ -10085,6 +10085,16 @@ public class QuickFixTestGenerated extends AbstractQuickFixTest {
runTest("idea/testData/quickfix/override/typeMismatchOnOverride/changeOverriddenPropertyType2.kt"); runTest("idea/testData/quickfix/override/typeMismatchOnOverride/changeOverriddenPropertyType2.kt");
} }
@TestMetadata("changeOverriddenPropertyTypeFromCtorParameter.kt")
public void testChangeOverriddenPropertyTypeFromCtorParameter() throws Exception {
runTest("idea/testData/quickfix/override/typeMismatchOnOverride/changeOverriddenPropertyTypeFromCtorParameter.kt");
}
@TestMetadata("changeOverridingCtorParameterType.kt")
public void testChangeOverridingCtorParameterType() throws Exception {
runTest("idea/testData/quickfix/override/typeMismatchOnOverride/changeOverridingCtorParameterType.kt");
}
@TestMetadata("changeOverridingPropertyTypeToFunctionType.kt") @TestMetadata("changeOverridingPropertyTypeToFunctionType.kt")
public void testChangeOverridingPropertyTypeToFunctionType() throws Exception { public void testChangeOverridingPropertyTypeToFunctionType() throws Exception {
runTest("idea/testData/quickfix/override/typeMismatchOnOverride/changeOverridingPropertyTypeToFunctionType.kt"); runTest("idea/testData/quickfix/override/typeMismatchOnOverride/changeOverridingPropertyTypeToFunctionType.kt");