Support default arguments for expected declarations

#KT-21913 Fixed

compiler/testData/codegen/box/multiplatform/defaultArguments/constructor.kt

@@ -0,0 +1,21 @@
+// !LANGUAGE: +MultiPlatformProjects
+// WITH_RUNTIME
+// FILE: common.kt
+
+expect class Foo(a: String, b: Int = 0, c: Double? = null)
+
+// FILE: jvm.kt
+
+import kotlin.test.assertEquals
+
+actual class Foo actual constructor(a: String, b: Int, c: Double?) {
+    val result: String = a + "," + b + "," + c
+}
+
+fun box(): String {
+    assertEquals("OK,0,null", Foo("OK").result)
+    assertEquals("OK,42,null", Foo("OK", 42).result)
+    assertEquals("OK,42,3.14", Foo("OK", 42, 3.14).result)
+
+    return "OK"
+}

compiler/testData/codegen/box/multiplatform/defaultArguments/function.kt

@@ -0,0 +1,32 @@
+// !LANGUAGE: +MultiPlatformProjects
+// WITH_RUNTIME
+// FILE: common.kt
+
+expect fun topLevel(a: String, b: Int = 0, c: Double? = null): String
+
+expect class Foo() {
+    fun member(a: String, b: Int = 0, c: Double? = null): String
+}
+
+// FILE: jvm.kt
+
+import kotlin.test.assertEquals
+
+actual fun topLevel(a: String, b: Int, c: Double?): String = a + "," + b + "," + c
+
+actual class Foo actual constructor() {
+    actual fun member(a: String, b: Int, c: Double?): String = a + "," + b + "," + c
+}
+
+fun box(): String {
+    assertEquals("OK,0,null", topLevel("OK"))
+    assertEquals("OK,42,null", topLevel("OK", 42))
+    assertEquals("OK,42,3.14", topLevel("OK", 42, 3.14))
+
+    val foo = Foo()
+    assertEquals("OK,0,null", foo.member("OK"))
+    assertEquals("OK,42,null", foo.member("OK", 42))
+    assertEquals("OK,42,3.14", foo.member("OK", 42, 3.14))
+
+    return "OK"
+}

compiler/testData/codegen/box/multiplatform/defaultArguments/inheritedFromCommonClass.kt

@@ -0,0 +1,24 @@
+// !LANGUAGE: +MultiPlatformProjects
+// WITH_RUNTIME
+// FILE: common.kt
+
+open class A() {
+    fun member(a: String, b: Int = 0, c: Double? = null): String = a + "," + b + "," + c
+}
+
+expect class B() : A
+
+// FILE: jvm.kt
+
+import kotlin.test.assertEquals
+
+actual class B actual constructor() : A()
+
+fun box(): String {
+    val b = B()
+    assertEquals("OK,0,null", b.member("OK"))
+    assertEquals("OK,42,null", b.member("OK", 42))
+    assertEquals("OK,42,3.14", b.member("OK", 42, 3.14))
+
+    return "OK"
+}

compiler/testData/codegen/box/multiplatform/defaultArguments/inheritedFromExpectedClass.kt

@@ -0,0 +1,28 @@
+// !LANGUAGE: +MultiPlatformProjects
+// WITH_RUNTIME
+// FILE: common.kt
+
+expect open class A() {
+    fun member(a: String, b: Int = 0, c: Double? = null): String
+}
+
+expect class B() : A
+
+// FILE: jvm.kt
+
+import kotlin.test.assertEquals
+
+actual open class A actual constructor() {
+    actual fun member(a: String, b: Int, c: Double?): String = a + "," + b + "," + c
+}
+
+actual class B actual constructor() : A()
+
+fun box(): String {
+    val b = B()
+    assertEquals("OK,0,null", b.member("OK"))
+    assertEquals("OK,42,null", b.member("OK", 42))
+    assertEquals("OK,42,3.14", b.member("OK", 42, 3.14))
+
+    return "OK"
+}

compiler/testData/codegen/box/multiplatform/defaultArguments/inlineFunctionWithDefaultLambda.kt

