From 16c6935d9127b2f318293adf8bc8bb971c4b47aa Mon Sep 17 00:00:00 2001 From: Svetlana Isakova Date: Wed, 4 Apr 2012 19:19:02 +0400 Subject: [PATCH] added 'public' annotation to library functions --- idea/testData/libraries/library/library.kt | 48 +++++++++---------- .../libraries/usercode/library.marked.kt | 48 +++++++++---------- 2 files changed, 48 insertions(+), 48 deletions(-) diff --git a/idea/testData/libraries/library/library.kt b/idea/testData/libraries/library/library.kt index 9ee91b2108d..f999b591f02 100644 --- a/idea/testData/libraries/library/library.kt +++ b/idea/testData/libraries/library/library.kt @@ -2,16 +2,16 @@ package testData.libraries import java.util.* -trait SimpleTrait { +public trait SimpleTrait { } -class SimpleClass { +public class SimpleClass { } -class SimpleTraitImpl : SimpleTrait { +public class SimpleTraitImpl : SimpleTrait { } -class WithInnerAndObject { +public class WithInnerAndObject { class object { fun foo() { } @@ -24,34 +24,34 @@ class WithInnerAndObject { } } -class WithTraitClassObject { +public class WithTraitClassObject { class object : SimpleTrait } -abstract class AbstractClass { +public abstract class AbstractClass { } -enum class Color(val rgb : Int) { +public enum class Color(val rgb : Int) { RED : Color(0xFF0000) GREEN : Color(0x00FF00) BLUE : Color(0x0000FF) } -abstract class ClassWithAbstractAndOpenMembers { - abstract fun abstractFun() - open fun openFun() { +public abstract class ClassWithAbstractAndOpenMembers { + public abstract fun abstractFun() + public open fun openFun() { } - abstract val abstractVal : String - open val openVal : String = "" - open val openValWithGetter : String + public abstract val abstractVal : String + public open val openVal : String = "" + public open val openValWithGetter : String get() { return "239" } public abstract var abstractVar : String - open var openVar : String = "" - open var openVarWithGetter : String + public open var openVar : String = "" + public open var openVarWithGetter : String get() { return "239" } @@ -59,38 +59,38 @@ abstract class ClassWithAbstractAndOpenMembers { } } -fun main(args : Array) { +public fun main(args : Array) { } public val globalVal : #(Int, String) = #(239, "239") -val globalValWithGetter : Long +public val globalValWithGetter : Long get() { return System.currentTimeMillis() } -val String.exProp : String +public val String.exProp : String get() { return this } -val Int.exProp : Int +public val Int.exProp : Int get() { return this } -val #(T, T).exProp : String +public val #(T, T).exProp : String get() { return "${this._1} : ${this._2}" } -fun func(a : Int, b : String = "55") { +public fun func(a : Int, b : String = "55") { } -fun func(a : Int, b : Int) { +public fun func(a : Int, b : Int) { } -fun func() { +public fun func() { } -inline fun T.filter(predicate: (T)-> Boolean) : T? = this +public inline fun T.filter(predicate: (T)-> Boolean) : T? = this diff --git a/idea/testData/libraries/usercode/library.marked.kt b/idea/testData/libraries/usercode/library.marked.kt index 55f708f1607..9b8d1a9f4ac 100644 --- a/idea/testData/libraries/usercode/library.marked.kt +++ b/idea/testData/libraries/usercode/library.marked.kt @@ -2,16 +2,16 @@ package testData.libraries import java.util.* -trait SimpleTrait { +public trait SimpleTrait { } -class SimpleClass { +public class SimpleClass { } -class SimpleTraitImpl : SimpleTrait { +public class SimpleTraitImpl : SimpleTrait { } -class <15>WithInnerAndObject { +public class <15>WithInnerAndObject { class object { fun <16>foo() { } @@ -24,34 +24,34 @@ class <15>WithInnerAndObject { } } -class WithTraitClassObject { +public class WithTraitClassObject { class object : SimpleTrait } -abstract class AbstractClass { +public abstract class AbstractClass { } -enum class <4><5>Color(val <6>rgb : Int) { +public enum class <4><5>Color(val <6>rgb : Int) { RED : Color(0xFF0000) GREEN : Color(0x00FF00) BLUE : Color(0x0000FF) } -abstract class <1>ClassWithAbstractAndOpenMembers { - abstract fun abstractFun() - open fun openFun() { +public abstract class <1>ClassWithAbstractAndOpenMembers { + public abstract fun abstractFun() + public open fun openFun() { } - abstract val abstractVal : String - open val openVal : String = "" - open val openValWithGetter : String + public abstract val abstractVal : String + public open val openVal : String = "" + public open val openValWithGetter : String get() { return "239" } public abstract var <2><3>abstractVar : String - open var openVar : String = "" - open var openVarWithGetter : String + public open var openVar : String = "" + public open var openVarWithGetter : String get() { return "239" } @@ -59,38 +59,38 @@ abstract class <1>ClassWithAbstractAndOpenMembers { } } -fun main(args : Array) { +public fun main(args : Array) { } public val <7>globalVal : #(Int, String) = #(239, "239") -val <8>globalValWithGetter : Long +public val <8>globalValWithGetter : Long get() { return System.currentTimeMillis() } -val String.<9>exProp : String +public val String.<9>exProp : String get() { return this } -val Int.exProp : Int +public val Int.exProp : Int get() { return this } -val #(T, T).<10>exProp : String +public val #(T, T).<10>exProp : String get() { return "${this._1} : ${this._2}" } -fun <11><12>func(a : Int, b : String = "55") { +public fun <11><12>func(a : Int, b : String = "55") { } -fun <13>func(a : Int, b : Int) { +public fun <13>func(a : Int, b : Int) { } -fun <14>func() { +public fun <14>func() { } -inline fun T.<17>filter(predicate: (T)-> Boolean) : T? = this +public inline fun T.<17>filter(predicate: (T)-> Boolean) : T? = this