diff --git a/.idea/modules.xml b/.idea/modules.xml
index 6c8c0174592..593516f76ef 100644
--- a/.idea/modules.xml
+++ b/.idea/modules.xml
@@ -35,6 +35,7 @@
+
diff --git a/build.xml b/build.xml
index aa6edb1dcbe..6db078f304d 100644
--- a/build.xml
+++ b/build.xml
@@ -565,7 +565,7 @@
-
@@ -598,6 +598,7 @@
+
diff --git a/compiler/testData/builtin-classes.txt b/compiler/testData/builtin-classes.txt
index 9c78e90364a..985f02e0bbf 100644
--- a/compiler/testData/builtin-classes.txt
+++ b/compiler/testData/builtin-classes.txt
@@ -934,282 +934,6 @@ public trait Iterator {
public abstract fun next(): T
}
-public trait KExtensionFunction0 : kotlin.ExtensionFunction0 {
- public abstract override /*1*/ /*fake_override*/ fun T.invoke(): R
-}
-
-public trait KExtensionFunction1 : kotlin.ExtensionFunction1 {
- public abstract override /*1*/ /*fake_override*/ fun T.invoke(/*0*/ p1: P1): R
-}
-
-public trait KExtensionFunction10 : kotlin.ExtensionFunction10 {
- public abstract override /*1*/ /*fake_override*/ fun T.invoke(/*0*/ p1: P1, /*1*/ p2: P2, /*2*/ p3: P3, /*3*/ p4: P4, /*4*/ p5: P5, /*5*/ p6: P6, /*6*/ p7: P7, /*7*/ p8: P8, /*8*/ p9: P9, /*9*/ p10: P10): R
-}
-
-public trait KExtensionFunction11 : kotlin.ExtensionFunction11 {
- public abstract override /*1*/ /*fake_override*/ fun T.invoke(/*0*/ p1: P1, /*1*/ p2: P2, /*2*/ p3: P3, /*3*/ p4: P4, /*4*/ p5: P5, /*5*/ p6: P6, /*6*/ p7: P7, /*7*/ p8: P8, /*8*/ p9: P9, /*9*/ p10: P10, /*10*/ p11: P11): R
-}
-
-public trait KExtensionFunction12 : kotlin.ExtensionFunction12 {
- public abstract override /*1*/ /*fake_override*/ fun T.invoke(/*0*/ p1: P1, /*1*/ p2: P2, /*2*/ p3: P3, /*3*/ p4: P4, /*4*/ p5: P5, /*5*/ p6: P6, /*6*/ p7: P7, /*7*/ p8: P8, /*8*/ p9: P9, /*9*/ p10: P10, /*10*/ p11: P11, /*11*/ p12: P12): R
-}
-
-public trait KExtensionFunction13 : kotlin.ExtensionFunction13 {
- public abstract override /*1*/ /*fake_override*/ fun T.invoke(/*0*/ p1: P1, /*1*/ p2: P2, /*2*/ p3: P3, /*3*/ p4: P4, /*4*/ p5: P5, /*5*/ p6: P6, /*6*/ p7: P7, /*7*/ p8: P8, /*8*/ p9: P9, /*9*/ p10: P10, /*10*/ p11: P11, /*11*/ p12: P12, /*12*/ p13: P13): R
-}
-
-public trait KExtensionFunction14 : kotlin.ExtensionFunction14 {
- public abstract override /*1*/ /*fake_override*/ fun T.invoke(/*0*/ p1: P1, /*1*/ p2: P2, /*2*/ p3: P3, /*3*/ p4: P4, /*4*/ p5: P5, /*5*/ p6: P6, /*6*/ p7: P7, /*7*/ p8: P8, /*8*/ p9: P9, /*9*/ p10: P10, /*10*/ p11: P11, /*11*/ p12: P12, /*12*/ p13: P13, /*13*/ p14: P14): R
-}
-
-public trait KExtensionFunction15 : kotlin.ExtensionFunction15 {
- public abstract override /*1*/ /*fake_override*/ fun T.invoke(/*0*/ p1: P1, /*1*/ p2: P2, /*2*/ p3: P3, /*3*/ p4: P4, /*4*/ p5: P5, /*5*/ p6: P6, /*6*/ p7: P7, /*7*/ p8: P8, /*8*/ p9: P9, /*9*/ p10: P10, /*10*/ p11: P11, /*11*/ p12: P12, /*12*/ p13: P13, /*13*/ p14: P14, /*14*/ p15: P15): R
-}
-
-public trait KExtensionFunction16 : kotlin.ExtensionFunction16 {
- public abstract override /*1*/ /*fake_override*/ fun T.invoke(/*0*/ p1: P1, /*1*/ p2: P2, /*2*/ p3: P3, /*3*/ p4: P4, /*4*/ p5: P5, /*5*/ p6: P6, /*6*/ p7: P7, /*7*/ p8: P8, /*8*/ p9: P9, /*9*/ p10: P10, /*10*/ p11: P11, /*11*/ p12: P12, /*12*/ p13: P13, /*13*/ p14: P14, /*14*/ p15: P15, /*15*/ p16: P16): R
-}
-
-public trait KExtensionFunction17 : kotlin.ExtensionFunction17 {
- public abstract override /*1*/ /*fake_override*/ fun T.invoke(/*0*/ p1: P1, /*1*/ p2: P2, /*2*/ p3: P3, /*3*/ p4: P4, /*4*/ p5: P5, /*5*/ p6: P6, /*6*/ p7: P7, /*7*/ p8: P8, /*8*/ p9: P9, /*9*/ p10: P10, /*10*/ p11: P11, /*11*/ p12: P12, /*12*/ p13: P13, /*13*/ p14: P14, /*14*/ p15: P15, /*15*/ p16: P16, /*16*/ p17: P17): R
-}
-
-public trait KExtensionFunction18 : kotlin.ExtensionFunction18 {
- public abstract override /*1*/ /*fake_override*/ fun T.invoke(/*0*/ p1: P1, /*1*/ p2: P2, /*2*/ p3: P3, /*3*/ p4: P4, /*4*/ p5: P5, /*5*/ p6: P6, /*6*/ p7: P7, /*7*/ p8: P8, /*8*/ p9: P9, /*9*/ p10: P10, /*10*/ p11: P11, /*11*/ p12: P12, /*12*/ p13: P13, /*13*/ p14: P14, /*14*/ p15: P15, /*15*/ p16: P16, /*16*/ p17: P17, /*17*/ p18: P18): R
-}
-
-public trait KExtensionFunction19 : kotlin.ExtensionFunction19 {
- public abstract override /*1*/ /*fake_override*/ fun T.invoke(/*0*/ p1: P1, /*1*/ p2: P2, /*2*/ p3: P3, /*3*/ p4: P4, /*4*/ p5: P5, /*5*/ p6: P6, /*6*/ p7: P7, /*7*/ p8: P8, /*8*/ p9: P9, /*9*/ p10: P10, /*10*/ p11: P11, /*11*/ p12: P12, /*12*/ p13: P13, /*13*/ p14: P14, /*14*/ p15: P15, /*15*/ p16: P16, /*16*/ p17: P17, /*17*/ p18: P18, /*18*/ p19: P19): R
-}
-
-public trait KExtensionFunction2 : kotlin.ExtensionFunction2 {
- public abstract override /*1*/ /*fake_override*/ fun T.invoke(/*0*/ p1: P1, /*1*/ p2: P2): R
-}
-
-public trait KExtensionFunction20 : kotlin.ExtensionFunction20 {
- public abstract override /*1*/ /*fake_override*/ fun T.invoke(/*0*/ p1: P1, /*1*/ p2: P2, /*2*/ p3: P3, /*3*/ p4: P4, /*4*/ p5: P5, /*5*/ p6: P6, /*6*/ p7: P7, /*7*/ p8: P8, /*8*/ p9: P9, /*9*/ p10: P10, /*10*/ p11: P11, /*11*/ p12: P12, /*12*/ p13: P13, /*13*/ p14: P14, /*14*/ p15: P15, /*15*/ p16: P16, /*16*/ p17: P17, /*17*/ p18: P18, /*18*/ p19: P19, /*19*/ p20: P20): R
-}
-
-public trait KExtensionFunction21 : kotlin.ExtensionFunction21 {
- public abstract override /*1*/ /*fake_override*/ fun T.invoke(/*0*/ p1: P1, /*1*/ p2: P2, /*2*/ p3: P3, /*3*/ p4: P4, /*4*/ p5: P5, /*5*/ p6: P6, /*6*/ p7: P7, /*7*/ p8: P8, /*8*/ p9: P9, /*9*/ p10: P10, /*10*/ p11: P11, /*11*/ p12: P12, /*12*/ p13: P13, /*13*/ p14: P14, /*14*/ p15: P15, /*15*/ p16: P16, /*16*/ p17: P17, /*17*/ p18: P18, /*18*/ p19: P19, /*19*/ p20: P20, /*20*/ p21: P21): R
-}
-
-public trait KExtensionFunction22 : kotlin.ExtensionFunction22 {
- public abstract override /*1*/ /*fake_override*/ fun T.invoke(/*0*/ p1: P1, /*1*/ p2: P2, /*2*/ p3: P3, /*3*/ p4: P4, /*4*/ p5: P5, /*5*/ p6: P6, /*6*/ p7: P7, /*7*/ p8: P8, /*8*/ p9: P9, /*9*/ p10: P10, /*10*/ p11: P11, /*11*/ p12: P12, /*12*/ p13: P13, /*13*/ p14: P14, /*14*/ p15: P15, /*15*/ p16: P16, /*16*/ p17: P17, /*17*/ p18: P18, /*18*/ p19: P19, /*19*/ p20: P20, /*20*/ p21: P21, /*21*/ p22: P22): R
-}
-
-public trait KExtensionFunction3 : kotlin.ExtensionFunction3 {
- public abstract override /*1*/ /*fake_override*/ fun T.invoke(/*0*/ p1: P1, /*1*/ p2: P2, /*2*/ p3: P3): R
-}
-
-public trait KExtensionFunction4 : kotlin.ExtensionFunction4 {
- public abstract override /*1*/ /*fake_override*/ fun T.invoke(/*0*/ p1: P1, /*1*/ p2: P2, /*2*/ p3: P3, /*3*/ p4: P4): R
-}
-
-public trait KExtensionFunction5 : kotlin.ExtensionFunction5 {
- public abstract override /*1*/ /*fake_override*/ fun T.invoke(/*0*/ p1: P1, /*1*/ p2: P2, /*2*/ p3: P3, /*3*/ p4: P4, /*4*/ p5: P5): R
-}
-
-public trait KExtensionFunction6 : kotlin.ExtensionFunction6 {
- public abstract override /*1*/ /*fake_override*/ fun T.invoke(/*0*/ p1: P1, /*1*/ p2: P2, /*2*/ p3: P3, /*3*/ p4: P4, /*4*/ p5: P5, /*5*/ p6: P6): R
-}
-
-public trait KExtensionFunction7 : kotlin.ExtensionFunction7 {
- public abstract override /*1*/ /*fake_override*/ fun T.invoke(/*0*/ p1: P1, /*1*/ p2: P2, /*2*/ p3: P3, /*3*/ p4: P4, /*4*/ p5: P5, /*5*/ p6: P6, /*6*/ p7: P7): R
-}
-
-public trait KExtensionFunction8 : kotlin.ExtensionFunction8 {
- public abstract override /*1*/ /*fake_override*/ fun T.invoke(/*0*/ p1: P1, /*1*/ p2: P2, /*2*/ p3: P3, /*3*/ p4: P4, /*4*/ p5: P5, /*5*/ p6: P6, /*6*/ p7: P7, /*7*/ p8: P8): R
-}
-
-public trait KExtensionFunction9 : kotlin.ExtensionFunction9 {
- public abstract override /*1*/ /*fake_override*/ fun T.invoke(/*0*/ p1: P1, /*1*/ p2: P2, /*2*/ p3: P3, /*3*/ p4: P4, /*4*/ p5: P5, /*5*/ p6: P6, /*6*/ p7: P7, /*7*/ p8: P8, /*8*/ p9: P9): R
-}
-
-public trait KFunction0 : kotlin.Function0 {
- public abstract override /*1*/ /*fake_override*/ fun invoke(): R
-}
-
-public trait KFunction1 : kotlin.Function1 {
- public abstract override /*1*/ /*fake_override*/ fun invoke(/*0*/ p1: P1): R
-}
-
-public trait KFunction10 : kotlin.Function10 {
- public abstract override /*1*/ /*fake_override*/ fun invoke(/*0*/ p1: P1, /*1*/ p2: P2, /*2*/ p3: P3, /*3*/ p4: P4, /*4*/ p5: P5, /*5*/ p6: P6, /*6*/ p7: P7, /*7*/ p8: P8, /*8*/ p9: P9, /*9*/ p10: P10): R
-}
-
-public trait KFunction11 : kotlin.Function11 {
- public abstract override /*1*/ /*fake_override*/ fun invoke(/*0*/ p1: P1, /*1*/ p2: P2, /*2*/ p3: P3, /*3*/ p4: P4, /*4*/ p5: P5, /*5*/ p6: P6, /*6*/ p7: P7, /*7*/ p8: P8, /*8*/ p9: P9, /*9*/ p10: P10, /*10*/ p11: P11): R
-}
-
-public trait KFunction12 : kotlin.Function12 {
- public abstract override /*1*/ /*fake_override*/ fun invoke(/*0*/ p1: P1, /*1*/ p2: P2, /*2*/ p3: P3, /*3*/ p4: P4, /*4*/ p5: P5, /*5*/ p6: P6, /*6*/ p7: P7, /*7*/ p8: P8, /*8*/ p9: P9, /*9*/ p10: P10, /*10*/ p11: P11, /*11*/ p12: P12): R
-}
-
-public trait KFunction13 : kotlin.Function13 {
- public abstract override /*1*/ /*fake_override*/ fun invoke(/*0*/ p1: P1, /*1*/ p2: P2, /*2*/ p3: P3, /*3*/ p4: P4, /*4*/ p5: P5, /*5*/ p6: P6, /*6*/ p7: P7, /*7*/ p8: P8, /*8*/ p9: P9, /*9*/ p10: P10, /*10*/ p11: P11, /*11*/ p12: P12, /*12*/ p13: P13): R
-}
-
-public trait KFunction14 : kotlin.Function14 {
- public abstract override /*1*/ /*fake_override*/ fun invoke(/*0*/ p1: P1, /*1*/ p2: P2, /*2*/ p3: P3, /*3*/ p4: P4, /*4*/ p5: P5, /*5*/ p6: P6, /*6*/ p7: P7, /*7*/ p8: P8, /*8*/ p9: P9, /*9*/ p10: P10, /*10*/ p11: P11, /*11*/ p12: P12, /*12*/ p13: P13, /*13*/ p14: P14): R
-}
-
-public trait KFunction15 : kotlin.Function15 {
- public abstract override /*1*/ /*fake_override*/ fun invoke(/*0*/ p1: P1, /*1*/ p2: P2, /*2*/ p3: P3, /*3*/ p4: P4, /*4*/ p5: P5, /*5*/ p6: P6, /*6*/ p7: P7, /*7*/ p8: P8, /*8*/ p9: P9, /*9*/ p10: P10, /*10*/ p11: P11, /*11*/ p12: P12, /*12*/ p13: P13, /*13*/ p14: P14, /*14*/ p15: P15): R
-}
-
-public trait KFunction16 : kotlin.Function16 {
- public abstract override /*1*/ /*fake_override*/ fun invoke(/*0*/ p1: P1, /*1*/ p2: P2, /*2*/ p3: P3, /*3*/ p4: P4, /*4*/ p5: P5, /*5*/ p6: P6, /*6*/ p7: P7, /*7*/ p8: P8, /*8*/ p9: P9, /*9*/ p10: P10, /*10*/ p11: P11, /*11*/ p12: P12, /*12*/ p13: P13, /*13*/ p14: P14, /*14*/ p15: P15, /*15*/ p16: P16): R
-}
-
-public trait KFunction17 : kotlin.Function17 {
- public abstract override /*1*/ /*fake_override*/ fun invoke(/*0*/ p1: P1, /*1*/ p2: P2, /*2*/ p3: P3, /*3*/ p4: P4, /*4*/ p5: P5, /*5*/ p6: P6, /*6*/ p7: P7, /*7*/ p8: P8, /*8*/ p9: P9, /*9*/ p10: P10, /*10*/ p11: P11, /*11*/ p12: P12, /*12*/ p13: P13, /*13*/ p14: P14, /*14*/ p15: P15, /*15*/ p16: P16, /*16*/ p17: P17): R
-}
-
-public trait KFunction18 : kotlin.Function18 {
- public abstract override /*1*/ /*fake_override*/ fun invoke(/*0*/ p1: P1, /*1*/ p2: P2, /*2*/ p3: P3, /*3*/ p4: P4, /*4*/ p5: P5, /*5*/ p6: P6, /*6*/ p7: P7, /*7*/ p8: P8, /*8*/ p9: P9, /*9*/ p10: P10, /*10*/ p11: P11, /*11*/ p12: P12, /*12*/ p13: P13, /*13*/ p14: P14, /*14*/ p15: P15, /*15*/ p16: P16, /*16*/ p17: P17, /*17*/ p18: P18): R
-}
-
-public trait KFunction19 : kotlin.Function19 {
- public abstract override /*1*/ /*fake_override*/ fun invoke(/*0*/ p1: P1, /*1*/ p2: P2, /*2*/ p3: P3, /*3*/ p4: P4, /*4*/ p5: P5, /*5*/ p6: P6, /*6*/ p7: P7, /*7*/ p8: P8, /*8*/ p9: P9, /*9*/ p10: P10, /*10*/ p11: P11, /*11*/ p12: P12, /*12*/ p13: P13, /*13*/ p14: P14, /*14*/ p15: P15, /*15*/ p16: P16, /*16*/ p17: P17, /*17*/ p18: P18, /*18*/ p19: P19): R
-}
-
-public trait KFunction2 : kotlin.Function2 {
- public abstract override /*1*/ /*fake_override*/ fun invoke(/*0*/ p1: P1, /*1*/ p2: P2): R
-}
-
-public trait KFunction20 : kotlin.Function20 {
- public abstract override /*1*/ /*fake_override*/ fun invoke(/*0*/ p1: P1, /*1*/ p2: P2, /*2*/ p3: P3, /*3*/ p4: P4, /*4*/ p5: P5, /*5*/ p6: P6, /*6*/ p7: P7, /*7*/ p8: P8, /*8*/ p9: P9, /*9*/ p10: P10, /*10*/ p11: P11, /*11*/ p12: P12, /*12*/ p13: P13, /*13*/ p14: P14, /*14*/ p15: P15, /*15*/ p16: P16, /*16*/ p17: P17, /*17*/ p18: P18, /*18*/ p19: P19, /*19*/ p20: P20): R
-}
-
-public trait KFunction21 : kotlin.Function21 {
- public abstract override /*1*/ /*fake_override*/ fun invoke(/*0*/ p1: P1, /*1*/ p2: P2, /*2*/ p3: P3, /*3*/ p4: P4, /*4*/ p5: P5, /*5*/ p6: P6, /*6*/ p7: P7, /*7*/ p8: P8, /*8*/ p9: P9, /*9*/ p10: P10, /*10*/ p11: P11, /*11*/ p12: P12, /*12*/ p13: P13, /*13*/ p14: P14, /*14*/ p15: P15, /*15*/ p16: P16, /*16*/ p17: P17, /*17*/ p18: P18, /*18*/ p19: P19, /*19*/ p20: P20, /*20*/ p21: P21): R
-}
-
-public trait KFunction22 : kotlin.Function22 {
- public abstract override /*1*/ /*fake_override*/ fun invoke(/*0*/ p1: P1, /*1*/ p2: P2, /*2*/ p3: P3, /*3*/ p4: P4, /*4*/ p5: P5, /*5*/ p6: P6, /*6*/ p7: P7, /*7*/ p8: P8, /*8*/ p9: P9, /*9*/ p10: P10, /*10*/ p11: P11, /*11*/ p12: P12, /*12*/ p13: P13, /*13*/ p14: P14, /*14*/ p15: P15, /*15*/ p16: P16, /*16*/ p17: P17, /*17*/ p18: P18, /*18*/ p19: P19, /*19*/ p20: P20, /*20*/ p21: P21, /*21*/ p22: P22): R
-}
-
-public trait KFunction3 : kotlin.Function3 {
- public abstract override /*1*/ /*fake_override*/ fun invoke(/*0*/ p1: P1, /*1*/ p2: P2, /*2*/ p3: P3): R
-}
-
-public trait KFunction4 : kotlin.Function4 {
- public abstract override /*1*/ /*fake_override*/ fun invoke(/*0*/ p1: P1, /*1*/ p2: P2, /*2*/ p3: P3, /*3*/ p4: P4): R
-}
-
-public trait KFunction5 : kotlin.Function5 {
- public abstract override /*1*/ /*fake_override*/ fun invoke(/*0*/ p1: P1, /*1*/ p2: P2, /*2*/ p3: P3, /*3*/ p4: P4, /*4*/ p5: P5): R
-}
-
-public trait KFunction6 : kotlin.Function6 {
- public abstract override /*1*/ /*fake_override*/ fun invoke(/*0*/ p1: P1, /*1*/ p2: P2, /*2*/ p3: P3, /*3*/ p4: P4, /*4*/ p5: P5, /*5*/ p6: P6): R
-}
-
-public trait KFunction7 : kotlin.Function7 {
- public abstract override /*1*/ /*fake_override*/ fun invoke(/*0*/ p1: P1, /*1*/ p2: P2, /*2*/ p3: P3, /*3*/ p4: P4, /*4*/ p5: P5, /*5*/ p6: P6, /*6*/ p7: P7): R
-}
-
-public trait KFunction8 : kotlin.Function8 {
- public abstract override /*1*/ /*fake_override*/ fun invoke(/*0*/ p1: P1, /*1*/ p2: P2, /*2*/ p3: P3, /*3*/ p4: P4, /*4*/ p5: P5, /*5*/ p6: P6, /*6*/ p7: P7, /*7*/ p8: P8): R
-}
-
-public trait KFunction9 : kotlin.Function9 {
- public abstract override /*1*/ /*fake_override*/ fun invoke(/*0*/ p1: P1, /*1*/ p2: P2, /*2*/ p3: P3, /*3*/ p4: P4, /*4*/ p5: P5, /*5*/ p6: P6, /*6*/ p7: P7, /*7*/ p8: P8, /*8*/ p9: P9): R
-}
-
-public trait KMemberFunction0 : kotlin.ExtensionFunction0 {
- public abstract override /*1*/ /*fake_override*/ fun T.invoke(): R
-}
-
-public trait KMemberFunction1 : kotlin.ExtensionFunction1 {
- public abstract override /*1*/ /*fake_override*/ fun T.invoke(/*0*/ p1: P1): R
-}
-
-public trait KMemberFunction10 : kotlin.ExtensionFunction10 {
- public abstract override /*1*/ /*fake_override*/ fun T.invoke(/*0*/ p1: P1, /*1*/ p2: P2, /*2*/ p3: P3, /*3*/ p4: P4, /*4*/ p5: P5, /*5*/ p6: P6, /*6*/ p7: P7, /*7*/ p8: P8, /*8*/ p9: P9, /*9*/ p10: P10): R
-}
-
-public trait KMemberFunction11 : kotlin.ExtensionFunction11 {
- public abstract override /*1*/ /*fake_override*/ fun T.invoke(/*0*/ p1: P1, /*1*/ p2: P2, /*2*/ p3: P3, /*3*/ p4: P4, /*4*/ p5: P5, /*5*/ p6: P6, /*6*/ p7: P7, /*7*/ p8: P8, /*8*/ p9: P9, /*9*/ p10: P10, /*10*/ p11: P11): R
-}
-
-public trait KMemberFunction12 : kotlin.ExtensionFunction12 {
- public abstract override /*1*/ /*fake_override*/ fun T.invoke(/*0*/ p1: P1, /*1*/ p2: P2, /*2*/ p3: P3, /*3*/ p4: P4, /*4*/ p5: P5, /*5*/ p6: P6, /*6*/ p7: P7, /*7*/ p8: P8, /*8*/ p9: P9, /*9*/ p10: P10, /*10*/ p11: P11, /*11*/ p12: P12): R
-}
-
-public trait KMemberFunction13 : kotlin.ExtensionFunction13 {
- public abstract override /*1*/ /*fake_override*/ fun T.invoke(/*0*/ p1: P1, /*1*/ p2: P2, /*2*/ p3: P3, /*3*/ p4: P4, /*4*/ p5: P5, /*5*/ p6: P6, /*6*/ p7: P7, /*7*/ p8: P8, /*8*/ p9: P9, /*9*/ p10: P10, /*10*/ p11: P11, /*11*/ p12: P12, /*12*/ p13: P13): R
-}
-
-public trait KMemberFunction14 : kotlin.ExtensionFunction14 {
- public abstract override /*1*/ /*fake_override*/ fun T.invoke(/*0*/ p1: P1, /*1*/ p2: P2, /*2*/ p3: P3, /*3*/ p4: P4, /*4*/ p5: P5, /*5*/ p6: P6, /*6*/ p7: P7, /*7*/ p8: P8, /*8*/ p9: P9, /*9*/ p10: P10, /*10*/ p11: P11, /*11*/ p12: P12, /*12*/ p13: P13, /*13*/ p14: P14): R
-}
-
-public trait KMemberFunction15 : kotlin.ExtensionFunction15 {
- public abstract override /*1*/ /*fake_override*/ fun T.invoke(/*0*/ p1: P1, /*1*/ p2: P2, /*2*/ p3: P3, /*3*/ p4: P4, /*4*/ p5: P5, /*5*/ p6: P6, /*6*/ p7: P7, /*7*/ p8: P8, /*8*/ p9: P9, /*9*/ p10: P10, /*10*/ p11: P11, /*11*/ p12: P12, /*12*/ p13: P13, /*13*/ p14: P14, /*14*/ p15: P15): R
-}
-
-public trait KMemberFunction16 : kotlin.ExtensionFunction16 {
- public abstract override /*1*/ /*fake_override*/ fun T.invoke(/*0*/ p1: P1, /*1*/ p2: P2, /*2*/ p3: P3, /*3*/ p4: P4, /*4*/ p5: P5, /*5*/ p6: P6, /*6*/ p7: P7, /*7*/ p8: P8, /*8*/ p9: P9, /*9*/ p10: P10, /*10*/ p11: P11, /*11*/ p12: P12, /*12*/ p13: P13, /*13*/ p14: P14, /*14*/ p15: P15, /*15*/ p16: P16): R
-}
-
-public trait KMemberFunction17 : kotlin.ExtensionFunction17 {
- public abstract override /*1*/ /*fake_override*/ fun T.invoke(/*0*/ p1: P1, /*1*/ p2: P2, /*2*/ p3: P3, /*3*/ p4: P4, /*4*/ p5: P5, /*5*/ p6: P6, /*6*/ p7: P7, /*7*/ p8: P8, /*8*/ p9: P9, /*9*/ p10: P10, /*10*/ p11: P11, /*11*/ p12: P12, /*12*/ p13: P13, /*13*/ p14: P14, /*14*/ p15: P15, /*15*/ p16: P16, /*16*/ p17: P17): R
-}
-
-public trait KMemberFunction18 : kotlin.ExtensionFunction18 {
- public abstract override /*1*/ /*fake_override*/ fun T.invoke(/*0*/ p1: P1, /*1*/ p2: P2, /*2*/ p3: P3, /*3*/ p4: P4, /*4*/ p5: P5, /*5*/ p6: P6, /*6*/ p7: P7, /*7*/ p8: P8, /*8*/ p9: P9, /*9*/ p10: P10, /*10*/ p11: P11, /*11*/ p12: P12, /*12*/ p13: P13, /*13*/ p14: P14, /*14*/ p15: P15, /*15*/ p16: P16, /*16*/ p17: P17, /*17*/ p18: P18): R
-}
-
-public trait KMemberFunction19 : kotlin.ExtensionFunction19 {
- public abstract override /*1*/ /*fake_override*/ fun T.invoke(/*0*/ p1: P1, /*1*/ p2: P2, /*2*/ p3: P3, /*3*/ p4: P4, /*4*/ p5: P5, /*5*/ p6: P6, /*6*/ p7: P7, /*7*/ p8: P8, /*8*/ p9: P9, /*9*/ p10: P10, /*10*/ p11: P11, /*11*/ p12: P12, /*12*/ p13: P13, /*13*/ p14: P14, /*14*/ p15: P15, /*15*/ p16: P16, /*16*/ p17: P17, /*17*/ p18: P18, /*18*/ p19: P19): R
-}
-
-public trait KMemberFunction2 : kotlin.ExtensionFunction2 {
- public abstract override /*1*/ /*fake_override*/ fun T.invoke(/*0*/ p1: P1, /*1*/ p2: P2): R
-}
-
-public trait KMemberFunction20 : kotlin.ExtensionFunction20 {
- public abstract override /*1*/ /*fake_override*/ fun T.invoke(/*0*/ p1: P1, /*1*/ p2: P2, /*2*/ p3: P3, /*3*/ p4: P4, /*4*/ p5: P5, /*5*/ p6: P6, /*6*/ p7: P7, /*7*/ p8: P8, /*8*/ p9: P9, /*9*/ p10: P10, /*10*/ p11: P11, /*11*/ p12: P12, /*12*/ p13: P13, /*13*/ p14: P14, /*14*/ p15: P15, /*15*/ p16: P16, /*16*/ p17: P17, /*17*/ p18: P18, /*18*/ p19: P19, /*19*/ p20: P20): R
-}
-
-public trait KMemberFunction21 : kotlin.ExtensionFunction21 {
- public abstract override /*1*/ /*fake_override*/ fun T.invoke(/*0*/ p1: P1, /*1*/ p2: P2, /*2*/ p3: P3, /*3*/ p4: P4, /*4*/ p5: P5, /*5*/ p6: P6, /*6*/ p7: P7, /*7*/ p8: P8, /*8*/ p9: P9, /*9*/ p10: P10, /*10*/ p11: P11, /*11*/ p12: P12, /*12*/ p13: P13, /*13*/ p14: P14, /*14*/ p15: P15, /*15*/ p16: P16, /*16*/ p17: P17, /*17*/ p18: P18, /*18*/ p19: P19, /*19*/ p20: P20, /*20*/ p21: P21): R
-}
-
-public trait KMemberFunction22 : kotlin.ExtensionFunction22 {
- public abstract override /*1*/ /*fake_override*/ fun T.invoke(/*0*/ p1: P1, /*1*/ p2: P2, /*2*/ p3: P3, /*3*/ p4: P4, /*4*/ p5: P5, /*5*/ p6: P6, /*6*/ p7: P7, /*7*/ p8: P8, /*8*/ p9: P9, /*9*/ p10: P10, /*10*/ p11: P11, /*11*/ p12: P12, /*12*/ p13: P13, /*13*/ p14: P14, /*14*/ p15: P15, /*15*/ p16: P16, /*16*/ p17: P17, /*17*/ p18: P18, /*18*/ p19: P19, /*19*/ p20: P20, /*20*/ p21: P21, /*21*/ p22: P22): R
-}
-
-public trait KMemberFunction3 : kotlin.ExtensionFunction3 {
- public abstract override /*1*/ /*fake_override*/ fun T.invoke(/*0*/ p1: P1, /*1*/ p2: P2, /*2*/ p3: P3): R
-}
-
-public trait KMemberFunction4 : kotlin.ExtensionFunction4 {
- public abstract override /*1*/ /*fake_override*/ fun T.invoke(/*0*/ p1: P1, /*1*/ p2: P2, /*2*/ p3: P3, /*3*/ p4: P4): R
-}
-
-public trait KMemberFunction5 : kotlin.ExtensionFunction5 {
- public abstract override /*1*/ /*fake_override*/ fun T.invoke(/*0*/ p1: P1, /*1*/ p2: P2, /*2*/ p3: P3, /*3*/ p4: P4, /*4*/ p5: P5): R
-}
-
-public trait KMemberFunction6 : kotlin.ExtensionFunction6 {
- public abstract override /*1*/ /*fake_override*/ fun T.invoke(/*0*/ p1: P1, /*1*/ p2: P2, /*2*/ p3: P3, /*3*/ p4: P4, /*4*/ p5: P5, /*5*/ p6: P6): R
-}
-
-public trait KMemberFunction7 : kotlin.ExtensionFunction7 {
- public abstract override /*1*/ /*fake_override*/ fun T.invoke(/*0*/ p1: P1, /*1*/ p2: P2, /*2*/ p3: P3, /*3*/ p4: P4, /*4*/ p5: P5, /*5*/ p6: P6, /*6*/ p7: P7): R
-}
-
-public trait KMemberFunction8 : kotlin.ExtensionFunction8 {
- public abstract override /*1*/ /*fake_override*/ fun T.invoke(/*0*/ p1: P1, /*1*/ p2: P2, /*2*/ p3: P3, /*3*/ p4: P4, /*4*/ p5: P5, /*5*/ p6: P6, /*6*/ p7: P7, /*7*/ p8: P8): R
-}
-
-public trait KMemberFunction9 : kotlin.ExtensionFunction9 {
- public abstract override /*1*/ /*fake_override*/ fun T.invoke(/*0*/ p1: P1, /*1*/ p2: P2, /*2*/ p3: P3, /*3*/ p4: P4, /*4*/ p5: P5, /*5*/ p6: P6, /*6*/ p7: P7, /*7*/ p8: P8, /*8*/ p9: P9): R
-}
-
public trait List : kotlin.Collection {
public abstract override /*1*/ fun contains(/*0*/ o: kotlin.Any?): kotlin.Boolean
public abstract override /*1*/ fun containsAll(/*0*/ c: kotlin.Collection): kotlin.Boolean
diff --git a/compiler/testData/codegen/box/callableReference/abstractClassMember.kt b/compiler/testData/codegen/boxWithStdlib/callableReference/function/abstractClassMember.kt
similarity index 100%
rename from compiler/testData/codegen/box/callableReference/abstractClassMember.kt
rename to compiler/testData/codegen/boxWithStdlib/callableReference/function/abstractClassMember.kt
diff --git a/compiler/testData/codegen/box/callableReference/booleanNotIntrinsic.kt b/compiler/testData/codegen/boxWithStdlib/callableReference/function/booleanNotIntrinsic.kt
similarity index 100%
rename from compiler/testData/codegen/box/callableReference/booleanNotIntrinsic.kt
rename to compiler/testData/codegen/boxWithStdlib/callableReference/function/booleanNotIntrinsic.kt
diff --git a/compiler/testData/codegen/box/callableReference/classMemberFromClass.kt b/compiler/testData/codegen/boxWithStdlib/callableReference/function/classMemberFromClass.kt
similarity index 100%
rename from compiler/testData/codegen/box/callableReference/classMemberFromClass.kt
rename to compiler/testData/codegen/boxWithStdlib/callableReference/function/classMemberFromClass.kt
diff --git a/compiler/testData/codegen/box/callableReference/classMemberFromExtension.kt b/compiler/testData/codegen/boxWithStdlib/callableReference/function/classMemberFromExtension.kt
similarity index 100%
rename from compiler/testData/codegen/box/callableReference/classMemberFromExtension.kt
rename to compiler/testData/codegen/boxWithStdlib/callableReference/function/classMemberFromExtension.kt
diff --git a/compiler/testData/codegen/box/callableReference/classMemberFromTopLevelStringNoArgs.kt b/compiler/testData/codegen/boxWithStdlib/callableReference/function/classMemberFromTopLevelStringNoArgs.kt
similarity index 100%
rename from compiler/testData/codegen/box/callableReference/classMemberFromTopLevelStringNoArgs.kt
rename to compiler/testData/codegen/boxWithStdlib/callableReference/function/classMemberFromTopLevelStringNoArgs.kt
diff --git a/compiler/testData/codegen/box/callableReference/classMemberFromTopLevelStringOneStringArg.kt b/compiler/testData/codegen/boxWithStdlib/callableReference/function/classMemberFromTopLevelStringOneStringArg.kt
similarity index 100%
rename from compiler/testData/codegen/box/callableReference/classMemberFromTopLevelStringOneStringArg.kt
rename to compiler/testData/codegen/boxWithStdlib/callableReference/function/classMemberFromTopLevelStringOneStringArg.kt
diff --git a/compiler/testData/codegen/box/callableReference/classMemberFromTopLevelUnitNoArgs.kt b/compiler/testData/codegen/boxWithStdlib/callableReference/function/classMemberFromTopLevelUnitNoArgs.kt
similarity index 100%
rename from compiler/testData/codegen/box/callableReference/classMemberFromTopLevelUnitNoArgs.kt
rename to compiler/testData/codegen/boxWithStdlib/callableReference/function/classMemberFromTopLevelUnitNoArgs.kt
diff --git a/compiler/testData/codegen/box/callableReference/classMemberFromTopLevelUnitOneStringArg.kt b/compiler/testData/codegen/boxWithStdlib/callableReference/function/classMemberFromTopLevelUnitOneStringArg.kt
similarity index 100%
rename from compiler/testData/codegen/box/callableReference/classMemberFromTopLevelUnitOneStringArg.kt
rename to compiler/testData/codegen/boxWithStdlib/callableReference/function/classMemberFromTopLevelUnitOneStringArg.kt
diff --git a/compiler/testData/codegen/box/callableReference/constructorFromTopLevelNoArgs.kt b/compiler/testData/codegen/boxWithStdlib/callableReference/function/constructorFromTopLevelNoArgs.kt
similarity index 100%
rename from compiler/testData/codegen/box/callableReference/constructorFromTopLevelNoArgs.kt
rename to compiler/testData/codegen/boxWithStdlib/callableReference/function/constructorFromTopLevelNoArgs.kt
diff --git a/compiler/testData/codegen/box/callableReference/constructorFromTopLevelOneStringArg.kt b/compiler/testData/codegen/boxWithStdlib/callableReference/function/constructorFromTopLevelOneStringArg.kt
similarity index 100%
rename from compiler/testData/codegen/box/callableReference/constructorFromTopLevelOneStringArg.kt
rename to compiler/testData/codegen/boxWithStdlib/callableReference/function/constructorFromTopLevelOneStringArg.kt
diff --git a/compiler/testData/codegen/box/callableReference/enumNameMethod.kt b/compiler/testData/codegen/boxWithStdlib/callableReference/function/enumNameMethod.kt
similarity index 100%
rename from compiler/testData/codegen/box/callableReference/enumNameMethod.kt
rename to compiler/testData/codegen/boxWithStdlib/callableReference/function/enumNameMethod.kt
diff --git a/compiler/testData/codegen/box/callableReference/equalsIntrinsic.kt b/compiler/testData/codegen/boxWithStdlib/callableReference/function/equalsIntrinsic.kt
similarity index 100%
rename from compiler/testData/codegen/box/callableReference/equalsIntrinsic.kt
rename to compiler/testData/codegen/boxWithStdlib/callableReference/function/equalsIntrinsic.kt
diff --git a/compiler/testData/codegen/box/callableReference/extensionFromClass.kt b/compiler/testData/codegen/boxWithStdlib/callableReference/function/extensionFromClass.kt
similarity index 100%
rename from compiler/testData/codegen/box/callableReference/extensionFromClass.kt
rename to compiler/testData/codegen/boxWithStdlib/callableReference/function/extensionFromClass.kt
diff --git a/compiler/testData/codegen/box/callableReference/extensionFromExtension.kt b/compiler/testData/codegen/boxWithStdlib/callableReference/function/extensionFromExtension.kt
similarity index 100%
rename from compiler/testData/codegen/box/callableReference/extensionFromExtension.kt
rename to compiler/testData/codegen/boxWithStdlib/callableReference/function/extensionFromExtension.kt
diff --git a/compiler/testData/codegen/box/callableReference/extensionFromTopLevelStringNoArgs.kt b/compiler/testData/codegen/boxWithStdlib/callableReference/function/extensionFromTopLevelStringNoArgs.kt
similarity index 100%
rename from compiler/testData/codegen/box/callableReference/extensionFromTopLevelStringNoArgs.kt
rename to compiler/testData/codegen/boxWithStdlib/callableReference/function/extensionFromTopLevelStringNoArgs.kt
diff --git a/compiler/testData/codegen/box/callableReference/extensionFromTopLevelStringOneStringArg.kt b/compiler/testData/codegen/boxWithStdlib/callableReference/function/extensionFromTopLevelStringOneStringArg.kt
similarity index 100%
rename from compiler/testData/codegen/box/callableReference/extensionFromTopLevelStringOneStringArg.kt
rename to compiler/testData/codegen/boxWithStdlib/callableReference/function/extensionFromTopLevelStringOneStringArg.kt
diff --git a/compiler/testData/codegen/box/callableReference/extensionFromTopLevelUnitNoArgs.kt b/compiler/testData/codegen/boxWithStdlib/callableReference/function/extensionFromTopLevelUnitNoArgs.kt
similarity index 100%
rename from compiler/testData/codegen/box/callableReference/extensionFromTopLevelUnitNoArgs.kt
rename to compiler/testData/codegen/boxWithStdlib/callableReference/function/extensionFromTopLevelUnitNoArgs.kt
diff --git a/compiler/testData/codegen/box/callableReference/extensionFromTopLevelUnitOneStringArg.kt b/compiler/testData/codegen/boxWithStdlib/callableReference/function/extensionFromTopLevelUnitOneStringArg.kt
similarity index 100%
rename from compiler/testData/codegen/box/callableReference/extensionFromTopLevelUnitOneStringArg.kt
rename to compiler/testData/codegen/boxWithStdlib/callableReference/function/extensionFromTopLevelUnitOneStringArg.kt
diff --git a/compiler/testData/codegen/box/callableReference/genericMember.kt b/compiler/testData/codegen/boxWithStdlib/callableReference/function/genericMember.kt
similarity index 100%
rename from compiler/testData/codegen/box/callableReference/genericMember.kt
rename to compiler/testData/codegen/boxWithStdlib/callableReference/function/genericMember.kt
diff --git a/compiler/testData/codegen/box/callableReference/innerConstructorFromClass.kt b/compiler/testData/codegen/boxWithStdlib/callableReference/function/innerConstructorFromClass.kt
similarity index 100%
rename from compiler/testData/codegen/box/callableReference/innerConstructorFromClass.kt
rename to compiler/testData/codegen/boxWithStdlib/callableReference/function/innerConstructorFromClass.kt
diff --git a/compiler/testData/codegen/box/callableReference/innerConstructorFromExtension.kt b/compiler/testData/codegen/boxWithStdlib/callableReference/function/innerConstructorFromExtension.kt
similarity index 100%
rename from compiler/testData/codegen/box/callableReference/innerConstructorFromExtension.kt
rename to compiler/testData/codegen/boxWithStdlib/callableReference/function/innerConstructorFromExtension.kt
diff --git a/compiler/testData/codegen/box/callableReference/innerConstructorFromTopLevelNoArgs.kt b/compiler/testData/codegen/boxWithStdlib/callableReference/function/innerConstructorFromTopLevelNoArgs.kt
similarity index 100%
rename from compiler/testData/codegen/box/callableReference/innerConstructorFromTopLevelNoArgs.kt
rename to compiler/testData/codegen/boxWithStdlib/callableReference/function/innerConstructorFromTopLevelNoArgs.kt
diff --git a/compiler/testData/codegen/box/callableReference/innerConstructorFromTopLevelOneStringArg.kt b/compiler/testData/codegen/boxWithStdlib/callableReference/function/innerConstructorFromTopLevelOneStringArg.kt
similarity index 100%
rename from compiler/testData/codegen/box/callableReference/innerConstructorFromTopLevelOneStringArg.kt
rename to compiler/testData/codegen/boxWithStdlib/callableReference/function/innerConstructorFromTopLevelOneStringArg.kt
diff --git a/compiler/testData/codegen/box/callableReference/local/captureOuter.kt b/compiler/testData/codegen/boxWithStdlib/callableReference/function/local/captureOuter.kt
similarity index 100%
rename from compiler/testData/codegen/box/callableReference/local/captureOuter.kt
rename to compiler/testData/codegen/boxWithStdlib/callableReference/function/local/captureOuter.kt
diff --git a/compiler/testData/codegen/box/callableReference/local/classMember.kt b/compiler/testData/codegen/boxWithStdlib/callableReference/function/local/classMember.kt
similarity index 100%
rename from compiler/testData/codegen/box/callableReference/local/classMember.kt
rename to compiler/testData/codegen/boxWithStdlib/callableReference/function/local/classMember.kt
diff --git a/compiler/testData/codegen/box/callableReference/local/closureWithSideEffect.kt b/compiler/testData/codegen/boxWithStdlib/callableReference/function/local/closureWithSideEffect.kt
similarity index 100%
rename from compiler/testData/codegen/box/callableReference/local/closureWithSideEffect.kt
rename to compiler/testData/codegen/boxWithStdlib/callableReference/function/local/closureWithSideEffect.kt
diff --git a/compiler/testData/codegen/box/callableReference/local/constructor.kt b/compiler/testData/codegen/boxWithStdlib/callableReference/function/local/constructor.kt
similarity index 100%
rename from compiler/testData/codegen/box/callableReference/local/constructor.kt
rename to compiler/testData/codegen/boxWithStdlib/callableReference/function/local/constructor.kt
diff --git a/compiler/testData/codegen/box/callableReference/local/constructorWithInitializer.kt b/compiler/testData/codegen/boxWithStdlib/callableReference/function/local/constructorWithInitializer.kt
similarity index 100%
rename from compiler/testData/codegen/box/callableReference/local/constructorWithInitializer.kt
rename to compiler/testData/codegen/boxWithStdlib/callableReference/function/local/constructorWithInitializer.kt
diff --git a/compiler/testData/codegen/box/callableReference/local/enumExtendsTrait.kt b/compiler/testData/codegen/boxWithStdlib/callableReference/function/local/enumExtendsTrait.kt
similarity index 100%
rename from compiler/testData/codegen/box/callableReference/local/enumExtendsTrait.kt
rename to compiler/testData/codegen/boxWithStdlib/callableReference/function/local/enumExtendsTrait.kt
diff --git a/compiler/testData/codegen/box/callableReference/local/extension.kt b/compiler/testData/codegen/boxWithStdlib/callableReference/function/local/extension.kt
similarity index 100%
rename from compiler/testData/codegen/box/callableReference/local/extension.kt
rename to compiler/testData/codegen/boxWithStdlib/callableReference/function/local/extension.kt
diff --git a/compiler/testData/codegen/box/callableReference/local/extensionToLocalClass.kt b/compiler/testData/codegen/boxWithStdlib/callableReference/function/local/extensionToLocalClass.kt
similarity index 100%
rename from compiler/testData/codegen/box/callableReference/local/extensionToLocalClass.kt
rename to compiler/testData/codegen/boxWithStdlib/callableReference/function/local/extensionToLocalClass.kt
diff --git a/compiler/testData/codegen/box/callableReference/local/extensionToPrimitive.kt b/compiler/testData/codegen/boxWithStdlib/callableReference/function/local/extensionToPrimitive.kt
similarity index 100%
rename from compiler/testData/codegen/box/callableReference/local/extensionToPrimitive.kt
rename to compiler/testData/codegen/boxWithStdlib/callableReference/function/local/extensionToPrimitive.kt
diff --git a/compiler/testData/codegen/box/callableReference/local/extensionWithClosure.kt b/compiler/testData/codegen/boxWithStdlib/callableReference/function/local/extensionWithClosure.kt
similarity index 100%
rename from compiler/testData/codegen/box/callableReference/local/extensionWithClosure.kt
rename to compiler/testData/codegen/boxWithStdlib/callableReference/function/local/extensionWithClosure.kt
diff --git a/compiler/testData/codegen/box/callableReference/local/genericMember.kt b/compiler/testData/codegen/boxWithStdlib/callableReference/function/local/genericMember.kt
similarity index 100%
rename from compiler/testData/codegen/box/callableReference/local/genericMember.kt
rename to compiler/testData/codegen/boxWithStdlib/callableReference/function/local/genericMember.kt
diff --git a/compiler/testData/codegen/box/callableReference/local/localClassMember.kt b/compiler/testData/codegen/boxWithStdlib/callableReference/function/local/localClassMember.kt
similarity index 100%
rename from compiler/testData/codegen/box/callableReference/local/localClassMember.kt
rename to compiler/testData/codegen/boxWithStdlib/callableReference/function/local/localClassMember.kt
diff --git a/compiler/testData/codegen/box/callableReference/local/localLocal.kt b/compiler/testData/codegen/boxWithStdlib/callableReference/function/local/localLocal.kt
similarity index 100%
rename from compiler/testData/codegen/box/callableReference/local/localLocal.kt
rename to compiler/testData/codegen/boxWithStdlib/callableReference/function/local/localLocal.kt
diff --git a/compiler/testData/codegen/box/callableReference/local/recursiveClosure.kt b/compiler/testData/codegen/boxWithStdlib/callableReference/function/local/recursiveClosure.kt
similarity index 100%
rename from compiler/testData/codegen/box/callableReference/local/recursiveClosure.kt
rename to compiler/testData/codegen/boxWithStdlib/callableReference/function/local/recursiveClosure.kt
diff --git a/compiler/testData/codegen/box/callableReference/local/simple.kt b/compiler/testData/codegen/boxWithStdlib/callableReference/function/local/simple.kt
similarity index 100%
rename from compiler/testData/codegen/box/callableReference/local/simple.kt
rename to compiler/testData/codegen/boxWithStdlib/callableReference/function/local/simple.kt
diff --git a/compiler/testData/codegen/box/callableReference/local/simpleClosure.kt b/compiler/testData/codegen/boxWithStdlib/callableReference/function/local/simpleClosure.kt
similarity index 100%
rename from compiler/testData/codegen/box/callableReference/local/simpleClosure.kt
rename to compiler/testData/codegen/boxWithStdlib/callableReference/function/local/simpleClosure.kt
diff --git a/compiler/testData/codegen/box/callableReference/local/simpleWithArg.kt b/compiler/testData/codegen/boxWithStdlib/callableReference/function/local/simpleWithArg.kt
similarity index 100%
rename from compiler/testData/codegen/box/callableReference/local/simpleWithArg.kt
rename to compiler/testData/codegen/boxWithStdlib/callableReference/function/local/simpleWithArg.kt
diff --git a/compiler/testData/codegen/box/callableReference/local/unitWithSideEffect.kt b/compiler/testData/codegen/boxWithStdlib/callableReference/function/local/unitWithSideEffect.kt
similarity index 100%
rename from compiler/testData/codegen/box/callableReference/local/unitWithSideEffect.kt
rename to compiler/testData/codegen/boxWithStdlib/callableReference/function/local/unitWithSideEffect.kt
diff --git a/compiler/testData/codegen/box/callableReference/nestedConstructorFromClass.kt b/compiler/testData/codegen/boxWithStdlib/callableReference/function/nestedConstructorFromClass.kt
similarity index 100%
rename from compiler/testData/codegen/box/callableReference/nestedConstructorFromClass.kt
rename to compiler/testData/codegen/boxWithStdlib/callableReference/function/nestedConstructorFromClass.kt
diff --git a/compiler/testData/codegen/box/callableReference/nestedConstructorFromTopLevelNoArgs.kt b/compiler/testData/codegen/boxWithStdlib/callableReference/function/nestedConstructorFromTopLevelNoArgs.kt
similarity index 100%
rename from compiler/testData/codegen/box/callableReference/nestedConstructorFromTopLevelNoArgs.kt
rename to compiler/testData/codegen/boxWithStdlib/callableReference/function/nestedConstructorFromTopLevelNoArgs.kt
diff --git a/compiler/testData/codegen/box/callableReference/nestedConstructorFromTopLevelOneStringArg.kt b/compiler/testData/codegen/boxWithStdlib/callableReference/function/nestedConstructorFromTopLevelOneStringArg.kt
similarity index 100%
rename from compiler/testData/codegen/box/callableReference/nestedConstructorFromTopLevelOneStringArg.kt
rename to compiler/testData/codegen/boxWithStdlib/callableReference/function/nestedConstructorFromTopLevelOneStringArg.kt
diff --git a/compiler/testData/codegen/box/callableReference/newArray.kt b/compiler/testData/codegen/boxWithStdlib/callableReference/function/newArray.kt
similarity index 100%
rename from compiler/testData/codegen/box/callableReference/newArray.kt
rename to compiler/testData/codegen/boxWithStdlib/callableReference/function/newArray.kt
diff --git a/compiler/testData/codegen/box/callableReference/objectMemberUnitNoArgs.kt b/compiler/testData/codegen/boxWithStdlib/callableReference/function/objectMemberUnitNoArgs.kt
similarity index 100%
rename from compiler/testData/codegen/box/callableReference/objectMemberUnitNoArgs.kt
rename to compiler/testData/codegen/boxWithStdlib/callableReference/function/objectMemberUnitNoArgs.kt
diff --git a/compiler/testData/codegen/box/callableReference/objectMemberUnitOneStringArg.kt b/compiler/testData/codegen/boxWithStdlib/callableReference/function/objectMemberUnitOneStringArg.kt
similarity index 100%
rename from compiler/testData/codegen/box/callableReference/objectMemberUnitOneStringArg.kt
rename to compiler/testData/codegen/boxWithStdlib/callableReference/function/objectMemberUnitOneStringArg.kt
diff --git a/compiler/testData/codegen/box/callableReference/privateClassMember.kt b/compiler/testData/codegen/boxWithStdlib/callableReference/function/privateClassMember.kt
similarity index 100%
rename from compiler/testData/codegen/box/callableReference/privateClassMember.kt
rename to compiler/testData/codegen/boxWithStdlib/callableReference/function/privateClassMember.kt
diff --git a/compiler/testData/codegen/box/callableReference/sortListOfStrings.kt b/compiler/testData/codegen/boxWithStdlib/callableReference/function/sortListOfStrings.kt
similarity index 100%
rename from compiler/testData/codegen/box/callableReference/sortListOfStrings.kt
rename to compiler/testData/codegen/boxWithStdlib/callableReference/function/sortListOfStrings.kt
diff --git a/compiler/testData/codegen/box/callableReference/toString.kt b/compiler/testData/codegen/boxWithStdlib/callableReference/function/toString.kt
similarity index 100%
rename from compiler/testData/codegen/box/callableReference/toString.kt
rename to compiler/testData/codegen/boxWithStdlib/callableReference/function/toString.kt
diff --git a/compiler/testData/codegen/box/callableReference/topLevelFromClass.kt b/compiler/testData/codegen/boxWithStdlib/callableReference/function/topLevelFromClass.kt
similarity index 100%
rename from compiler/testData/codegen/box/callableReference/topLevelFromClass.kt
rename to compiler/testData/codegen/boxWithStdlib/callableReference/function/topLevelFromClass.kt
diff --git a/compiler/testData/codegen/box/callableReference/topLevelFromExtension.kt b/compiler/testData/codegen/boxWithStdlib/callableReference/function/topLevelFromExtension.kt
similarity index 100%
rename from compiler/testData/codegen/box/callableReference/topLevelFromExtension.kt
rename to compiler/testData/codegen/boxWithStdlib/callableReference/function/topLevelFromExtension.kt
diff --git a/compiler/testData/codegen/box/callableReference/topLevelFromTopLevelStringNoArgs.kt b/compiler/testData/codegen/boxWithStdlib/callableReference/function/topLevelFromTopLevelStringNoArgs.kt
similarity index 100%
rename from compiler/testData/codegen/box/callableReference/topLevelFromTopLevelStringNoArgs.kt
rename to compiler/testData/codegen/boxWithStdlib/callableReference/function/topLevelFromTopLevelStringNoArgs.kt
diff --git a/compiler/testData/codegen/box/callableReference/topLevelFromTopLevelStringOneStringArg.kt b/compiler/testData/codegen/boxWithStdlib/callableReference/function/topLevelFromTopLevelStringOneStringArg.kt
similarity index 100%
rename from compiler/testData/codegen/box/callableReference/topLevelFromTopLevelStringOneStringArg.kt
rename to compiler/testData/codegen/boxWithStdlib/callableReference/function/topLevelFromTopLevelStringOneStringArg.kt
diff --git a/compiler/testData/codegen/box/callableReference/topLevelFromTopLevelUnitNoArgs.kt b/compiler/testData/codegen/boxWithStdlib/callableReference/function/topLevelFromTopLevelUnitNoArgs.kt
similarity index 100%
rename from compiler/testData/codegen/box/callableReference/topLevelFromTopLevelUnitNoArgs.kt
rename to compiler/testData/codegen/boxWithStdlib/callableReference/function/topLevelFromTopLevelUnitNoArgs.kt
diff --git a/compiler/testData/codegen/box/callableReference/topLevelFromTopLevelUnitOneStringArg.kt b/compiler/testData/codegen/boxWithStdlib/callableReference/function/topLevelFromTopLevelUnitOneStringArg.kt
similarity index 100%
rename from compiler/testData/codegen/box/callableReference/topLevelFromTopLevelUnitOneStringArg.kt
rename to compiler/testData/codegen/boxWithStdlib/callableReference/function/topLevelFromTopLevelUnitOneStringArg.kt
diff --git a/compiler/testData/codegen/box/callableReference/traitImplMethodWithClassReceiver.kt b/compiler/testData/codegen/boxWithStdlib/callableReference/function/traitImplMethodWithClassReceiver.kt
similarity index 100%
rename from compiler/testData/codegen/box/callableReference/traitImplMethodWithClassReceiver.kt
rename to compiler/testData/codegen/boxWithStdlib/callableReference/function/traitImplMethodWithClassReceiver.kt
diff --git a/compiler/testData/codegen/box/callableReference/traitMember.kt b/compiler/testData/codegen/boxWithStdlib/callableReference/function/traitMember.kt
similarity index 100%
rename from compiler/testData/codegen/box/callableReference/traitMember.kt
rename to compiler/testData/codegen/boxWithStdlib/callableReference/function/traitMember.kt
diff --git a/compiler/testData/diagnostics/tests/callableReference/abstractClassConstructors.kt b/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/abstractClassConstructors.kt
similarity index 100%
rename from compiler/testData/diagnostics/tests/callableReference/abstractClassConstructors.kt
rename to compiler/testData/diagnostics/testsWithStdLib/callableReference/function/abstractClassConstructors.kt
diff --git a/compiler/testData/diagnostics/tests/callableReference/ambiguityTopLevelVsTopLevel.kt b/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/ambiguityTopLevelVsTopLevel.kt
similarity index 100%
rename from compiler/testData/diagnostics/tests/callableReference/ambiguityTopLevelVsTopLevel.kt
rename to compiler/testData/diagnostics/testsWithStdLib/callableReference/function/ambiguityTopLevelVsTopLevel.kt
diff --git a/compiler/testData/diagnostics/tests/callableReference/constructorFromClass.kt b/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/constructorFromClass.kt
similarity index 100%
rename from compiler/testData/diagnostics/tests/callableReference/constructorFromClass.kt
rename to compiler/testData/diagnostics/testsWithStdLib/callableReference/function/constructorFromClass.kt
diff --git a/compiler/testData/diagnostics/tests/callableReference/constructorFromExtension.kt b/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/constructorFromExtension.kt
similarity index 100%
rename from compiler/testData/diagnostics/tests/callableReference/constructorFromExtension.kt
rename to compiler/testData/diagnostics/testsWithStdLib/callableReference/function/constructorFromExtension.kt
diff --git a/compiler/testData/diagnostics/tests/callableReference/constructorFromExtensionInClass.kt b/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/constructorFromExtensionInClass.kt
similarity index 100%
rename from compiler/testData/diagnostics/tests/callableReference/constructorFromExtensionInClass.kt
rename to compiler/testData/diagnostics/testsWithStdLib/callableReference/function/constructorFromExtensionInClass.kt
diff --git a/compiler/testData/diagnostics/tests/callableReference/constructorFromTopLevel.kt b/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/constructorFromTopLevel.kt
similarity index 100%
rename from compiler/testData/diagnostics/tests/callableReference/constructorFromTopLevel.kt
rename to compiler/testData/diagnostics/testsWithStdLib/callableReference/function/constructorFromTopLevel.kt
diff --git a/compiler/testData/diagnostics/tests/callableReference/differentPackageClass.kt b/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/differentPackageClass.kt
similarity index 100%
rename from compiler/testData/diagnostics/tests/callableReference/differentPackageClass.kt
rename to compiler/testData/diagnostics/testsWithStdLib/callableReference/function/differentPackageClass.kt
diff --git a/compiler/testData/diagnostics/tests/callableReference/differentPackageExtension.kt b/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/differentPackageExtension.kt
similarity index 100%
rename from compiler/testData/diagnostics/tests/callableReference/differentPackageExtension.kt
rename to compiler/testData/diagnostics/testsWithStdLib/callableReference/function/differentPackageExtension.kt
diff --git a/compiler/testData/diagnostics/tests/callableReference/differentPackageTopLevel.kt b/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/differentPackageTopLevel.kt
similarity index 100%
rename from compiler/testData/diagnostics/tests/callableReference/differentPackageTopLevel.kt
rename to compiler/testData/diagnostics/testsWithStdLib/callableReference/function/differentPackageTopLevel.kt
diff --git a/compiler/testData/diagnostics/tests/callableReference/empty.kt b/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/empty.kt
similarity index 100%
rename from compiler/testData/diagnostics/tests/callableReference/empty.kt
rename to compiler/testData/diagnostics/testsWithStdLib/callableReference/function/empty.kt
diff --git a/compiler/testData/diagnostics/tests/callableReference/extensionFromClass.kt b/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/extensionFromClass.kt
similarity index 100%
rename from compiler/testData/diagnostics/tests/callableReference/extensionFromClass.kt
rename to compiler/testData/diagnostics/testsWithStdLib/callableReference/function/extensionFromClass.kt
diff --git a/compiler/testData/diagnostics/tests/callableReference/extensionFromExtension.kt b/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/extensionFromExtension.kt
similarity index 100%
rename from compiler/testData/diagnostics/tests/callableReference/extensionFromExtension.kt
rename to compiler/testData/diagnostics/testsWithStdLib/callableReference/function/extensionFromExtension.kt
diff --git a/compiler/testData/diagnostics/tests/callableReference/extensionFromExtensionInClass.kt b/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/extensionFromExtensionInClass.kt
similarity index 100%
rename from compiler/testData/diagnostics/tests/callableReference/extensionFromExtensionInClass.kt
rename to compiler/testData/diagnostics/testsWithStdLib/callableReference/function/extensionFromExtensionInClass.kt
diff --git a/compiler/testData/diagnostics/tests/callableReference/extensionFromTopLevel.kt b/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/extensionFromTopLevel.kt
similarity index 100%
rename from compiler/testData/diagnostics/tests/callableReference/extensionFromTopLevel.kt
rename to compiler/testData/diagnostics/testsWithStdLib/callableReference/function/extensionFromTopLevel.kt
diff --git a/compiler/testData/diagnostics/tests/callableReference/extensionInClassDisallowed.kt b/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/extensionInClassDisallowed.kt
similarity index 100%
rename from compiler/testData/diagnostics/tests/callableReference/extensionInClassDisallowed.kt
rename to compiler/testData/diagnostics/testsWithStdLib/callableReference/function/extensionInClassDisallowed.kt
diff --git a/compiler/testData/diagnostics/tests/callableReference/genericClassFromTopLevel.kt b/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/genericClassFromTopLevel.kt
similarity index 100%
rename from compiler/testData/diagnostics/tests/callableReference/genericClassFromTopLevel.kt
rename to compiler/testData/diagnostics/testsWithStdLib/callableReference/function/genericClassFromTopLevel.kt
diff --git a/compiler/testData/diagnostics/tests/callableReference/importedInnerConstructor.kt b/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/importedInnerConstructor.kt
similarity index 100%
rename from compiler/testData/diagnostics/tests/callableReference/importedInnerConstructor.kt
rename to compiler/testData/diagnostics/testsWithStdLib/callableReference/function/importedInnerConstructor.kt
diff --git a/compiler/testData/diagnostics/tests/callableReference/innerConstructorFromClass.kt b/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/innerConstructorFromClass.kt
similarity index 100%
rename from compiler/testData/diagnostics/tests/callableReference/innerConstructorFromClass.kt
rename to compiler/testData/diagnostics/testsWithStdLib/callableReference/function/innerConstructorFromClass.kt
diff --git a/compiler/testData/diagnostics/tests/callableReference/innerConstructorFromExtension.kt b/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/innerConstructorFromExtension.kt
similarity index 100%
rename from compiler/testData/diagnostics/tests/callableReference/innerConstructorFromExtension.kt
rename to compiler/testData/diagnostics/testsWithStdLib/callableReference/function/innerConstructorFromExtension.kt
diff --git a/compiler/testData/diagnostics/tests/callableReference/innerConstructorFromTopLevel.kt b/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/innerConstructorFromTopLevel.kt
similarity index 100%
rename from compiler/testData/diagnostics/tests/callableReference/innerConstructorFromTopLevel.kt
rename to compiler/testData/diagnostics/testsWithStdLib/callableReference/function/innerConstructorFromTopLevel.kt
diff --git a/compiler/testData/diagnostics/tests/callableReference/lhsNotAClass.kt b/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/lhsNotAClass.kt
similarity index 100%
rename from compiler/testData/diagnostics/tests/callableReference/lhsNotAClass.kt
rename to compiler/testData/diagnostics/testsWithStdLib/callableReference/function/lhsNotAClass.kt
diff --git a/compiler/testData/diagnostics/tests/callableReference/localConstructor.kt b/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/localConstructor.kt
similarity index 100%
rename from compiler/testData/diagnostics/tests/callableReference/localConstructor.kt
rename to compiler/testData/diagnostics/testsWithStdLib/callableReference/function/localConstructor.kt
diff --git a/compiler/testData/diagnostics/tests/callableReference/localConstructorFromExtensionInLocalClass.kt b/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/localConstructorFromExtensionInLocalClass.kt
similarity index 100%
rename from compiler/testData/diagnostics/tests/callableReference/localConstructorFromExtensionInLocalClass.kt
rename to compiler/testData/diagnostics/testsWithStdLib/callableReference/function/localConstructorFromExtensionInLocalClass.kt
diff --git a/compiler/testData/diagnostics/tests/callableReference/localConstructorFromLocalClass.kt b/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/localConstructorFromLocalClass.kt
similarity index 100%
rename from compiler/testData/diagnostics/tests/callableReference/localConstructorFromLocalClass.kt
rename to compiler/testData/diagnostics/testsWithStdLib/callableReference/function/localConstructorFromLocalClass.kt
diff --git a/compiler/testData/diagnostics/tests/callableReference/localConstructorFromLocalExtension.kt b/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/localConstructorFromLocalExtension.kt
similarity index 100%
rename from compiler/testData/diagnostics/tests/callableReference/localConstructorFromLocalExtension.kt
rename to compiler/testData/diagnostics/testsWithStdLib/callableReference/function/localConstructorFromLocalExtension.kt
diff --git a/compiler/testData/diagnostics/tests/callableReference/localNamedFun.kt b/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/localNamedFun.kt
similarity index 100%
rename from compiler/testData/diagnostics/tests/callableReference/localNamedFun.kt
rename to compiler/testData/diagnostics/testsWithStdLib/callableReference/function/localNamedFun.kt
diff --git a/compiler/testData/diagnostics/tests/callableReference/localNamedFunFromExtensionInLocalClass.kt b/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/localNamedFunFromExtensionInLocalClass.kt
similarity index 100%
rename from compiler/testData/diagnostics/tests/callableReference/localNamedFunFromExtensionInLocalClass.kt
rename to compiler/testData/diagnostics/testsWithStdLib/callableReference/function/localNamedFunFromExtensionInLocalClass.kt
diff --git a/compiler/testData/diagnostics/tests/callableReference/localNamedFunFromLocalClass.kt b/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/localNamedFunFromLocalClass.kt
similarity index 100%
rename from compiler/testData/diagnostics/tests/callableReference/localNamedFunFromLocalClass.kt
rename to compiler/testData/diagnostics/testsWithStdLib/callableReference/function/localNamedFunFromLocalClass.kt
diff --git a/compiler/testData/diagnostics/tests/callableReference/localNamedFunFromLocalExtension.kt b/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/localNamedFunFromLocalExtension.kt
similarity index 100%
rename from compiler/testData/diagnostics/tests/callableReference/localNamedFunFromLocalExtension.kt
rename to compiler/testData/diagnostics/testsWithStdLib/callableReference/function/localNamedFunFromLocalExtension.kt
diff --git a/compiler/testData/diagnostics/tests/callableReference/longQualifiedName.kt b/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/longQualifiedName.kt
similarity index 100%
rename from compiler/testData/diagnostics/tests/callableReference/longQualifiedName.kt
rename to compiler/testData/diagnostics/testsWithStdLib/callableReference/function/longQualifiedName.kt
diff --git a/compiler/testData/diagnostics/tests/callableReference/longQualifiedNameGeneric.kt b/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/longQualifiedNameGeneric.kt
similarity index 100%
rename from compiler/testData/diagnostics/tests/callableReference/longQualifiedNameGeneric.kt
rename to compiler/testData/diagnostics/testsWithStdLib/callableReference/function/longQualifiedNameGeneric.kt
diff --git a/compiler/testData/diagnostics/tests/callableReference/memberFromClass.kt b/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/memberFromClass.kt
similarity index 100%
rename from compiler/testData/diagnostics/tests/callableReference/memberFromClass.kt
rename to compiler/testData/diagnostics/testsWithStdLib/callableReference/function/memberFromClass.kt
diff --git a/compiler/testData/diagnostics/tests/callableReference/memberFromExtension.kt b/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/memberFromExtension.kt
similarity index 100%
rename from compiler/testData/diagnostics/tests/callableReference/memberFromExtension.kt
rename to compiler/testData/diagnostics/testsWithStdLib/callableReference/function/memberFromExtension.kt
diff --git a/compiler/testData/diagnostics/tests/callableReference/memberFromExtensionInClass.kt b/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/memberFromExtensionInClass.kt
similarity index 100%
rename from compiler/testData/diagnostics/tests/callableReference/memberFromExtensionInClass.kt
rename to compiler/testData/diagnostics/testsWithStdLib/callableReference/function/memberFromExtensionInClass.kt
diff --git a/compiler/testData/diagnostics/tests/callableReference/memberFromTopLevel.kt b/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/memberFromTopLevel.kt
similarity index 100%
rename from compiler/testData/diagnostics/tests/callableReference/memberFromTopLevel.kt
rename to compiler/testData/diagnostics/testsWithStdLib/callableReference/function/memberFromTopLevel.kt
diff --git a/compiler/testData/diagnostics/tests/callableReference/nestedConstructorFromClass.kt b/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/nestedConstructorFromClass.kt
similarity index 100%
rename from compiler/testData/diagnostics/tests/callableReference/nestedConstructorFromClass.kt
rename to compiler/testData/diagnostics/testsWithStdLib/callableReference/function/nestedConstructorFromClass.kt
diff --git a/compiler/testData/diagnostics/tests/callableReference/nestedConstructorFromExtension.kt b/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/nestedConstructorFromExtension.kt
similarity index 100%
rename from compiler/testData/diagnostics/tests/callableReference/nestedConstructorFromExtension.kt
rename to compiler/testData/diagnostics/testsWithStdLib/callableReference/function/nestedConstructorFromExtension.kt
diff --git a/compiler/testData/diagnostics/tests/callableReference/nestedConstructorFromTopLevel.kt b/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/nestedConstructorFromTopLevel.kt
similarity index 100%
rename from compiler/testData/diagnostics/tests/callableReference/nestedConstructorFromTopLevel.kt
rename to compiler/testData/diagnostics/testsWithStdLib/callableReference/function/nestedConstructorFromTopLevel.kt
diff --git a/compiler/testData/diagnostics/tests/callableReference/noAmbiguityLocalVsTopLevel.kt b/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/noAmbiguityLocalVsTopLevel.kt
similarity index 100%
rename from compiler/testData/diagnostics/tests/callableReference/noAmbiguityLocalVsTopLevel.kt
rename to compiler/testData/diagnostics/testsWithStdLib/callableReference/function/noAmbiguityLocalVsTopLevel.kt
diff --git a/compiler/testData/diagnostics/tests/callableReference/noAmbiguityMemberVsExtension.kt b/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/noAmbiguityMemberVsExtension.kt
similarity index 100%
rename from compiler/testData/diagnostics/tests/callableReference/noAmbiguityMemberVsExtension.kt
rename to compiler/testData/diagnostics/testsWithStdLib/callableReference/function/noAmbiguityMemberVsExtension.kt
diff --git a/compiler/testData/diagnostics/tests/callableReference/noAmbiguityMemberVsTopLevel.kt b/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/noAmbiguityMemberVsTopLevel.kt
similarity index 100%
rename from compiler/testData/diagnostics/tests/callableReference/noAmbiguityMemberVsTopLevel.kt
rename to compiler/testData/diagnostics/testsWithStdLib/callableReference/function/noAmbiguityMemberVsTopLevel.kt
diff --git a/compiler/testData/diagnostics/tests/callableReference/renameOnImport.kt b/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/renameOnImport.kt
similarity index 100%
rename from compiler/testData/diagnostics/tests/callableReference/renameOnImport.kt
rename to compiler/testData/diagnostics/testsWithStdLib/callableReference/function/renameOnImport.kt
diff --git a/compiler/testData/diagnostics/tests/callableReference/topLevelFromClass.kt b/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/topLevelFromClass.kt
similarity index 100%
rename from compiler/testData/diagnostics/tests/callableReference/topLevelFromClass.kt
rename to compiler/testData/diagnostics/testsWithStdLib/callableReference/function/topLevelFromClass.kt
diff --git a/compiler/testData/diagnostics/tests/callableReference/topLevelFromExtension.kt b/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/topLevelFromExtension.kt
similarity index 100%
rename from compiler/testData/diagnostics/tests/callableReference/topLevelFromExtension.kt
rename to compiler/testData/diagnostics/testsWithStdLib/callableReference/function/topLevelFromExtension.kt
diff --git a/compiler/testData/diagnostics/tests/callableReference/topLevelFromExtensionInClass.kt b/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/topLevelFromExtensionInClass.kt
similarity index 100%
rename from compiler/testData/diagnostics/tests/callableReference/topLevelFromExtensionInClass.kt
rename to compiler/testData/diagnostics/testsWithStdLib/callableReference/function/topLevelFromExtensionInClass.kt
diff --git a/compiler/testData/diagnostics/tests/callableReference/topLevelFromTopLevel.kt b/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/topLevelFromTopLevel.kt
similarity index 100%
rename from compiler/testData/diagnostics/tests/callableReference/topLevelFromTopLevel.kt
rename to compiler/testData/diagnostics/testsWithStdLib/callableReference/function/topLevelFromTopLevel.kt
diff --git a/compiler/testData/diagnostics/tests/callableReference/unresolved.kt b/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/unresolved.kt
similarity index 100%
rename from compiler/testData/diagnostics/tests/callableReference/unresolved.kt
rename to compiler/testData/diagnostics/testsWithStdLib/callableReference/function/unresolved.kt
diff --git a/compiler/tests/org/jetbrains/jet/checkers/JetDiagnosticsTestGenerated.java b/compiler/tests/org/jetbrains/jet/checkers/JetDiagnosticsTestGenerated.java
index 9bc248bbd34..e5c84174ed6 100644
--- a/compiler/tests/org/jetbrains/jet/checkers/JetDiagnosticsTestGenerated.java
+++ b/compiler/tests/org/jetbrains/jet/checkers/JetDiagnosticsTestGenerated.java
@@ -33,7 +33,7 @@ import org.jetbrains.jet.checkers.AbstractJetDiagnosticsTest;
@InnerTestClasses({JetDiagnosticsTestGenerated.Tests.class, JetDiagnosticsTestGenerated.Script.class, JetDiagnosticsTestGenerated.TailRecursion.class})
public class JetDiagnosticsTestGenerated extends AbstractJetDiagnosticsTest {
@TestMetadata("compiler/testData/diagnostics/tests")
- @InnerTestClasses({Tests.Annotations.class, Tests.BackingField.class, Tests.CallableReference.class, Tests.Cast.class, Tests.CheckArguments.class, Tests.ClassObjects.class, Tests.ControlFlowAnalysis.class, Tests.ControlStructures.class, Tests.CyclicHierarchy.class, Tests.DataClasses.class, Tests.DataFlow.class, Tests.DataFlowInfoTraversal.class, Tests.DeclarationChecks.class, Tests.DelegatedProperty.class, Tests.Deparenthesize.class, Tests.Enum.class, Tests.Evaluate.class, Tests.Extensions.class, Tests.FunctionLiterals.class, Tests.Generics.class, Tests.Imports.class, Tests.IncompleteCode.class, Tests.Inference.class, Tests.Infos.class, Tests.Inline.class, Tests.Inner.class, Tests.J_k.class, Tests.Jdk_annotations.class, Tests.Library.class, Tests.Multimodule.class, Tests.NamedArguments.class, Tests.NullabilityAndAutoCasts.class, Tests.NullableTypes.class, Tests.Numbers.class, Tests.Objects.class, Tests.OperatorsOverloading.class, Tests.Overload.class, Tests.Override.class, Tests.Recovery.class, Tests.Redeclarations.class, Tests.Regressions.class, Tests.Resolve.class, Tests.Scopes.class, Tests.SenselessComparison.class, Tests.Shadowing.class, Tests.SmartCasts.class, Tests.Substitutions.class, Tests.Subtyping.class, Tests.Suppress.class, Tests.ThisAndSuper.class, Tests.Typedefs.class, Tests.Unit.class, Tests.Varargs.class, Tests.When.class})
+ @InnerTestClasses({Tests.Annotations.class, Tests.BackingField.class, Tests.Cast.class, Tests.CheckArguments.class, Tests.ClassObjects.class, Tests.ControlFlowAnalysis.class, Tests.ControlStructures.class, Tests.CyclicHierarchy.class, Tests.DataClasses.class, Tests.DataFlow.class, Tests.DataFlowInfoTraversal.class, Tests.DeclarationChecks.class, Tests.DelegatedProperty.class, Tests.Deparenthesize.class, Tests.Enum.class, Tests.Evaluate.class, Tests.Extensions.class, Tests.FunctionLiterals.class, Tests.Generics.class, Tests.Imports.class, Tests.IncompleteCode.class, Tests.Inference.class, Tests.Infos.class, Tests.Inline.class, Tests.Inner.class, Tests.J_k.class, Tests.Jdk_annotations.class, Tests.Library.class, Tests.Multimodule.class, Tests.NamedArguments.class, Tests.NullabilityAndAutoCasts.class, Tests.NullableTypes.class, Tests.Numbers.class, Tests.Objects.class, Tests.OperatorsOverloading.class, Tests.Overload.class, Tests.Override.class, Tests.Recovery.class, Tests.Redeclarations.class, Tests.Regressions.class, Tests.Resolve.class, Tests.Scopes.class, Tests.SenselessComparison.class, Tests.Shadowing.class, Tests.SmartCasts.class, Tests.Substitutions.class, Tests.Subtyping.class, Tests.Suppress.class, Tests.ThisAndSuper.class, Tests.Typedefs.class, Tests.Unit.class, Tests.Varargs.class, Tests.When.class})
public static class Tests extends AbstractJetDiagnosticsTest {
@TestMetadata("Abstract.kt")
public void testAbstract() throws Exception {
@@ -785,249 +785,6 @@ public class JetDiagnosticsTestGenerated extends AbstractJetDiagnosticsTest {
}
- @TestMetadata("compiler/testData/diagnostics/tests/callableReference")
- public static class CallableReference extends AbstractJetDiagnosticsTest {
- @TestMetadata("abstractClassConstructors.kt")
- public void testAbstractClassConstructors() throws Exception {
- doTest("compiler/testData/diagnostics/tests/callableReference/abstractClassConstructors.kt");
- }
-
- public void testAllFilesPresentInCallableReference() throws Exception {
- JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.TestsPackage", new File("compiler/testData/diagnostics/tests/callableReference"), Pattern.compile("^(.+)\\.kt$"), true);
- }
-
- @TestMetadata("ambiguityTopLevelVsTopLevel.kt")
- public void testAmbiguityTopLevelVsTopLevel() throws Exception {
- doTest("compiler/testData/diagnostics/tests/callableReference/ambiguityTopLevelVsTopLevel.kt");
- }
-
- @TestMetadata("constructorFromClass.kt")
- public void testConstructorFromClass() throws Exception {
- doTest("compiler/testData/diagnostics/tests/callableReference/constructorFromClass.kt");
- }
-
- @TestMetadata("constructorFromExtension.kt")
- public void testConstructorFromExtension() throws Exception {
- doTest("compiler/testData/diagnostics/tests/callableReference/constructorFromExtension.kt");
- }
-
- @TestMetadata("constructorFromExtensionInClass.kt")
- public void testConstructorFromExtensionInClass() throws Exception {
- doTest("compiler/testData/diagnostics/tests/callableReference/constructorFromExtensionInClass.kt");
- }
-
- @TestMetadata("constructorFromTopLevel.kt")
- public void testConstructorFromTopLevel() throws Exception {
- doTest("compiler/testData/diagnostics/tests/callableReference/constructorFromTopLevel.kt");
- }
-
- @TestMetadata("differentPackageClass.kt")
- public void testDifferentPackageClass() throws Exception {
- doTest("compiler/testData/diagnostics/tests/callableReference/differentPackageClass.kt");
- }
-
- @TestMetadata("differentPackageExtension.kt")
- public void testDifferentPackageExtension() throws Exception {
- doTest("compiler/testData/diagnostics/tests/callableReference/differentPackageExtension.kt");
- }
-
- @TestMetadata("differentPackageTopLevel.kt")
- public void testDifferentPackageTopLevel() throws Exception {
- doTest("compiler/testData/diagnostics/tests/callableReference/differentPackageTopLevel.kt");
- }
-
- @TestMetadata("empty.kt")
- public void testEmpty() throws Exception {
- doTest("compiler/testData/diagnostics/tests/callableReference/empty.kt");
- }
-
- @TestMetadata("extensionFromClass.kt")
- public void testExtensionFromClass() throws Exception {
- doTest("compiler/testData/diagnostics/tests/callableReference/extensionFromClass.kt");
- }
-
- @TestMetadata("extensionFromExtension.kt")
- public void testExtensionFromExtension() throws Exception {
- doTest("compiler/testData/diagnostics/tests/callableReference/extensionFromExtension.kt");
- }
-
- @TestMetadata("extensionFromExtensionInClass.kt")
- public void testExtensionFromExtensionInClass() throws Exception {
- doTest("compiler/testData/diagnostics/tests/callableReference/extensionFromExtensionInClass.kt");
- }
-
- @TestMetadata("extensionFromTopLevel.kt")
- public void testExtensionFromTopLevel() throws Exception {
- doTest("compiler/testData/diagnostics/tests/callableReference/extensionFromTopLevel.kt");
- }
-
- @TestMetadata("extensionInClassDisallowed.kt")
- public void testExtensionInClassDisallowed() throws Exception {
- doTest("compiler/testData/diagnostics/tests/callableReference/extensionInClassDisallowed.kt");
- }
-
- @TestMetadata("genericClassFromTopLevel.kt")
- public void testGenericClassFromTopLevel() throws Exception {
- doTest("compiler/testData/diagnostics/tests/callableReference/genericClassFromTopLevel.kt");
- }
-
- @TestMetadata("importedInnerConstructor.kt")
- public void testImportedInnerConstructor() throws Exception {
- doTest("compiler/testData/diagnostics/tests/callableReference/importedInnerConstructor.kt");
- }
-
- @TestMetadata("innerConstructorFromClass.kt")
- public void testInnerConstructorFromClass() throws Exception {
- doTest("compiler/testData/diagnostics/tests/callableReference/innerConstructorFromClass.kt");
- }
-
- @TestMetadata("innerConstructorFromExtension.kt")
- public void testInnerConstructorFromExtension() throws Exception {
- doTest("compiler/testData/diagnostics/tests/callableReference/innerConstructorFromExtension.kt");
- }
-
- @TestMetadata("innerConstructorFromTopLevel.kt")
- public void testInnerConstructorFromTopLevel() throws Exception {
- doTest("compiler/testData/diagnostics/tests/callableReference/innerConstructorFromTopLevel.kt");
- }
-
- @TestMetadata("lhsNotAClass.kt")
- public void testLhsNotAClass() throws Exception {
- doTest("compiler/testData/diagnostics/tests/callableReference/lhsNotAClass.kt");
- }
-
- @TestMetadata("localConstructor.kt")
- public void testLocalConstructor() throws Exception {
- doTest("compiler/testData/diagnostics/tests/callableReference/localConstructor.kt");
- }
-
- @TestMetadata("localConstructorFromExtensionInLocalClass.kt")
- public void testLocalConstructorFromExtensionInLocalClass() throws Exception {
- doTest("compiler/testData/diagnostics/tests/callableReference/localConstructorFromExtensionInLocalClass.kt");
- }
-
- @TestMetadata("localConstructorFromLocalClass.kt")
- public void testLocalConstructorFromLocalClass() throws Exception {
- doTest("compiler/testData/diagnostics/tests/callableReference/localConstructorFromLocalClass.kt");
- }
-
- @TestMetadata("localConstructorFromLocalExtension.kt")
- public void testLocalConstructorFromLocalExtension() throws Exception {
- doTest("compiler/testData/diagnostics/tests/callableReference/localConstructorFromLocalExtension.kt");
- }
-
- @TestMetadata("localNamedFun.kt")
- public void testLocalNamedFun() throws Exception {
- doTest("compiler/testData/diagnostics/tests/callableReference/localNamedFun.kt");
- }
-
- @TestMetadata("localNamedFunFromExtensionInLocalClass.kt")
- public void testLocalNamedFunFromExtensionInLocalClass() throws Exception {
- doTest("compiler/testData/diagnostics/tests/callableReference/localNamedFunFromExtensionInLocalClass.kt");
- }
-
- @TestMetadata("localNamedFunFromLocalClass.kt")
- public void testLocalNamedFunFromLocalClass() throws Exception {
- doTest("compiler/testData/diagnostics/tests/callableReference/localNamedFunFromLocalClass.kt");
- }
-
- @TestMetadata("localNamedFunFromLocalExtension.kt")
- public void testLocalNamedFunFromLocalExtension() throws Exception {
- doTest("compiler/testData/diagnostics/tests/callableReference/localNamedFunFromLocalExtension.kt");
- }
-
- @TestMetadata("longQualifiedName.kt")
- public void testLongQualifiedName() throws Exception {
- doTest("compiler/testData/diagnostics/tests/callableReference/longQualifiedName.kt");
- }
-
- @TestMetadata("longQualifiedNameGeneric.kt")
- public void testLongQualifiedNameGeneric() throws Exception {
- doTest("compiler/testData/diagnostics/tests/callableReference/longQualifiedNameGeneric.kt");
- }
-
- @TestMetadata("memberFromClass.kt")
- public void testMemberFromClass() throws Exception {
- doTest("compiler/testData/diagnostics/tests/callableReference/memberFromClass.kt");
- }
-
- @TestMetadata("memberFromExtension.kt")
- public void testMemberFromExtension() throws Exception {
- doTest("compiler/testData/diagnostics/tests/callableReference/memberFromExtension.kt");
- }
-
- @TestMetadata("memberFromExtensionInClass.kt")
- public void testMemberFromExtensionInClass() throws Exception {
- doTest("compiler/testData/diagnostics/tests/callableReference/memberFromExtensionInClass.kt");
- }
-
- @TestMetadata("memberFromTopLevel.kt")
- public void testMemberFromTopLevel() throws Exception {
- doTest("compiler/testData/diagnostics/tests/callableReference/memberFromTopLevel.kt");
- }
-
- @TestMetadata("nestedConstructorFromClass.kt")
- public void testNestedConstructorFromClass() throws Exception {
- doTest("compiler/testData/diagnostics/tests/callableReference/nestedConstructorFromClass.kt");
- }
-
- @TestMetadata("nestedConstructorFromExtension.kt")
- public void testNestedConstructorFromExtension() throws Exception {
- doTest("compiler/testData/diagnostics/tests/callableReference/nestedConstructorFromExtension.kt");
- }
-
- @TestMetadata("nestedConstructorFromTopLevel.kt")
- public void testNestedConstructorFromTopLevel() throws Exception {
- doTest("compiler/testData/diagnostics/tests/callableReference/nestedConstructorFromTopLevel.kt");
- }
-
- @TestMetadata("noAmbiguityLocalVsTopLevel.kt")
- public void testNoAmbiguityLocalVsTopLevel() throws Exception {
- doTest("compiler/testData/diagnostics/tests/callableReference/noAmbiguityLocalVsTopLevel.kt");
- }
-
- @TestMetadata("noAmbiguityMemberVsExtension.kt")
- public void testNoAmbiguityMemberVsExtension() throws Exception {
- doTest("compiler/testData/diagnostics/tests/callableReference/noAmbiguityMemberVsExtension.kt");
- }
-
- @TestMetadata("noAmbiguityMemberVsTopLevel.kt")
- public void testNoAmbiguityMemberVsTopLevel() throws Exception {
- doTest("compiler/testData/diagnostics/tests/callableReference/noAmbiguityMemberVsTopLevel.kt");
- }
-
- @TestMetadata("renameOnImport.kt")
- public void testRenameOnImport() throws Exception {
- doTest("compiler/testData/diagnostics/tests/callableReference/renameOnImport.kt");
- }
-
- @TestMetadata("topLevelFromClass.kt")
- public void testTopLevelFromClass() throws Exception {
- doTest("compiler/testData/diagnostics/tests/callableReference/topLevelFromClass.kt");
- }
-
- @TestMetadata("topLevelFromExtension.kt")
- public void testTopLevelFromExtension() throws Exception {
- doTest("compiler/testData/diagnostics/tests/callableReference/topLevelFromExtension.kt");
- }
-
- @TestMetadata("topLevelFromExtensionInClass.kt")
- public void testTopLevelFromExtensionInClass() throws Exception {
- doTest("compiler/testData/diagnostics/tests/callableReference/topLevelFromExtensionInClass.kt");
- }
-
- @TestMetadata("topLevelFromTopLevel.kt")
- public void testTopLevelFromTopLevel() throws Exception {
- doTest("compiler/testData/diagnostics/tests/callableReference/topLevelFromTopLevel.kt");
- }
-
- @TestMetadata("unresolved.kt")
- public void testUnresolved() throws Exception {
- doTest("compiler/testData/diagnostics/tests/callableReference/unresolved.kt");
- }
-
- }
-
@TestMetadata("compiler/testData/diagnostics/tests/cast")
@InnerTestClasses({Cast.Bare.class, Cast.NeverSucceeds.class})
public static class Cast extends AbstractJetDiagnosticsTest {
@@ -7242,7 +6999,6 @@ public class JetDiagnosticsTestGenerated extends AbstractJetDiagnosticsTest {
suite.addTestSuite(Tests.class);
suite.addTest(Annotations.innerSuite());
suite.addTestSuite(BackingField.class);
- suite.addTestSuite(CallableReference.class);
suite.addTest(Cast.innerSuite());
suite.addTestSuite(CheckArguments.class);
suite.addTestSuite(ClassObjects.class);
diff --git a/compiler/tests/org/jetbrains/jet/checkers/JetDiagnosticsTestWithStdLibGenerated.java b/compiler/tests/org/jetbrains/jet/checkers/JetDiagnosticsTestWithStdLibGenerated.java
index f1fade3abc9..e0530809c43 100644
--- a/compiler/tests/org/jetbrains/jet/checkers/JetDiagnosticsTestWithStdLibGenerated.java
+++ b/compiler/tests/org/jetbrains/jet/checkers/JetDiagnosticsTestWithStdLibGenerated.java
@@ -31,7 +31,7 @@ import org.jetbrains.jet.checkers.AbstractJetDiagnosticsTestWithStdLib;
/** This class is generated by {@link org.jetbrains.jet.generators.tests.TestsPackage}. DO NOT MODIFY MANUALLY */
@SuppressWarnings("all")
@TestMetadata("compiler/testData/diagnostics/testsWithStdLib")
-@InnerTestClasses({JetDiagnosticsTestWithStdLibGenerated.Annotations.class, JetDiagnosticsTestWithStdLibGenerated.FunctionLiterals.class, JetDiagnosticsTestWithStdLibGenerated.KotlinSignature.class})
+@InnerTestClasses({JetDiagnosticsTestWithStdLibGenerated.Annotations.class, JetDiagnosticsTestWithStdLibGenerated.CallableReference.class, JetDiagnosticsTestWithStdLibGenerated.FunctionLiterals.class, JetDiagnosticsTestWithStdLibGenerated.KotlinSignature.class})
public class JetDiagnosticsTestWithStdLibGenerated extends AbstractJetDiagnosticsTestWithStdLib {
public void testAllFilesPresentInTestsWithStdLib() throws Exception {
JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.TestsPackage", new File("compiler/testData/diagnostics/testsWithStdLib"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -85,6 +85,264 @@ public class JetDiagnosticsTestWithStdLibGenerated extends AbstractJetDiagnostic
}
}
+ @TestMetadata("compiler/testData/diagnostics/testsWithStdLib/callableReference")
+ @InnerTestClasses({CallableReference.Function.class})
+ public static class CallableReference extends AbstractJetDiagnosticsTestWithStdLib {
+ public void testAllFilesPresentInCallableReference() throws Exception {
+ JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.TestsPackage", new File("compiler/testData/diagnostics/testsWithStdLib/callableReference"), Pattern.compile("^(.+)\\.kt$"), true);
+ }
+
+ @TestMetadata("compiler/testData/diagnostics/testsWithStdLib/callableReference/function")
+ public static class Function extends AbstractJetDiagnosticsTestWithStdLib {
+ @TestMetadata("abstractClassConstructors.kt")
+ public void testAbstractClassConstructors() throws Exception {
+ doTest("compiler/testData/diagnostics/testsWithStdLib/callableReference/function/abstractClassConstructors.kt");
+ }
+
+ public void testAllFilesPresentInFunction() throws Exception {
+ JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.TestsPackage", new File("compiler/testData/diagnostics/testsWithStdLib/callableReference/function"), Pattern.compile("^(.+)\\.kt$"), true);
+ }
+
+ @TestMetadata("ambiguityTopLevelVsTopLevel.kt")
+ public void testAmbiguityTopLevelVsTopLevel() throws Exception {
+ doTest("compiler/testData/diagnostics/testsWithStdLib/callableReference/function/ambiguityTopLevelVsTopLevel.kt");
+ }
+
+ @TestMetadata("constructorFromClass.kt")
+ public void testConstructorFromClass() throws Exception {
+ doTest("compiler/testData/diagnostics/testsWithStdLib/callableReference/function/constructorFromClass.kt");
+ }
+
+ @TestMetadata("constructorFromExtension.kt")
+ public void testConstructorFromExtension() throws Exception {
+ doTest("compiler/testData/diagnostics/testsWithStdLib/callableReference/function/constructorFromExtension.kt");
+ }
+
+ @TestMetadata("constructorFromExtensionInClass.kt")
+ public void testConstructorFromExtensionInClass() throws Exception {
+ doTest("compiler/testData/diagnostics/testsWithStdLib/callableReference/function/constructorFromExtensionInClass.kt");
+ }
+
+ @TestMetadata("constructorFromTopLevel.kt")
+ public void testConstructorFromTopLevel() throws Exception {
+ doTest("compiler/testData/diagnostics/testsWithStdLib/callableReference/function/constructorFromTopLevel.kt");
+ }
+
+ @TestMetadata("differentPackageClass.kt")
+ public void testDifferentPackageClass() throws Exception {
+ doTest("compiler/testData/diagnostics/testsWithStdLib/callableReference/function/differentPackageClass.kt");
+ }
+
+ @TestMetadata("differentPackageExtension.kt")
+ public void testDifferentPackageExtension() throws Exception {
+ doTest("compiler/testData/diagnostics/testsWithStdLib/callableReference/function/differentPackageExtension.kt");
+ }
+
+ @TestMetadata("differentPackageTopLevel.kt")
+ public void testDifferentPackageTopLevel() throws Exception {
+ doTest("compiler/testData/diagnostics/testsWithStdLib/callableReference/function/differentPackageTopLevel.kt");
+ }
+
+ @TestMetadata("empty.kt")
+ public void testEmpty() throws Exception {
+ doTest("compiler/testData/diagnostics/testsWithStdLib/callableReference/function/empty.kt");
+ }
+
+ @TestMetadata("extensionFromClass.kt")
+ public void testExtensionFromClass() throws Exception {
+ doTest("compiler/testData/diagnostics/testsWithStdLib/callableReference/function/extensionFromClass.kt");
+ }
+
+ @TestMetadata("extensionFromExtension.kt")
+ public void testExtensionFromExtension() throws Exception {
+ doTest("compiler/testData/diagnostics/testsWithStdLib/callableReference/function/extensionFromExtension.kt");
+ }
+
+ @TestMetadata("extensionFromExtensionInClass.kt")
+ public void testExtensionFromExtensionInClass() throws Exception {
+ doTest("compiler/testData/diagnostics/testsWithStdLib/callableReference/function/extensionFromExtensionInClass.kt");
+ }
+
+ @TestMetadata("extensionFromTopLevel.kt")
+ public void testExtensionFromTopLevel() throws Exception {
+ doTest("compiler/testData/diagnostics/testsWithStdLib/callableReference/function/extensionFromTopLevel.kt");
+ }
+
+ @TestMetadata("extensionInClassDisallowed.kt")
+ public void testExtensionInClassDisallowed() throws Exception {
+ doTest("compiler/testData/diagnostics/testsWithStdLib/callableReference/function/extensionInClassDisallowed.kt");
+ }
+
+ @TestMetadata("genericClassFromTopLevel.kt")
+ public void testGenericClassFromTopLevel() throws Exception {
+ doTest("compiler/testData/diagnostics/testsWithStdLib/callableReference/function/genericClassFromTopLevel.kt");
+ }
+
+ @TestMetadata("importedInnerConstructor.kt")
+ public void testImportedInnerConstructor() throws Exception {
+ doTest("compiler/testData/diagnostics/testsWithStdLib/callableReference/function/importedInnerConstructor.kt");
+ }
+
+ @TestMetadata("innerConstructorFromClass.kt")
+ public void testInnerConstructorFromClass() throws Exception {
+ doTest("compiler/testData/diagnostics/testsWithStdLib/callableReference/function/innerConstructorFromClass.kt");
+ }
+
+ @TestMetadata("innerConstructorFromExtension.kt")
+ public void testInnerConstructorFromExtension() throws Exception {
+ doTest("compiler/testData/diagnostics/testsWithStdLib/callableReference/function/innerConstructorFromExtension.kt");
+ }
+
+ @TestMetadata("innerConstructorFromTopLevel.kt")
+ public void testInnerConstructorFromTopLevel() throws Exception {
+ doTest("compiler/testData/diagnostics/testsWithStdLib/callableReference/function/innerConstructorFromTopLevel.kt");
+ }
+
+ @TestMetadata("lhsNotAClass.kt")
+ public void testLhsNotAClass() throws Exception {
+ doTest("compiler/testData/diagnostics/testsWithStdLib/callableReference/function/lhsNotAClass.kt");
+ }
+
+ @TestMetadata("localConstructor.kt")
+ public void testLocalConstructor() throws Exception {
+ doTest("compiler/testData/diagnostics/testsWithStdLib/callableReference/function/localConstructor.kt");
+ }
+
+ @TestMetadata("localConstructorFromExtensionInLocalClass.kt")
+ public void testLocalConstructorFromExtensionInLocalClass() throws Exception {
+ doTest("compiler/testData/diagnostics/testsWithStdLib/callableReference/function/localConstructorFromExtensionInLocalClass.kt");
+ }
+
+ @TestMetadata("localConstructorFromLocalClass.kt")
+ public void testLocalConstructorFromLocalClass() throws Exception {
+ doTest("compiler/testData/diagnostics/testsWithStdLib/callableReference/function/localConstructorFromLocalClass.kt");
+ }
+
+ @TestMetadata("localConstructorFromLocalExtension.kt")
+ public void testLocalConstructorFromLocalExtension() throws Exception {
+ doTest("compiler/testData/diagnostics/testsWithStdLib/callableReference/function/localConstructorFromLocalExtension.kt");
+ }
+
+ @TestMetadata("localNamedFun.kt")
+ public void testLocalNamedFun() throws Exception {
+ doTest("compiler/testData/diagnostics/testsWithStdLib/callableReference/function/localNamedFun.kt");
+ }
+
+ @TestMetadata("localNamedFunFromExtensionInLocalClass.kt")
+ public void testLocalNamedFunFromExtensionInLocalClass() throws Exception {
+ doTest("compiler/testData/diagnostics/testsWithStdLib/callableReference/function/localNamedFunFromExtensionInLocalClass.kt");
+ }
+
+ @TestMetadata("localNamedFunFromLocalClass.kt")
+ public void testLocalNamedFunFromLocalClass() throws Exception {
+ doTest("compiler/testData/diagnostics/testsWithStdLib/callableReference/function/localNamedFunFromLocalClass.kt");
+ }
+
+ @TestMetadata("localNamedFunFromLocalExtension.kt")
+ public void testLocalNamedFunFromLocalExtension() throws Exception {
+ doTest("compiler/testData/diagnostics/testsWithStdLib/callableReference/function/localNamedFunFromLocalExtension.kt");
+ }
+
+ @TestMetadata("longQualifiedName.kt")
+ public void testLongQualifiedName() throws Exception {
+ doTest("compiler/testData/diagnostics/testsWithStdLib/callableReference/function/longQualifiedName.kt");
+ }
+
+ @TestMetadata("longQualifiedNameGeneric.kt")
+ public void testLongQualifiedNameGeneric() throws Exception {
+ doTest("compiler/testData/diagnostics/testsWithStdLib/callableReference/function/longQualifiedNameGeneric.kt");
+ }
+
+ @TestMetadata("memberFromClass.kt")
+ public void testMemberFromClass() throws Exception {
+ doTest("compiler/testData/diagnostics/testsWithStdLib/callableReference/function/memberFromClass.kt");
+ }
+
+ @TestMetadata("memberFromExtension.kt")
+ public void testMemberFromExtension() throws Exception {
+ doTest("compiler/testData/diagnostics/testsWithStdLib/callableReference/function/memberFromExtension.kt");
+ }
+
+ @TestMetadata("memberFromExtensionInClass.kt")
+ public void testMemberFromExtensionInClass() throws Exception {
+ doTest("compiler/testData/diagnostics/testsWithStdLib/callableReference/function/memberFromExtensionInClass.kt");
+ }
+
+ @TestMetadata("memberFromTopLevel.kt")
+ public void testMemberFromTopLevel() throws Exception {
+ doTest("compiler/testData/diagnostics/testsWithStdLib/callableReference/function/memberFromTopLevel.kt");
+ }
+
+ @TestMetadata("nestedConstructorFromClass.kt")
+ public void testNestedConstructorFromClass() throws Exception {
+ doTest("compiler/testData/diagnostics/testsWithStdLib/callableReference/function/nestedConstructorFromClass.kt");
+ }
+
+ @TestMetadata("nestedConstructorFromExtension.kt")
+ public void testNestedConstructorFromExtension() throws Exception {
+ doTest("compiler/testData/diagnostics/testsWithStdLib/callableReference/function/nestedConstructorFromExtension.kt");
+ }
+
+ @TestMetadata("nestedConstructorFromTopLevel.kt")
+ public void testNestedConstructorFromTopLevel() throws Exception {
+ doTest("compiler/testData/diagnostics/testsWithStdLib/callableReference/function/nestedConstructorFromTopLevel.kt");
+ }
+
+ @TestMetadata("noAmbiguityLocalVsTopLevel.kt")
+ public void testNoAmbiguityLocalVsTopLevel() throws Exception {
+ doTest("compiler/testData/diagnostics/testsWithStdLib/callableReference/function/noAmbiguityLocalVsTopLevel.kt");
+ }
+
+ @TestMetadata("noAmbiguityMemberVsExtension.kt")
+ public void testNoAmbiguityMemberVsExtension() throws Exception {
+ doTest("compiler/testData/diagnostics/testsWithStdLib/callableReference/function/noAmbiguityMemberVsExtension.kt");
+ }
+
+ @TestMetadata("noAmbiguityMemberVsTopLevel.kt")
+ public void testNoAmbiguityMemberVsTopLevel() throws Exception {
+ doTest("compiler/testData/diagnostics/testsWithStdLib/callableReference/function/noAmbiguityMemberVsTopLevel.kt");
+ }
+
+ @TestMetadata("renameOnImport.kt")
+ public void testRenameOnImport() throws Exception {
+ doTest("compiler/testData/diagnostics/testsWithStdLib/callableReference/function/renameOnImport.kt");
+ }
+
+ @TestMetadata("topLevelFromClass.kt")
+ public void testTopLevelFromClass() throws Exception {
+ doTest("compiler/testData/diagnostics/testsWithStdLib/callableReference/function/topLevelFromClass.kt");
+ }
+
+ @TestMetadata("topLevelFromExtension.kt")
+ public void testTopLevelFromExtension() throws Exception {
+ doTest("compiler/testData/diagnostics/testsWithStdLib/callableReference/function/topLevelFromExtension.kt");
+ }
+
+ @TestMetadata("topLevelFromExtensionInClass.kt")
+ public void testTopLevelFromExtensionInClass() throws Exception {
+ doTest("compiler/testData/diagnostics/testsWithStdLib/callableReference/function/topLevelFromExtensionInClass.kt");
+ }
+
+ @TestMetadata("topLevelFromTopLevel.kt")
+ public void testTopLevelFromTopLevel() throws Exception {
+ doTest("compiler/testData/diagnostics/testsWithStdLib/callableReference/function/topLevelFromTopLevel.kt");
+ }
+
+ @TestMetadata("unresolved.kt")
+ public void testUnresolved() throws Exception {
+ doTest("compiler/testData/diagnostics/testsWithStdLib/callableReference/function/unresolved.kt");
+ }
+
+ }
+
+ public static Test innerSuite() {
+ TestSuite suite = new TestSuite("CallableReference");
+ suite.addTestSuite(CallableReference.class);
+ suite.addTestSuite(Function.class);
+ return suite;
+ }
+ }
+
@TestMetadata("compiler/testData/diagnostics/testsWithStdLib/functionLiterals")
public static class FunctionLiterals extends AbstractJetDiagnosticsTestWithStdLib {
public void testAllFilesPresentInFunctionLiterals() throws Exception {
@@ -120,6 +378,7 @@ public class JetDiagnosticsTestWithStdLibGenerated extends AbstractJetDiagnostic
TestSuite suite = new TestSuite("JetDiagnosticsTestWithStdLibGenerated");
suite.addTestSuite(JetDiagnosticsTestWithStdLibGenerated.class);
suite.addTest(Annotations.innerSuite());
+ suite.addTest(CallableReference.innerSuite());
suite.addTestSuite(FunctionLiterals.class);
suite.addTestSuite(KotlinSignature.class);
return suite;
diff --git a/compiler/tests/org/jetbrains/jet/codegen/KotlinSyntheticClassAnnotationTest.java b/compiler/tests/org/jetbrains/jet/codegen/KotlinSyntheticClassAnnotationTest.java
index 3072c488931..a3975c3ee6d 100644
--- a/compiler/tests/org/jetbrains/jet/codegen/KotlinSyntheticClassAnnotationTest.java
+++ b/compiler/tests/org/jetbrains/jet/codegen/KotlinSyntheticClassAnnotationTest.java
@@ -39,7 +39,7 @@ public class KotlinSyntheticClassAnnotationTest extends CodegenTestCase {
@Override
protected void setUp() throws Exception {
super.setUp();
- createEnvironmentWithMockJdkAndIdeaAnnotations(ConfigurationKind.JDK_ONLY);
+ createEnvironmentWithMockJdkAndIdeaAnnotations(ConfigurationKind.ALL);
}
public void testPackagePart() {
diff --git a/compiler/tests/org/jetbrains/jet/codegen/forTestCompile/ForTestCompileRuntime.java b/compiler/tests/org/jetbrains/jet/codegen/forTestCompile/ForTestCompileRuntime.java
index eac5cb5baa2..c16ed690a48 100644
--- a/compiler/tests/org/jetbrains/jet/codegen/forTestCompile/ForTestCompileRuntime.java
+++ b/compiler/tests/org/jetbrains/jet/codegen/forTestCompile/ForTestCompileRuntime.java
@@ -38,6 +38,7 @@ import java.util.regex.Pattern;
public class ForTestCompileRuntime {
private static final String BUILT_INS_SRC_PATH = "core/builtins/src";
private static final String RUNTIME_JVM_SRC_PATH = "core/runtime.jvm/src";
+ private static final String REFLECTION_SRC_PATH = "core/reflection/src";
private ForTestCompileRuntime() {
}
@@ -57,7 +58,7 @@ public class ForTestCompileRuntime {
}
private static void compileBuiltIns(@NotNull File destDir) throws IOException {
- String src = BUILT_INS_SRC_PATH + File.pathSeparator + RUNTIME_JVM_SRC_PATH;
+ String src = BUILT_INS_SRC_PATH + File.pathSeparator + RUNTIME_JVM_SRC_PATH + File.pathSeparator + REFLECTION_SRC_PATH;
compileKotlinToJvm("built-ins", destDir, src, src);
JetTestUtils.compileJavaFiles(
diff --git a/compiler/tests/org/jetbrains/jet/codegen/generated/BlackBoxCodegenTestGenerated.java b/compiler/tests/org/jetbrains/jet/codegen/generated/BlackBoxCodegenTestGenerated.java
index 3b78bb7628a..b502d55d5b9 100644
--- a/compiler/tests/org/jetbrains/jet/codegen/generated/BlackBoxCodegenTestGenerated.java
+++ b/compiler/tests/org/jetbrains/jet/codegen/generated/BlackBoxCodegenTestGenerated.java
@@ -31,7 +31,7 @@ import org.jetbrains.jet.codegen.generated.AbstractBlackBoxCodegenTest;
/** This class is generated by {@link org.jetbrains.jet.generators.tests.TestsPackage}. DO NOT MODIFY MANUALLY */
@SuppressWarnings("all")
@TestMetadata("compiler/testData/codegen/box")
-@InnerTestClasses({BlackBoxCodegenTestGenerated.Arrays.class, BlackBoxCodegenTestGenerated.BinaryOp.class, BlackBoxCodegenTestGenerated.Bridges.class, BlackBoxCodegenTestGenerated.BuiltinStubMethods.class, BlackBoxCodegenTestGenerated.CallableReference.class, BlackBoxCodegenTestGenerated.Casts.class, BlackBoxCodegenTestGenerated.Classes.class, BlackBoxCodegenTestGenerated.Closures.class, BlackBoxCodegenTestGenerated.Constants.class, BlackBoxCodegenTestGenerated.ControlStructures.class, BlackBoxCodegenTestGenerated.DefaultArguments.class, BlackBoxCodegenTestGenerated.DelegatedProperty.class, BlackBoxCodegenTestGenerated.Elvis.class, BlackBoxCodegenTestGenerated.Enum.class, BlackBoxCodegenTestGenerated.ExclExcl.class, BlackBoxCodegenTestGenerated.ExtensionFunctions.class, BlackBoxCodegenTestGenerated.ExtensionProperties.class, BlackBoxCodegenTestGenerated.FakeOverride.class, BlackBoxCodegenTestGenerated.FieldRename.class, BlackBoxCodegenTestGenerated.Finally.class, BlackBoxCodegenTestGenerated.Functions.class, BlackBoxCodegenTestGenerated.InnerNested.class, BlackBoxCodegenTestGenerated.Instructions.class, BlackBoxCodegenTestGenerated.Intrinsics.class, BlackBoxCodegenTestGenerated.Labels.class, BlackBoxCodegenTestGenerated.LocalClasses.class, BlackBoxCodegenTestGenerated.MultiDecl.class, BlackBoxCodegenTestGenerated.Objects.class, BlackBoxCodegenTestGenerated.OperatorConventions.class, BlackBoxCodegenTestGenerated.Package.class, BlackBoxCodegenTestGenerated.PrimitiveTypes.class, BlackBoxCodegenTestGenerated.Properties.class, BlackBoxCodegenTestGenerated.Reflection.class, BlackBoxCodegenTestGenerated.Regressions.class, BlackBoxCodegenTestGenerated.SafeCall.class, BlackBoxCodegenTestGenerated.SamConstructors.class, BlackBoxCodegenTestGenerated.Strings.class, BlackBoxCodegenTestGenerated.Super.class, BlackBoxCodegenTestGenerated.ToArray.class, BlackBoxCodegenTestGenerated.Traits.class, BlackBoxCodegenTestGenerated.TypeInfo.class, BlackBoxCodegenTestGenerated.TypeMapping.class, BlackBoxCodegenTestGenerated.UnaryOp.class, BlackBoxCodegenTestGenerated.Unit.class, BlackBoxCodegenTestGenerated.Vararg.class, BlackBoxCodegenTestGenerated.When.class})
+@InnerTestClasses({BlackBoxCodegenTestGenerated.Arrays.class, BlackBoxCodegenTestGenerated.BinaryOp.class, BlackBoxCodegenTestGenerated.Bridges.class, BlackBoxCodegenTestGenerated.BuiltinStubMethods.class, BlackBoxCodegenTestGenerated.Casts.class, BlackBoxCodegenTestGenerated.Classes.class, BlackBoxCodegenTestGenerated.Closures.class, BlackBoxCodegenTestGenerated.Constants.class, BlackBoxCodegenTestGenerated.ControlStructures.class, BlackBoxCodegenTestGenerated.DefaultArguments.class, BlackBoxCodegenTestGenerated.DelegatedProperty.class, BlackBoxCodegenTestGenerated.Elvis.class, BlackBoxCodegenTestGenerated.Enum.class, BlackBoxCodegenTestGenerated.ExclExcl.class, BlackBoxCodegenTestGenerated.ExtensionFunctions.class, BlackBoxCodegenTestGenerated.ExtensionProperties.class, BlackBoxCodegenTestGenerated.FakeOverride.class, BlackBoxCodegenTestGenerated.FieldRename.class, BlackBoxCodegenTestGenerated.Finally.class, BlackBoxCodegenTestGenerated.Functions.class, BlackBoxCodegenTestGenerated.InnerNested.class, BlackBoxCodegenTestGenerated.Instructions.class, BlackBoxCodegenTestGenerated.Intrinsics.class, BlackBoxCodegenTestGenerated.Labels.class, BlackBoxCodegenTestGenerated.LocalClasses.class, BlackBoxCodegenTestGenerated.MultiDecl.class, BlackBoxCodegenTestGenerated.Objects.class, BlackBoxCodegenTestGenerated.OperatorConventions.class, BlackBoxCodegenTestGenerated.Package.class, BlackBoxCodegenTestGenerated.PrimitiveTypes.class, BlackBoxCodegenTestGenerated.Properties.class, BlackBoxCodegenTestGenerated.Reflection.class, BlackBoxCodegenTestGenerated.Regressions.class, BlackBoxCodegenTestGenerated.SafeCall.class, BlackBoxCodegenTestGenerated.SamConstructors.class, BlackBoxCodegenTestGenerated.Strings.class, BlackBoxCodegenTestGenerated.Super.class, BlackBoxCodegenTestGenerated.ToArray.class, BlackBoxCodegenTestGenerated.Traits.class, BlackBoxCodegenTestGenerated.TypeInfo.class, BlackBoxCodegenTestGenerated.TypeMapping.class, BlackBoxCodegenTestGenerated.UnaryOp.class, BlackBoxCodegenTestGenerated.Unit.class, BlackBoxCodegenTestGenerated.Vararg.class, BlackBoxCodegenTestGenerated.When.class})
public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest {
public void testAllFilesPresentInBox() throws Exception {
JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.TestsPackage", new File("compiler/testData/codegen/box"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -624,319 +624,6 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest {
}
- @TestMetadata("compiler/testData/codegen/box/callableReference")
- @InnerTestClasses({CallableReference.Local.class})
- public static class CallableReference extends AbstractBlackBoxCodegenTest {
- @TestMetadata("abstractClassMember.kt")
- public void testAbstractClassMember() throws Exception {
- doTest("compiler/testData/codegen/box/callableReference/abstractClassMember.kt");
- }
-
- public void testAllFilesPresentInCallableReference() throws Exception {
- JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.TestsPackage", new File("compiler/testData/codegen/box/callableReference"), Pattern.compile("^(.+)\\.kt$"), true);
- }
-
- @TestMetadata("booleanNotIntrinsic.kt")
- public void testBooleanNotIntrinsic() throws Exception {
- doTest("compiler/testData/codegen/box/callableReference/booleanNotIntrinsic.kt");
- }
-
- @TestMetadata("classMemberFromClass.kt")
- public void testClassMemberFromClass() throws Exception {
- doTest("compiler/testData/codegen/box/callableReference/classMemberFromClass.kt");
- }
-
- @TestMetadata("classMemberFromExtension.kt")
- public void testClassMemberFromExtension() throws Exception {
- doTest("compiler/testData/codegen/box/callableReference/classMemberFromExtension.kt");
- }
-
- @TestMetadata("classMemberFromTopLevelStringNoArgs.kt")
- public void testClassMemberFromTopLevelStringNoArgs() throws Exception {
- doTest("compiler/testData/codegen/box/callableReference/classMemberFromTopLevelStringNoArgs.kt");
- }
-
- @TestMetadata("classMemberFromTopLevelStringOneStringArg.kt")
- public void testClassMemberFromTopLevelStringOneStringArg() throws Exception {
- doTest("compiler/testData/codegen/box/callableReference/classMemberFromTopLevelStringOneStringArg.kt");
- }
-
- @TestMetadata("classMemberFromTopLevelUnitNoArgs.kt")
- public void testClassMemberFromTopLevelUnitNoArgs() throws Exception {
- doTest("compiler/testData/codegen/box/callableReference/classMemberFromTopLevelUnitNoArgs.kt");
- }
-
- @TestMetadata("classMemberFromTopLevelUnitOneStringArg.kt")
- public void testClassMemberFromTopLevelUnitOneStringArg() throws Exception {
- doTest("compiler/testData/codegen/box/callableReference/classMemberFromTopLevelUnitOneStringArg.kt");
- }
-
- @TestMetadata("constructorFromTopLevelNoArgs.kt")
- public void testConstructorFromTopLevelNoArgs() throws Exception {
- doTest("compiler/testData/codegen/box/callableReference/constructorFromTopLevelNoArgs.kt");
- }
-
- @TestMetadata("constructorFromTopLevelOneStringArg.kt")
- public void testConstructorFromTopLevelOneStringArg() throws Exception {
- doTest("compiler/testData/codegen/box/callableReference/constructorFromTopLevelOneStringArg.kt");
- }
-
- @TestMetadata("enumNameMethod.kt")
- public void testEnumNameMethod() throws Exception {
- doTest("compiler/testData/codegen/box/callableReference/enumNameMethod.kt");
- }
-
- @TestMetadata("equalsIntrinsic.kt")
- public void testEqualsIntrinsic() throws Exception {
- doTest("compiler/testData/codegen/box/callableReference/equalsIntrinsic.kt");
- }
-
- @TestMetadata("extensionFromClass.kt")
- public void testExtensionFromClass() throws Exception {
- doTest("compiler/testData/codegen/box/callableReference/extensionFromClass.kt");
- }
-
- @TestMetadata("extensionFromExtension.kt")
- public void testExtensionFromExtension() throws Exception {
- doTest("compiler/testData/codegen/box/callableReference/extensionFromExtension.kt");
- }
-
- @TestMetadata("extensionFromTopLevelStringNoArgs.kt")
- public void testExtensionFromTopLevelStringNoArgs() throws Exception {
- doTest("compiler/testData/codegen/box/callableReference/extensionFromTopLevelStringNoArgs.kt");
- }
-
- @TestMetadata("extensionFromTopLevelStringOneStringArg.kt")
- public void testExtensionFromTopLevelStringOneStringArg() throws Exception {
- doTest("compiler/testData/codegen/box/callableReference/extensionFromTopLevelStringOneStringArg.kt");
- }
-
- @TestMetadata("extensionFromTopLevelUnitNoArgs.kt")
- public void testExtensionFromTopLevelUnitNoArgs() throws Exception {
- doTest("compiler/testData/codegen/box/callableReference/extensionFromTopLevelUnitNoArgs.kt");
- }
-
- @TestMetadata("extensionFromTopLevelUnitOneStringArg.kt")
- public void testExtensionFromTopLevelUnitOneStringArg() throws Exception {
- doTest("compiler/testData/codegen/box/callableReference/extensionFromTopLevelUnitOneStringArg.kt");
- }
-
- @TestMetadata("genericMember.kt")
- public void testGenericMember() throws Exception {
- doTest("compiler/testData/codegen/box/callableReference/genericMember.kt");
- }
-
- @TestMetadata("innerConstructorFromClass.kt")
- public void testInnerConstructorFromClass() throws Exception {
- doTest("compiler/testData/codegen/box/callableReference/innerConstructorFromClass.kt");
- }
-
- @TestMetadata("innerConstructorFromExtension.kt")
- public void testInnerConstructorFromExtension() throws Exception {
- doTest("compiler/testData/codegen/box/callableReference/innerConstructorFromExtension.kt");
- }
-
- @TestMetadata("innerConstructorFromTopLevelNoArgs.kt")
- public void testInnerConstructorFromTopLevelNoArgs() throws Exception {
- doTest("compiler/testData/codegen/box/callableReference/innerConstructorFromTopLevelNoArgs.kt");
- }
-
- @TestMetadata("innerConstructorFromTopLevelOneStringArg.kt")
- public void testInnerConstructorFromTopLevelOneStringArg() throws Exception {
- doTest("compiler/testData/codegen/box/callableReference/innerConstructorFromTopLevelOneStringArg.kt");
- }
-
- @TestMetadata("nestedConstructorFromClass.kt")
- public void testNestedConstructorFromClass() throws Exception {
- doTest("compiler/testData/codegen/box/callableReference/nestedConstructorFromClass.kt");
- }
-
- @TestMetadata("nestedConstructorFromTopLevelNoArgs.kt")
- public void testNestedConstructorFromTopLevelNoArgs() throws Exception {
- doTest("compiler/testData/codegen/box/callableReference/nestedConstructorFromTopLevelNoArgs.kt");
- }
-
- @TestMetadata("nestedConstructorFromTopLevelOneStringArg.kt")
- public void testNestedConstructorFromTopLevelOneStringArg() throws Exception {
- doTest("compiler/testData/codegen/box/callableReference/nestedConstructorFromTopLevelOneStringArg.kt");
- }
-
- @TestMetadata("newArray.kt")
- public void testNewArray() throws Exception {
- doTest("compiler/testData/codegen/box/callableReference/newArray.kt");
- }
-
- @TestMetadata("objectMemberUnitNoArgs.kt")
- public void testObjectMemberUnitNoArgs() throws Exception {
- doTest("compiler/testData/codegen/box/callableReference/objectMemberUnitNoArgs.kt");
- }
-
- @TestMetadata("objectMemberUnitOneStringArg.kt")
- public void testObjectMemberUnitOneStringArg() throws Exception {
- doTest("compiler/testData/codegen/box/callableReference/objectMemberUnitOneStringArg.kt");
- }
-
- @TestMetadata("privateClassMember.kt")
- public void testPrivateClassMember() throws Exception {
- doTest("compiler/testData/codegen/box/callableReference/privateClassMember.kt");
- }
-
- @TestMetadata("sortListOfStrings.kt")
- public void testSortListOfStrings() throws Exception {
- doTest("compiler/testData/codegen/box/callableReference/sortListOfStrings.kt");
- }
-
- @TestMetadata("toString.kt")
- public void testToString() throws Exception {
- doTest("compiler/testData/codegen/box/callableReference/toString.kt");
- }
-
- @TestMetadata("topLevelFromClass.kt")
- public void testTopLevelFromClass() throws Exception {
- doTest("compiler/testData/codegen/box/callableReference/topLevelFromClass.kt");
- }
-
- @TestMetadata("topLevelFromExtension.kt")
- public void testTopLevelFromExtension() throws Exception {
- doTest("compiler/testData/codegen/box/callableReference/topLevelFromExtension.kt");
- }
-
- @TestMetadata("topLevelFromTopLevelStringNoArgs.kt")
- public void testTopLevelFromTopLevelStringNoArgs() throws Exception {
- doTest("compiler/testData/codegen/box/callableReference/topLevelFromTopLevelStringNoArgs.kt");
- }
-
- @TestMetadata("topLevelFromTopLevelStringOneStringArg.kt")
- public void testTopLevelFromTopLevelStringOneStringArg() throws Exception {
- doTest("compiler/testData/codegen/box/callableReference/topLevelFromTopLevelStringOneStringArg.kt");
- }
-
- @TestMetadata("topLevelFromTopLevelUnitNoArgs.kt")
- public void testTopLevelFromTopLevelUnitNoArgs() throws Exception {
- doTest("compiler/testData/codegen/box/callableReference/topLevelFromTopLevelUnitNoArgs.kt");
- }
-
- @TestMetadata("topLevelFromTopLevelUnitOneStringArg.kt")
- public void testTopLevelFromTopLevelUnitOneStringArg() throws Exception {
- doTest("compiler/testData/codegen/box/callableReference/topLevelFromTopLevelUnitOneStringArg.kt");
- }
-
- @TestMetadata("traitImplMethodWithClassReceiver.kt")
- public void testTraitImplMethodWithClassReceiver() throws Exception {
- doTest("compiler/testData/codegen/box/callableReference/traitImplMethodWithClassReceiver.kt");
- }
-
- @TestMetadata("traitMember.kt")
- public void testTraitMember() throws Exception {
- doTest("compiler/testData/codegen/box/callableReference/traitMember.kt");
- }
-
- @TestMetadata("compiler/testData/codegen/box/callableReference/local")
- public static class Local extends AbstractBlackBoxCodegenTest {
- public void testAllFilesPresentInLocal() throws Exception {
- JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.TestsPackage", new File("compiler/testData/codegen/box/callableReference/local"), Pattern.compile("^(.+)\\.kt$"), true);
- }
-
- @TestMetadata("captureOuter.kt")
- public void testCaptureOuter() throws Exception {
- doTest("compiler/testData/codegen/box/callableReference/local/captureOuter.kt");
- }
-
- @TestMetadata("classMember.kt")
- public void testClassMember() throws Exception {
- doTest("compiler/testData/codegen/box/callableReference/local/classMember.kt");
- }
-
- @TestMetadata("closureWithSideEffect.kt")
- public void testClosureWithSideEffect() throws Exception {
- doTest("compiler/testData/codegen/box/callableReference/local/closureWithSideEffect.kt");
- }
-
- @TestMetadata("constructor.kt")
- public void testConstructor() throws Exception {
- doTest("compiler/testData/codegen/box/callableReference/local/constructor.kt");
- }
-
- @TestMetadata("constructorWithInitializer.kt")
- public void testConstructorWithInitializer() throws Exception {
- doTest("compiler/testData/codegen/box/callableReference/local/constructorWithInitializer.kt");
- }
-
- @TestMetadata("enumExtendsTrait.kt")
- public void testEnumExtendsTrait() throws Exception {
- doTest("compiler/testData/codegen/box/callableReference/local/enumExtendsTrait.kt");
- }
-
- @TestMetadata("extension.kt")
- public void testExtension() throws Exception {
- doTest("compiler/testData/codegen/box/callableReference/local/extension.kt");
- }
-
- @TestMetadata("extensionToLocalClass.kt")
- public void testExtensionToLocalClass() throws Exception {
- doTest("compiler/testData/codegen/box/callableReference/local/extensionToLocalClass.kt");
- }
-
- @TestMetadata("extensionToPrimitive.kt")
- public void testExtensionToPrimitive() throws Exception {
- doTest("compiler/testData/codegen/box/callableReference/local/extensionToPrimitive.kt");
- }
-
- @TestMetadata("extensionWithClosure.kt")
- public void testExtensionWithClosure() throws Exception {
- doTest("compiler/testData/codegen/box/callableReference/local/extensionWithClosure.kt");
- }
-
- @TestMetadata("genericMember.kt")
- public void testGenericMember() throws Exception {
- doTest("compiler/testData/codegen/box/callableReference/local/genericMember.kt");
- }
-
- @TestMetadata("localClassMember.kt")
- public void testLocalClassMember() throws Exception {
- doTest("compiler/testData/codegen/box/callableReference/local/localClassMember.kt");
- }
-
- @TestMetadata("localLocal.kt")
- public void testLocalLocal() throws Exception {
- doTest("compiler/testData/codegen/box/callableReference/local/localLocal.kt");
- }
-
- @TestMetadata("recursiveClosure.kt")
- public void testRecursiveClosure() throws Exception {
- doTest("compiler/testData/codegen/box/callableReference/local/recursiveClosure.kt");
- }
-
- @TestMetadata("simple.kt")
- public void testSimple() throws Exception {
- doTest("compiler/testData/codegen/box/callableReference/local/simple.kt");
- }
-
- @TestMetadata("simpleClosure.kt")
- public void testSimpleClosure() throws Exception {
- doTest("compiler/testData/codegen/box/callableReference/local/simpleClosure.kt");
- }
-
- @TestMetadata("simpleWithArg.kt")
- public void testSimpleWithArg() throws Exception {
- doTest("compiler/testData/codegen/box/callableReference/local/simpleWithArg.kt");
- }
-
- @TestMetadata("unitWithSideEffect.kt")
- public void testUnitWithSideEffect() throws Exception {
- doTest("compiler/testData/codegen/box/callableReference/local/unitWithSideEffect.kt");
- }
-
- }
-
- public static Test innerSuite() {
- TestSuite suite = new TestSuite("CallableReference");
- suite.addTestSuite(CallableReference.class);
- suite.addTestSuite(Local.class);
- return suite;
- }
- }
-
@TestMetadata("compiler/testData/codegen/box/casts")
public static class Casts extends AbstractBlackBoxCodegenTest {
public void testAllFilesPresentInCasts() throws Exception {
@@ -5635,7 +5322,6 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest {
suite.addTestSuite(BinaryOp.class);
suite.addTest(Bridges.innerSuite());
suite.addTestSuite(BuiltinStubMethods.class);
- suite.addTest(CallableReference.innerSuite());
suite.addTestSuite(Casts.class);
suite.addTestSuite(Classes.class);
suite.addTest(Closures.innerSuite());
diff --git a/compiler/tests/org/jetbrains/jet/codegen/generated/BlackBoxWithStdlibCodegenTestGenerated.java b/compiler/tests/org/jetbrains/jet/codegen/generated/BlackBoxWithStdlibCodegenTestGenerated.java
index 171b92d6b5e..c55798a7a01 100644
--- a/compiler/tests/org/jetbrains/jet/codegen/generated/BlackBoxWithStdlibCodegenTestGenerated.java
+++ b/compiler/tests/org/jetbrains/jet/codegen/generated/BlackBoxWithStdlibCodegenTestGenerated.java
@@ -31,7 +31,7 @@ import org.jetbrains.jet.codegen.generated.AbstractBlackBoxCodegenTest;
/** This class is generated by {@link org.jetbrains.jet.generators.tests.TestsPackage}. DO NOT MODIFY MANUALLY */
@SuppressWarnings("all")
@TestMetadata("compiler/testData/codegen/boxWithStdlib")
-@InnerTestClasses({BlackBoxWithStdlibCodegenTestGenerated.Annotations.class, BlackBoxWithStdlibCodegenTestGenerated.Arrays.class, BlackBoxWithStdlibCodegenTestGenerated.Casts.class, BlackBoxWithStdlibCodegenTestGenerated.DataClasses.class, BlackBoxWithStdlibCodegenTestGenerated.Evaluate.class, BlackBoxWithStdlibCodegenTestGenerated.FullJdk.class, BlackBoxWithStdlibCodegenTestGenerated.JdkAnnotations.class, BlackBoxWithStdlibCodegenTestGenerated.Ranges.class, BlackBoxWithStdlibCodegenTestGenerated.Regressions.class, BlackBoxWithStdlibCodegenTestGenerated.Strings.class, BlackBoxWithStdlibCodegenTestGenerated.ToArray.class, BlackBoxWithStdlibCodegenTestGenerated.Vararg.class, BlackBoxWithStdlibCodegenTestGenerated.When.class})
+@InnerTestClasses({BlackBoxWithStdlibCodegenTestGenerated.Annotations.class, BlackBoxWithStdlibCodegenTestGenerated.Arrays.class, BlackBoxWithStdlibCodegenTestGenerated.CallableReference.class, BlackBoxWithStdlibCodegenTestGenerated.Casts.class, BlackBoxWithStdlibCodegenTestGenerated.DataClasses.class, BlackBoxWithStdlibCodegenTestGenerated.Evaluate.class, BlackBoxWithStdlibCodegenTestGenerated.FullJdk.class, BlackBoxWithStdlibCodegenTestGenerated.JdkAnnotations.class, BlackBoxWithStdlibCodegenTestGenerated.Ranges.class, BlackBoxWithStdlibCodegenTestGenerated.Regressions.class, BlackBoxWithStdlibCodegenTestGenerated.Strings.class, BlackBoxWithStdlibCodegenTestGenerated.ToArray.class, BlackBoxWithStdlibCodegenTestGenerated.Vararg.class, BlackBoxWithStdlibCodegenTestGenerated.When.class})
public class BlackBoxWithStdlibCodegenTestGenerated extends AbstractBlackBoxCodegenTest {
public void testAllFilesPresentInBoxWithStdlib() throws Exception {
JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.TestsPackage", new File("compiler/testData/codegen/boxWithStdlib"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -93,6 +93,334 @@ public class BlackBoxWithStdlibCodegenTestGenerated extends AbstractBlackBoxCode
}
+ @TestMetadata("compiler/testData/codegen/boxWithStdlib/callableReference")
+ @InnerTestClasses({CallableReference.Function.class})
+ public static class CallableReference extends AbstractBlackBoxCodegenTest {
+ public void testAllFilesPresentInCallableReference() throws Exception {
+ JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.TestsPackage", new File("compiler/testData/codegen/boxWithStdlib/callableReference"), Pattern.compile("^(.+)\\.kt$"), true);
+ }
+
+ @TestMetadata("compiler/testData/codegen/boxWithStdlib/callableReference/function")
+ @InnerTestClasses({Function.Local.class})
+ public static class Function extends AbstractBlackBoxCodegenTest {
+ @TestMetadata("abstractClassMember.kt")
+ public void testAbstractClassMember() throws Exception {
+ doTestWithStdlib("compiler/testData/codegen/boxWithStdlib/callableReference/function/abstractClassMember.kt");
+ }
+
+ public void testAllFilesPresentInFunction() throws Exception {
+ JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.TestsPackage", new File("compiler/testData/codegen/boxWithStdlib/callableReference/function"), Pattern.compile("^(.+)\\.kt$"), true);
+ }
+
+ @TestMetadata("booleanNotIntrinsic.kt")
+ public void testBooleanNotIntrinsic() throws Exception {
+ doTestWithStdlib("compiler/testData/codegen/boxWithStdlib/callableReference/function/booleanNotIntrinsic.kt");
+ }
+
+ @TestMetadata("classMemberFromClass.kt")
+ public void testClassMemberFromClass() throws Exception {
+ doTestWithStdlib("compiler/testData/codegen/boxWithStdlib/callableReference/function/classMemberFromClass.kt");
+ }
+
+ @TestMetadata("classMemberFromExtension.kt")
+ public void testClassMemberFromExtension() throws Exception {
+ doTestWithStdlib("compiler/testData/codegen/boxWithStdlib/callableReference/function/classMemberFromExtension.kt");
+ }
+
+ @TestMetadata("classMemberFromTopLevelStringNoArgs.kt")
+ public void testClassMemberFromTopLevelStringNoArgs() throws Exception {
+ doTestWithStdlib("compiler/testData/codegen/boxWithStdlib/callableReference/function/classMemberFromTopLevelStringNoArgs.kt");
+ }
+
+ @TestMetadata("classMemberFromTopLevelStringOneStringArg.kt")
+ public void testClassMemberFromTopLevelStringOneStringArg() throws Exception {
+ doTestWithStdlib("compiler/testData/codegen/boxWithStdlib/callableReference/function/classMemberFromTopLevelStringOneStringArg.kt");
+ }
+
+ @TestMetadata("classMemberFromTopLevelUnitNoArgs.kt")
+ public void testClassMemberFromTopLevelUnitNoArgs() throws Exception {
+ doTestWithStdlib("compiler/testData/codegen/boxWithStdlib/callableReference/function/classMemberFromTopLevelUnitNoArgs.kt");
+ }
+
+ @TestMetadata("classMemberFromTopLevelUnitOneStringArg.kt")
+ public void testClassMemberFromTopLevelUnitOneStringArg() throws Exception {
+ doTestWithStdlib("compiler/testData/codegen/boxWithStdlib/callableReference/function/classMemberFromTopLevelUnitOneStringArg.kt");
+ }
+
+ @TestMetadata("constructorFromTopLevelNoArgs.kt")
+ public void testConstructorFromTopLevelNoArgs() throws Exception {
+ doTestWithStdlib("compiler/testData/codegen/boxWithStdlib/callableReference/function/constructorFromTopLevelNoArgs.kt");
+ }
+
+ @TestMetadata("constructorFromTopLevelOneStringArg.kt")
+ public void testConstructorFromTopLevelOneStringArg() throws Exception {
+ doTestWithStdlib("compiler/testData/codegen/boxWithStdlib/callableReference/function/constructorFromTopLevelOneStringArg.kt");
+ }
+
+ @TestMetadata("enumNameMethod.kt")
+ public void testEnumNameMethod() throws Exception {
+ doTestWithStdlib("compiler/testData/codegen/boxWithStdlib/callableReference/function/enumNameMethod.kt");
+ }
+
+ @TestMetadata("equalsIntrinsic.kt")
+ public void testEqualsIntrinsic() throws Exception {
+ doTestWithStdlib("compiler/testData/codegen/boxWithStdlib/callableReference/function/equalsIntrinsic.kt");
+ }
+
+ @TestMetadata("extensionFromClass.kt")
+ public void testExtensionFromClass() throws Exception {
+ doTestWithStdlib("compiler/testData/codegen/boxWithStdlib/callableReference/function/extensionFromClass.kt");
+ }
+
+ @TestMetadata("extensionFromExtension.kt")
+ public void testExtensionFromExtension() throws Exception {
+ doTestWithStdlib("compiler/testData/codegen/boxWithStdlib/callableReference/function/extensionFromExtension.kt");
+ }
+
+ @TestMetadata("extensionFromTopLevelStringNoArgs.kt")
+ public void testExtensionFromTopLevelStringNoArgs() throws Exception {
+ doTestWithStdlib("compiler/testData/codegen/boxWithStdlib/callableReference/function/extensionFromTopLevelStringNoArgs.kt");
+ }
+
+ @TestMetadata("extensionFromTopLevelStringOneStringArg.kt")
+ public void testExtensionFromTopLevelStringOneStringArg() throws Exception {
+ doTestWithStdlib("compiler/testData/codegen/boxWithStdlib/callableReference/function/extensionFromTopLevelStringOneStringArg.kt");
+ }
+
+ @TestMetadata("extensionFromTopLevelUnitNoArgs.kt")
+ public void testExtensionFromTopLevelUnitNoArgs() throws Exception {
+ doTestWithStdlib("compiler/testData/codegen/boxWithStdlib/callableReference/function/extensionFromTopLevelUnitNoArgs.kt");
+ }
+
+ @TestMetadata("extensionFromTopLevelUnitOneStringArg.kt")
+ public void testExtensionFromTopLevelUnitOneStringArg() throws Exception {
+ doTestWithStdlib("compiler/testData/codegen/boxWithStdlib/callableReference/function/extensionFromTopLevelUnitOneStringArg.kt");
+ }
+
+ @TestMetadata("genericMember.kt")
+ public void testGenericMember() throws Exception {
+ doTestWithStdlib("compiler/testData/codegen/boxWithStdlib/callableReference/function/genericMember.kt");
+ }
+
+ @TestMetadata("innerConstructorFromClass.kt")
+ public void testInnerConstructorFromClass() throws Exception {
+ doTestWithStdlib("compiler/testData/codegen/boxWithStdlib/callableReference/function/innerConstructorFromClass.kt");
+ }
+
+ @TestMetadata("innerConstructorFromExtension.kt")
+ public void testInnerConstructorFromExtension() throws Exception {
+ doTestWithStdlib("compiler/testData/codegen/boxWithStdlib/callableReference/function/innerConstructorFromExtension.kt");
+ }
+
+ @TestMetadata("innerConstructorFromTopLevelNoArgs.kt")
+ public void testInnerConstructorFromTopLevelNoArgs() throws Exception {
+ doTestWithStdlib("compiler/testData/codegen/boxWithStdlib/callableReference/function/innerConstructorFromTopLevelNoArgs.kt");
+ }
+
+ @TestMetadata("innerConstructorFromTopLevelOneStringArg.kt")
+ public void testInnerConstructorFromTopLevelOneStringArg() throws Exception {
+ doTestWithStdlib("compiler/testData/codegen/boxWithStdlib/callableReference/function/innerConstructorFromTopLevelOneStringArg.kt");
+ }
+
+ @TestMetadata("nestedConstructorFromClass.kt")
+ public void testNestedConstructorFromClass() throws Exception {
+ doTestWithStdlib("compiler/testData/codegen/boxWithStdlib/callableReference/function/nestedConstructorFromClass.kt");
+ }
+
+ @TestMetadata("nestedConstructorFromTopLevelNoArgs.kt")
+ public void testNestedConstructorFromTopLevelNoArgs() throws Exception {
+ doTestWithStdlib("compiler/testData/codegen/boxWithStdlib/callableReference/function/nestedConstructorFromTopLevelNoArgs.kt");
+ }
+
+ @TestMetadata("nestedConstructorFromTopLevelOneStringArg.kt")
+ public void testNestedConstructorFromTopLevelOneStringArg() throws Exception {
+ doTestWithStdlib("compiler/testData/codegen/boxWithStdlib/callableReference/function/nestedConstructorFromTopLevelOneStringArg.kt");
+ }
+
+ @TestMetadata("newArray.kt")
+ public void testNewArray() throws Exception {
+ doTestWithStdlib("compiler/testData/codegen/boxWithStdlib/callableReference/function/newArray.kt");
+ }
+
+ @TestMetadata("objectMemberUnitNoArgs.kt")
+ public void testObjectMemberUnitNoArgs() throws Exception {
+ doTestWithStdlib("compiler/testData/codegen/boxWithStdlib/callableReference/function/objectMemberUnitNoArgs.kt");
+ }
+
+ @TestMetadata("objectMemberUnitOneStringArg.kt")
+ public void testObjectMemberUnitOneStringArg() throws Exception {
+ doTestWithStdlib("compiler/testData/codegen/boxWithStdlib/callableReference/function/objectMemberUnitOneStringArg.kt");
+ }
+
+ @TestMetadata("privateClassMember.kt")
+ public void testPrivateClassMember() throws Exception {
+ doTestWithStdlib("compiler/testData/codegen/boxWithStdlib/callableReference/function/privateClassMember.kt");
+ }
+
+ @TestMetadata("sortListOfStrings.kt")
+ public void testSortListOfStrings() throws Exception {
+ doTestWithStdlib("compiler/testData/codegen/boxWithStdlib/callableReference/function/sortListOfStrings.kt");
+ }
+
+ @TestMetadata("toString.kt")
+ public void testToString() throws Exception {
+ doTestWithStdlib("compiler/testData/codegen/boxWithStdlib/callableReference/function/toString.kt");
+ }
+
+ @TestMetadata("topLevelFromClass.kt")
+ public void testTopLevelFromClass() throws Exception {
+ doTestWithStdlib("compiler/testData/codegen/boxWithStdlib/callableReference/function/topLevelFromClass.kt");
+ }
+
+ @TestMetadata("topLevelFromExtension.kt")
+ public void testTopLevelFromExtension() throws Exception {
+ doTestWithStdlib("compiler/testData/codegen/boxWithStdlib/callableReference/function/topLevelFromExtension.kt");
+ }
+
+ @TestMetadata("topLevelFromTopLevelStringNoArgs.kt")
+ public void testTopLevelFromTopLevelStringNoArgs() throws Exception {
+ doTestWithStdlib("compiler/testData/codegen/boxWithStdlib/callableReference/function/topLevelFromTopLevelStringNoArgs.kt");
+ }
+
+ @TestMetadata("topLevelFromTopLevelStringOneStringArg.kt")
+ public void testTopLevelFromTopLevelStringOneStringArg() throws Exception {
+ doTestWithStdlib("compiler/testData/codegen/boxWithStdlib/callableReference/function/topLevelFromTopLevelStringOneStringArg.kt");
+ }
+
+ @TestMetadata("topLevelFromTopLevelUnitNoArgs.kt")
+ public void testTopLevelFromTopLevelUnitNoArgs() throws Exception {
+ doTestWithStdlib("compiler/testData/codegen/boxWithStdlib/callableReference/function/topLevelFromTopLevelUnitNoArgs.kt");
+ }
+
+ @TestMetadata("topLevelFromTopLevelUnitOneStringArg.kt")
+ public void testTopLevelFromTopLevelUnitOneStringArg() throws Exception {
+ doTestWithStdlib("compiler/testData/codegen/boxWithStdlib/callableReference/function/topLevelFromTopLevelUnitOneStringArg.kt");
+ }
+
+ @TestMetadata("traitImplMethodWithClassReceiver.kt")
+ public void testTraitImplMethodWithClassReceiver() throws Exception {
+ doTestWithStdlib("compiler/testData/codegen/boxWithStdlib/callableReference/function/traitImplMethodWithClassReceiver.kt");
+ }
+
+ @TestMetadata("traitMember.kt")
+ public void testTraitMember() throws Exception {
+ doTestWithStdlib("compiler/testData/codegen/boxWithStdlib/callableReference/function/traitMember.kt");
+ }
+
+ @TestMetadata("compiler/testData/codegen/boxWithStdlib/callableReference/function/local")
+ public static class Local extends AbstractBlackBoxCodegenTest {
+ public void testAllFilesPresentInLocal() throws Exception {
+ JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.TestsPackage", new File("compiler/testData/codegen/boxWithStdlib/callableReference/function/local"), Pattern.compile("^(.+)\\.kt$"), true);
+ }
+
+ @TestMetadata("captureOuter.kt")
+ public void testCaptureOuter() throws Exception {
+ doTestWithStdlib("compiler/testData/codegen/boxWithStdlib/callableReference/function/local/captureOuter.kt");
+ }
+
+ @TestMetadata("classMember.kt")
+ public void testClassMember() throws Exception {
+ doTestWithStdlib("compiler/testData/codegen/boxWithStdlib/callableReference/function/local/classMember.kt");
+ }
+
+ @TestMetadata("closureWithSideEffect.kt")
+ public void testClosureWithSideEffect() throws Exception {
+ doTestWithStdlib("compiler/testData/codegen/boxWithStdlib/callableReference/function/local/closureWithSideEffect.kt");
+ }
+
+ @TestMetadata("constructor.kt")
+ public void testConstructor() throws Exception {
+ doTestWithStdlib("compiler/testData/codegen/boxWithStdlib/callableReference/function/local/constructor.kt");
+ }
+
+ @TestMetadata("constructorWithInitializer.kt")
+ public void testConstructorWithInitializer() throws Exception {
+ doTestWithStdlib("compiler/testData/codegen/boxWithStdlib/callableReference/function/local/constructorWithInitializer.kt");
+ }
+
+ @TestMetadata("enumExtendsTrait.kt")
+ public void testEnumExtendsTrait() throws Exception {
+ doTestWithStdlib("compiler/testData/codegen/boxWithStdlib/callableReference/function/local/enumExtendsTrait.kt");
+ }
+
+ @TestMetadata("extension.kt")
+ public void testExtension() throws Exception {
+ doTestWithStdlib("compiler/testData/codegen/boxWithStdlib/callableReference/function/local/extension.kt");
+ }
+
+ @TestMetadata("extensionToLocalClass.kt")
+ public void testExtensionToLocalClass() throws Exception {
+ doTestWithStdlib("compiler/testData/codegen/boxWithStdlib/callableReference/function/local/extensionToLocalClass.kt");
+ }
+
+ @TestMetadata("extensionToPrimitive.kt")
+ public void testExtensionToPrimitive() throws Exception {
+ doTestWithStdlib("compiler/testData/codegen/boxWithStdlib/callableReference/function/local/extensionToPrimitive.kt");
+ }
+
+ @TestMetadata("extensionWithClosure.kt")
+ public void testExtensionWithClosure() throws Exception {
+ doTestWithStdlib("compiler/testData/codegen/boxWithStdlib/callableReference/function/local/extensionWithClosure.kt");
+ }
+
+ @TestMetadata("genericMember.kt")
+ public void testGenericMember() throws Exception {
+ doTestWithStdlib("compiler/testData/codegen/boxWithStdlib/callableReference/function/local/genericMember.kt");
+ }
+
+ @TestMetadata("localClassMember.kt")
+ public void testLocalClassMember() throws Exception {
+ doTestWithStdlib("compiler/testData/codegen/boxWithStdlib/callableReference/function/local/localClassMember.kt");
+ }
+
+ @TestMetadata("localLocal.kt")
+ public void testLocalLocal() throws Exception {
+ doTestWithStdlib("compiler/testData/codegen/boxWithStdlib/callableReference/function/local/localLocal.kt");
+ }
+
+ @TestMetadata("recursiveClosure.kt")
+ public void testRecursiveClosure() throws Exception {
+ doTestWithStdlib("compiler/testData/codegen/boxWithStdlib/callableReference/function/local/recursiveClosure.kt");
+ }
+
+ @TestMetadata("simple.kt")
+ public void testSimple() throws Exception {
+ doTestWithStdlib("compiler/testData/codegen/boxWithStdlib/callableReference/function/local/simple.kt");
+ }
+
+ @TestMetadata("simpleClosure.kt")
+ public void testSimpleClosure() throws Exception {
+ doTestWithStdlib("compiler/testData/codegen/boxWithStdlib/callableReference/function/local/simpleClosure.kt");
+ }
+
+ @TestMetadata("simpleWithArg.kt")
+ public void testSimpleWithArg() throws Exception {
+ doTestWithStdlib("compiler/testData/codegen/boxWithStdlib/callableReference/function/local/simpleWithArg.kt");
+ }
+
+ @TestMetadata("unitWithSideEffect.kt")
+ public void testUnitWithSideEffect() throws Exception {
+ doTestWithStdlib("compiler/testData/codegen/boxWithStdlib/callableReference/function/local/unitWithSideEffect.kt");
+ }
+
+ }
+
+ public static Test innerSuite() {
+ TestSuite suite = new TestSuite("Function");
+ suite.addTestSuite(Function.class);
+ suite.addTestSuite(Local.class);
+ return suite;
+ }
+ }
+
+ public static Test innerSuite() {
+ TestSuite suite = new TestSuite("CallableReference");
+ suite.addTestSuite(CallableReference.class);
+ suite.addTest(Function.innerSuite());
+ return suite;
+ }
+ }
+
@TestMetadata("compiler/testData/codegen/boxWithStdlib/casts")
public static class Casts extends AbstractBlackBoxCodegenTest {
public void testAllFilesPresentInCasts() throws Exception {
@@ -1127,6 +1455,7 @@ public class BlackBoxWithStdlibCodegenTestGenerated extends AbstractBlackBoxCode
suite.addTestSuite(BlackBoxWithStdlibCodegenTestGenerated.class);
suite.addTestSuite(Annotations.class);
suite.addTestSuite(Arrays.class);
+ suite.addTest(CallableReference.innerSuite());
suite.addTestSuite(Casts.class);
suite.addTest(DataClasses.innerSuite());
suite.addTestSuite(Evaluate.class);
diff --git a/core/reflection/reflection.iml b/core/reflection/reflection.iml
new file mode 100644
index 00000000000..5ceeb8204d8
--- /dev/null
+++ b/core/reflection/reflection.iml
@@ -0,0 +1,11 @@
+
+
+
+
+
+
+
+
+
+
+
diff --git a/core/builtins/src/kotlin/KExtensionFunctions.kt b/core/reflection/src/kotlin/KExtensionFunctions.kt
similarity index 100%
rename from core/builtins/src/kotlin/KExtensionFunctions.kt
rename to core/reflection/src/kotlin/KExtensionFunctions.kt
diff --git a/core/builtins/src/kotlin/KFunctions.kt b/core/reflection/src/kotlin/KFunctions.kt
similarity index 100%
rename from core/builtins/src/kotlin/KFunctions.kt
rename to core/reflection/src/kotlin/KFunctions.kt
diff --git a/core/builtins/src/kotlin/KMemberFunctions.kt b/core/reflection/src/kotlin/KMemberFunctions.kt
similarity index 100%
rename from core/builtins/src/kotlin/KMemberFunctions.kt
rename to core/reflection/src/kotlin/KMemberFunctions.kt
diff --git a/core/runtime.jvm/runtime.jvm.iml b/core/runtime.jvm/runtime.jvm.iml
index 5ceeb8204d8..c66ddd7b996 100644
--- a/core/runtime.jvm/runtime.jvm.iml
+++ b/core/runtime.jvm/runtime.jvm.iml
@@ -6,6 +6,7 @@
+
diff --git a/generators/src/org/jetbrains/jet/generators/builtins/functions.kt b/generators/src/org/jetbrains/jet/generators/builtins/functions.kt
index da425b9dfd7..4852ab27b8a 100644
--- a/generators/src/org/jetbrains/jet/generators/builtins/functions.kt
+++ b/generators/src/org/jetbrains/jet/generators/builtins/functions.kt
@@ -39,7 +39,7 @@ enum class FunctionKind(
fun getImplClassName(i: Int) = classNamePrefix + "Impl" + i
fun getSuperClassName(i: Int) = superClassNamePrefix?.plus(i)
- private fun isReflection() = superClassNamePrefix != null
+ fun isReflection() = superClassNamePrefix != null
}
abstract class GenerateFunctionsBase(out: PrintWriter, val kind: FunctionKind): BuiltInsSourceGenerator(out) {
diff --git a/generators/src/org/jetbrains/jet/generators/builtins/generateBuiltIns.kt b/generators/src/org/jetbrains/jet/generators/builtins/generateBuiltIns.kt
index 39a1b5103c5..083746899ec 100644
--- a/generators/src/org/jetbrains/jet/generators/builtins/generateBuiltIns.kt
+++ b/generators/src/org/jetbrains/jet/generators/builtins/generateBuiltIns.kt
@@ -31,6 +31,7 @@ fun assertExists(file: File): Unit =
val BUILT_INS_NATIVE_DIR = File("core/builtins/native/kotlin/")
val BUILT_INS_SRC_DIR = File("core/builtins/src/kotlin/")
+val REFLECTION_DIR = File("core/reflection/src/kotlin/")
val RUNTIME_JVM_DIR = File("core/runtime.jvm/src/kotlin/")
abstract class BuiltInsSourceGenerator(val out: PrintWriter) {
@@ -54,10 +55,11 @@ abstract class BuiltInsSourceGenerator(val out: PrintWriter) {
fun generateBuiltIns(generate: (File, (PrintWriter) -> BuiltInsSourceGenerator) -> Unit) {
assertExists(BUILT_INS_NATIVE_DIR)
assertExists(BUILT_INS_SRC_DIR)
+ assertExists(REFLECTION_DIR)
assertExists(RUNTIME_JVM_DIR)
for (kind in FunctionKind.values()) {
- generate(File(BUILT_INS_SRC_DIR, kind.getFileName())) { GenerateFunctions(it, kind) }
+ generate(File(if (kind.isReflection()) REFLECTION_DIR else BUILT_INS_SRC_DIR, kind.getFileName())) { GenerateFunctions(it, kind) }
generate(File(RUNTIME_JVM_DIR, kind.getImplFileName()), { GenerateFunctionsImpl(it, kind) })
}
diff --git a/idea/tests/org/jetbrains/jet/findUsages/AbstractJetFindUsagesTest.java b/idea/tests/org/jetbrains/jet/findUsages/AbstractJetFindUsagesTest.java
index 9c9e9fdd1cc..d747e42bf62 100644
--- a/idea/tests/org/jetbrains/jet/findUsages/AbstractJetFindUsagesTest.java
+++ b/idea/tests/org/jetbrains/jet/findUsages/AbstractJetFindUsagesTest.java
@@ -48,7 +48,7 @@ import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.jetbrains.jet.InTextDirectivesUtils;
import org.jetbrains.jet.lang.psi.*;
-import org.jetbrains.jet.plugin.JetLightProjectDescriptor;
+import org.jetbrains.jet.plugin.JetWithJdkAndRuntimeLightProjectDescriptor;
import org.jetbrains.jet.plugin.PluginTestCaseBase;
import org.jetbrains.jet.plugin.findUsages.KotlinClassFindUsagesOptions;
import org.jetbrains.jet.plugin.findUsages.KotlinFunctionFindUsagesOptions;
@@ -257,7 +257,7 @@ public abstract class AbstractJetFindUsagesTest extends LightCodeInsightFixtureT
@NotNull
@Override
protected LightProjectDescriptor getProjectDescriptor() {
- return JetLightProjectDescriptor.INSTANCE;
+ return JetWithJdkAndRuntimeLightProjectDescriptor.INSTANCE;
}
@Override
diff --git a/idea/tests/org/jetbrains/jet/safeDelete/AbstractJetSafeDeleteTest.java b/idea/tests/org/jetbrains/jet/safeDelete/AbstractJetSafeDeleteTest.java
index aa5c77fc961..5048380223e 100644
--- a/idea/tests/org/jetbrains/jet/safeDelete/AbstractJetSafeDeleteTest.java
+++ b/idea/tests/org/jetbrains/jet/safeDelete/AbstractJetSafeDeleteTest.java
@@ -28,7 +28,7 @@ import com.intellij.testFramework.LightProjectDescriptor;
import com.intellij.testFramework.fixtures.LightCodeInsightFixtureTestCase;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.jet.lang.psi.*;
-import org.jetbrains.jet.plugin.JetLightProjectDescriptor;
+import org.jetbrains.jet.plugin.JetWithJdkAndRuntimeLightProjectDescriptor;
import org.jetbrains.jet.plugin.PluginTestCaseBase;
import java.io.File;
@@ -40,7 +40,7 @@ public abstract class AbstractJetSafeDeleteTest extends LightCodeInsightFixtureT
@NotNull
@Override
protected LightProjectDescriptor getProjectDescriptor() {
- return JetLightProjectDescriptor.INSTANCE;
+ return JetWithJdkAndRuntimeLightProjectDescriptor.INSTANCE;
}
@Override
diff --git a/libraries/tools/runtime/pom.xml b/libraries/tools/runtime/pom.xml
index dbf820ad450..e8b7800415c 100644
--- a/libraries/tools/runtime/pom.xml
+++ b/libraries/tools/runtime/pom.xml
@@ -34,6 +34,7 @@
+