@@ -0,0 +1,32 @@
+// !LANGUAGE: +MultiPlatformProjects
+// WITH_RUNTIME
+// FILE: common.kt
+
+expect inline fun topLevel(a: String, b: Int = 0, c: () -> Double? = { null }): String
+
+expect class Foo() {
+    inline fun member(a: String, b: Int = 0, c: () -> Double? = { null }): String
+}
+
+// FILE: jvm.kt
+
+import kotlin.test.assertEquals
+
+actual inline fun topLevel(a: String, b: Int, c: () -> Double?): String = a + "," + b + "," + c()
+
+actual class Foo actual constructor() {
+    actual inline fun member(a: String, b: Int, c: () -> Double?): String = a + "," + b + "," + c()
+}
+
+fun box(): String {
+    assertEquals("OK,0,null", topLevel("OK"))
+    assertEquals("OK,42,null", topLevel("OK", 42))
+    assertEquals("OK,42,3.14", topLevel("OK", 42, { 3.14 }))
+
+    val foo = Foo()
+    assertEquals("OK,0,null", foo.member("OK"))
+    assertEquals("OK,42,null", foo.member("OK", 42))
+    assertEquals("OK,42,3.14", foo.member("OK", 42, { 3.14 }))
+
+    return "OK"
+}

compiler/testData/diagnostics/tests/multiplatform/defaultArguments/constructor.kt

@@ -0,0 +1,23 @@
+// !LANGUAGE: +MultiPlatformProjects
+// MODULE: m1-common
+// FILE: common.kt
+
+expect class Ok(x: Int, y: String = "")
+
+expect class FailX(x: Int, y: String = "")
+
+expect class FailY(x: Int, y: String = "")
+
+fun test() {
+    Ok(42)
+    Ok(42, "OK")
+}
+
+// MODULE: m2-jvm(m1-common)
+// FILE: jvm.kt
+
+actual class Ok actual constructor(x: Int, y: String)
+
+actual class FailX actual constructor(<!ACTUAL_FUNCTION_WITH_DEFAULT_ARGUMENTS!>x: Int = 0<!>, y: String)
+
+actual class FailY actual constructor(x: Int, <!ACTUAL_FUNCTION_WITH_DEFAULT_ARGUMENTS!>y: String = ""<!>)

compiler/testData/diagnostics/tests/multiplatform/defaultArguments/constructor.txt

@@ -0,0 +1,52 @@
+// -- Module: <m1-common> --
+package
+
+public fun test(): kotlin.Unit
+
+public final expect class FailX {
+    public constructor FailX(/*0*/ x: kotlin.Int, /*1*/ y: kotlin.String = ...)
+    public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
+    public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
+    public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
+}
+
+public final expect class FailY {
+    public constructor FailY(/*0*/ x: kotlin.Int, /*1*/ y: kotlin.String = ...)
+    public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
+    public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
+    public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
+}
+
+public final expect class Ok {
+    public constructor Ok(/*0*/ x: kotlin.Int, /*1*/ y: kotlin.String = ...)
+    public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
+    public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
+    public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
+}
+
+
+// -- Module: <m2-jvm> --
+package
+
+public fun test(): kotlin.Unit
+
+public final actual class FailX {
+    public constructor FailX(/*0*/ x: kotlin.Int = ..., /*1*/ y: kotlin.String)
+    public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
+    public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
+    public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
+}
+
+public final actual class FailY {
+    public constructor FailY(/*0*/ x: kotlin.Int, /*1*/ y: kotlin.String = ...)
+    public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
+    public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
+    public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
+}
+
+public final actual class Ok {
+    public constructor Ok(/*0*/ x: kotlin.Int, /*1*/ y: kotlin.String)
+    public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
+    public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
+    public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
+}

compiler/testData/diagnostics/tests/multiplatform/defaultArguments/expectedDeclaresDefaultArguments.kt

