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

[AA] include inferred types in functional exp expected type

Browse Source 
Fixed for K2 only, k1 remains as is

^KT-62466 fixed
This commit is contained in:
Anna Kozlova
2023-10-10 11:25:47 +02:00
committed by Space Team
parent c32e7c723d
commit 1f4d985b7b
8 changed files with 57 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/components/KtFirExpressionTypeProvider.kt
+4 -1
View File
@@ -223,7 +223,10 @@ internal class KtFirExpressionTypeProvider(
val callee = (firCall.calleeReference as? FirResolvedNamedReference)?.resolvedSymbol
if (callee?.fir?.origin == FirDeclarationOrigin.SamConstructor) {
return (callee.fir as FirSimpleFunction).returnTypeRef.coneType.asKtType()
val substitutor = (firCall as? FirQualifiedAccessExpression)
?.createConeSubstitutorFromTypeArguments(discardErrorTypes = true)
?: ConeSubstitutor.Empty
return substitutor.substituteOrSelf((callee.fir as FirSimpleFunction).returnTypeRef.coneType).asKtType()
}
val argumentsToParameters = firCall.argumentsToSubstitutedValueParameters(substituteWithErrorTypes = false) ?: return null
analysis/analysis-api-fir/tests-gen/org/jetbrains/kotlin/analysis/api/fir/test/cases/generated/cases/components/expressionTypeProvider/FirIdeDependentAnalysisSourceModuleExpectedExpressionTypeTestGenerated.java
Generated
+6
View File
@@ -184,6 +184,12 @@ public class FirIdeDependentAnalysisSourceModuleExpectedExpressionTypeTestGenera
runTest("analysis/analysis-api/testData/components/expressionTypeProvider/expectedExpressionType/functionPositionalParamQualified.kt");
}
@Test
@TestMetadata("functionalTypeSubstitution.kt")
public void testFunctionalTypeSubstitution() throws Exception {
runTest("analysis/analysis-api/testData/components/expressionTypeProvider/expectedExpressionType/functionalTypeSubstitution.kt");
}
@Test
@TestMetadata("ifCondition.kt")
public void testIfCondition() throws Exception {
analysis/analysis-api-fir/tests-gen/org/jetbrains/kotlin/analysis/api/fir/test/cases/generated/cases/components/expressionTypeProvider/FirIdeNormalAnalysisSourceModuleExpectedExpressionTypeTestGenerated.java
Generated
+6
View File
@@ -184,6 +184,12 @@ public class FirIdeNormalAnalysisSourceModuleExpectedExpressionTypeTestGenerated
runTest("analysis/analysis-api/testData/components/expressionTypeProvider/expectedExpressionType/functionPositionalParamQualified.kt");
}
@Test
@TestMetadata("functionalTypeSubstitution.kt")
public void testFunctionalTypeSubstitution() throws Exception {
runTest("analysis/analysis-api/testData/components/expressionTypeProvider/expectedExpressionType/functionalTypeSubstitution.kt");
}
@Test
@TestMetadata("ifCondition.kt")
public void testIfCondition() throws Exception {