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

FIR: render resolved qualifier type arguments in dumps

Browse Source
This commit is contained in:
Mikhail Glukhikh
2024-01-15 22:35:23 +01:00
committed by Space Team
parent 0a21669fb9
commit caa850e470
13 changed files with 22 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/property/implicitTypeFromIncorrectAccessorsPropagationScript.lazyResolve.txt
Vendored
+1 -1
View File
@@ -437,7 +437,7 @@ FILE: [ResolvedTo(BODY_RESOLVE)] implicitTypeFromIncorrectAccessorsPropagationSc
}
[ResolvedTo(BODY_RESOLVE)] init {
@R|low/Anno|[Types](position = <strcat>(String(setter parameter type ), R|low/prop|)) Q|kotlin/collections/List|
@R|low/Anno|[Types](position = <strcat>(String(setter parameter type ), R|low/prop|)) Q|kotlin/collections/List|<R|@R|low/Anno|(position = <strcat>(String(setter nested parameter type ), R|low/prop|)) kotlin/collections/Collection<@R|low/Anno|(position = <strcat>(String(setter nested nested parameter type ), R|low/prop|)) kotlin/String>|>
}
public final [ResolvedTo(BODY_RESOLVE)] val $$result: <ERROR TYPE REF: Unresolved name: value> = <Unresolved name: value>#
analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/property/implicitTypeFromIncorrectAccessorsScript.lazyResolve.txt
Vendored
+1 -1
View File
@@ -398,7 +398,7 @@ FILE: [ResolvedTo(BODY_RESOLVE)] implicitTypeFromIncorrectAccessorsScript.kts
}
[ResolvedTo(BODY_RESOLVE)] init {
@R|low/Anno|[Types](position = <strcat>(String(setter parameter type ), R|low/prop|)) Q|kotlin/collections/List|
@R|low/Anno|[Types](position = <strcat>(String(setter parameter type ), R|low/prop|)) Q|kotlin/collections/List|<R|@R|low/Anno|(position = <strcat>(String(setter nested parameter type ), R|low/prop|)) kotlin/collections/Collection<@R|low/Anno|(position = <strcat>(String(setter nested nested parameter type ), R|low/prop|)) kotlin/String>|>
}
public final [ResolvedTo(BODY_RESOLVE)] val $$result: <ERROR TYPE REF: Unresolved name: value> = <Unresolved name: value>#
compiler/fir/analysis-tests/testData/resolve/diagnostics/annotationArgumentKClassLiteralTypeError.fir.txt
Vendored
+1 -1
View File
@@ -10,7 +10,7 @@ FILE: annotationArgumentKClassLiteralTypeError.kt
}
public final val <reified T> R|T|.test: R|kotlin/Any|
public inline get(): R|kotlin/Any| {
^ @R|Ann|(a = <implicitArrayOf>(<getClass>(R|T|), <getClass>(Q|kotlin/Array|))) object : R|kotlin/Any| {
^ @R|Ann|(a = <implicitArrayOf>(<getClass>(R|T|), <getClass>(Q|kotlin/Array|<R|kotlin/Array<kotlin/Array<kotlin/Array<T>>>|>))) object : R|kotlin/Any| {
private constructor(): R|<anonymous><T>| {
super<R|kotlin/Any|>()
}
compiler/fir/analysis-tests/testData/resolve/diagnostics/typeArgumentsNotAllowed.fir.txt
Vendored
+1 -1
View File
@@ -24,7 +24,7 @@ FILE: typeArgumentsNotAllowed.kt
}
}
public final val a: <ERROR TYPE REF: Unresolved name: MyClass> = Q|rest|.<Unresolved name: MyClass>#<R|kotlin/String|>
public final val a: <ERROR TYPE REF: Unresolved name: MyClass> = Q|rest|<R|kotlin/Int|>.<Unresolved name: MyClass>#<R|kotlin/String|>
public get(): <ERROR TYPE REF: Unresolved name: MyClass>
public final val b: <ERROR TYPE REF: Unresolved name: MyClass> = Q|rest/Best|.<Unresolved name: MyClass>#<R|kotlin/String|>
public get(): <ERROR TYPE REF: Unresolved name: MyClass>
compiler/fir/analysis-tests/testData/resolve/references/incorrectReferenceOnInnerClassMember.fir.txt
Vendored
+2 -2
View File
@@ -18,6 +18,6 @@ FILE: incorrectReferenceOnInnerClassMember.kt
}
public final fun test(): R|kotlin/Unit| {
Q|foo/Outer|.<Resolution to classifier>#(Int(42))
Q|foo/Outer|.<Resolution to classifier>#(Int(42))::<Unresolved reference: method>#
Q|foo/Outer|<R|kotlin/Int|>.<Resolution to classifier>#(Int(42))
Q|foo/Outer|<R|kotlin/Int|>.<Resolution to classifier>#(Int(42))::<Unresolved reference: method>#
}
compiler/fir/analysis-tests/testData/resolve/references/mutablePropertyGenericButNotCapturedType.fir.txt
Vendored
+4 -4
View File
@@ -15,20 +15,20 @@ FILE: mutablePropertyGenericButNotCapturedType.kt
public set(value: R|Generic<T>|): R|kotlin/Unit|
public final fun testWithinClass(): R|kotlin/Unit| {
lval mutableProperty: R|kotlin/reflect/KMutableProperty1<Klass<T>, Generic<T>>| = Q|Klass|::R|/Klass.mutableProperty|
lval mutableProperty: R|kotlin/reflect/KMutableProperty1<Klass<T>, Generic<T>>| = Q|Klass|<R|T|>::R|/Klass.mutableProperty|
R|<local>/mutableProperty|.R|SubstitutionOverride<kotlin/reflect/KMutableProperty1.set: R|kotlin/Unit|>|(this@R|/Klass|, R|/Generic.Generic|<R|T|>())
}
}
public final fun testConcreteType(): R|kotlin/Unit| {
lval mutableProperty: R|kotlin/reflect/KMutableProperty1<Klass<kotlin/Int>, Generic<kotlin/Int>>| = Q|Klass|::R|SubstitutionOverride</Klass.mutableProperty: R|Generic<kotlin/Int>|>|
lval mutableProperty: R|kotlin/reflect/KMutableProperty1<Klass<kotlin/Int>, Generic<kotlin/Int>>| = Q|Klass|<R|kotlin/Int|>::R|SubstitutionOverride</Klass.mutableProperty: R|Generic<kotlin/Int>|>|
R|<local>/mutableProperty|.R|SubstitutionOverride<kotlin/reflect/KMutableProperty1.set: R|kotlin/Unit|>|(R|/Klass.Klass|<R|kotlin/Int|>(), R|/Generic.Generic|<R|kotlin/Int|>())
}
public final fun <A> testGenericType(): R|kotlin/Unit| {
lval mutableProperty: R|kotlin/reflect/KMutableProperty1<Klass<A>, Generic<A>>| = Q|Klass|::R|SubstitutionOverride</Klass.mutableProperty: R|Generic<A>|>|
lval mutableProperty: R|kotlin/reflect/KMutableProperty1<Klass<A>, Generic<A>>| = Q|Klass|<R|A|>::R|SubstitutionOverride</Klass.mutableProperty: R|Generic<A>|>|
R|<local>/mutableProperty|.R|SubstitutionOverride<kotlin/reflect/KMutableProperty1.set: R|kotlin/Unit|>|(R|/Klass.Klass|<R|A|>(), R|/Generic.Generic|<R|A|>())
}
public final fun <S : R|kotlin/CharSequence|> testGenericTypeWithBounds(): R|kotlin/Unit| {
lval mutableProperty: R|kotlin/reflect/KMutableProperty1<Klass<S>, Generic<S>>| = Q|Klass|::R|SubstitutionOverride</Klass.mutableProperty: R|Generic<S>|>|
lval mutableProperty: R|kotlin/reflect/KMutableProperty1<Klass<S>, Generic<S>>| = Q|Klass|<R|S|>::R|SubstitutionOverride</Klass.mutableProperty: R|Generic<S>|>|
R|<local>/mutableProperty|.R|SubstitutionOverride<kotlin/reflect/KMutableProperty1.set: R|kotlin/Unit|>|(R|/Klass.Klass|<R|S|>(), R|/Generic.Generic|<R|S|>())
}
compiler/fir/analysis-tests/testData/resolve/references/mutablePropertyWithCapturedType.fir.txt
Vendored
+1 -1
View File
@@ -16,6 +16,6 @@ FILE: mutablePropertyWithCapturedType.kt
}
public final fun test(): R|kotlin/Unit| {
lval mutableProperty: R|kotlin/reflect/KMutableProperty1<Klass<*>, Generic<out kotlin/Any?>>| = Q|Klass|::R|SubstitutionOverride</Klass.mutableProperty: R|Generic<CapturedType(*)>|>|
lval mutableProperty: R|kotlin/reflect/KMutableProperty1<Klass<*>, Generic<out kotlin/Any?>>| = Q|Klass|<*>::R|SubstitutionOverride</Klass.mutableProperty: R|Generic<CapturedType(*)>|>|
R|<local>/mutableProperty|.R|SubstitutionOverride<kotlin/reflect/KMutableProperty1.set: R|kotlin/Unit|>|(R|/Klass.Klass|<R|kotlin/Int|>(), R|/Generic.Generic|<R|kotlin/String|>())
}
compiler/fir/analysis-tests/testData/resolve/references/referenceToExtension.fir.txt
Vendored
+4 -4
View File
@@ -35,13 +35,13 @@ FILE: referenceToExtension.kt
}
public final fun test_1(): R|kotlin/Unit| {
lval memberValRef: R|kotlin/reflect/KProperty1<GenericTest.B<*>, GenericTest.A<out kotlin/Any?>>| = Q|GenericTest.B|::R|SubstitutionOverride</GenericTest.B.memberVal: R|GenericTest.A<CapturedType(*)>|>|
lval memberFunRef: R|kotlin/reflect/KFunction1<GenericTest.B<*>, GenericTest.A<out kotlin/Any?>>| = Q|GenericTest.B|::R|SubstitutionOverride</GenericTest.B.memberFun: R|GenericTest.A<CapturedType(*)>|>|
lval memberValRef: R|kotlin/reflect/KProperty1<GenericTest.B<*>, GenericTest.A<out kotlin/Any?>>| = Q|GenericTest.B|<*>::R|SubstitutionOverride</GenericTest.B.memberVal: R|GenericTest.A<CapturedType(*)>|>|
lval memberFunRef: R|kotlin/reflect/KFunction1<GenericTest.B<*>, GenericTest.A<out kotlin/Any?>>| = Q|GenericTest.B|<*>::R|SubstitutionOverride</GenericTest.B.memberFun: R|GenericTest.A<CapturedType(*)>|>|
}
public final fun test_2(): R|kotlin/Unit| {
lval extensionValRef: R|kotlin/reflect/KProperty1<GenericTest.B<*>, GenericTest.A<out kotlin/Any?>>| = Q|GenericTest.B|::R|/GenericTest.extensionVal<CapturedType(*)>|
lval extensionFunRef: R|@ExtensionFunctionType kotlin/reflect/KFunction1<GenericTest.B<*>, GenericTest.A<out kotlin/Any?>>| = Q|GenericTest.B|::R|/GenericTest.extensionFun<CapturedType(*)>|
lval extensionValRef: R|kotlin/reflect/KProperty1<GenericTest.B<*>, GenericTest.A<out kotlin/Any?>>| = Q|GenericTest.B|<*>::R|/GenericTest.extensionVal<CapturedType(*)>|
lval extensionFunRef: R|@ExtensionFunctionType kotlin/reflect/KFunction1<GenericTest.B<*>, GenericTest.A<out kotlin/Any?>>| = Q|GenericTest.B|<*>::R|/GenericTest.extensionFun<CapturedType(*)>|
}
}
compiler/fir/analysis-tests/testData/resolve/references/referenceToSyntheticJavaPropertyWithProjection.fir.txt
Vendored
+2 -2
View File
@@ -9,6 +9,6 @@ FILE: main.kt
}
public final fun test(): R|kotlin/Unit| {
Q|JavaInv|::R|/JavaInv.stringVal|
Q|KotlinInv|::R|SubstitutionOverride</KotlinInv.stringVal: R|kotlin/String|>|
Q|JavaInv|<out R|kotlin/Number|>::R|/JavaInv.stringVal|
Q|KotlinInv|<out R|kotlin/Number|>::R|SubstitutionOverride</KotlinInv.stringVal: R|kotlin/String|>|
}
compiler/fir/analysis-tests/testData/resolveWithStdlib/reflectionClass.fir.txt
Vendored
+1 -1
View File
@@ -5,5 +5,5 @@ FILE: reflectionClass.kt
public get(): R|kotlin/reflect/KClass<kotlin/String>|
public final fun foo(): R|kotlin/Unit| {
lval stringClass: R|java/lang/Class<kotlin/String>| = <getClass>(Q|kotlin/String|).R|kotlin/jvm/java|<R|kotlin/String|>
lval arrayStringClass: R|java/lang/Class<kotlin/Array<kotlin/String>>| = <getClass>(Q|kotlin/Array|).R|kotlin/jvm/java|<R|kotlin/Array<kotlin/String>|>
lval arrayStringClass: R|java/lang/Class<kotlin/Array<kotlin/String>>| = <getClass>(Q|kotlin/Array|<R|kotlin/String|>).R|kotlin/jvm/java|<R|kotlin/Array<kotlin/String>|>
}
compiler/fir/tree/src/org/jetbrains/kotlin/fir/renderer/FirRenderer.kt
+1
View File
@@ -1154,6 +1154,7 @@ class FirRenderer(
override fun visitResolvedQualifier(resolvedQualifier: FirResolvedQualifier) {
resolvedQualifierRenderer.render(resolvedQualifier)
resolvedQualifier.typeArguments.renderTypeArguments()
}
override fun visitBinaryLogicExpression(binaryLogicExpression: FirBinaryLogicExpression) {
compiler/testData/diagnostics/tests/incompleteCode/incompleteConstructorCall.fir.txt
Vendored
+2 -2
View File
@@ -47,9 +47,9 @@ FILE: incompleteConstructorCall.fir.kt
}
}
public final val test: R|Outer.Companion| = Q|Outer|
public final val test: R|Outer.Companion| = Q|Outer|<R|kotlin/String|>
public get(): R|Outer.Companion|
public final val test2: R|Outer.Nested.Companion| = Q|Outer.Nested|
public final val test2: R|Outer.Nested.Companion| = Q|Outer.Nested|<R|kotlin/String|>
public get(): R|Outer.Nested.Companion|
public final val test3: R|Outer.Inner.Companion| = R|kotlin/Double|
public get(): R|Outer.Inner.Companion|
compiler/testData/diagnostics/testsWithStdLib/resolve/ambiguousTypeReferences/callableReferenceUnboundCase.fir.txt
Vendored
+1 -1
View File
@@ -1,4 +1,4 @@
FILE: test.kt
public final fun test(): R|kotlin/reflect/KProperty1<kotlin/collections/HashMap<kotlin/String, kotlin/String>, kotlin/Int>| {
^test Q|kotlin/collections/HashMap|::R|SubstitutionOverride<java/util/HashMap.size: R|kotlin/Int|>|
^test Q|kotlin/collections/HashMap|<R|kotlin/String|, R|kotlin/String|>::R|SubstitutionOverride<java/util/HashMap.size: R|kotlin/Int|>|
}