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

AA FIR: use fully expanded type when computing optimal type mapping mode

Browse Source 
^KT-61460 Fixed
This commit is contained in:
Jinseong Jeon
2023-08-25 11:47:04 -07:00
committed by teamcity
parent 1868b29cc9
commit 4cdc22c9cc
3 changed files with 24 additions and 4 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/KtFirPsiTypeProvider.kt
+8 -4
View File
@@ -82,10 +82,14 @@ internal class KtFirPsiTypeProvider(
KtTypeMappingMode.SUPER_TYPE -> TypeMappingMode.SUPER_TYPE KtTypeMappingMode.SUPER_TYPE -> TypeMappingMode.SUPER_TYPE
KtTypeMappingMode.SUPER_TYPE_KOTLIN_COLLECTIONS_AS_IS -> TypeMappingMode.SUPER_TYPE_KOTLIN_COLLECTIONS_AS_IS KtTypeMappingMode.SUPER_TYPE_KOTLIN_COLLECTIONS_AS_IS -> TypeMappingMode.SUPER_TYPE_KOTLIN_COLLECTIONS_AS_IS
KtTypeMappingMode.RETURN_TYPE_BOXED -> TypeMappingMode.RETURN_TYPE_BOXED KtTypeMappingMode.RETURN_TYPE_BOXED -> TypeMappingMode.RETURN_TYPE_BOXED
KtTypeMappingMode.RETURN_TYPE -> KtTypeMappingMode.RETURN_TYPE -> {
rootModuleSession.jvmTypeMapper.typeContext.getOptimalModeForReturnType(type.coneType, isAnnotationMethod) val expandedType = type.coneType.fullyExpandedType(rootModuleSession)
KtTypeMappingMode.VALUE_PARAMETER -> rootModuleSession.jvmTypeMapper.typeContext.getOptimalModeForReturnType(expandedType, isAnnotationMethod)
rootModuleSession.jvmTypeMapper.typeContext.getOptimalModeForValueParameter(type.coneType) }
KtTypeMappingMode.VALUE_PARAMETER -> {
val expandedType = type.coneType.fullyExpandedType(rootModuleSession)
rootModuleSession.jvmTypeMapper.typeContext.getOptimalModeForValueParameter(expandedType)
}
} }
} }
} }
compiler/testData/asJava/lightClasses/lightClassByPsi/typealiasInTypeArguments.java
Vendored
+10
View File
@@ -4,6 +4,16 @@ public abstract interface A /* A*/ {
public abstract interface B /* B*/<T, R> { public abstract interface B /* B*/<T, R> {
} }
public final class Foo /* Foo*/ {
@org.jetbrains.annotations.Nullable()
private final kotlin.jvm.functions.Function0<java.lang.Boolean> p;
@org.jetbrains.annotations.Nullable()
public final kotlin.jvm.functions.Function0<java.lang.Boolean> getP();// getP()
public Foo(@org.jetbrains.annotations.Nullable() kotlin.jvm.functions.Function0<java.lang.Boolean>);// .ctor(kotlin.jvm.functions.Function0<java.lang.Boolean>)
}
public abstract interface Test /* Test*/ { public abstract interface Test /* Test*/ {
@org.jetbrains.annotations.NotNull() @org.jetbrains.annotations.NotNull()
public abstract A foo();// foo() public abstract A foo();// foo()
compiler/testData/asJava/lightClasses/lightClassByPsi/typealiasInTypeArguments.kt
Vendored
+6
View File
@@ -6,6 +6,8 @@ typealias OtherA = A
typealias OtherOtherA = OtherA typealias OtherOtherA = OtherA
typealias OtherB<X, Y> = B<Y, X> typealias OtherB<X, Y> = B<Y, X>
typealias TA = () -> Boolean
interface Test { interface Test {
fun foo(): A fun foo(): A
fun fooAliased(): OtherA fun fooAliased(): OtherA
@@ -13,3 +15,7 @@ interface Test {
fun bar(): B<A, B<A, String>> fun bar(): B<A, B<A, String>>
fun barAliased(): OtherB<OtherB<String, OtherA>, OtherOtherA> fun barAliased(): OtherB<OtherB<String, OtherA>, OtherOtherA>
} }
class Foo(
val p: TA?,
)