J2K: adapted for default visibility modifier 'public'

This commit is contained in:
Valentin Kipyatkov
2015-09-15 11:29:27 +03:00
parent 1ccbda6af4
commit c3ddd5d32b
477 changed files with 1359 additions and 1350 deletions
@@ -1,12 +1,12 @@
annotation class Anon(public val stringArray: Array<String>, public val intArray: IntArray, // string
public val string: String)
annotation internal class Anon(val stringArray: Array<String>, val intArray: IntArray, // string
val string: String)
Anon(string = "a", stringArray = arrayOf("a", "b"), intArray = intArrayOf(1, 2))
@Target(AnnotationTarget.CONSTRUCTOR, AnnotationTarget.FIELD)
annotation class I
annotation internal class I
@Target(AnnotationTarget.FUNCTION, AnnotationTarget.PROPERTY_GETTER, AnnotationTarget.PROPERTY_SETTER)
annotation class J
annotation internal class J
@Target
annotation class K
annotation internal class K
@@ -1,4 +1,4 @@
annotation class Anon(public val s: String = "a", public val stringArray: Array<String> = arrayOf("a", "b"), public val intArray: IntArray)
annotation internal class Anon(val s: String = "a", val stringArray: Array<String> = arrayOf("a", "b"), val intArray: IntArray)
Anon(intArray = intArrayOf(1, 2))
class A
internal class A
@@ -1,20 +1,20 @@
// ERROR: Body is not allowed for annotation class
// ERROR: Modifier 'companion' is not applicable inside 'annotation class'
annotation class Anon(public val value: String) {
annotation internal class Anon(val value: String) {
public enum class E {
enum class E {
A, B
}
companion object {
public val field: E = E.A
val field: E = E.A
}
}
Anon("a")
interface I {
internal interface I {
companion object {
public val e: Anon.E = Anon.field
val e: Anon.E = Anon.field
}
}
@@ -1,13 +1,13 @@
annotation class Anon(public vararg val value: String, public val x: Int = 1)
annotation internal class Anon(vararg val value: String, val x: Int = 1)
Anon("a", "b")
interface I1
internal interface I1
Anon("c", "d", x = 1)
interface I2
internal interface I2
Anon("c", "d", x = 1)
interface I3
internal interface I3
Anon(value = *arrayOf("c", "d"))
interface I4
internal interface I4
+8 -5
View File
@@ -1,3 +1,6 @@
// ERROR: This annotation is not applicable to target 'local variable'
// ERROR: This annotation is not applicable to target 'value parameter'
// ERROR: This annotation is not applicable to target 'value parameter'
import javaApi.*
Anon1(value = *arrayOf("a"), stringArray = arrayOf("b"), intArray = intArrayOf(1, 2), string = "x")
@@ -8,22 +11,22 @@ Anon5(1)
Anon6("x", "y")
Anon7(String::class, StringBuilder::class)
Anon8(classes = arrayOf(String::class, StringBuilder::class))
class C {
internal class C {
Anon5(1) Deprecated("") private val field1 = 0
Anon5(1)
private val field2 = 0
Anon5(1) var field3 = 0
Anon5(1) internal var field3 = 0
Anon5(1)
var field4 = 0
internal var field4 = 0
Anon6
fun foo(Deprecated("") p1: Int, Deprecated("") Anon5(2) p2: Char) {
internal fun foo(Deprecated("") p1: Int, Deprecated("") Anon5(2) p2: Char) {
@Deprecated("") @Anon5(3) val c = 'a'
}
Anon5(1) fun bar() {
Anon5(1) internal fun bar() {
}
}
@@ -1,6 +1,6 @@
import kotlin.reflect.KClass
annotation class Ann(public val value: KClass<*>, public val other: KClass<*>)
annotation internal class Ann(val value: KClass<*>, val other: KClass<*>)
Ann(other = String::class, value = Any::class)
class C
internal class C
@@ -1,9 +1,9 @@
import kotlin.reflect.KClass
annotation class Ann(public vararg val value: KClass<*>)
annotation internal class Ann(vararg val value: KClass<*>)
Ann(String::class, Any::class)
class C
internal class C
Ann
class D
internal class D
+5 -5
View File
@@ -2,23 +2,23 @@
// !specifyLocalVariableTypeByDefault: true
package test
public class Test(str: String) {
var myStr = "String2"
class Test(str: String) {
internal var myStr = "String2"
init {
myStr = str
}
public fun sout(str: String) {
fun sout(str: String) {
// UNNECESSARY_NOT_NULL_ASSERTION heuristic does not work any more, instead we can skip generating !! altogether
println(str)
}
public fun dummy(str: String): String {
fun dummy(str: String): String {
return str
}
public fun test() {
fun test() {
sout("String")
val test: String = "String2"
sout(test)
@@ -2,18 +2,18 @@
// !specifyLocalVariableTypeByDefault: true
package test
class Foo {
fun execute() {
internal class Foo {
internal fun execute() {
}
}
class Bar {
var fooNotNull = Foo()
var fooNullable: Foo? = null
internal class Bar {
internal var fooNotNull = Foo()
internal var fooNullable: Foo? = null
}
class Test {
public fun test(barNotNull: Bar, barNullable: Bar?) {
internal class Test {
fun test(barNotNull: Bar, barNullable: Bar?) {
barNotNull.fooNotNull.execute()
barNotNull.fooNullable!!.execute()
barNullable!!.fooNotNull.execute()
@@ -1,22 +1,22 @@
// !specifyLocalVariableTypeByDefault: true
package test
public class Test(str: String?) {
var myStr: String? = "String2"
class Test(str: String?) {
internal var myStr: String? = "String2"
init {
myStr = str
}
public fun sout(str: String?) {
fun sout(str: String?) {
println(str)
}
public fun dummy(str: String?): String? {
fun dummy(str: String?): String? {
return str
}
public fun test() {
fun test() {
sout("String")
val test: String? = "String2"
sout(test)
@@ -1,2 +1,2 @@
class C Deprecated("")
internal class C Deprecated("")
constructor()