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

Fix for EA-81477 : correct handling of a property without initializer (but with e.g. getter)

Browse Source 
(cherry picked from commit 4e2d35a)
This commit is contained in:
Mikhail Glukhikh
2016-06-17 14:25:12 +03:00
committed by Mikhail Glukhikh
parent 5b328e9042
commit b44c94a887
4 changed files with 17 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/src/org/jetbrains/kotlin/idea/quickfix/ChangeFunctionLiteralReturnTypeFix.kt
+3 -1
View File
@@ -64,7 +64,9 @@ class ChangeFunctionLiteralReturnTypeFix(
val eventualFunctionLiteralType = TypeUtils.substituteParameters(functionClass, functionClassTypeParameters)
val correspondingProperty = PsiTreeUtil.getParentOfType(functionLiteralExpression, KtProperty::class.java)
if (correspondingProperty != null && QuickFixUtil.canEvaluateTo(correspondingProperty.initializer!!, functionLiteralExpression)) {
if (correspondingProperty != null &&
correspondingProperty.initializer?.let { QuickFixUtil.canEvaluateTo(it, functionLiteralExpression) } ?: true
) {
val correspondingPropertyTypeRef = correspondingProperty.typeReference
val propertyType = context.get(BindingContext.TYPE, correspondingPropertyTypeRef)
return if (propertyType != null && !KotlinTypeChecker.DEFAULT.isSubtypeOf(eventualFunctionLiteralType, propertyType))
idea/testData/quickfix/typeMismatch/typeMismatchOnReturnedExpression/literalPropertyWithGetter.kt
Vendored
+4
View File
@@ -0,0 +1,4 @@
// "Change 'complex' type to '(Int) -> Long'" "true"
val complex: (Int) -> String
get() = { it.toLong()<caret> }
idea/testData/quickfix/typeMismatch/typeMismatchOnReturnedExpression/literalPropertyWithGetter.kt.after
Vendored
+4
View File
@@ -0,0 +1,4 @@
// "Change 'complex' type to '(Int) -> Long'" "true"
val complex: (Int) -> Long
get() = { it.toLong() }
idea/tests/org/jetbrains/kotlin/idea/quickfix/QuickFixTestGenerated.java
+6
View File
@@ -8370,6 +8370,12 @@ public class QuickFixTestGenerated extends AbstractQuickFixTest {
doTest(fileName);
}
@TestMetadata("literalPropertyWithGetter.kt")
public void testLiteralPropertyWithGetter() throws Exception {
String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/typeMismatch/typeMismatchOnReturnedExpression/literalPropertyWithGetter.kt");
doTest(fileName);
}
@TestMetadata("multiFakeOverride.kt")
public void testMultiFakeOverride() throws Exception {
String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/typeMismatch/typeMismatchOnReturnedExpression/multiFakeOverride.kt");