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

[FIR] Render outer type parameters differently

Browse Source
This commit is contained in:
Nikolay Lunyak
2023-07-27 11:51:48 +03:00
committed by Space Team
parent e4246e8f51
commit c2ad475153
37 changed files with 118 additions and 109 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/fir/analysis-tests/testData/resolve/diagnostics/conflictingProjection.fir.txt
Vendored
+6 -6
View File
@@ -67,12 +67,12 @@ FILE: conflictingProjection.kt
super<R|kotlin/Any|>()
}
public final inner class Intermediate<K, T> : R|kotlin/Any| {
public final inner class Intermediate<K, Outer(T)> : R|kotlin/Any| {
public Outer<T>.constructor<K>(): R|Outer.Intermediate<K, T>| {
super<R|kotlin/Any|>()
}
public final inner class Inner<G, K, T> : R|kotlin/Any| {
public final inner class Inner<G, Outer(K), Outer(T)> : R|kotlin/Any| {
public Outer.Intermediate<K, T>.constructor<G>(): R|Outer.Intermediate.Inner<G, K, T>| {
super<R|kotlin/Any|>()
}
@@ -114,12 +114,12 @@ FILE: conflictingProjection.kt
super<R|kotlin/Any|>()
}
public final inner class OutIntermediate<out K, in T> : R|kotlin/Any| {
public final inner class OutIntermediate<out K, in Outer(T)> : R|kotlin/Any| {
public InOuter<T>.constructor<out K>(): R|InOuter.OutIntermediate<K, T>| {
super<R|kotlin/Any|>()
}
public final inner class InInner<in G, out K, in T> : R|kotlin/Any| {
public final inner class InInner<in G, out Outer(K), in Outer(T)> : R|kotlin/Any| {
public InOuter.OutIntermediate<K, T>.constructor<in G>(): R|InOuter.OutIntermediate.InInner<G, K, T>| {
super<R|kotlin/Any|>()
}
@@ -161,12 +161,12 @@ FILE: conflictingProjection.kt
super<R|kotlin/Any|>()
}
public final inner class TwoParametersIntermediate<out K, K1, T, in T1> : R|kotlin/Any| {
public final inner class TwoParametersIntermediate<out K, K1, Outer(T), in Outer(T1)> : R|kotlin/Any| {
public TwoParametersOuter<T, T1>.constructor<out K, K1>(): R|TwoParametersOuter.TwoParametersIntermediate<K, K1, T, T1>| {
super<R|kotlin/Any|>()
}
public final inner class InInner<in G, G1, out K, K1, T, in T1> : R|kotlin/Any| {
public final inner class InInner<in G, G1, out Outer(K), Outer(K1), Outer(T), in Outer(T1)> : R|kotlin/Any| {
public TwoParametersOuter.TwoParametersIntermediate<K, K1, T, T1>.constructor<in G, G1>(): R|TwoParametersOuter.TwoParametersIntermediate.InInner<G, G1, K, K1, T, T1>| {
super<R|kotlin/Any|>()
}