From 793fdd4f55b097a945efaafe9a7b392522786223 Mon Sep 17 00:00:00 2001 From: Evgeny Gerashchenko Date: Thu, 5 Apr 2012 19:04:55 +0400 Subject: [PATCH] Added file to test library used in LibrariesWith[out]SourcesTests. --- idea/testData/libraries/decompiled/namespace.kt | 2 ++ idea/testData/libraries/library/extra.kt | 4 ++++ idea/testData/libraries/library/{library.kt => main.kt} | 2 -- idea/testData/libraries/usercode/ClassObject.kt | 2 +- idea/testData/libraries/usercode/Enum.kt | 2 +- idea/testData/libraries/usercode/ExtensionFunction.kt | 2 +- idea/testData/libraries/usercode/ExtensionProperty.kt | 2 +- idea/testData/libraries/usercode/GlobalFunction.kt | 2 +- idea/testData/libraries/usercode/GlobalProperty.kt | 2 +- idea/testData/libraries/usercode/Property.kt | 2 +- 10 files changed, 13 insertions(+), 9 deletions(-) create mode 100644 idea/testData/libraries/library/extra.kt rename idea/testData/libraries/library/{library.kt => main.kt} (98%) diff --git a/idea/testData/libraries/decompiled/namespace.kt b/idea/testData/libraries/decompiled/namespace.kt index 65ebbdd78bc..99c56eb99d8 100644 --- a/idea/testData/libraries/decompiled/namespace.kt +++ b/idea/testData/libraries/decompiled/namespace.kt @@ -19,6 +19,8 @@ package testData.libraries [final fun func(val a : jet.Int, val b : jet.String) : Unit { /* compiled code */ }] +[final fun func(val str : jet.String) : Unit { /* compiled code */ }] + [final fun main(val args : jet.Array) : Unit { /* compiled code */ }] [final fun T.filter(val predicate : (T) -> jet.Boolean) : T? { /* compiled code */ }] diff --git a/idea/testData/libraries/library/extra.kt b/idea/testData/libraries/library/extra.kt new file mode 100644 index 00000000000..1f896eb0bc1 --- /dev/null +++ b/idea/testData/libraries/library/extra.kt @@ -0,0 +1,4 @@ +package testData.libraries + +public fun func(str : String) { +} \ No newline at end of file diff --git a/idea/testData/libraries/library/library.kt b/idea/testData/libraries/library/main.kt similarity index 98% rename from idea/testData/libraries/library/library.kt rename to idea/testData/libraries/library/main.kt index f999b591f02..a50bbab3605 100644 --- a/idea/testData/libraries/library/library.kt +++ b/idea/testData/libraries/library/main.kt @@ -1,7 +1,5 @@ package testData.libraries -import java.util.* - public trait SimpleTrait { } diff --git a/idea/testData/libraries/usercode/ClassObject.kt b/idea/testData/libraries/usercode/ClassObject.kt index ec70406f533..1a610fe8ec3 100644 --- a/idea/testData/libraries/usercode/ClassObject.kt +++ b/idea/testData/libraries/usercode/ClassObject.kt @@ -4,7 +4,7 @@ fun foo() { WithInnerAndObject.foo() } -// library.kt +// main.kt //public class <1>WithInnerAndObject { // class object { // fun <2>foo() { \ No newline at end of file diff --git a/idea/testData/libraries/usercode/Enum.kt b/idea/testData/libraries/usercode/Enum.kt index 8c3075e084a..a2f0dcbca6a 100644 --- a/idea/testData/libraries/usercode/Enum.kt +++ b/idea/testData/libraries/usercode/Enum.kt @@ -3,5 +3,5 @@ import testData.libraries.* val color: Color? = Color.RED val rgb = color?.rgb -// library.kt +// main.kt //public enum class <1><2>Color(val <3>rgb : Int) { \ No newline at end of file diff --git a/idea/testData/libraries/usercode/ExtensionFunction.kt b/idea/testData/libraries/usercode/ExtensionFunction.kt index cb80c7091c5..f3eef688dd8 100644 --- a/idea/testData/libraries/usercode/ExtensionFunction.kt +++ b/idea/testData/libraries/usercode/ExtensionFunction.kt @@ -2,6 +2,6 @@ import testData.libraries.* val v = 5.filter { it % 2 == 1 } -// library.kt +// main.kt //public inline fun T.<1>filter(predicate: (T)-> Boolean) : T? = this diff --git a/idea/testData/libraries/usercode/ExtensionProperty.kt b/idea/testData/libraries/usercode/ExtensionProperty.kt index bbbdd160868..38f9d1886e9 100644 --- a/idea/testData/libraries/usercode/ExtensionProperty.kt +++ b/idea/testData/libraries/usercode/ExtensionProperty.kt @@ -5,7 +5,7 @@ fun foo() { println(#(1, 2).exProp) } -// library.kt +// main.kt //public val String.<1>exProp : String //get() { // return this diff --git a/idea/testData/libraries/usercode/GlobalFunction.kt b/idea/testData/libraries/usercode/GlobalFunction.kt index 7fb35e1aba6..64af03c0bd4 100644 --- a/idea/testData/libraries/usercode/GlobalFunction.kt +++ b/idea/testData/libraries/usercode/GlobalFunction.kt @@ -7,7 +7,7 @@ fun foo() { func() } -// library.kt +// main.kt //public fun <1><2>func(a : Int, b : String = "55") { //} // diff --git a/idea/testData/libraries/usercode/GlobalProperty.kt b/idea/testData/libraries/usercode/GlobalProperty.kt index 618f28821cc..6c675f5b2ed 100644 --- a/idea/testData/libraries/usercode/GlobalProperty.kt +++ b/idea/testData/libraries/usercode/GlobalProperty.kt @@ -5,7 +5,7 @@ fun foo() { println(globalValWithGetter) } -// library.kt +// main.kt //public val <1>globalVal : #(Int, String) = #(239, "239") // //public val <2>globalValWithGetter : Long \ No newline at end of file diff --git a/idea/testData/libraries/usercode/Property.kt b/idea/testData/libraries/usercode/Property.kt index 4eb1e3aaa1c..5f7a6e9ff1f 100644 --- a/idea/testData/libraries/usercode/Property.kt +++ b/idea/testData/libraries/usercode/Property.kt @@ -5,7 +5,7 @@ fun foo(a : ClassWithAbstractAndOpenMembers) { println(a.abstractVar) } -// library.kt +// main.kt //public abstract class <1>ClassWithAbstractAndOpenMembers { // public abstract fun abstractFun() // public open fun openFun() {