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

j2k/testData/fileOrElement/issues/comments.kt

@@ -25,20 +25,20 @@ internal class C {
     }
 
     //simple one line comment for function
-    internal fun f1() {
+    fun f1() {
     }
 
     //simple one line comment for field
-    internal var j: Int = 0
+    var j: Int = 0
 
     //double c style
     //comment before function
-    internal fun f2() {
+    fun f2() {
     }
 
     //double c style
     //comment before field
-    internal var k: Int = 0
+    var k: Int = 0
 
     //combination
     /** of
@@ -48,7 +48,7 @@ internal class C {
      * different
      */
     //comments
-    internal fun f3() {
+    fun f3() {
     }
 
     //combination
@@ -59,8 +59,8 @@ internal class C {
      * different
      */
     //comments
-    internal var l: Int = 0
+    var l: Int = 0
 
     /*two*/ /*comments*//*line*/
-    internal var z: Int = 0
+    var z: Int = 0
 }

j2k/testData/fileOrElement/issues/kt-1074.kt

@@ -1,7 +1,7 @@
 package demo
 
 internal object Test {
-    internal fun subListRangeCheck(fromIndex: Int, toIndex: Int, size: Int) {
+    fun subListRangeCheck(fromIndex: Int, toIndex: Int, size: Int) {
         if (fromIndex < 0)
             throw IndexOutOfBoundsException("fromIndex = " + fromIndex)
         if (toIndex > size)

j2k/testData/fileOrElement/issues/kt-5294.kt

@@ -1,4 +1,4 @@
-internal class X internal constructor(private val list: List<X.Y>) {
+internal class X(private val list: List<X.Y>) {
 
     internal inner class Y
 }

j2k/testData/fileOrElement/issues/kt-5400.kt

@@ -4,5 +4,5 @@ internal open class Base {
 }
 
 internal class Derived : Base() {
-    internal var field: Base.Nested
+    var field: Base.Nested
 }

j2k/testData/fileOrElement/issues/kt-543-boxed.kt

@@ -1,10 +1,10 @@
 package demo
 
 internal class Test {
-    internal fun putInt(i: Int?) {
+    fun putInt(i: Int?) {
     }
 
-    internal fun test() {
+    fun test() {
         val b = 10
         putInt(b.toInt())
 

j2k/testData/fileOrElement/issues/kt-543-mixed.kt

@@ -1,10 +1,10 @@
 package demo
 
 internal class Test {
-    internal fun putInt(i: Int?) {
+    fun putInt(i: Int?) {
     }
 
-    internal fun test() {
+    fun test() {
         val i = 10
         putInt(i)
     }

j2k/testData/fileOrElement/issues/kt-543.kt

@@ -1,10 +1,10 @@
 package demo
 
 internal class Test {
-    internal fun putInt(i: Int) {
+    fun putInt(i: Int) {
     }
 
-    internal fun test() {
+    fun test() {
         val b = 10
         putInt(b.toInt())
     }

j2k/testData/fileOrElement/issues/kt-792-mixed.kt

@@ -1,8 +1,8 @@
 package demo
 
-internal class Test internal constructor(i: Int?) {
+internal class Test(i: Int?) {
 
-    internal fun test() {
+    fun test() {
         val i = 10
         Test(i)
     }

j2k/testData/fileOrElement/issues/kt-792.kt

@@ -1,8 +1,8 @@
 package demo
 
-internal class Test internal constructor(i: Int) {
+internal class Test(i: Int) {
 
-    internal fun test() {
+    fun test() {
         val b = 10
         Test(b.toInt())
     }

j2k/testData/fileOrElement/issues/kt-794-mixed.kt

@@ -1,11 +1,11 @@
 package demo
 
 internal class Test {
-    internal fun getInteger(i: Int?): Int? {
+    fun getInteger(i: Int?): Int? {
         return i
     }
 
-    internal fun test() {
+    fun test() {
         val i = getInteger(10)!!
     }
 }

j2k/testData/fileOrElement/issues/kt-794.kt

@@ -1,5 +1,5 @@
 internal class Test {
-    internal fun getInt(): Int {
+    fun getInt(): Int {
         val b = 10
         return b.toInt()
     }

j2k/testData/fileOrElement/issues/kt-809-string.kt

@@ -1,20 +1,20 @@
 package demo
 
 internal class Container {
-    internal var myString = "1"
+    var myString = "1"
 }
 
 internal object One {
-    internal var myContainer = Container()
+    var myContainer = Container()
 }
 
-internal class StringContainer internal constructor(s: String)
+internal class StringContainer(s: String)
 
 internal class Test {
-    internal fun putString(s: String) {
+    fun putString(s: String) {
     }
 
-    internal fun test() {
+    fun test() {
         putString(One.myContainer.myString)
         StringContainer(One.myContainer.myString)
     }

j2k/testData/fileOrElement/issues/kt-809.kt

@@ -1,20 +1,20 @@
 package demo
 
 internal class Container {
-    internal var myInt = 1
+    var myInt = 1
 }
 
 internal object One {
-    internal var myContainer = Container()
+    var myContainer = Container()
 }
 
-internal class IntContainer internal constructor(i: Int)
+internal class IntContainer(i: Int)
 
 internal class Test {
-    internal fun putInt(i: Int) {
+    fun putInt(i: Int) {
     }
 
-    internal fun test() {
+    fun test() {
         putInt(One.myContainer.myInt)
         IntContainer(One.myContainer.myInt)
     }

j2k/testData/fileOrElement/issues/kt-820-field.kt

@@ -1,13 +1,13 @@
 package demo
 
 internal class Container {
-    internal var myInt = 1
+    var myInt = 1
 }
 
 internal object One {
-    internal var myContainer = Container()
+    var myContainer = Container()
 }
 
 internal class Test {
-    internal var b = One.myContainer.myInt.toByte()
+    var b = One.myContainer.myInt.toByte()
 }

j2k/testData/fileOrElement/issues/kt-820.kt

@@ -1,15 +1,15 @@
 package demo
 
 internal class Container {
-    internal var myInt = 1
+    var myInt = 1
 }
 
 internal object One {
-    internal var myContainer = Container()
+    var myContainer = Container()
 }
 
 internal class Test {
-    internal fun test() {
+    fun test() {
         val b = One.myContainer.myInt.toByte()
     }
 }

j2k/testData/fileOrElement/issues/kt-824.kt

@@ -1,15 +1,15 @@
 package demo
 
 internal class Container {
-    internal var myBoolean = true
+    var myBoolean = true
 }
 
 internal object One {
-    internal var myContainer = Container()
+    var myContainer = Container()
 }
 
 internal class Test {
-    internal fun test() {
+    fun test() {
         if (One.myContainer.myBoolean)
             println("Ok")
 

j2k/testData/fileOrElement/issues/kt-828.kt

@@ -1,5 +1,5 @@
 internal class Test {
-    internal fun test() {
+    fun test() {
         var res = true
         res = res and false
         res = res or false

j2k/testData/fileOrElement/issues/kt-851.kt

@@ -1,8 +1,8 @@
 internal class Test {
-    internal fun putInt(i: Int) {
+    fun putInt(i: Int) {
     }
 
-    internal fun test() {
+    fun test() {
         val b = 10
         putInt(b.toInt())
     }

j2k/testData/fileOrElement/issues/kt-852.kt

@@ -1,7 +1,7 @@
 package demo
 
 internal class Test {
-    internal fun test(): String {
+    fun test(): String {
         val s1 = ""
         val s2 = ""
         val s3 = ""

j2k/testData/fileOrElement/issues/kt-893.kt

@@ -1,7 +1,7 @@
 package demo
 
 internal class Test {
-    internal fun test() {
+    fun test() {
         for (i in 0..9) {
             println(i)
         }

j2k/testData/fileOrElement/issues/kt-963.kt

@@ -6,5 +6,5 @@ internal class C(a: Int) {
         abc = a * 2
     }
 
-    internal var abc = 0
+    var abc = 0
 }

j2k/testData/fileOrElement/issues/spaceBeforeAssignment.kt

@@ -1,5 +1,5 @@
 import java.util.*
 
 internal class A {
-    internal var list: List<String> = ArrayList()
+    var list: List<String> = ArrayList()
 }