From 94dfcba5c56f9e2ceac67058c4d60bb779c29efc Mon Sep 17 00:00:00 2001 From: "Pavel V. Talanov" Date: Fri, 20 Apr 2018 13:38:29 +0200 Subject: [PATCH] Minor: adjust quick fix test data to avoid "conflicting overloads" --- .../functionTypeParameterToReceiverByImpl/js/js.kt | 2 +- .../functionTypeParameterToReceiverByImpl/js/js.kt.after | 2 +- .../functionTypeParameterToReceiverByImpl/jvm/jvm.kt | 2 +- .../functionTypeParameterToReceiverByImpl/jvm/jvm.kt.after | 2 +- .../functionTypeReceiverToParameterByImpl/js/js.kt | 2 +- .../functionTypeReceiverToParameterByImpl/js/js.kt.after | 2 +- .../functionTypeReceiverToParameterByImpl/jvm/jvm.kt | 2 +- .../functionTypeReceiverToParameterByImpl/jvm/jvm.kt.after | 2 +- .../memberFunParameterToReceiverByImpl/js/js.kt | 2 +- .../memberFunParameterToReceiverByImpl/js/js.kt.after | 2 +- .../memberFunParameterToReceiverByImpl/jvm/jvm.kt | 2 +- .../memberFunParameterToReceiverByImpl/jvm/jvm.kt.after | 2 +- .../memberFunReceiverToParameterByImpl/js/js.kt | 2 +- .../memberFunReceiverToParameterByImpl/js/js.kt.after | 2 +- .../memberFunReceiverToParameterByImpl/jvm/jvm.kt | 2 +- .../memberFunReceiverToParameterByImpl/jvm/jvm.kt.after | 2 +- 16 files changed, 16 insertions(+), 16 deletions(-) diff --git a/idea/testData/multiModuleQuickFix/functionTypeParameterToReceiverByImpl/js/js.kt b/idea/testData/multiModuleQuickFix/functionTypeParameterToReceiverByImpl/js/js.kt index b2d55e30475..36eef205281 100644 --- a/idea/testData/multiModuleQuickFix/functionTypeParameterToReceiverByImpl/js/js.kt +++ b/idea/testData/multiModuleQuickFix/functionTypeParameterToReceiverByImpl/js/js.kt @@ -2,6 +2,6 @@ actual fun foo(n: Int, action: (Int) -> Int) = action(n) -fun test() { +fun test1() { foo(1) { n -> n + 1 } } \ No newline at end of file diff --git a/idea/testData/multiModuleQuickFix/functionTypeParameterToReceiverByImpl/js/js.kt.after b/idea/testData/multiModuleQuickFix/functionTypeParameterToReceiverByImpl/js/js.kt.after index a99a6734cca..7f17cd37aaf 100644 --- a/idea/testData/multiModuleQuickFix/functionTypeParameterToReceiverByImpl/js/js.kt.after +++ b/idea/testData/multiModuleQuickFix/functionTypeParameterToReceiverByImpl/js/js.kt.after @@ -2,6 +2,6 @@ actual fun foo(n: Int, action: Int.() -> Int) = n.action() -fun test() { +fun test1() { foo(1) { this + 1 } } \ No newline at end of file diff --git a/idea/testData/multiModuleQuickFix/functionTypeParameterToReceiverByImpl/jvm/jvm.kt b/idea/testData/multiModuleQuickFix/functionTypeParameterToReceiverByImpl/jvm/jvm.kt index 55489c149ae..d64c8068cfb 100644 --- a/idea/testData/multiModuleQuickFix/functionTypeParameterToReceiverByImpl/jvm/jvm.kt +++ b/idea/testData/multiModuleQuickFix/functionTypeParameterToReceiverByImpl/jvm/jvm.kt @@ -1,5 +1,5 @@ actual fun foo(n: Int, action: (Int) -> Int) = action(n) -fun test() { +fun test1() { foo(1) { n -> n + 1 } } \ No newline at end of file diff --git a/idea/testData/multiModuleQuickFix/functionTypeParameterToReceiverByImpl/jvm/jvm.kt.after b/idea/testData/multiModuleQuickFix/functionTypeParameterToReceiverByImpl/jvm/jvm.kt.after index 2b8acbda556..9f9348a3229 100644 --- a/idea/testData/multiModuleQuickFix/functionTypeParameterToReceiverByImpl/jvm/jvm.kt.after +++ b/idea/testData/multiModuleQuickFix/functionTypeParameterToReceiverByImpl/jvm/jvm.kt.after @@ -1,5 +1,5 @@ actual fun foo(n: Int, action: Int.() -> Int) = n.action() -fun test() { +fun test1() { foo(1) { this + 1 } } \ No newline at end of file diff --git a/idea/testData/multiModuleQuickFix/functionTypeReceiverToParameterByImpl/js/js.kt b/idea/testData/multiModuleQuickFix/functionTypeReceiverToParameterByImpl/js/js.kt index d0abb30a2e9..7eebac6e460 100644 --- a/idea/testData/multiModuleQuickFix/functionTypeReceiverToParameterByImpl/js/js.kt +++ b/idea/testData/multiModuleQuickFix/functionTypeReceiverToParameterByImpl/js/js.kt @@ -2,6 +2,6 @@ actual fun foo(n: Int, action: Int.() -> Int) = n.action() -fun test() { +fun test1() { foo(1) { this + 1 } } \ No newline at end of file diff --git a/idea/testData/multiModuleQuickFix/functionTypeReceiverToParameterByImpl/js/js.kt.after b/idea/testData/multiModuleQuickFix/functionTypeReceiverToParameterByImpl/js/js.kt.after index 9bf6116cb5a..4af5997cc08 100644 --- a/idea/testData/multiModuleQuickFix/functionTypeReceiverToParameterByImpl/js/js.kt.after +++ b/idea/testData/multiModuleQuickFix/functionTypeReceiverToParameterByImpl/js/js.kt.after @@ -2,6 +2,6 @@ actual fun foo(n: Int, action: (Int) -> Int) = action(n) -fun test() { +fun test1() { foo(1) { i -> i + 1 } } \ No newline at end of file diff --git a/idea/testData/multiModuleQuickFix/functionTypeReceiverToParameterByImpl/jvm/jvm.kt b/idea/testData/multiModuleQuickFix/functionTypeReceiverToParameterByImpl/jvm/jvm.kt index 2b8acbda556..9f9348a3229 100644 --- a/idea/testData/multiModuleQuickFix/functionTypeReceiverToParameterByImpl/jvm/jvm.kt +++ b/idea/testData/multiModuleQuickFix/functionTypeReceiverToParameterByImpl/jvm/jvm.kt @@ -1,5 +1,5 @@ actual fun foo(n: Int, action: Int.() -> Int) = n.action() -fun test() { +fun test1() { foo(1) { this + 1 } } \ No newline at end of file diff --git a/idea/testData/multiModuleQuickFix/functionTypeReceiverToParameterByImpl/jvm/jvm.kt.after b/idea/testData/multiModuleQuickFix/functionTypeReceiverToParameterByImpl/jvm/jvm.kt.after index bb96cb0598f..b1ad7fc7771 100644 --- a/idea/testData/multiModuleQuickFix/functionTypeReceiverToParameterByImpl/jvm/jvm.kt.after +++ b/idea/testData/multiModuleQuickFix/functionTypeReceiverToParameterByImpl/jvm/jvm.kt.after @@ -1,5 +1,5 @@ actual fun foo(n: Int, action: (Int) -> Int) = action(n) -fun test() { +fun test1() { foo(1) { i -> i + 1 } } \ No newline at end of file diff --git a/idea/testData/multiModuleQuickFix/memberFunParameterToReceiverByImpl/js/js.kt b/idea/testData/multiModuleQuickFix/memberFunParameterToReceiverByImpl/js/js.kt index da5ed405bfd..67f33a786e7 100644 --- a/idea/testData/multiModuleQuickFix/memberFunParameterToReceiverByImpl/js/js.kt +++ b/idea/testData/multiModuleQuickFix/memberFunParameterToReceiverByImpl/js/js.kt @@ -6,6 +6,6 @@ actual class Foo { } } -fun Foo.test() { +fun Foo.testJs() { foo(1, "2") } \ No newline at end of file diff --git a/idea/testData/multiModuleQuickFix/memberFunParameterToReceiverByImpl/js/js.kt.after b/idea/testData/multiModuleQuickFix/memberFunParameterToReceiverByImpl/js/js.kt.after index d0a4763d7a6..e92224ca30c 100644 --- a/idea/testData/multiModuleQuickFix/memberFunParameterToReceiverByImpl/js/js.kt.after +++ b/idea/testData/multiModuleQuickFix/memberFunParameterToReceiverByImpl/js/js.kt.after @@ -6,6 +6,6 @@ actual class Foo { } } -fun Foo.test() { +fun Foo.testJs() { "2".foo(1) } \ No newline at end of file diff --git a/idea/testData/multiModuleQuickFix/memberFunParameterToReceiverByImpl/jvm/jvm.kt b/idea/testData/multiModuleQuickFix/memberFunParameterToReceiverByImpl/jvm/jvm.kt index 664d5ace897..47d69042270 100644 --- a/idea/testData/multiModuleQuickFix/memberFunParameterToReceiverByImpl/jvm/jvm.kt +++ b/idea/testData/multiModuleQuickFix/memberFunParameterToReceiverByImpl/jvm/jvm.kt @@ -4,6 +4,6 @@ actual class Foo { } } -fun Foo.test() { +fun Foo.testJvm() { foo(1, "2") } \ No newline at end of file diff --git a/idea/testData/multiModuleQuickFix/memberFunParameterToReceiverByImpl/jvm/jvm.kt.after b/idea/testData/multiModuleQuickFix/memberFunParameterToReceiverByImpl/jvm/jvm.kt.after index 3b0a374c589..9884dad78ce 100644 --- a/idea/testData/multiModuleQuickFix/memberFunParameterToReceiverByImpl/jvm/jvm.kt.after +++ b/idea/testData/multiModuleQuickFix/memberFunParameterToReceiverByImpl/jvm/jvm.kt.after @@ -4,6 +4,6 @@ actual class Foo { } } -fun Foo.test() { +fun Foo.testJvm() { "2".foo(1) } \ No newline at end of file diff --git a/idea/testData/multiModuleQuickFix/memberFunReceiverToParameterByImpl/js/js.kt b/idea/testData/multiModuleQuickFix/memberFunReceiverToParameterByImpl/js/js.kt index 199e28b4361..5011b27d54f 100644 --- a/idea/testData/multiModuleQuickFix/memberFunReceiverToParameterByImpl/js/js.kt +++ b/idea/testData/multiModuleQuickFix/memberFunReceiverToParameterByImpl/js/js.kt @@ -6,6 +6,6 @@ actual class Foo { } } -fun Foo.test() { +fun Foo.test1() { "1".foo(2) } \ No newline at end of file diff --git a/idea/testData/multiModuleQuickFix/memberFunReceiverToParameterByImpl/js/js.kt.after b/idea/testData/multiModuleQuickFix/memberFunReceiverToParameterByImpl/js/js.kt.after index c81313ee542..d2fe22cb631 100644 --- a/idea/testData/multiModuleQuickFix/memberFunReceiverToParameterByImpl/js/js.kt.after +++ b/idea/testData/multiModuleQuickFix/memberFunReceiverToParameterByImpl/js/js.kt.after @@ -6,6 +6,6 @@ actual class Foo { } } -fun Foo.test() { +fun Foo.test1() { foo("1", 2) } \ No newline at end of file diff --git a/idea/testData/multiModuleQuickFix/memberFunReceiverToParameterByImpl/jvm/jvm.kt b/idea/testData/multiModuleQuickFix/memberFunReceiverToParameterByImpl/jvm/jvm.kt index e651251d2ca..52ca020c5fb 100644 --- a/idea/testData/multiModuleQuickFix/memberFunReceiverToParameterByImpl/jvm/jvm.kt +++ b/idea/testData/multiModuleQuickFix/memberFunReceiverToParameterByImpl/jvm/jvm.kt @@ -4,6 +4,6 @@ actual class Foo { } } -fun Foo.test() { +fun Foo.test1() { "1".foo(2) } \ No newline at end of file diff --git a/idea/testData/multiModuleQuickFix/memberFunReceiverToParameterByImpl/jvm/jvm.kt.after b/idea/testData/multiModuleQuickFix/memberFunReceiverToParameterByImpl/jvm/jvm.kt.after index 404af929110..167acc86c95 100644 --- a/idea/testData/multiModuleQuickFix/memberFunReceiverToParameterByImpl/jvm/jvm.kt.after +++ b/idea/testData/multiModuleQuickFix/memberFunReceiverToParameterByImpl/jvm/jvm.kt.after @@ -4,6 +4,6 @@ actual class Foo { } } -fun Foo.test() { +fun Foo.test1() { foo("1", 2) } \ No newline at end of file