azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

added 'public' annotation to library functions

Browse Source
This commit is contained in:
Svetlana Isakova
2012-04-04 19:19:02 +04:00
parent 0ec24f5e3d
commit 16c6935d91
2 changed files with 48 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/testData/libraries/library/library.kt
+24 -24
View File
@@ -2,16 +2,16 @@ package testData.libraries
import java.util.* 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 { class object {
fun foo() { fun foo() {
} }
@@ -24,34 +24,34 @@ class WithInnerAndObject {
} }
} }
class WithTraitClassObject { public class WithTraitClassObject {
class object : SimpleTrait 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) RED : Color(0xFF0000)
GREEN : Color(0x00FF00) GREEN : Color(0x00FF00)
BLUE : Color(0x0000FF) BLUE : Color(0x0000FF)
} }
abstract class ClassWithAbstractAndOpenMembers { public abstract class ClassWithAbstractAndOpenMembers {
abstract fun abstractFun() public abstract fun abstractFun()
open fun openFun() { public open fun openFun() {
} }
abstract val abstractVal : String public abstract val abstractVal : String
open val openVal : String = "" public open val openVal : String = ""
open val openValWithGetter : String public open val openValWithGetter : String
get() { get() {
return "239" return "239"
} }
public abstract var abstractVar : String public abstract var abstractVar : String
open var openVar : String = "" public open var openVar : String = ""
open var openVarWithGetter : String public open var openVarWithGetter : String
get() { get() {
return "239" return "239"
} }
@@ -59,38 +59,38 @@ abstract class ClassWithAbstractAndOpenMembers {
} }
} }
fun main(args : Array<String>) { public fun main(args : Array<String>) {
} }
public val globalVal : #(Int, String) = #(239, "239") public val globalVal : #(Int, String) = #(239, "239")
val globalValWithGetter : Long public val globalValWithGetter : Long
get() { get() {
return System.currentTimeMillis() return System.currentTimeMillis()
} }
val String.exProp : String public val String.exProp : String
get() { get() {
return this return this
} }
val Int.exProp : Int public val Int.exProp : Int
get() { get() {
return this return this
} }
val <T> #(T, T).exProp : String public val <T> #(T, T).exProp : String
get() { get() {
return "${this._1} : ${this._2}" 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> T.filter(predicate: (T)-> Boolean) : T? = this public inline fun <T> T.filter(predicate: (T)-> Boolean) : T? = this
idea/testData/libraries/usercode/library.marked.kt
+24 -24
View File
@@ -2,16 +2,16 @@ package testData.libraries
import java.util.* 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 { class object {
fun <16>foo() { fun <16>foo() {
} }
@@ -24,34 +24,34 @@ class <15>WithInnerAndObject {
} }
} }
class WithTraitClassObject { public class WithTraitClassObject {
class object : SimpleTrait 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) RED : Color(0xFF0000)
GREEN : Color(0x00FF00) GREEN : Color(0x00FF00)
BLUE : Color(0x0000FF) BLUE : Color(0x0000FF)
} }
abstract class <1>ClassWithAbstractAndOpenMembers { public abstract class <1>ClassWithAbstractAndOpenMembers {
abstract fun abstractFun() public abstract fun abstractFun()
open fun openFun() { public open fun openFun() {
} }
abstract val abstractVal : String public abstract val abstractVal : String
open val openVal : String = "" public open val openVal : String = ""
open val openValWithGetter : String public open val openValWithGetter : String
get() { get() {
return "239" return "239"
} }
public abstract var <2><3>abstractVar : String public abstract var <2><3>abstractVar : String
open var openVar : String = "" public open var openVar : String = ""
open var openVarWithGetter : String public open var openVarWithGetter : String
get() { get() {
return "239" return "239"
} }
@@ -59,38 +59,38 @@ abstract class <1>ClassWithAbstractAndOpenMembers {
} }
} }
fun main(args : Array<String>) { public fun main(args : Array<String>) {
} }
public val <7>globalVal : #(Int, String) = #(239, "239") public val <7>globalVal : #(Int, String) = #(239, "239")
val <8>globalValWithGetter : Long public val <8>globalValWithGetter : Long
get() { get() {
return System.currentTimeMillis() return System.currentTimeMillis()
} }
val String.<9>exProp : String public val String.<9>exProp : String
get() { get() {
return this return this
} }
val Int.exProp : Int public val Int.exProp : Int
get() { get() {
return this return this
} }
val <T> #(T, T).<10>exProp : String public val <T> #(T, T).<10>exProp : String
get() { get() {
return "${this._1} : ${this._2}" 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> T.<17>filter(predicate: (T)-> Boolean) : T? = this public inline fun <T> T.<17>filter(predicate: (T)-> Boolean) : T? = this