@@ -0,0 +1,41 @@
+// !LANGUAGE: +MultiPlatformProjects
+// MODULE: m1-common
+// FILE: common.kt
+
+expect fun ok(x: Int, y: String = "")
+
+expect fun failX(x: Int, y: String = "")
+
+expect fun failY(x: Int, y: String = "")
+
+expect open class Foo {
+    fun ok(x: Int, y: String = "")
+
+    fun failX(x: Int, y: String = "")
+
+    fun failY(x: Int, y: String = "")
+}
+
+fun test(foo: Foo) {
+    ok(42)
+    ok(42, "OK")
+    foo.ok(42)
+    foo.ok(42, "OK")
+}
+
+// MODULE: m2-jvm(m1-common)
+// FILE: jvm.kt
+
+actual fun ok(x: Int, y: String) {}
+
+actual fun failX(<!ACTUAL_FUNCTION_WITH_DEFAULT_ARGUMENTS!>x: Int = 0<!>, y: String) {}
+
+actual fun failY(x: Int, <!ACTUAL_FUNCTION_WITH_DEFAULT_ARGUMENTS!>y: String = ""<!>) {}
+
+actual open class Foo {
+    actual fun ok(x: Int, y: String) {}
+
+    actual fun failX(<!ACTUAL_FUNCTION_WITH_DEFAULT_ARGUMENTS!>x: Int = 0<!>, y: String) {}
+
+    actual fun failY(x: Int, <!ACTUAL_FUNCTION_WITH_DEFAULT_ARGUMENTS!>y: String = ""<!>) {}
+}

compiler/testData/diagnostics/tests/multiplatform/defaultArguments/expectedDeclaresDefaultArguments.txt

@@ -0,0 +1,35 @@
+// -- Module: <m1-common> --
+package
+
+public expect fun failX(/*0*/ x: kotlin.Int, /*1*/ y: kotlin.String = ...): kotlin.Unit
+public expect fun failY(/*0*/ x: kotlin.Int, /*1*/ y: kotlin.String = ...): kotlin.Unit
+public expect fun ok(/*0*/ x: kotlin.Int, /*1*/ y: kotlin.String = ...): kotlin.Unit
+public fun test(/*0*/ foo: Foo): kotlin.Unit
+
+public open expect class Foo {
+    public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
+    public final expect fun failX(/*0*/ x: kotlin.Int, /*1*/ y: kotlin.String = ...): kotlin.Unit
+    public final expect fun failY(/*0*/ x: kotlin.Int, /*1*/ y: kotlin.String = ...): kotlin.Unit
+    public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
+    public final expect fun ok(/*0*/ x: kotlin.Int, /*1*/ y: kotlin.String = ...): kotlin.Unit
+    public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
+}
+
+
+// -- Module: <m2-jvm> --
+package
+
+public actual fun failX(/*0*/ x: kotlin.Int = ..., /*1*/ y: kotlin.String): kotlin.Unit
+public actual fun failY(/*0*/ x: kotlin.Int, /*1*/ y: kotlin.String = ...): kotlin.Unit
+public actual fun ok(/*0*/ x: kotlin.Int, /*1*/ y: kotlin.String): kotlin.Unit
+public fun test(/*0*/ foo: Foo): kotlin.Unit
+
+public open actual class Foo {
+    public constructor Foo()
+    public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
+    public final actual fun failX(/*0*/ x: kotlin.Int = ..., /*1*/ y: kotlin.String): kotlin.Unit
+    public final actual fun failY(/*0*/ x: kotlin.Int, /*1*/ y: kotlin.String = ...): kotlin.Unit
+    public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
+    public final actual fun ok(/*0*/ x: kotlin.Int, /*1*/ y: kotlin.String): kotlin.Unit
+    public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
+}

compiler/testData/diagnostics/tests/multiplatform/defaultArguments/expectedInheritsDefaultArguments.kt

