diff --git a/idea/testData/fir/multiModule/basicWithAnnotatedOverriddenJava/jvm/Annotated.java b/compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/BasicWithAnnotatedJava.kt similarity index 61% rename from idea/testData/fir/multiModule/basicWithAnnotatedOverriddenJava/jvm/Annotated.java rename to compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/BasicWithAnnotatedJava.kt index 1b8dc1e486f..d226db97961 100644 --- a/idea/testData/fir/multiModule/basicWithAnnotatedOverriddenJava/jvm/Annotated.java +++ b/compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/BasicWithAnnotatedJava.kt @@ -1,3 +1,5 @@ +// FILE: Annotated.java + import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -7,4 +9,14 @@ public class Annotated { if (param != null) return param; else return ""; } -} \ No newline at end of file +} + +// FILE: jvm.kt + +class User : Annotated() { + fun test() { + val x = foo("123") + val y = foo(null) + } +} + diff --git a/idea/testData/fir/multiModule/basicWithAnnotatedJava/jvm/jvm.txt b/compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/BasicWithAnnotatedJava.txt similarity index 100% rename from idea/testData/fir/multiModule/basicWithAnnotatedJava/jvm/jvm.txt rename to compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/BasicWithAnnotatedJava.txt diff --git a/compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/BasicWithAnnotatedOverriddenJava.kt b/compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/BasicWithAnnotatedOverriddenJava.kt new file mode 100644 index 00000000000..a1d767e4466 --- /dev/null +++ b/compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/BasicWithAnnotatedOverriddenJava.kt @@ -0,0 +1,29 @@ +// FILE: Annotated.java + +import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; + +public class Annotated { + @NotNull + public String foo(@Nullable String param) { + if (param != null) return param; + else return ""; + } +} + +// FILE: AnnotatedDerived.java + +public class AnnotatedDerived extends Annotated { + public String foo(String param) { + return super.foo(param); + } +} + +// FILE: jvm.kt + +class User : AnnotatedDerived() { + fun test() { + val x = foo("123") + val y = foo(null) + } +} diff --git a/idea/testData/fir/multiModule/basicWithAnnotatedOverriddenJava/jvm/jvm.txt b/compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/BasicWithAnnotatedOverriddenJava.txt similarity index 100% rename from idea/testData/fir/multiModule/basicWithAnnotatedOverriddenJava/jvm/jvm.txt rename to compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/BasicWithAnnotatedOverriddenJava.txt diff --git a/compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/BasicWithJava.kt b/compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/BasicWithJava.kt new file mode 100644 index 00000000000..18ef9a85b5e --- /dev/null +++ b/compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/BasicWithJava.kt @@ -0,0 +1,9 @@ +// FILE: Some.java + +public class Some { + +} + +// FILE: jvm.kt + +class A : Some() \ No newline at end of file diff --git a/idea/testData/fir/multiModule/basicWithJava/jvm/jvm.txt b/compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/BasicWithJava.txt similarity index 100% rename from idea/testData/fir/multiModule/basicWithJava/jvm/jvm.txt rename to compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/BasicWithJava.txt diff --git a/compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/BasicWithJavaFakeOverride.kt b/compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/BasicWithJavaFakeOverride.kt new file mode 100644 index 00000000000..66f07e00e3b --- /dev/null +++ b/compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/BasicWithJavaFakeOverride.kt @@ -0,0 +1,19 @@ +// FILE: A.java + +public class A { + public T foo(T t) { + return t; + } +} + +// FILE: simpleFakeOverride.kt + + +class Some + +class B : A() { + fun test() { + foo(Some()) + } +} + diff --git a/idea/testData/fir/multiModule/basicWithJavaFakeOverride/jvm/simpleFakeOverride.txt b/compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/BasicWithJavaFakeOverride.txt similarity index 100% rename from idea/testData/fir/multiModule/basicWithJavaFakeOverride/jvm/simpleFakeOverride.txt rename to compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/BasicWithJavaFakeOverride.txt diff --git a/idea/testData/fir/multiModule/basicWithPrimitiveJava/jvm/Some.java b/compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/BasicWithPrimitiveJava.kt similarity index 61% rename from idea/testData/fir/multiModule/basicWithPrimitiveJava/jvm/Some.java rename to compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/BasicWithPrimitiveJava.kt index 136d4550702..232bac20c76 100644 --- a/idea/testData/fir/multiModule/basicWithPrimitiveJava/jvm/Some.java +++ b/compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/BasicWithPrimitiveJava.kt @@ -1,3 +1,5 @@ +// FILE: Some.java + public class Some { public boolean foo(int param) { return param > 0; @@ -11,4 +13,14 @@ public class Some { } return result; } -} \ No newline at end of file +} + +// FILE: jvm.kt + +class A : Some() { + fun test() { + val res1 = foo(1) + val res2 = foo(-1) + val res3 = bar(intArrayOf(0, 2, -2)) + } +} diff --git a/idea/testData/fir/multiModule/basicWithPrimitiveJava/jvm/jvm.txt b/compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/BasicWithPrimitiveJava.txt similarity index 100% rename from idea/testData/fir/multiModule/basicWithPrimitiveJava/jvm/jvm.txt rename to compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/BasicWithPrimitiveJava.txt diff --git a/compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/FieldAccessFromDerived.kt b/compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/FieldAccessFromDerived.kt new file mode 100644 index 00000000000..0c7016fd563 --- /dev/null +++ b/compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/FieldAccessFromDerived.kt @@ -0,0 +1,13 @@ +// FILE: Base.java + +public class Base { + public int value = 0; +} + +// FILE: Derived.kt + +class Derived : Base() { + fun getValue() = value + + fun foo() = value +} diff --git a/idea/testData/fir/multiModule/fieldAccessFromDerived/jvm/Derived.txt b/compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/FieldAccessFromDerived.txt similarity index 100% rename from idea/testData/fir/multiModule/fieldAccessFromDerived/jvm/Derived.txt rename to compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/FieldAccessFromDerived.txt diff --git a/compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/IntersectionTypesProblem.kt b/compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/IntersectionTypesProblem.kt new file mode 100644 index 00000000000..c8c9797f869 --- /dev/null +++ b/compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/IntersectionTypesProblem.kt @@ -0,0 +1,32 @@ +// FILE: Diagnostic.java + +package jvm; + +public interface Diagnostic {} + +// FILE: DiagnosticWithParameters1.java + +package jvm; + +public interface DiagnosticWithParameters1 extends Diagnostic { + A getA(); +} + +// FILE: DiagnosticWithParameters2.java + +package jvm; + +public interface DiagnosticWithParameters2 extends Diagnostic { + A getA(); + B getB(); +} + +// FILE: test.kt + +package jvm; + +fun select(x: K, y: K): K = x + +fun test(d1: DiagnosticWithParameters1<*, *>, d2: DiagnosticWithParameters2<*, *, *>) { + val res = select(d1.a, d2.b) +} diff --git a/compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/IntersectionTypesProblem.txt b/compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/IntersectionTypesProblem.txt new file mode 100644 index 00000000000..a1795b34d90 --- /dev/null +++ b/compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/IntersectionTypesProblem.txt @@ -0,0 +1,7 @@ +FILE: test.kt + public final fun select(x: R|K|, y: R|K|): R|K| { + ^select R|/x| + } + public final fun test(d1: R|DiagnosticWithParameters1<*, *>|, d2: R|DiagnosticWithParameters2<*, *, *>|): R|kotlin/Unit| { + lval res: R|ft!| = R|jvm/select|!|>(R|/d1|.R|/DiagnosticWithParameters1.a|, R|/d2|.R|/DiagnosticWithParameters2.b|) + } diff --git a/idea/testData/fir/multiModule/javaGetPrefixConflict/jvm/JavaClass.java b/compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/JavaGetPrefixConflict.kt similarity index 50% rename from idea/testData/fir/multiModule/javaGetPrefixConflict/jvm/JavaClass.java rename to compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/JavaGetPrefixConflict.kt index 1b96a540891..7a90ce9693c 100644 --- a/idea/testData/fir/multiModule/javaGetPrefixConflict/jvm/JavaClass.java +++ b/compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/JavaGetPrefixConflict.kt @@ -1,3 +1,5 @@ +// FILE: JavaClass.java + public class JavaClass { public String getText() { return "Text"; @@ -6,4 +8,15 @@ public class JavaClass { public String getText(String param) { return "Text with " + param; } -} \ No newline at end of file +} + +// FILE: Test.kt + +fun test() { + val jc = JavaClass() + val result = jc.text +} + +fun otherTest(jc: JavaClass) { + val result = jc.text +} diff --git a/idea/testData/fir/multiModule/javaGetPrefixConflict/jvm/Test.txt b/compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/JavaGetPrefixConflict.txt similarity index 100% rename from idea/testData/fir/multiModule/javaGetPrefixConflict/jvm/Test.txt rename to compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/JavaGetPrefixConflict.txt diff --git a/compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/JavaInheritsKotlinDerived.kt b/compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/JavaInheritsKotlinDerived.kt new file mode 100644 index 00000000000..770af6e62d2 --- /dev/null +++ b/compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/JavaInheritsKotlinDerived.kt @@ -0,0 +1,22 @@ +// FILE: JavaClass.java + +public class JavaClass extends Derived { + +} + +// FILE: Base.kt + +open class Base { + open val some: String get() = "Base" +} + +open class Derived : Base() { + override val some: String get() = "Derived" +} + +// FILE: Test.kt + +fun test() { + val jc = JavaClass() + val result = jc.some +} diff --git a/idea/testData/fir/multiModule/javaInheritsKotlinDerived/jvm/Base.txt b/compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/JavaInheritsKotlinDerived.txt similarity index 74% rename from idea/testData/fir/multiModule/javaInheritsKotlinDerived/jvm/Base.txt rename to compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/JavaInheritsKotlinDerived.txt index 21df10c1487..0ab73bc9bf2 100644 --- a/idea/testData/fir/multiModule/javaInheritsKotlinDerived/jvm/Base.txt +++ b/compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/JavaInheritsKotlinDerived.txt @@ -21,3 +21,8 @@ FILE: Base.kt } } +FILE: Test.kt + public final fun test(): R|kotlin/Unit| { + lval jc: R|JavaClass| = R|/JavaClass.JavaClass|() + lval result: R|kotlin/String| = R|/jc|.R|/Derived.some| + } diff --git a/compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/JavaInheritsKotlinExtension.kt b/compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/JavaInheritsKotlinExtension.kt new file mode 100644 index 00000000000..bb44dc94272 --- /dev/null +++ b/compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/JavaInheritsKotlinExtension.kt @@ -0,0 +1,21 @@ +// FILE: Inheritor.java + +public class Inheritor extends Second { + public void foo(First first, String s, int i) {} +} + +// FILE: Base.kt + +interface First + +open class Second { + open fun First.foo(s: String, i: Int) {} +} + +// FILE: Test.kt + +class Tester : Inheritor(), First { + fun test() { + foo("abc", 456) + } +} diff --git a/idea/testData/fir/multiModule/javaInheritsKotlinExtension/jvm/Base.txt b/compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/JavaInheritsKotlinExtension.txt similarity index 50% rename from idea/testData/fir/multiModule/javaInheritsKotlinExtension/jvm/Base.txt rename to compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/JavaInheritsKotlinExtension.txt index a520ace058b..283295e8632 100644 --- a/idea/testData/fir/multiModule/javaInheritsKotlinExtension/jvm/Base.txt +++ b/compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/JavaInheritsKotlinExtension.txt @@ -10,3 +10,14 @@ FILE: Base.kt } } +FILE: Test.kt + public final class Tester : R|Inheritor|, R|First| { + public constructor(): R|Tester| { + super() + } + + public final fun test(): R|kotlin/Unit| { + (this@R|/Tester|, this@R|/Tester|).R|/Inheritor.foo|(String(abc), Int(456)) + } + + } diff --git a/compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/JavaInheritsKotlinProperty.kt b/compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/JavaInheritsKotlinProperty.kt new file mode 100644 index 00000000000..6d7b17af6d7 --- /dev/null +++ b/compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/JavaInheritsKotlinProperty.kt @@ -0,0 +1,21 @@ +// FILE: Base.kt + +interface Base { + val x: Int +} + +// FILE: Inheritor.java + +public class Inheritor implements Base { + public int getX() { + return 42; + } +} + +// FILE: Test.kt + +class Tester : Inheritor() { + fun test(): Int { + return x + } +} diff --git a/idea/testData/fir/multiModule/javaInheritsKotlinProperty/jvm/Test.txt b/compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/JavaInheritsKotlinProperty.txt similarity index 62% rename from idea/testData/fir/multiModule/javaInheritsKotlinProperty/jvm/Test.txt rename to compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/JavaInheritsKotlinProperty.txt index fc841124e73..d0635b834e7 100644 --- a/idea/testData/fir/multiModule/javaInheritsKotlinProperty/jvm/Test.txt +++ b/compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/JavaInheritsKotlinProperty.txt @@ -1,3 +1,9 @@ +FILE: Base.kt + public abstract interface Base : R|kotlin/Any| { + public abstract val x: R|kotlin/Int| + public get(): R|kotlin/Int| + + } FILE: Test.kt public final class Tester : R|Inheritor| { public constructor(): R|Tester| { diff --git a/compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/JavaInheritsRawKotlin.kt b/compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/JavaInheritsRawKotlin.kt new file mode 100644 index 00000000000..7468a3faa84 --- /dev/null +++ b/compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/JavaInheritsRawKotlin.kt @@ -0,0 +1,17 @@ +// FILE: Derived.kt + +class Derived : Some() + +// FILE: Some.java + +public class Some implements Strange { + public Object foo() { + return ""; + } +} + +// FILE: Strange.kt + +interface Strange { + fun foo(): T +} \ No newline at end of file diff --git a/idea/testData/fir/multiModule/javaInheritsRawKotlin/jvm/Derived.txt b/compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/JavaInheritsRawKotlin.txt similarity index 53% rename from idea/testData/fir/multiModule/javaInheritsRawKotlin/jvm/Derived.txt rename to compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/JavaInheritsRawKotlin.txt index 09f4269529e..231a03d50e5 100644 --- a/idea/testData/fir/multiModule/javaInheritsRawKotlin/jvm/Derived.txt +++ b/compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/JavaInheritsRawKotlin.txt @@ -5,3 +5,8 @@ FILE: Derived.kt } } +FILE: Strange.kt + public abstract interface Strange : R|kotlin/Any| { + public abstract fun foo(): R|T| + + } diff --git a/compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/JavaSyntheticProperty.kt b/compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/JavaSyntheticProperty.kt new file mode 100644 index 00000000000..bbc9e5899b6 --- /dev/null +++ b/compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/JavaSyntheticProperty.kt @@ -0,0 +1,9 @@ +// FILE: JavaClass.java + +class JavaClass { + public String getFoo() { return null; } +} + +// FILE: test.kt + +val x = JavaClass().foo \ No newline at end of file diff --git a/idea/testData/fir/multiModule/javaSyntheticProperty/jvm/Test.txt b/compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/JavaSyntheticProperty.txt similarity index 92% rename from idea/testData/fir/multiModule/javaSyntheticProperty/jvm/Test.txt rename to compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/JavaSyntheticProperty.txt index a1567b6ddae..a751a98a432 100644 --- a/idea/testData/fir/multiModule/javaSyntheticProperty/jvm/Test.txt +++ b/compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/JavaSyntheticProperty.txt @@ -1,3 +1,3 @@ -FILE: Test.kt +FILE: test.kt public final val x: R|ft!| = R|/JavaClass.JavaClass|().R|/JavaClass.foo| public get(): R|ft!| diff --git a/idea/testData/fir/multiModule/overrideWithJava/jvm/B.kt b/compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/OverrideWithJava.kt similarity index 55% rename from idea/testData/fir/multiModule/overrideWithJava/jvm/B.kt rename to compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/OverrideWithJava.kt index 1e8254e92c0..9dc95ae90d9 100644 --- a/idea/testData/fir/multiModule/overrideWithJava/jvm/B.kt +++ b/compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/OverrideWithJava.kt @@ -1,3 +1,17 @@ +// FILE: A.java + +public class A { + public A foo() { + return this; + } + + public A bar() { + return this; + } +} + +// FILE: test.kt + class B : A() { override fun foo(): B = this fun bar(): B = this // Here we should have "missing override" but no ambiguity diff --git a/idea/testData/fir/multiModule/overrideWithJava/jvm/B.txt b/compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/OverrideWithJava.txt similarity index 96% rename from idea/testData/fir/multiModule/overrideWithJava/jvm/B.txt rename to compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/OverrideWithJava.txt index e8a8936c63f..2cfc3a42638 100644 --- a/idea/testData/fir/multiModule/overrideWithJava/jvm/B.txt +++ b/compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/OverrideWithJava.txt @@ -1,4 +1,4 @@ -FILE: B.kt +FILE: test.kt public final class B : R|A| { public constructor(): R|B| { super() diff --git a/compiler/fir/analysis-tests/testData/resolveWithStdlib/multiModule/Basic.kt b/compiler/fir/analysis-tests/testData/resolveWithStdlib/multiModule/Basic.kt new file mode 100644 index 00000000000..f185a5429b5 --- /dev/null +++ b/compiler/fir/analysis-tests/testData/resolveWithStdlib/multiModule/Basic.kt @@ -0,0 +1,18 @@ +// MODULE: m1 +// FILE: base.kt + +package hello + +class Hello(val msg: String) + +class Test(val set: java.util.Set<*>) + +// MODULE: m2(m1) +// FILE: user.kt + +package test + +import hello.Hello + +fun foo(hello: Hello): String = hello.msg + diff --git a/idea/testData/fir/multiModule/basic/m1_java/base.txt b/compiler/fir/analysis-tests/testData/resolveWithStdlib/multiModule/Basic.txt similarity index 80% rename from idea/testData/fir/multiModule/basic/m1_java/base.txt rename to compiler/fir/analysis-tests/testData/resolveWithStdlib/multiModule/Basic.txt index 86707e10bf3..39ea2414813 100644 --- a/idea/testData/fir/multiModule/basic/m1_java/base.txt +++ b/compiler/fir/analysis-tests/testData/resolveWithStdlib/multiModule/Basic.txt @@ -17,3 +17,7 @@ FILE: base.kt public get(): R|java/util/Set<*>| } +FILE: user.kt + public final fun foo(hello: R|hello/Hello|): R|kotlin/String| { + ^foo R|/hello|.R|hello/Hello.msg| + } diff --git a/compiler/fir/analysis-tests/testData/resolveWithStdlib/multiModule/FakeOverrides.kt b/compiler/fir/analysis-tests/testData/resolveWithStdlib/multiModule/FakeOverrides.kt new file mode 100644 index 00000000000..21388fc95bc --- /dev/null +++ b/compiler/fir/analysis-tests/testData/resolveWithStdlib/multiModule/FakeOverrides.kt @@ -0,0 +1,31 @@ +// !LANGUAGE: +MultiPlatformProjects +// MODULE: m1-common +// FILE: common.kt + +expect open class A() { + open fun foo(arg: T) +} +open class B : A() { + // Fake: override fun foo(arg: String) = super.foo(arg) + // Fake (JVM only): override fun bar(arg: String): String = super.bar(arg) +} +open class C : B() { + open fun bar(arg: String): String = arg + open fun baz(arg: CharSequence): String = arg.toString() +} + +// MODULE: m1-jvm(m1-common) +// FILE: jvm.kt + +actual open class A { + actual open fun foo(arg: T) {} + open fun bar(arg: T): T = arg + open fun baz(arg: T): T = arg +} +class D : C() { + fun test() { + foo("") + bar("") // should be resolved to just C.bar + baz("") + } +} diff --git a/idea/testData/fir/multiModule/mppFakeOverrides/jvm/jvm.txt b/compiler/fir/analysis-tests/testData/resolveWithStdlib/multiModule/FakeOverrides.txt similarity index 51% rename from idea/testData/fir/multiModule/mppFakeOverrides/jvm/jvm.txt rename to compiler/fir/analysis-tests/testData/resolveWithStdlib/multiModule/FakeOverrides.txt index e152acab7c6..e7459dd83ed 100644 --- a/idea/testData/fir/multiModule/mppFakeOverrides/jvm/jvm.txt +++ b/compiler/fir/analysis-tests/testData/resolveWithStdlib/multiModule/FakeOverrides.txt @@ -1,3 +1,32 @@ +FILE: common.kt + public open expect class A : R|kotlin/Any| { + public constructor(): R|A| { + super() + } + + public open fun foo(arg: R|T|): R|kotlin/Unit| + + } + public open class B : R|A| { + public constructor(): R|B| { + super|>() + } + + } + public open class C : R|B| { + public constructor(): R|C| { + super() + } + + public open fun bar(arg: R|kotlin/String|): R|kotlin/String| { + ^bar R|/arg| + } + + public open fun baz(arg: R|kotlin/CharSequence|): R|kotlin/String| { + ^baz R|/arg|.R|kotlin/Any.toString|() + } + + } FILE: jvm.kt public open actual class A : R|kotlin/Any| { public constructor(): R|A| { diff --git a/idea/testData/fir/multiModule/mppMemberType/jvm/jvm.kt b/compiler/fir/analysis-tests/testData/resolveWithStdlib/multiModule/MemberType.kt similarity index 62% rename from idea/testData/fir/multiModule/mppMemberType/jvm/jvm.kt rename to compiler/fir/analysis-tests/testData/resolveWithStdlib/multiModule/MemberType.kt index e8fc2000f4e..3d197588ea6 100644 --- a/idea/testData/fir/multiModule/mppMemberType/jvm/jvm.kt +++ b/compiler/fir/analysis-tests/testData/resolveWithStdlib/multiModule/MemberType.kt @@ -1,3 +1,16 @@ +// !LANGUAGE: +MultiPlatformProjects +// MODULE: m1-common +// FILE: common.kt + +expect class MyList { + fun get(i: Int): Int +} + +open class Wrapper(val list: MyList) + +// MODULE: m1-jvm(m1-common) +// FILE: jvm.kt + actual class MyList { actual fun get(i: Int): Int = i @@ -17,10 +30,10 @@ fun useList(list: MyList) { list.set(2, 3) } -class DerivedWrapper : Wrapper() { +class DerivedWrapper : Wrapper(MyList()) { fun use() { // We should deal with receiver to resolve this list.get(1) list.set(2, 3) } -} \ No newline at end of file +} diff --git a/idea/testData/fir/multiModule/mppMemberType/jvm/jvm.txt b/compiler/fir/analysis-tests/testData/resolveWithStdlib/multiModule/MemberType.txt similarity index 69% rename from idea/testData/fir/multiModule/mppMemberType/jvm/jvm.txt rename to compiler/fir/analysis-tests/testData/resolveWithStdlib/multiModule/MemberType.txt index 90fe0e43852..36a25e3079a 100644 --- a/idea/testData/fir/multiModule/mppMemberType/jvm/jvm.txt +++ b/compiler/fir/analysis-tests/testData/resolveWithStdlib/multiModule/MemberType.txt @@ -1,3 +1,21 @@ +FILE: common.kt + public final expect class MyList : R|kotlin/Any| { + public constructor(): R|MyList| { + super() + } + + public final fun get(i: R|kotlin/Int|): R|kotlin/Int| + + } + public open class Wrapper : R|kotlin/Any| { + public constructor(list: R|MyList|): R|Wrapper| { + super() + } + + public final val list: R|MyList| = R|/list| + public get(): R|MyList| + + } FILE: jvm.kt public final actual class MyList : R|kotlin/Any| { public constructor(): R|MyList| { @@ -29,7 +47,7 @@ FILE: jvm.kt } public final class DerivedWrapper : R|Wrapper| { public constructor(): R|DerivedWrapper| { - super() + super(R|/MyList.MyList|()) } public final fun use(): R|kotlin/Unit| { diff --git a/idea/testData/fir/multiModule/mppMembers/jvm/jvm.kt b/compiler/fir/analysis-tests/testData/resolveWithStdlib/multiModule/Members.kt similarity index 52% rename from idea/testData/fir/multiModule/mppMembers/jvm/jvm.kt rename to compiler/fir/analysis-tests/testData/resolveWithStdlib/multiModule/Members.kt index 488c9f817e9..bee90651ef6 100644 --- a/idea/testData/fir/multiModule/mppMembers/jvm/jvm.kt +++ b/compiler/fir/analysis-tests/testData/resolveWithStdlib/multiModule/Members.kt @@ -1,3 +1,16 @@ +// !LANGUAGE: +MultiPlatformProjects +// MODULE: m1-common +// FILE: common.kt + +expect open class A() { + fun foo() +} + +open class B : A() + +// MODULE: m1-jvm(m1-common) +// FILE: jvm.kt + actual open class A { actual fun foo() {} @@ -16,4 +29,4 @@ class D : A() { foo() bar() } -} \ No newline at end of file +} diff --git a/idea/testData/fir/multiModule/mppMembers/jvm/jvm.txt b/compiler/fir/analysis-tests/testData/resolveWithStdlib/multiModule/Members.txt similarity index 70% rename from idea/testData/fir/multiModule/mppMembers/jvm/jvm.txt rename to compiler/fir/analysis-tests/testData/resolveWithStdlib/multiModule/Members.txt index 9f4eecf3e3f..0e65433b8a6 100644 --- a/idea/testData/fir/multiModule/mppMembers/jvm/jvm.txt +++ b/compiler/fir/analysis-tests/testData/resolveWithStdlib/multiModule/Members.txt @@ -1,3 +1,18 @@ +FILE: common.kt + public open expect class A : R|kotlin/Any| { + public constructor(): R|A| { + super() + } + + public final fun foo(): R|kotlin/Unit| + + } + public open class B : R|A| { + public constructor(): R|B| { + super() + } + + } FILE: jvm.kt public open actual class A : R|kotlin/Any| { public constructor(): R|A| { diff --git a/idea/testData/fir/multiModule/mppSuperTypes/jvm/jvm.kt b/compiler/fir/analysis-tests/testData/resolveWithStdlib/multiModule/SuperTypes.kt similarity index 61% rename from idea/testData/fir/multiModule/mppSuperTypes/jvm/jvm.kt rename to compiler/fir/analysis-tests/testData/resolveWithStdlib/multiModule/SuperTypes.kt index 7f9212f9c55..2efd920ab41 100644 --- a/idea/testData/fir/multiModule/mppSuperTypes/jvm/jvm.kt +++ b/compiler/fir/analysis-tests/testData/resolveWithStdlib/multiModule/SuperTypes.kt @@ -1,3 +1,16 @@ +// !LANGUAGE: +MultiPlatformProjects +// MODULE: m1-common +// FILE: common.kt + +expect open class A() { + fun foo() +} + +open class B : A() + +// MODULE: m1-jvm(m1-common) +// FILE: jvm.kt + abstract class X { fun bar() {} } diff --git a/idea/testData/fir/multiModule/mppSuperTypes/jvm/jvm.txt b/compiler/fir/analysis-tests/testData/resolveWithStdlib/multiModule/SuperTypes.txt similarity index 77% rename from idea/testData/fir/multiModule/mppSuperTypes/jvm/jvm.txt rename to compiler/fir/analysis-tests/testData/resolveWithStdlib/multiModule/SuperTypes.txt index fd084feb802..4e67881f9dc 100644 --- a/idea/testData/fir/multiModule/mppSuperTypes/jvm/jvm.txt +++ b/compiler/fir/analysis-tests/testData/resolveWithStdlib/multiModule/SuperTypes.txt @@ -1,3 +1,18 @@ +FILE: common.kt + public open expect class A : R|kotlin/Any| { + public constructor(): R|A| { + super() + } + + public final fun foo(): R|kotlin/Unit| + + } + public open class B : R|A| { + public constructor(): R|B| { + super() + } + + } FILE: jvm.kt public abstract class X : R|kotlin/Any| { public constructor(): R|X| { diff --git a/compiler/fir/analysis-tests/tests/org/jetbrains/kotlin/fir/FirDiagnosticsWithStdlibTestGenerated.java b/compiler/fir/analysis-tests/tests/org/jetbrains/kotlin/fir/FirDiagnosticsWithStdlibTestGenerated.java index ffea0fac13b..f1cac337d91 100644 --- a/compiler/fir/analysis-tests/tests/org/jetbrains/kotlin/fir/FirDiagnosticsWithStdlibTestGenerated.java +++ b/compiler/fir/analysis-tests/tests/org/jetbrains/kotlin/fir/FirDiagnosticsWithStdlibTestGenerated.java @@ -710,6 +710,31 @@ public class FirDiagnosticsWithStdlibTestGenerated extends AbstractFirDiagnostic KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k"), Pattern.compile("^([^.]+)\\.kt$"), null, true); } + @TestMetadata("BasicWithAnnotatedJava.kt") + public void testBasicWithAnnotatedJava() throws Exception { + runTest("compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/BasicWithAnnotatedJava.kt"); + } + + @TestMetadata("BasicWithAnnotatedOverriddenJava.kt") + public void testBasicWithAnnotatedOverriddenJava() throws Exception { + runTest("compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/BasicWithAnnotatedOverriddenJava.kt"); + } + + @TestMetadata("BasicWithJava.kt") + public void testBasicWithJava() throws Exception { + runTest("compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/BasicWithJava.kt"); + } + + @TestMetadata("BasicWithJavaFakeOverride.kt") + public void testBasicWithJavaFakeOverride() throws Exception { + runTest("compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/BasicWithJavaFakeOverride.kt"); + } + + @TestMetadata("BasicWithPrimitiveJava.kt") + public void testBasicWithPrimitiveJava() throws Exception { + runTest("compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/BasicWithPrimitiveJava.kt"); + } + @TestMetadata("capturedFlexible.kt") public void testCapturedFlexible() throws Exception { runTest("compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/capturedFlexible.kt"); @@ -720,6 +745,11 @@ public class FirDiagnosticsWithStdlibTestGenerated extends AbstractFirDiagnostic runTest("compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/complexFlexibleInference.kt"); } + @TestMetadata("FieldAccessFromDerived.kt") + public void testFieldAccessFromDerived() throws Exception { + runTest("compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/FieldAccessFromDerived.kt"); + } + @TestMetadata("FieldAndGetter.kt") public void testFieldAndGetter() throws Exception { runTest("compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/FieldAndGetter.kt"); @@ -750,6 +780,41 @@ public class FirDiagnosticsWithStdlibTestGenerated extends AbstractFirDiagnostic runTest("compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/FunctionTypeInJava.kt"); } + @TestMetadata("IntersectionTypesProblem.kt") + public void testIntersectionTypesProblem() throws Exception { + runTest("compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/IntersectionTypesProblem.kt"); + } + + @TestMetadata("JavaGetPrefixConflict.kt") + public void testJavaGetPrefixConflict() throws Exception { + runTest("compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/JavaGetPrefixConflict.kt"); + } + + @TestMetadata("JavaInheritsKotlinDerived.kt") + public void testJavaInheritsKotlinDerived() throws Exception { + runTest("compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/JavaInheritsKotlinDerived.kt"); + } + + @TestMetadata("JavaInheritsKotlinExtension.kt") + public void testJavaInheritsKotlinExtension() throws Exception { + runTest("compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/JavaInheritsKotlinExtension.kt"); + } + + @TestMetadata("JavaInheritsKotlinProperty.kt") + public void testJavaInheritsKotlinProperty() throws Exception { + runTest("compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/JavaInheritsKotlinProperty.kt"); + } + + @TestMetadata("JavaInheritsRawKotlin.kt") + public void testJavaInheritsRawKotlin() throws Exception { + runTest("compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/JavaInheritsRawKotlin.kt"); + } + + @TestMetadata("JavaSyntheticProperty.kt") + public void testJavaSyntheticProperty() throws Exception { + runTest("compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/JavaSyntheticProperty.kt"); + } + @TestMetadata("JavaVisibility2.kt") public void testJavaVisibility2() throws Exception { runTest("compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/JavaVisibility2.kt"); @@ -825,6 +890,11 @@ public class FirDiagnosticsWithStdlibTestGenerated extends AbstractFirDiagnostic runTest("compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/outerInnerClasses.kt"); } + @TestMetadata("OverrideWithJava.kt") + public void testOverrideWithJava() throws Exception { + runTest("compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/OverrideWithJava.kt"); + } + @TestMetadata("RawType.kt") public void testRawType() throws Exception { runTest("compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/RawType.kt"); @@ -871,6 +941,44 @@ public class FirDiagnosticsWithStdlibTestGenerated extends AbstractFirDiagnostic } } + @TestMetadata("compiler/fir/analysis-tests/testData/resolveWithStdlib/multiModule") + @TestDataPath("$PROJECT_ROOT") + @RunWith(JUnit3RunnerWithInners.class) + public static class MultiModule extends AbstractFirDiagnosticsWithStdlibTest { + private void runTest(String testDataFilePath) throws Exception { + KotlinTestUtils.runTest(this::doTest, this, testDataFilePath); + } + + public void testAllFilesPresentInMultiModule() throws Exception { + KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/fir/analysis-tests/testData/resolveWithStdlib/multiModule"), Pattern.compile("^([^.]+)\\.kt$"), null, true); + } + + @TestMetadata("Basic.kt") + public void testBasic() throws Exception { + runTest("compiler/fir/analysis-tests/testData/resolveWithStdlib/multiModule/Basic.kt"); + } + + @TestMetadata("FakeOverrides.kt") + public void testFakeOverrides() throws Exception { + runTest("compiler/fir/analysis-tests/testData/resolveWithStdlib/multiModule/FakeOverrides.kt"); + } + + @TestMetadata("MemberType.kt") + public void testMemberType() throws Exception { + runTest("compiler/fir/analysis-tests/testData/resolveWithStdlib/multiModule/MemberType.kt"); + } + + @TestMetadata("Members.kt") + public void testMembers() throws Exception { + runTest("compiler/fir/analysis-tests/testData/resolveWithStdlib/multiModule/Members.kt"); + } + + @TestMetadata("SuperTypes.kt") + public void testSuperTypes() throws Exception { + runTest("compiler/fir/analysis-tests/testData/resolveWithStdlib/multiModule/SuperTypes.kt"); + } + } + @TestMetadata("compiler/fir/analysis-tests/testData/resolveWithStdlib/problems") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) diff --git a/idea/idea-frontend-fir/idea-fir-low-level-api/tests/org/jetbrains/kotlin/idea/fir/low/level/api/FirMultiModuleResolveTestGenerated.java b/idea/idea-frontend-fir/idea-fir-low-level-api/tests/org/jetbrains/kotlin/idea/fir/low/level/api/FirMultiModuleResolveTestGenerated.java index 3e9efca83c0..f92f3500044 100644 --- a/idea/idea-frontend-fir/idea-fir-low-level-api/tests/org/jetbrains/kotlin/idea/fir/low/level/api/FirMultiModuleResolveTestGenerated.java +++ b/idea/idea-frontend-fir/idea-fir-low-level-api/tests/org/jetbrains/kotlin/idea/fir/low/level/api/FirMultiModuleResolveTestGenerated.java @@ -27,104 +27,4 @@ public class FirMultiModuleResolveTestGenerated extends AbstractFirMultiModuleRe public void testAllFilesPresentInMultiModule() throws Exception { KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("idea/testData/fir/multiModule"), Pattern.compile("^([^\\.]+)$"), null, false); } - - @TestMetadata("basic") - public void testBasic() throws Exception { - runTest("idea/testData/fir/multiModule/basic/"); - } - - @TestMetadata("basicWithAnnotatedJava") - public void testBasicWithAnnotatedJava() throws Exception { - runTest("idea/testData/fir/multiModule/basicWithAnnotatedJava/"); - } - - @TestMetadata("basicWithAnnotatedOverriddenJava") - public void testBasicWithAnnotatedOverriddenJava() throws Exception { - runTest("idea/testData/fir/multiModule/basicWithAnnotatedOverriddenJava/"); - } - - @TestMetadata("basicWithJava") - public void testBasicWithJava() throws Exception { - runTest("idea/testData/fir/multiModule/basicWithJava/"); - } - - @TestMetadata("basicWithJavaFakeOverride") - public void testBasicWithJavaFakeOverride() throws Exception { - runTest("idea/testData/fir/multiModule/basicWithJavaFakeOverride/"); - } - - @TestMetadata("basicWithPrimitiveJava") - public void testBasicWithPrimitiveJava() throws Exception { - runTest("idea/testData/fir/multiModule/basicWithPrimitiveJava/"); - } - - @TestMetadata("fieldAccessFromDerived") - public void testFieldAccessFromDerived() throws Exception { - runTest("idea/testData/fir/multiModule/fieldAccessFromDerived/"); - } - - @TestMetadata("intersectionTypesProblem") - public void testIntersectionTypesProblem() throws Exception { - runTest("idea/testData/fir/multiModule/intersectionTypesProblem/"); - } - - @TestMetadata("javaGetPrefixConflict") - public void testJavaGetPrefixConflict() throws Exception { - runTest("idea/testData/fir/multiModule/javaGetPrefixConflict/"); - } - - @TestMetadata("javaInheritsKotlinDerived") - public void testJavaInheritsKotlinDerived() throws Exception { - runTest("idea/testData/fir/multiModule/javaInheritsKotlinDerived/"); - } - - @TestMetadata("javaInheritsKotlinExtension") - public void testJavaInheritsKotlinExtension() throws Exception { - runTest("idea/testData/fir/multiModule/javaInheritsKotlinExtension/"); - } - - @TestMetadata("javaInheritsKotlinProperty") - public void testJavaInheritsKotlinProperty() throws Exception { - runTest("idea/testData/fir/multiModule/javaInheritsKotlinProperty/"); - } - - @TestMetadata("javaInheritsRawKotlin") - public void testJavaInheritsRawKotlin() throws Exception { - runTest("idea/testData/fir/multiModule/javaInheritsRawKotlin/"); - } - - @TestMetadata("javaSyntheticProperty") - public void testJavaSyntheticProperty() throws Exception { - runTest("idea/testData/fir/multiModule/javaSyntheticProperty/"); - } - - @TestMetadata("mppFakeOverrides") - public void testMppFakeOverrides() throws Exception { - runTest("idea/testData/fir/multiModule/mppFakeOverrides/"); - } - - @TestMetadata("mppMemberType") - public void testMppMemberType() throws Exception { - runTest("idea/testData/fir/multiModule/mppMemberType/"); - } - - @TestMetadata("mppMembers") - public void testMppMembers() throws Exception { - runTest("idea/testData/fir/multiModule/mppMembers/"); - } - - @TestMetadata("mppSuperTypes") - public void testMppSuperTypes() throws Exception { - runTest("idea/testData/fir/multiModule/mppSuperTypes/"); - } - - @TestMetadata("overrideWithJava") - public void testOverrideWithJava() throws Exception { - runTest("idea/testData/fir/multiModule/overrideWithJava/"); - } - - @TestMetadata("withStdlib") - public void testWithStdlib() throws Exception { - runTest("idea/testData/fir/multiModule/withStdlib/"); - } } diff --git a/idea/testData/fir/multiModule/basic/m1_java/base.kt b/idea/testData/fir/multiModule/basic/m1_java/base.kt deleted file mode 100644 index 101af630af6..00000000000 --- a/idea/testData/fir/multiModule/basic/m1_java/base.kt +++ /dev/null @@ -1,5 +0,0 @@ -package hello - -class Hello(val msg: String) - -class Test(val set: java.util.Set<*>) \ No newline at end of file diff --git a/idea/testData/fir/multiModule/basic/m2_java_dep(m1-java)/user.kt b/idea/testData/fir/multiModule/basic/m2_java_dep(m1-java)/user.kt deleted file mode 100644 index f8209c7ac1a..00000000000 --- a/idea/testData/fir/multiModule/basic/m2_java_dep(m1-java)/user.kt +++ /dev/null @@ -1,5 +0,0 @@ -package test - -import hello.Hello - -fun foo(hello: Hello): String = hello.msg \ No newline at end of file diff --git a/idea/testData/fir/multiModule/basic/m2_java_dep(m1-java)/user.txt b/idea/testData/fir/multiModule/basic/m2_java_dep(m1-java)/user.txt deleted file mode 100644 index f2029ad2d37..00000000000 --- a/idea/testData/fir/multiModule/basic/m2_java_dep(m1-java)/user.txt +++ /dev/null @@ -1,4 +0,0 @@ -FILE: user.kt - public final fun foo(hello: R|hello/Hello|): R|kotlin/String| { - ^foo R|/hello|.R|hello/Hello.msg| - } diff --git a/idea/testData/fir/multiModule/basicWithAnnotatedJava/extraDump.java.txt b/idea/testData/fir/multiModule/basicWithAnnotatedJava/extraDump.java.txt deleted file mode 100644 index e7ecc4843e5..00000000000 --- a/idea/testData/fir/multiModule/basicWithAnnotatedJava/extraDump.java.txt +++ /dev/null @@ -1,6 +0,0 @@ -public open class Annotated : R|kotlin/Any| { - @R|org/jetbrains/annotations/NotNull|() public open fun foo(@R|org/jetbrains/annotations/Nullable|() param: R|kotlin/String?|): R|kotlin/String| - - public constructor(): R|Annotated| - -} diff --git a/idea/testData/fir/multiModule/basicWithAnnotatedJava/jvm/Annotated.java b/idea/testData/fir/multiModule/basicWithAnnotatedJava/jvm/Annotated.java deleted file mode 100644 index 1b8dc1e486f..00000000000 --- a/idea/testData/fir/multiModule/basicWithAnnotatedJava/jvm/Annotated.java +++ /dev/null @@ -1,10 +0,0 @@ -import org.jetbrains.annotations.NotNull; -import org.jetbrains.annotations.Nullable; - -public class Annotated { - @NotNull - public String foo(@Nullable String param) { - if (param != null) return param; - else return ""; - } -} \ No newline at end of file diff --git a/idea/testData/fir/multiModule/basicWithAnnotatedJava/jvm/jvm.kt b/idea/testData/fir/multiModule/basicWithAnnotatedJava/jvm/jvm.kt deleted file mode 100644 index 41669bcbb07..00000000000 --- a/idea/testData/fir/multiModule/basicWithAnnotatedJava/jvm/jvm.kt +++ /dev/null @@ -1,6 +0,0 @@ -class User : Annotated() { - fun test() { - val x = foo("123") - val y = foo(null) - } -} \ No newline at end of file diff --git a/idea/testData/fir/multiModule/basicWithAnnotatedOverriddenJava/extraDump.java.txt b/idea/testData/fir/multiModule/basicWithAnnotatedOverriddenJava/extraDump.java.txt deleted file mode 100644 index edda149c574..00000000000 --- a/idea/testData/fir/multiModule/basicWithAnnotatedOverriddenJava/extraDump.java.txt +++ /dev/null @@ -1,12 +0,0 @@ -public open class Annotated : R|kotlin/Any| { - @R|org/jetbrains/annotations/NotNull|() public open fun foo(@R|org/jetbrains/annotations/Nullable|() param: R|kotlin/String?|): R|kotlin/String| - - public constructor(): R|Annotated| - -} -public open class AnnotatedDerived : R|Annotated| { - public open fun foo(param: R|kotlin/String?|): R|kotlin/String| - - public constructor(): R|AnnotatedDerived| - -} diff --git a/idea/testData/fir/multiModule/basicWithAnnotatedOverriddenJava/jvm/AnnotatedDerived.java b/idea/testData/fir/multiModule/basicWithAnnotatedOverriddenJava/jvm/AnnotatedDerived.java deleted file mode 100644 index 4d74b83e1b7..00000000000 --- a/idea/testData/fir/multiModule/basicWithAnnotatedOverriddenJava/jvm/AnnotatedDerived.java +++ /dev/null @@ -1,5 +0,0 @@ -public class AnnotatedDerived extends Annotated { - public String foo(String param) { - return super.foo(param); - } -} \ No newline at end of file diff --git a/idea/testData/fir/multiModule/basicWithAnnotatedOverriddenJava/jvm/jvm.kt b/idea/testData/fir/multiModule/basicWithAnnotatedOverriddenJava/jvm/jvm.kt deleted file mode 100644 index b3c8f0afcdf..00000000000 --- a/idea/testData/fir/multiModule/basicWithAnnotatedOverriddenJava/jvm/jvm.kt +++ /dev/null @@ -1,6 +0,0 @@ -class User : AnnotatedDerived() { - fun test() { - val x = foo("123") - val y = foo(null) - } -} \ No newline at end of file diff --git a/idea/testData/fir/multiModule/basicWithJava/extraDump.java.txt b/idea/testData/fir/multiModule/basicWithJava/extraDump.java.txt deleted file mode 100644 index cc9d26f4ecb..00000000000 --- a/idea/testData/fir/multiModule/basicWithJava/extraDump.java.txt +++ /dev/null @@ -1,4 +0,0 @@ -public open class Some : R|kotlin/Any| { - public constructor(): R|Some| - -} diff --git a/idea/testData/fir/multiModule/basicWithJava/jvm/Some.java b/idea/testData/fir/multiModule/basicWithJava/jvm/Some.java deleted file mode 100644 index d57bf6af7d4..00000000000 --- a/idea/testData/fir/multiModule/basicWithJava/jvm/Some.java +++ /dev/null @@ -1,3 +0,0 @@ -public class Some { - -} \ No newline at end of file diff --git a/idea/testData/fir/multiModule/basicWithJava/jvm/jvm.kt b/idea/testData/fir/multiModule/basicWithJava/jvm/jvm.kt deleted file mode 100644 index 6aedbcf25b5..00000000000 --- a/idea/testData/fir/multiModule/basicWithJava/jvm/jvm.kt +++ /dev/null @@ -1,3 +0,0 @@ - - -class A : Some() \ No newline at end of file diff --git a/idea/testData/fir/multiModule/basicWithJavaFakeOverride/extraDump.java.txt b/idea/testData/fir/multiModule/basicWithJavaFakeOverride/extraDump.java.txt deleted file mode 100644 index c3677cd7bbd..00000000000 --- a/idea/testData/fir/multiModule/basicWithJavaFakeOverride/extraDump.java.txt +++ /dev/null @@ -1,6 +0,0 @@ -public open class A!|> : R|kotlin/Any| { - public open fun foo(t: R|ft!|): R|ft!| - - public constructor!|>(): R|A| - -} diff --git a/idea/testData/fir/multiModule/basicWithJavaFakeOverride/jvm/A.java b/idea/testData/fir/multiModule/basicWithJavaFakeOverride/jvm/A.java deleted file mode 100644 index e90456e8b55..00000000000 --- a/idea/testData/fir/multiModule/basicWithJavaFakeOverride/jvm/A.java +++ /dev/null @@ -1,5 +0,0 @@ -public class A { - public T foo(T t) { - return t; - } -} \ No newline at end of file diff --git a/idea/testData/fir/multiModule/basicWithJavaFakeOverride/jvm/simpleFakeOverride.kt b/idea/testData/fir/multiModule/basicWithJavaFakeOverride/jvm/simpleFakeOverride.kt deleted file mode 100644 index a43197bc0d8..00000000000 --- a/idea/testData/fir/multiModule/basicWithJavaFakeOverride/jvm/simpleFakeOverride.kt +++ /dev/null @@ -1,9 +0,0 @@ - -class Some - -class B : A() { - fun test() { - foo(Some()) - } -} - diff --git a/idea/testData/fir/multiModule/basicWithPrimitiveJava/extraDump.java.txt b/idea/testData/fir/multiModule/basicWithPrimitiveJava/extraDump.java.txt deleted file mode 100644 index 443691153d3..00000000000 --- a/idea/testData/fir/multiModule/basicWithPrimitiveJava/extraDump.java.txt +++ /dev/null @@ -1,8 +0,0 @@ -public open class Some : R|kotlin/Any| { - public open fun foo(param: R|kotlin/Int|): R|kotlin/Boolean| - - public open fun bar(arr: R|ft!|): R|ft!>, kotlin/Array!>?>!| - - public constructor(): R|Some| - -} diff --git a/idea/testData/fir/multiModule/basicWithPrimitiveJava/jvm/jvm.kt b/idea/testData/fir/multiModule/basicWithPrimitiveJava/jvm/jvm.kt deleted file mode 100644 index 30a7d26c902..00000000000 --- a/idea/testData/fir/multiModule/basicWithPrimitiveJava/jvm/jvm.kt +++ /dev/null @@ -1,7 +0,0 @@ -class A : Some() { - fun test() { - val res1 = foo(1) - val res2 = foo(-1) - val res3 = bar(intArrayOf(0, 2, -2)) - } -} \ No newline at end of file diff --git a/idea/testData/fir/multiModule/dummy.txt b/idea/testData/fir/multiModule/dummy.txt new file mode 100644 index 00000000000..cd53e7418b1 --- /dev/null +++ b/idea/testData/fir/multiModule/dummy.txt @@ -0,0 +1 @@ +This file is just to keep parent directory alive. \ No newline at end of file diff --git a/idea/testData/fir/multiModule/fieldAccessFromDerived/extraDump.java.txt b/idea/testData/fir/multiModule/fieldAccessFromDerived/extraDump.java.txt deleted file mode 100644 index 87ce38e350f..00000000000 --- a/idea/testData/fir/multiModule/fieldAccessFromDerived/extraDump.java.txt +++ /dev/null @@ -1,6 +0,0 @@ -public open class Base : R|kotlin/Any| { - public open field value: - - public constructor(): R|Base| - -} diff --git a/idea/testData/fir/multiModule/fieldAccessFromDerived/jvm/Base.java b/idea/testData/fir/multiModule/fieldAccessFromDerived/jvm/Base.java deleted file mode 100644 index 2538fed2533..00000000000 --- a/idea/testData/fir/multiModule/fieldAccessFromDerived/jvm/Base.java +++ /dev/null @@ -1,3 +0,0 @@ -public class Base { - public int value = 0; -} \ No newline at end of file diff --git a/idea/testData/fir/multiModule/fieldAccessFromDerived/jvm/Derived.kt b/idea/testData/fir/multiModule/fieldAccessFromDerived/jvm/Derived.kt deleted file mode 100644 index af4d5ff8c3b..00000000000 --- a/idea/testData/fir/multiModule/fieldAccessFromDerived/jvm/Derived.kt +++ /dev/null @@ -1,5 +0,0 @@ -class Derived : Base() { - fun getValue() = value - - fun foo() = value -} \ No newline at end of file diff --git a/idea/testData/fir/multiModule/intersectionTypesProblem/extraDump.java.txt b/idea/testData/fir/multiModule/intersectionTypesProblem/extraDump.java.txt deleted file mode 100644 index 87df11f8aa0..00000000000 --- a/idea/testData/fir/multiModule/intersectionTypesProblem/extraDump.java.txt +++ /dev/null @@ -1,12 +0,0 @@ -public abstract interface Diagnostic : R|kotlin/Any| { -} -public abstract interface DiagnosticWithParameters1!|, A : R|ft!|> : R|jvm/Diagnostic| { - public abstract fun getA(): R|ft!| - -} -public abstract interface DiagnosticWithParameters2!|, A : R|ft!|, B : R|ft!|> : R|jvm/Diagnostic| { - public abstract fun getA(): R|ft!| - - public abstract fun getB(): R|ft!| - -} diff --git a/idea/testData/fir/multiModule/intersectionTypesProblem/jvm/Diagnostic.java b/idea/testData/fir/multiModule/intersectionTypesProblem/jvm/Diagnostic.java deleted file mode 100644 index d53d04419fd..00000000000 --- a/idea/testData/fir/multiModule/intersectionTypesProblem/jvm/Diagnostic.java +++ /dev/null @@ -1,3 +0,0 @@ -package jvm; - -public interface Diagnostic {} \ No newline at end of file diff --git a/idea/testData/fir/multiModule/intersectionTypesProblem/jvm/DiagnosticWithParameters1.java b/idea/testData/fir/multiModule/intersectionTypesProblem/jvm/DiagnosticWithParameters1.java deleted file mode 100644 index 315d07e8bcd..00000000000 --- a/idea/testData/fir/multiModule/intersectionTypesProblem/jvm/DiagnosticWithParameters1.java +++ /dev/null @@ -1,5 +0,0 @@ -package jvm; - -public interface DiagnosticWithParameters1 extends Diagnostic { - A getA(); -} \ No newline at end of file diff --git a/idea/testData/fir/multiModule/intersectionTypesProblem/jvm/DiagnosticWithParameters2.java b/idea/testData/fir/multiModule/intersectionTypesProblem/jvm/DiagnosticWithParameters2.java deleted file mode 100644 index 12cf21d6f06..00000000000 --- a/idea/testData/fir/multiModule/intersectionTypesProblem/jvm/DiagnosticWithParameters2.java +++ /dev/null @@ -1,6 +0,0 @@ -package jvm; - -public interface DiagnosticWithParameters2 extends Diagnostic { - A getA(); - B getB(); -} \ No newline at end of file diff --git a/idea/testData/fir/multiModule/intersectionTypesProblem/jvm/test.kt b/idea/testData/fir/multiModule/intersectionTypesProblem/jvm/test.kt deleted file mode 100644 index 745c2b2d722..00000000000 --- a/idea/testData/fir/multiModule/intersectionTypesProblem/jvm/test.kt +++ /dev/null @@ -1,7 +0,0 @@ -package jvm; - -fun select(x: K, y: K): K = x - -fun test(d1: DiagnosticWithParameters1<*, *>, d2: DiagnosticWithParameters2<*, *, *>) { - val res = select(d1.a, d2.b) -} \ No newline at end of file diff --git a/idea/testData/fir/multiModule/intersectionTypesProblem/jvm/test.txt b/idea/testData/fir/multiModule/intersectionTypesProblem/jvm/test.txt deleted file mode 100644 index d7408754177..00000000000 --- a/idea/testData/fir/multiModule/intersectionTypesProblem/jvm/test.txt +++ /dev/null @@ -1,7 +0,0 @@ -FILE: test.kt - public final fun select(x: R|K|, y: R|K|): R|K| { - ^select R|/x| - } - public final fun test(d1: R|jvm/DiagnosticWithParameters1<*, *>|, d2: R|jvm/DiagnosticWithParameters2<*, *, *>|): R|kotlin/Unit| { - lval res: R|ft!| = R|jvm/select|!|>(R|/d1|.R|jvm/DiagnosticWithParameters1.a|, R|/d2|.R|jvm/DiagnosticWithParameters2.b|) - } diff --git a/idea/testData/fir/multiModule/javaGetPrefixConflict/extraDump.java.txt b/idea/testData/fir/multiModule/javaGetPrefixConflict/extraDump.java.txt deleted file mode 100644 index 40b8e0740d8..00000000000 --- a/idea/testData/fir/multiModule/javaGetPrefixConflict/extraDump.java.txt +++ /dev/null @@ -1,8 +0,0 @@ -public open class JavaClass : R|kotlin/Any| { - public open fun getText(): R|ft!| - - public open fun getText(param: R|ft!|): R|ft!| - - public constructor(): R|JavaClass| - -} diff --git a/idea/testData/fir/multiModule/javaGetPrefixConflict/jvm/Test.kt b/idea/testData/fir/multiModule/javaGetPrefixConflict/jvm/Test.kt deleted file mode 100644 index c5a1de538c6..00000000000 --- a/idea/testData/fir/multiModule/javaGetPrefixConflict/jvm/Test.kt +++ /dev/null @@ -1,8 +0,0 @@ -fun test() { - val jc = JavaClass() - val result = jc.text -} - -fun otherTest(jc: JavaClass) { - val result = jc.text -} \ No newline at end of file diff --git a/idea/testData/fir/multiModule/javaInheritsKotlinDerived/extraDump.java.txt b/idea/testData/fir/multiModule/javaInheritsKotlinDerived/extraDump.java.txt deleted file mode 100644 index d49a9e738f2..00000000000 --- a/idea/testData/fir/multiModule/javaInheritsKotlinDerived/extraDump.java.txt +++ /dev/null @@ -1,4 +0,0 @@ -public open class JavaClass : R|Derived| { - public constructor(): R|JavaClass| - -} diff --git a/idea/testData/fir/multiModule/javaInheritsKotlinDerived/jvm/Base.kt b/idea/testData/fir/multiModule/javaInheritsKotlinDerived/jvm/Base.kt deleted file mode 100644 index 9358101bf45..00000000000 --- a/idea/testData/fir/multiModule/javaInheritsKotlinDerived/jvm/Base.kt +++ /dev/null @@ -1,7 +0,0 @@ -open class Base { - open val some: String get() = "Base" -} - -open class Derived : Base() { - override val some: String get() = "Derived" -} \ No newline at end of file diff --git a/idea/testData/fir/multiModule/javaInheritsKotlinDerived/jvm/JavaClass.java b/idea/testData/fir/multiModule/javaInheritsKotlinDerived/jvm/JavaClass.java deleted file mode 100644 index aa3ccdc5429..00000000000 --- a/idea/testData/fir/multiModule/javaInheritsKotlinDerived/jvm/JavaClass.java +++ /dev/null @@ -1,3 +0,0 @@ -public class JavaClass extends Derived { - -} \ No newline at end of file diff --git a/idea/testData/fir/multiModule/javaInheritsKotlinDerived/jvm/Test.kt b/idea/testData/fir/multiModule/javaInheritsKotlinDerived/jvm/Test.kt deleted file mode 100644 index 350847cd3b0..00000000000 --- a/idea/testData/fir/multiModule/javaInheritsKotlinDerived/jvm/Test.kt +++ /dev/null @@ -1,4 +0,0 @@ -fun test() { - val jc = JavaClass() - val result = jc.some -} \ No newline at end of file diff --git a/idea/testData/fir/multiModule/javaInheritsKotlinDerived/jvm/Test.txt b/idea/testData/fir/multiModule/javaInheritsKotlinDerived/jvm/Test.txt deleted file mode 100644 index 33d09290429..00000000000 --- a/idea/testData/fir/multiModule/javaInheritsKotlinDerived/jvm/Test.txt +++ /dev/null @@ -1,5 +0,0 @@ -FILE: Test.kt - public final fun test(): R|kotlin/Unit| { - lval jc: R|JavaClass| = R|/JavaClass.JavaClass|() - lval result: R|kotlin/String| = R|/jc|.R|/Derived.some| - } diff --git a/idea/testData/fir/multiModule/javaInheritsKotlinExtension/extraDump.java.txt b/idea/testData/fir/multiModule/javaInheritsKotlinExtension/extraDump.java.txt deleted file mode 100644 index 475f975d2fe..00000000000 --- a/idea/testData/fir/multiModule/javaInheritsKotlinExtension/extraDump.java.txt +++ /dev/null @@ -1,6 +0,0 @@ -public open class Inheritor : R|Second| { - public open fun R|First|.foo(first: R|kotlin/String|, s: R|kotlin/Int|): R|kotlin/Unit| - - public constructor(): R|Inheritor| - -} diff --git a/idea/testData/fir/multiModule/javaInheritsKotlinExtension/jvm/Base.kt b/idea/testData/fir/multiModule/javaInheritsKotlinExtension/jvm/Base.kt deleted file mode 100644 index 3ab84197793..00000000000 --- a/idea/testData/fir/multiModule/javaInheritsKotlinExtension/jvm/Base.kt +++ /dev/null @@ -1,5 +0,0 @@ -interface First - -open class Second { - open fun First.foo(s: String, i: Int) {} -} \ No newline at end of file diff --git a/idea/testData/fir/multiModule/javaInheritsKotlinExtension/jvm/Inheritor.java b/idea/testData/fir/multiModule/javaInheritsKotlinExtension/jvm/Inheritor.java deleted file mode 100644 index a9b4a3ef323..00000000000 --- a/idea/testData/fir/multiModule/javaInheritsKotlinExtension/jvm/Inheritor.java +++ /dev/null @@ -1,3 +0,0 @@ -public class Inheritor extends Second { - public void foo(First first, String s, int i) {} -} \ No newline at end of file diff --git a/idea/testData/fir/multiModule/javaInheritsKotlinExtension/jvm/Test.kt b/idea/testData/fir/multiModule/javaInheritsKotlinExtension/jvm/Test.kt deleted file mode 100644 index 3e1bc93c301..00000000000 --- a/idea/testData/fir/multiModule/javaInheritsKotlinExtension/jvm/Test.kt +++ /dev/null @@ -1,5 +0,0 @@ -class Tester : Inheritor(), First { - fun test() { - foo("abc", 456) - } -} \ No newline at end of file diff --git a/idea/testData/fir/multiModule/javaInheritsKotlinExtension/jvm/Test.txt b/idea/testData/fir/multiModule/javaInheritsKotlinExtension/jvm/Test.txt deleted file mode 100644 index c1c5d117d6f..00000000000 --- a/idea/testData/fir/multiModule/javaInheritsKotlinExtension/jvm/Test.txt +++ /dev/null @@ -1,11 +0,0 @@ -FILE: Test.kt - public final class Tester : R|Inheritor|, R|First| { - public constructor(): R|Tester| { - super() - } - - public final fun test(): R|kotlin/Unit| { - (this@R|/Tester|, this@R|/Tester|).R|/Inheritor.foo|(String(abc), Int(456)) - } - - } diff --git a/idea/testData/fir/multiModule/javaInheritsKotlinProperty/extraDump.java.txt b/idea/testData/fir/multiModule/javaInheritsKotlinProperty/extraDump.java.txt deleted file mode 100644 index e8952ebaed0..00000000000 --- a/idea/testData/fir/multiModule/javaInheritsKotlinProperty/extraDump.java.txt +++ /dev/null @@ -1,6 +0,0 @@ -public open class Inheritor : R|kotlin/Any|, R|Base| { - public open fun getX(): R|kotlin/Int| - - public constructor(): R|Inheritor| - -} diff --git a/idea/testData/fir/multiModule/javaInheritsKotlinProperty/jvm/Base.kt b/idea/testData/fir/multiModule/javaInheritsKotlinProperty/jvm/Base.kt deleted file mode 100644 index b59589c78de..00000000000 --- a/idea/testData/fir/multiModule/javaInheritsKotlinProperty/jvm/Base.kt +++ /dev/null @@ -1,3 +0,0 @@ -interface Base { - val x: Int -} \ No newline at end of file diff --git a/idea/testData/fir/multiModule/javaInheritsKotlinProperty/jvm/Base.txt b/idea/testData/fir/multiModule/javaInheritsKotlinProperty/jvm/Base.txt deleted file mode 100644 index ff77fe4f514..00000000000 --- a/idea/testData/fir/multiModule/javaInheritsKotlinProperty/jvm/Base.txt +++ /dev/null @@ -1,6 +0,0 @@ -FILE: Base.kt - public abstract interface Base : R|kotlin/Any| { - public abstract val x: R|kotlin/Int| - public get(): R|kotlin/Int| - - } diff --git a/idea/testData/fir/multiModule/javaInheritsKotlinProperty/jvm/Inheritor.java b/idea/testData/fir/multiModule/javaInheritsKotlinProperty/jvm/Inheritor.java deleted file mode 100644 index 8e448f8145d..00000000000 --- a/idea/testData/fir/multiModule/javaInheritsKotlinProperty/jvm/Inheritor.java +++ /dev/null @@ -1,5 +0,0 @@ -public class Inheritor implements Base { - public int getX() { - return 42; - } -} \ No newline at end of file diff --git a/idea/testData/fir/multiModule/javaInheritsKotlinProperty/jvm/Test.kt b/idea/testData/fir/multiModule/javaInheritsKotlinProperty/jvm/Test.kt deleted file mode 100644 index 5e9391a3761..00000000000 --- a/idea/testData/fir/multiModule/javaInheritsKotlinProperty/jvm/Test.kt +++ /dev/null @@ -1,5 +0,0 @@ -class Tester : Inheritor() { - fun test(): Int { - return x - } -} \ No newline at end of file diff --git a/idea/testData/fir/multiModule/javaInheritsRawKotlin/extraDump.java.txt b/idea/testData/fir/multiModule/javaInheritsRawKotlin/extraDump.java.txt deleted file mode 100644 index 3390067b68b..00000000000 --- a/idea/testData/fir/multiModule/javaInheritsRawKotlin/extraDump.java.txt +++ /dev/null @@ -1,6 +0,0 @@ -public open class Some : R|kotlin/Any|, R|Strange| { - public open fun foo(): R|kotlin/Any?| - - public constructor(): R|Some| - -} diff --git a/idea/testData/fir/multiModule/javaInheritsRawKotlin/jvm/Derived.kt b/idea/testData/fir/multiModule/javaInheritsRawKotlin/jvm/Derived.kt deleted file mode 100644 index cf8bdc9b946..00000000000 --- a/idea/testData/fir/multiModule/javaInheritsRawKotlin/jvm/Derived.kt +++ /dev/null @@ -1 +0,0 @@ -class Derived : Some() \ No newline at end of file diff --git a/idea/testData/fir/multiModule/javaInheritsRawKotlin/jvm/Some.java b/idea/testData/fir/multiModule/javaInheritsRawKotlin/jvm/Some.java deleted file mode 100644 index be52d48d8d3..00000000000 --- a/idea/testData/fir/multiModule/javaInheritsRawKotlin/jvm/Some.java +++ /dev/null @@ -1,5 +0,0 @@ -public class Some implements Strange { - public Object foo() { - return ""; - } -} \ No newline at end of file diff --git a/idea/testData/fir/multiModule/javaInheritsRawKotlin/jvm/Strange.kt b/idea/testData/fir/multiModule/javaInheritsRawKotlin/jvm/Strange.kt deleted file mode 100644 index 58e08835710..00000000000 --- a/idea/testData/fir/multiModule/javaInheritsRawKotlin/jvm/Strange.kt +++ /dev/null @@ -1,3 +0,0 @@ -interface Strange { - fun foo(): T -} \ No newline at end of file diff --git a/idea/testData/fir/multiModule/javaInheritsRawKotlin/jvm/Strange.txt b/idea/testData/fir/multiModule/javaInheritsRawKotlin/jvm/Strange.txt deleted file mode 100644 index 8bbfd2a06b2..00000000000 --- a/idea/testData/fir/multiModule/javaInheritsRawKotlin/jvm/Strange.txt +++ /dev/null @@ -1,5 +0,0 @@ -FILE: Strange.kt - public abstract interface Strange : R|kotlin/Any| { - public abstract fun foo(): R|T| - - } diff --git a/idea/testData/fir/multiModule/javaSyntheticProperty/extraDump.java.txt b/idea/testData/fir/multiModule/javaSyntheticProperty/extraDump.java.txt deleted file mode 100644 index 3a454e77ecc..00000000000 --- a/idea/testData/fir/multiModule/javaSyntheticProperty/extraDump.java.txt +++ /dev/null @@ -1,6 +0,0 @@ -public/*package*/ open class JavaClass : R|kotlin/Any| { - public open fun getFoo(): R|ft!| - - public/*package*/ constructor(): R|JavaClass| - -} diff --git a/idea/testData/fir/multiModule/javaSyntheticProperty/jvm/JavaClass.java b/idea/testData/fir/multiModule/javaSyntheticProperty/jvm/JavaClass.java deleted file mode 100644 index ace825de25b..00000000000 --- a/idea/testData/fir/multiModule/javaSyntheticProperty/jvm/JavaClass.java +++ /dev/null @@ -1,3 +0,0 @@ -class JavaClass { - public String getFoo() { return null; } -} \ No newline at end of file diff --git a/idea/testData/fir/multiModule/javaSyntheticProperty/jvm/Test.kt b/idea/testData/fir/multiModule/javaSyntheticProperty/jvm/Test.kt deleted file mode 100644 index 428566c981d..00000000000 --- a/idea/testData/fir/multiModule/javaSyntheticProperty/jvm/Test.kt +++ /dev/null @@ -1 +0,0 @@ -val x = JavaClass().foo \ No newline at end of file diff --git a/idea/testData/fir/multiModule/mppFakeOverrides/common/common.kt b/idea/testData/fir/multiModule/mppFakeOverrides/common/common.kt deleted file mode 100644 index 3f3afd1fbee..00000000000 --- a/idea/testData/fir/multiModule/mppFakeOverrides/common/common.kt +++ /dev/null @@ -1,11 +0,0 @@ -expect open class A() { - open fun foo(arg: T) -} -open class B : A() { - // Fake: override fun foo(arg: String) = super.foo(arg) - // Fake (JVM only): override fun bar(arg: String): String = super.bar(arg) -} -open class C : B() { - open fun bar(arg: String): String = arg - open fun baz(arg: CharSequence): String = arg.toString() -} \ No newline at end of file diff --git a/idea/testData/fir/multiModule/mppFakeOverrides/common/common.txt b/idea/testData/fir/multiModule/mppFakeOverrides/common/common.txt deleted file mode 100644 index 33d7e987aa5..00000000000 --- a/idea/testData/fir/multiModule/mppFakeOverrides/common/common.txt +++ /dev/null @@ -1,29 +0,0 @@ -FILE: common.kt - public open expect class A : R|kotlin/Any| { - public constructor(): R|A| { - super() - } - - public open fun foo(arg: R|T|): R|kotlin/Unit| - - } - public open class B : R|A| { - public constructor(): R|B| { - super|>() - } - - } - public open class C : R|B| { - public constructor(): R|C| { - super() - } - - public open fun bar(arg: R|kotlin/String|): R|kotlin/String| { - ^bar R|/arg| - } - - public open fun baz(arg: R|kotlin/CharSequence|): R|kotlin/String| { - ^baz R|/arg|.R|kotlin/Any.toString|() - } - - } diff --git a/idea/testData/fir/multiModule/mppFakeOverrides/jvm/jvm.kt b/idea/testData/fir/multiModule/mppFakeOverrides/jvm/jvm.kt deleted file mode 100644 index e16146a3d7f..00000000000 --- a/idea/testData/fir/multiModule/mppFakeOverrides/jvm/jvm.kt +++ /dev/null @@ -1,12 +0,0 @@ -actual open class A { - actual open fun foo(arg: T) {} - open fun bar(arg: T): T = arg - open fun baz(arg: T): T = arg -} -class D : C() { - fun test() { - foo("") - bar("") // should be resolved to just C.bar - baz("") - } -} \ No newline at end of file diff --git a/idea/testData/fir/multiModule/mppMemberType/common/common.kt b/idea/testData/fir/multiModule/mppMemberType/common/common.kt deleted file mode 100644 index 13847ba8b16..00000000000 --- a/idea/testData/fir/multiModule/mppMemberType/common/common.kt +++ /dev/null @@ -1,5 +0,0 @@ -expect class MyList { - fun get(i: Int): Int -} - -open class Wrapper(val list: MyList) \ No newline at end of file diff --git a/idea/testData/fir/multiModule/mppMemberType/common/common.txt b/idea/testData/fir/multiModule/mppMemberType/common/common.txt deleted file mode 100644 index fb1074d3e20..00000000000 --- a/idea/testData/fir/multiModule/mppMemberType/common/common.txt +++ /dev/null @@ -1,18 +0,0 @@ -FILE: common.kt - public final expect class MyList : R|kotlin/Any| { - public constructor(): R|MyList| { - super() - } - - public final fun get(i: R|kotlin/Int|): R|kotlin/Int| - - } - public open class Wrapper : R|kotlin/Any| { - public constructor(list: R|MyList|): R|Wrapper| { - super() - } - - public final val list: R|MyList| = R|/list| - public get(): R|MyList| - - } diff --git a/idea/testData/fir/multiModule/mppMembers/common/common.kt b/idea/testData/fir/multiModule/mppMembers/common/common.kt deleted file mode 100644 index 8d04bbe4141..00000000000 --- a/idea/testData/fir/multiModule/mppMembers/common/common.kt +++ /dev/null @@ -1,5 +0,0 @@ -expect open class A() { - fun foo() -} - -open class B : A() \ No newline at end of file diff --git a/idea/testData/fir/multiModule/mppMembers/common/common.txt b/idea/testData/fir/multiModule/mppMembers/common/common.txt deleted file mode 100644 index ff4152056c7..00000000000 --- a/idea/testData/fir/multiModule/mppMembers/common/common.txt +++ /dev/null @@ -1,15 +0,0 @@ -FILE: common.kt - public open expect class A : R|kotlin/Any| { - public constructor(): R|A| { - super() - } - - public final fun foo(): R|kotlin/Unit| - - } - public open class B : R|A| { - public constructor(): R|B| { - super() - } - - } diff --git a/idea/testData/fir/multiModule/mppSuperTypes/common/common.kt b/idea/testData/fir/multiModule/mppSuperTypes/common/common.kt deleted file mode 100644 index 8d04bbe4141..00000000000 --- a/idea/testData/fir/multiModule/mppSuperTypes/common/common.kt +++ /dev/null @@ -1,5 +0,0 @@ -expect open class A() { - fun foo() -} - -open class B : A() \ No newline at end of file diff --git a/idea/testData/fir/multiModule/mppSuperTypes/common/common.txt b/idea/testData/fir/multiModule/mppSuperTypes/common/common.txt deleted file mode 100644 index ff4152056c7..00000000000 --- a/idea/testData/fir/multiModule/mppSuperTypes/common/common.txt +++ /dev/null @@ -1,15 +0,0 @@ -FILE: common.kt - public open expect class A : R|kotlin/Any| { - public constructor(): R|A| { - super() - } - - public final fun foo(): R|kotlin/Unit| - - } - public open class B : R|A| { - public constructor(): R|B| { - super() - } - - } diff --git a/idea/testData/fir/multiModule/overrideWithJava/extraDump.java.txt b/idea/testData/fir/multiModule/overrideWithJava/extraDump.java.txt deleted file mode 100644 index 40301ec5d17..00000000000 --- a/idea/testData/fir/multiModule/overrideWithJava/extraDump.java.txt +++ /dev/null @@ -1,8 +0,0 @@ -public open class A : R|kotlin/Any| { - public open fun foo(): R|ft!| - - public open fun bar(): R|ft!| - - public constructor(): R|A| - -} diff --git a/idea/testData/fir/multiModule/overrideWithJava/jvm/A.java b/idea/testData/fir/multiModule/overrideWithJava/jvm/A.java deleted file mode 100644 index be6f30c8a5c..00000000000 --- a/idea/testData/fir/multiModule/overrideWithJava/jvm/A.java +++ /dev/null @@ -1,9 +0,0 @@ -public class A { - public A foo() { - return this; - } - - public A bar() { - return this; - } -} \ No newline at end of file diff --git a/idea/testData/fir/multiModule/withStdlib/jvm_dep(stdlib)/Some.kt b/idea/testData/fir/multiModule/withStdlib/jvm_dep(stdlib)/Some.kt deleted file mode 100644 index 919b8e65426..00000000000 --- a/idea/testData/fir/multiModule/withStdlib/jvm_dep(stdlib)/Some.kt +++ /dev/null @@ -1 +0,0 @@ -val someList = listOf(1, 2, 3) \ No newline at end of file diff --git a/idea/testData/fir/multiModule/withStdlib/jvm_dep(stdlib)/Some.txt b/idea/testData/fir/multiModule/withStdlib/jvm_dep(stdlib)/Some.txt deleted file mode 100644 index c6ea7141d91..00000000000 --- a/idea/testData/fir/multiModule/withStdlib/jvm_dep(stdlib)/Some.txt +++ /dev/null @@ -1,3 +0,0 @@ -FILE: Some.kt - public final val someList: R|kotlin/collections/List| = R|kotlin/collections/listOf|(vararg(Int(1), Int(2), Int(3))) - public get(): R|kotlin/collections/List|