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

FIR multi-module: minor test data fixes after resolve enhancements

Browse Source
This commit is contained in:
Mikhail Glukhikh
2019-04-25 17:01:27 +03:00
parent 77817cb750
commit be18134270
3 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/testData/fir/multiModule/basicWithJavaFakeOverride/jvm/simpleFakeOverride.txt
Vendored
+1 -1
View File
@@ -11,7 +11,7 @@ FILE: simpleFakeOverride.kt
} }
public final fun test(): R|kotlin/Unit| { public final fun test(): R|kotlin/Unit| {
R|FakeOverride</A.foo: R|ft<T, T?>|!>|(R|/Some.Some|()) R|FakeOverride</A.foo: R|ft<Some, Some?>|!>|(R|/Some.Some|())
} }
} }
idea/testData/fir/multiModule/mppFakeOverrides/jvm/jvm.kt
Vendored
+1 -1
View File
@@ -7,6 +7,6 @@ class D : C() {
fun test() { fun test() {
foo("") foo("")
bar("") // should be resolved to just C.bar bar("") // should be resolved to just C.bar
baz("") // ambiguity (we have C.bar with CharSequence argument and fake override of A.bar with String argument) baz("")
} }
} }
idea/testData/fir/multiModule/mppFakeOverrides/jvm/jvm.txt
Vendored
+1 -1
View File
@@ -24,7 +24,7 @@ FILE: jvm.kt
public final fun test(): R|kotlin/Unit| { public final fun test(): R|kotlin/Unit| {
R|FakeOverride</A.foo: R|kotlin/Unit|>|(String()) R|FakeOverride</A.foo: R|kotlin/Unit|>|(String())
R|/C.bar|(String()) R|/C.bar|(String())
<Ambiguity: baz, [/C.baz, /A.baz]>#(String()) R|FakeOverride</A.baz: R|kotlin/String|>|(String())
} }
} }