J2K: do not produce redundant "internal" words for members in an internal class
This commit is contained in:
+2
-2
@@ -1,13 +1,13 @@
|
||||
internal class A {
|
||||
private var i: Int? = getByte().toInt()
|
||||
|
||||
internal fun foo() {
|
||||
fun foo() {
|
||||
i = 10
|
||||
}
|
||||
|
||||
companion object {
|
||||
|
||||
internal fun getByte(): Byte {
|
||||
fun getByte(): Byte {
|
||||
return 0
|
||||
}
|
||||
}
|
||||
|
||||
+1
-1
@@ -1,5 +1,5 @@
|
||||
// ERROR: Unresolved reference: Foo
|
||||
// ERROR: Property must be initialized or be abstract
|
||||
internal class C {
|
||||
internal var f: Foo
|
||||
var f: Foo
|
||||
}
|
||||
+5
-5
@@ -2,24 +2,24 @@ import java.util.*
|
||||
|
||||
internal class A {
|
||||
private val field1 = ArrayList<String>()
|
||||
internal val field2: List<String> = ArrayList()
|
||||
val field2: List<String> = ArrayList()
|
||||
val field3 = 0
|
||||
protected val field4 = 0
|
||||
|
||||
private var field5: List<String> = ArrayList()
|
||||
internal var field6: List<String> = ArrayList()
|
||||
var field6: List<String> = ArrayList()
|
||||
|
||||
private var field7 = 0
|
||||
internal var field8 = 0
|
||||
var field8 = 0
|
||||
|
||||
private var field9: String? = "a"
|
||||
private var field10: String? = foo()
|
||||
|
||||
internal fun foo(): String {
|
||||
fun foo(): String {
|
||||
return "x"
|
||||
}
|
||||
|
||||
internal fun bar() {
|
||||
fun bar() {
|
||||
field5 = ArrayList<String>()
|
||||
field7++
|
||||
field8++
|
||||
|
||||
+4
-4
@@ -1,9 +1,9 @@
|
||||
internal class A internal constructor(private val field6: Int, private val field8: Int, a: A) {
|
||||
internal class A(private val field6: Int, private val field8: Int, a: A) {
|
||||
private val field1 = 0
|
||||
private val field2 = 0
|
||||
private var field3 = 0
|
||||
internal val field4 = 0
|
||||
internal var field5 = 0
|
||||
val field4 = 0
|
||||
var field5 = 0
|
||||
private val field7: Int
|
||||
private val field9: Int
|
||||
private var field10: Int = 0
|
||||
@@ -18,7 +18,7 @@ internal class A internal constructor(private val field6: Int, private val field
|
||||
a.field11 = 10
|
||||
}
|
||||
|
||||
internal fun foo() {
|
||||
fun foo() {
|
||||
field3 = field2
|
||||
}
|
||||
}
|
||||
+1
-1
@@ -1,4 +1,4 @@
|
||||
// ERROR: Unresolved reference: Foo
|
||||
internal class C {
|
||||
internal val f = Foo(1, 2)
|
||||
val f = Foo(1, 2)
|
||||
}
|
||||
+1
-1
@@ -1,4 +1,4 @@
|
||||
// ERROR: Unresolved reference: Foo
|
||||
internal class C {
|
||||
internal var f = Foo(1, 2)
|
||||
var f = Foo(1, 2)
|
||||
}
|
||||
+1
-1
@@ -1,5 +1,5 @@
|
||||
// ERROR: Unresolved reference: Foo
|
||||
// ERROR: Property must be initialized or be abstract
|
||||
internal class C {
|
||||
internal var f: Foo
|
||||
var f: Foo
|
||||
}
|
||||
@@ -1,10 +1,10 @@
|
||||
// ERROR: This annotation is not applicable to target 'member property'
|
||||
internal class A {
|
||||
@Deprecated("")
|
||||
@Volatile internal var field1 = 0
|
||||
@Volatile var field1 = 0
|
||||
|
||||
@Transient internal var field2 = 1
|
||||
@Transient var field2 = 1
|
||||
|
||||
// Should work even for bad modifiers
|
||||
@Strictfp internal var field3 = 2.0
|
||||
@Strictfp var field3 = 2.0
|
||||
}
|
||||
Reference in New Issue
Block a user