J2K: do not produce redundant "internal" words for members in an internal class

2015-09-16 21:50:01 +03:00
parent 367b32c309
commit 0cc2158ec1
260 changed files with 459 additions and 448 deletions
@@ -1,7 +1,7 @@
 internal class C {
    private var s: String? = ""

-    internal fun foo() {
+    fun foo() {
        s = null
    }
 }
@@ -2,7 +2,7 @@
 internal class C {
    private val s = x()

-    internal fun foo() {
+    fun foo() {
        if (s == null) {
            print("null")
        }
@@ -1,6 +1,6 @@
 internal class C(private val s: String?) {

-    internal fun foo() {
+    fun foo() {
        if (s != null) {
            print("not null")
        }
@@ -3,7 +3,7 @@ internal class C {
 }

 internal class D {
-    internal fun foo(c: C) {
+    fun foo(c: C) {
        if (null == c.s) {
            println("null")
        }
@@ -1,7 +1,7 @@
 internal class C {
    private var s: String? = null

-    internal fun foo() {
+    fun foo() {
        s = "x"
    }
 }
@@ -2,7 +2,7 @@ internal class C {
    private fun foo(s: String?) {
    }

-    internal fun bar() {
+    fun bar() {
        foo(null)
    }
 }
@@ -4,7 +4,7 @@ internal class C {
 }

 internal class D {
-    internal fun bar(c: C) {
+    fun bar(c: C) {
        c.foo(null)
    }
 }
@@ -2,7 +2,7 @@ internal class C {
    private fun foo(s: String?) {
    }

-    internal fun bar(b: Boolean) {
+    fun bar(b: Boolean) {
        foo(if (b) "a" else null)
    }
 }
@@ -3,7 +3,7 @@ internal interface I {
 }

 internal class C {
-    internal fun foo(i: I) {
+    fun foo(i: I) {
        if (i.getString() == null) {
            println("null")
        }
@@ -3,7 +3,7 @@ internal interface I {
 }

 internal class C {
-    internal fun foo(i: I) {
+    fun foo(i: I) {
        val result = i.getString()
        if (result != null) {
            print(result)
@@ -3,7 +3,7 @@ internal interface I {
 }

 internal class C {
-    internal fun foo(i: I) {
+    fun foo(i: I) {
        val result = i.getString()
        if (result != null) {
            print(result)
@@ -3,7 +3,7 @@ internal interface I {
 }

 internal class C {
-    internal fun foo(i: I, b: Boolean) {
+    fun foo(i: I, b: Boolean) {
        var result: String? = i.getString()
        if (b) result = null
        if (result != null) {
@@ -4,7 +4,7 @@ internal class C {

    companion object {

-        internal fun getString(): String? {
+        fun getString(): String? {
            return x()
        }
    }
@@ -1,5 +1,5 @@
 internal class C {
-    internal fun foo(b: Boolean): String? {
+    fun foo(b: Boolean): String? {
        if (b) {
            return "abc"
        } else {
@@ -4,7 +4,7 @@ internal interface Getter {
 }

 internal class C {
-    internal fun foo(b: Boolean): String {
+    fun foo(b: Boolean): String {
        val getter = object : Getter {
            override fun get(): String? {
                return null
@@ -1,7 +1,7 @@
 internal class C {
-    internal fun foo(): String {
+    fun foo(): String {
        internal class Local {
-            internal fun foo(): String? {
+            fun foo(): String? {
                return null
            }
        }
@@ -1,5 +1,5 @@
 internal class C {
-    internal fun foo(b: Boolean): String? {
+    fun foo(b: Boolean): String? {
        return if (b) "abc" else null
    }
 }
@@ -1,7 +1,7 @@
 internal class A {
-    internal var field = foo()
+    var field = foo()

-    internal fun foo(): Int {
+    fun foo(): Int {
        return 1
    }
 }
@@ -1,9 +1,9 @@
 internal class C {
-    internal fun getString(b: Boolean): String? {
+    fun getString(b: Boolean): String? {
        return if (b) "a" else null
    }

-    internal fun foo(): Int {
+    fun foo(): Int {
        return getString(true)!!.length()
    }
 }
@@ -1,4 +1,4 @@
-internal fun foo(s: String?, b: Boolean): Int {
+fun foo(s: String?, b: Boolean): Int {
    if (s == null) println("null")
    if (b) return s!!.length()
    return 10
@@ -1,4 +1,4 @@
-internal fun foo(s: String?) {
+fun foo(s: String?) {
    if (s != null) {
        zoo(s)
    }
@@ -1,5 +1,5 @@
 // !specifyLocalVariableTypeByDefault: true
-internal fun foo(b: Boolean) {
+fun foo(b: Boolean) {
    var s: String? = "abc"
    if (b) {
        s = null
@@ -1,5 +1,5 @@
 // !specifyLocalVariableTypeByDefault: true
-internal fun foo() {
+fun foo() {
    val s: String? = bar()
    if (s != null) {
        zoo(s)
@@ -1,5 +1,5 @@
 // !specifyLocalVariableTypeByDefault: true
-internal fun foo(b: Boolean) {
+fun foo(b: Boolean) {
    var s: String? = null
    if (b) {
        s = "abc"
@@ -1,4 +1,4 @@
 // !specifyLocalVariableTypeByDefault: true
-internal fun foo(b: Boolean) {
+fun foo(b: Boolean) {
    val s: String? = (if (b) "abc" else null)
 }
@@ -1,5 +1,5 @@
 internal class A {
-    internal fun foo(s: String?): Int {
+    fun foo(s: String?): Int {
        if (s != null) {
            return s.length()
        }