@@ -0,0 +1,37 @@
+// !LANGUAGE: +MultiPlatformProjects
+// MODULE: m1-common
+// FILE: common.kt
+
+interface Foo {
+    fun ok(x: Int, y: String = "")
+
+    fun failX(x: Int, y: String = "")
+
+    fun failY(x: Int, y: String = "")
+}
+
+expect class Bar : Foo {
+    override fun ok(x: Int, y: String)
+
+    override fun failX(x: Int, y: String)
+
+    override fun failY(x: Int, y: String)
+}
+
+fun test(foo: Foo, bar: Bar) {
+    foo.ok(42)
+    foo.ok(42, "OK")
+    bar.ok(42)
+    bar.ok(42, "OK")
+}
+
+// MODULE: m2-jvm(m1-common)
+// FILE: jvm.kt
+
+actual class Bar : Foo {
+    actual override fun ok(x: Int, y: String) {}
+    
+    actual override fun failX(<!ACTUAL_FUNCTION_WITH_DEFAULT_ARGUMENTS!>x: Int = <!DEFAULT_VALUE_NOT_ALLOWED_IN_OVERRIDE!>0<!><!>, y: String) {}
+
+    actual override fun failY(x: Int, <!ACTUAL_FUNCTION_WITH_DEFAULT_ARGUMENTS!>y: String = <!DEFAULT_VALUE_NOT_ALLOWED_IN_OVERRIDE!>""<!><!>) {}
+}

compiler/testData/diagnostics/tests/multiplatform/defaultArguments/expectedInheritsDefaultArguments.txt

@@ -0,0 +1,47 @@
+// -- Module: <m1-common> --
+package
+
+public fun test(/*0*/ foo: Foo, /*1*/ bar: Bar): kotlin.Unit
+
+public final expect class Bar : Foo {
+    public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
+    public open expect override /*1*/ fun failX(/*0*/ x: kotlin.Int, /*1*/ y: kotlin.String = ...): kotlin.Unit
+    public open expect override /*1*/ fun failY(/*0*/ x: kotlin.Int, /*1*/ y: kotlin.String = ...): kotlin.Unit
+    public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
+    public open expect override /*1*/ fun ok(/*0*/ x: kotlin.Int, /*1*/ y: kotlin.String = ...): kotlin.Unit
+    public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
+}
+
+public interface Foo {
+    public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
+    public abstract fun failX(/*0*/ x: kotlin.Int, /*1*/ y: kotlin.String = ...): kotlin.Unit
+    public abstract fun failY(/*0*/ x: kotlin.Int, /*1*/ y: kotlin.String = ...): kotlin.Unit
+    public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
+    public abstract fun ok(/*0*/ x: kotlin.Int, /*1*/ y: kotlin.String = ...): kotlin.Unit
+    public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
+}
+
+
+// -- Module: <m2-jvm> --
+package
+
+public fun test(/*0*/ foo: Foo, /*1*/ bar: Bar): kotlin.Unit
+
+public final actual class Bar : Foo {
+    public constructor Bar()
+    public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
+    public open actual override /*1*/ fun failX(/*0*/ x: kotlin.Int = ..., /*1*/ y: kotlin.String = ...): kotlin.Unit
+    public open actual override /*1*/ fun failY(/*0*/ x: kotlin.Int, /*1*/ y: kotlin.String = ...): kotlin.Unit
+    public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
+    public open actual override /*1*/ fun ok(/*0*/ x: kotlin.Int, /*1*/ y: kotlin.String = ...): kotlin.Unit
+    public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
+}
+
+public interface Foo {
+    public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
+    public abstract fun failX(/*0*/ x: kotlin.Int, /*1*/ y: kotlin.String = ...): kotlin.Unit
+    public abstract fun failY(/*0*/ x: kotlin.Int, /*1*/ y: kotlin.String = ...): kotlin.Unit
+    public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
+    public abstract fun ok(/*0*/ x: kotlin.Int, /*1*/ y: kotlin.String = ...): kotlin.Unit
+    public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
+}

compiler/testData/diagnostics/tests/multiplatform/defaultArguments/expectedVsNonExpectedWithDefaults.kt

@@ -0,0 +1,17 @@
+// !LANGUAGE: +MultiPlatformProjects
+// !DIAGNOSTICS: -UNUSED_PARAMETER
+// MODULE: m1-common
+// FILE: common.kt
+
+expect fun ok(x: Int, y: String = "")
+
+// MODULE: m2-jvm(m1-common)
+// FILE: jvm.kt
+
+actual fun ok(x: Int, y: String) {}
+
+fun ok(x: Int, y: Long = 1L) {}
+
+fun test() {
+    <!OVERLOAD_RESOLUTION_AMBIGUITY!>ok<!>(1)
+}

compiler/testData/diagnostics/tests/multiplatform/defaultArguments/expectedVsNonExpectedWithDefaults.txt

@@ -0,0 +1,12 @@
+// -- Module: <m1-common> --
+package
+
+public expect fun ok(/*0*/ x: kotlin.Int, /*1*/ y: kotlin.String = ...): kotlin.Unit
+
+
+// -- Module: <m2-jvm> --
+package
+
+public fun ok(/*0*/ x: kotlin.Int, /*1*/ y: kotlin.Long = ...): kotlin.Unit
+public actual fun ok(/*0*/ x: kotlin.Int, /*1*/ y: kotlin.String): kotlin.Unit
+public fun test(): kotlin.Unit

compiler/testData/diagnostics/tests/multiplatform/headerClass/headerClassWithFunctionBody.kt

@@ -21,8 +21,6 @@ expect class Foo(
         <!EXPECTED_DECLARATION_WITH_BODY!>get()<!> = "no"
         <!EXPECTED_DECLARATION_WITH_BODY!>set(value)<!> {}
 
-    fun defaultArg(<!EXPECTED_DECLARATION_WITH_DEFAULT_PARAMETER!>value: String = "no"<!>)
-
     <!EXPECTED_DECLARATION_WITH_BODY!>fun functionWithBody(x: Int): Int<!> {
         return x + 1
     }

compiler/testData/diagnostics/tests/multiplatform/headerClass/headerClassWithFunctionBody.txt

@@ -7,7 +7,6 @@ public final expect class Foo {
     public expect final val constructorProperty: kotlin.String
     public expect final var getSet: kotlin.String
     public expect final val prop: kotlin.String = "no"
-    public final expect fun defaultArg(/*0*/ value: kotlin.String = ...): kotlin.Unit
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
     public final expect fun functionWithBody(/*0*/ x: kotlin.Int): kotlin.Int
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int

compiler/testData/diagnostics/tests/multiplatform/topLevelFun/defaultArguments.kt

@@ -1,5 +0,0 @@
-// !LANGUAGE: +MultiPlatformProjects
-// MODULE: m1-common
-// FILE: common.kt
-
-expect fun foo(x: Int, <!EXPECTED_DECLARATION_WITH_DEFAULT_PARAMETER!>y: String = ""<!>)

compiler/testData/diagnostics/tests/multiplatform/topLevelFun/defaultArguments.txt

@@ -1,3 +0,0 @@
-package
-
-public expect fun foo(/*0*/ x: kotlin.Int, /*1*/ y: kotlin.String = ...): kotlin.Unit

compiler/testData/multiplatform/incompatibleCallables/output.txt

@@ -164,12 +164,9 @@ The following declaration is incompatible because some type parameter is reified
 
 actual inline fun <reified X> f14() {}
                   ^
-compiler/testData/multiplatform/incompatibleCallables/jvm.kt:26:15: error: actual function 'f16' has no corresponding expected declaration
-The following declaration is incompatible because some parameters have default values:
-    public expect fun f16(s: String): Unit
-
+compiler/testData/multiplatform/incompatibleCallables/jvm.kt:26:16: error: actual function cannot have default argument values, they should be declared in the expected function
 actual fun f16(s: String = "") {}
-              ^
+               ^
 compiler/testData/multiplatform/incompatibleCallables/jvm.kt:28:15: error: actual function 'f17' has no corresponding expected declaration
 The following declaration is incompatible because some value parameter is vararg in one declaration and non-vararg in the other:
     public expect fun f17(vararg s: String): Unit