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

j2k/testData/fileOrElement/constructors/allCallsPrimary.kt

@@ -1,6 +1,6 @@
 package pack
 
-internal class C @JvmOverloads internal constructor(arg1: Int, arg2: Int = 0, arg3: Int = 0)
+internal class C @JvmOverloads constructor(arg1: Int, arg2: Int = 0, arg3: Int = 0)
 
 object User {
     fun main() {

j2k/testData/fileOrElement/constructors/allCallsPrimary2.kt

@@ -1,13 +1,13 @@
-internal class C internal constructor(internal val myArg1: Int) {
-    internal var myArg2: Int = 0
-    internal var myArg3: Int = 0
+internal class C(val myArg1: Int) {
+    var myArg2: Int = 0
+    var myArg3: Int = 0
 
-    internal constructor(arg1: Int, arg2: Int, arg3: Int) : this(arg1) {
+    constructor(arg1: Int, arg2: Int, arg3: Int) : this(arg1) {
         myArg2 = arg2
         myArg3 = arg3
     }
 
-    internal constructor(arg1: Int, arg2: Int) : this(arg1) {
+    constructor(arg1: Int, arg2: Int) : this(arg1) {
         myArg2 = arg2
         myArg3 = 0
     }

j2k/testData/fileOrElement/constructors/chain.kt

@@ -1,10 +1,10 @@
-internal class C internal constructor(arg1: Int, arg2: Int, arg3: Int) {
+internal class C(arg1: Int, arg2: Int, arg3: Int) {
 
-    internal constructor(arg1: Int, arg2: Int) : this(arg1, arg2, 0) {
+    constructor(arg1: Int, arg2: Int) : this(arg1, arg2, 0) {
         println()
     }
 
-    internal constructor(arg1: Int) : this(arg1, 0) {
+    constructor(arg1: Int) : this(arg1, 0) {
         println()
     }
 }

j2k/testData/fileOrElement/constructors/customerBuilder.kt

@@ -1,6 +1,6 @@
 package org.test.customer
 
-internal class Customer internal constructor(val firstName: String, val lastName: String) {
+internal class Customer(val firstName: String, val lastName: String) {
 
     init {
         doSmthBefore()

j2k/testData/fileOrElement/constructors/fieldsInitializedFromParams8.kt

@@ -1,3 +1,3 @@
-internal open class Base internal constructor(o: Any, l: Int)
+internal open class Base(o: Any, l: Int)
 
 internal class C(private val string: String) : Base(string, string.length())

j2k/testData/fileOrElement/constructors/lineBreaksBetweenParameters.kt

@@ -1,12 +1,12 @@
-internal class C1 internal constructor(arg1: Int,
-                                       arg2: Int,
-                                       arg3: Int) {
+internal class C1(arg1: Int,
+                  arg2: Int,
+                  arg3: Int) {
 
-    internal constructor(x: Int,
-                         y: Int) : this(x, x + y, 0) {
+    constructor(x: Int,
+                y: Int) : this(x, x + y, 0) {
     }
 }
 
-internal class C2 internal constructor(private val arg1: Int,
-                                       private val arg2: Int,
-                                       arg3: Int)
+internal class C2(private val arg1: Int,
+                  private val arg2: Int,
+                  arg3: Int)

j2k/testData/fileOrElement/constructors/methodCallInFactoryFun.kt

@@ -1,10 +1,10 @@
-internal class C internal constructor(private val arg1: Int, private val arg2: Int, private val arg3: Int) {
+internal class C(private val arg1: Int, private val arg2: Int, private val arg3: Int) {
 
-    internal fun foo(p: Int): Int {
+    fun foo(p: Int): Int {
         return p
     }
 
-    internal constructor(arg1: Int, arg2: Int, other: C) : this(arg1, arg2, 0) {
+    constructor(arg1: Int, arg2: Int, other: C) : this(arg1, arg2, 0) {
         println(foo(1) + this.foo(2) + other.foo(3) + staticFoo(4) + C.staticFoo(5))
     }
 

j2k/testData/fileOrElement/constructors/nestedClassNameInParameterDefaults.kt

@@ -1,6 +1,6 @@
-internal class A @JvmOverloads internal constructor(nested: A.Nested = A.Nested(A.Nested.FIELD)) {
+internal class A @JvmOverloads constructor(nested: A.Nested = A.Nested(A.Nested.FIELD)) {
 
-    internal class Nested internal constructor(p: Int) {
+    internal class Nested(p: Int) {
         companion object {
 
             val FIELD = 0

j2k/testData/fileOrElement/constructors/nestedClassNameInParameterDefaults2.kt

@@ -1,9 +1,9 @@
 // ERROR: Property must be initialized or be abstract
 import A.Nested
 
-internal class A @JvmOverloads internal constructor(nested: Nested = Nested(Nested.FIELD)) {
+internal class A @JvmOverloads constructor(nested: Nested = Nested(Nested.FIELD)) {
 
-    internal class Nested internal constructor(p: Int) {
+    internal class Nested(p: Int) {
         companion object {
 
             val FIELD = 0
@@ -12,5 +12,5 @@ internal class A @JvmOverloads internal constructor(nested: Nested = Nested(Nest
 }
 
 internal class B {
-    internal var nested: Nested
+    var nested: Nested
 }

j2k/testData/fileOrElement/constructors/nestedClassNameInParameterDefaults3.kt

@@ -3,9 +3,9 @@ package pack
 
 import pack.A.Nested
 
-internal class A @JvmOverloads internal constructor(nested: Nested = Nested(Nested.FIELD)) {
+internal class A @JvmOverloads constructor(nested: Nested = Nested(Nested.FIELD)) {
 
-    internal class Nested internal constructor(p: Int) {
+    internal class Nested(p: Int) {
         companion object {
 
             val FIELD = 0
@@ -14,5 +14,5 @@ internal class A @JvmOverloads internal constructor(nested: Nested = Nested(Nest
 }
 
 internal class B {
-    internal var nested: Nested
+    var nested: Nested
 }

j2k/testData/fileOrElement/constructors/nestedClassNameInParameterDefaults4.kt

@@ -3,9 +3,9 @@ package pack
 
 import pack.A.*
 
-internal class A @JvmOverloads internal constructor(nested: Nested = Nested(Nested.FIELD)) {
+internal class A @JvmOverloads constructor(nested: Nested = Nested(Nested.FIELD)) {
 
-    internal class Nested internal constructor(p: Int) {
+    internal class Nested(p: Int) {
         companion object {
 
             val FIELD = 0
@@ -14,5 +14,5 @@ internal class A @JvmOverloads internal constructor(nested: Nested = Nested(Nest
 }
 
 internal class B {
-    internal var nested: Nested
+    var nested: Nested
 }

j2k/testData/fileOrElement/constructors/nestedClassNameInSuperParameters.kt

@@ -1,6 +1,6 @@
-internal open class Base internal constructor(nested: Base.Nested) {
+internal open class Base(nested: Base.Nested) {
 
-    internal class Nested internal constructor(p: Int) {
+    internal class Nested(p: Int) {
         companion object {
 
             val FIELD = 0
@@ -8,4 +8,4 @@ internal open class Base internal constructor(nested: Base.Nested) {
     }
 }
 
-internal class Derived internal constructor() : Base(Base.Nested(Base.Nested.FIELD))
+internal class Derived : Base(Base.Nested(Base.Nested.FIELD))

j2k/testData/fileOrElement/constructors/noPrimary.kt

@@ -1,14 +1,14 @@
 internal open class Base
 
 internal class C : Base {
-    internal constructor(arg1: Int, arg2: Int, arg3: Int) {
+    constructor(arg1: Int, arg2: Int, arg3: Int) {
     }
 
-    internal constructor(arg1: Int, arg2: Int) : this(arg1, arg2, 0) {
+    constructor(arg1: Int, arg2: Int) : this(arg1, arg2, 0) {
         println()
     }
 
-    internal constructor(arg: Int) {
+    constructor(arg: Int) {
         println(arg)
     }
 }

j2k/testData/fileOrElement/constructors/parameterDefaults1.kt

@@ -1,7 +1,7 @@
 package pack
 
-internal class C @JvmOverloads internal constructor(a: Int = 0, b: Int = 0, c: Int = 0, d: Int = 0, e: Int = 0) {
+internal class C @JvmOverloads constructor(a: Int = 0, b: Int = 0, c: Int = 0, d: Int = 0, e: Int = 0) {
 
-    internal constructor(a: Int) : this(a, 0, 0, 0, 1) {
+    constructor(a: Int) : this(a, 0, 0, 0, 1) {
     }
 }

j2k/testData/fileOrElement/constructors/parameterDefaults2.kt

@@ -1,10 +1,10 @@
 package pack
 
-internal class C @JvmOverloads internal constructor(a: Int = 0, b: Int = 0, c: Int = 0, d: Int = 0, e: Int = 0) {
+internal class C @JvmOverloads constructor(a: Int = 0, b: Int = 0, c: Int = 0, d: Int = 0, e: Int = 0) {
 
-    internal constructor(a1: Int, b1: Int, c1: Int) : this(a1, b1, c1, 0, 0) {
+    constructor(a1: Int, b1: Int, c1: Int) : this(a1, b1, c1, 0, 0) {
     }
 
-    internal constructor(b: Byte) : this(b.toInt(), 0, 0, 0, 0) {
+    constructor(b: Byte) : this(b.toInt(), 0, 0, 0, 0) {
     }
 }

j2k/testData/fileOrElement/constructors/parameterDefaults3.kt

@@ -1,7 +1,7 @@
 package pack
 
-internal class C @JvmOverloads internal constructor(a: Int = 0, b: Int = 0, c: Int = 0, d: Int = 0, e: Int = 0) {
+internal class C @JvmOverloads constructor(a: Int = 0, b: Int = 0, c: Int = 0, d: Int = 0, e: Int = 0) {
 
-    internal constructor(a: Int, b: Int, c: Int) : this(b, a, c, 0, 0) {
+    constructor(a: Int, b: Int, c: Int) : this(b, a, c, 0, 0) {
     }
 }

j2k/testData/fileOrElement/constructors/parameterDefaults4.kt

@@ -1,3 +1,3 @@
 package pack
 
-internal class C @JvmOverloads internal constructor(a: Int = 1, b: Int = 2, c: Int = 3, d: Int = 4, e: Int = 5)
+internal class C @JvmOverloads constructor(a: Int = 1, b: Int = 2, c: Int = 3, d: Int = 4, e: Int = 5)

j2k/testData/fileOrElement/constructors/parameterDefaults5.kt

@@ -1,3 +1,3 @@
 package pack
 
-internal class C @JvmOverloads internal constructor(a: Int = 1, b: Int = 2, c: Int = 3, d: Int = 4, e: Int = 5)
+internal class C @JvmOverloads constructor(a: Int = 1, b: Int = 2, c: Int = 3, d: Int = 4, e: Int = 5)

j2k/testData/fileOrElement/constructors/parameterModification.kt

@@ -1,4 +1,4 @@
-internal class C @JvmOverloads internal constructor(arg1: Int, arg2: Int = 0, arg3: Int = 0) {
+internal class C @JvmOverloads constructor(arg1: Int, arg2: Int = 0, arg3: Int = 0) {
     private val field: Int
 
     init {
@@ -10,7 +10,7 @@ internal class C @JvmOverloads internal constructor(arg1: Int, arg2: Int = 0, ar
         arg3++
     }
 
-    internal constructor(arg1: Int, arg2: Int) : this(arg1, arg2, 0) {
+    constructor(arg1: Int, arg2: Int) : this(arg1, arg2, 0) {
         var arg2 = arg2
         arg2++
     }

j2k/testData/fileOrElement/constructors/qualifiedRefInFactoryFun.kt

@@ -1,12 +1,12 @@
-internal class C internal constructor(private val arg1: Int, private val arg2: Int, private val arg3: Int) {
+internal class C(private val arg1: Int, private val arg2: Int, private val arg3: Int) {
 
-    internal constructor(arg1: Int, arg2: Int, other: C) : this(arg1, arg2, 0) {
+    constructor(arg1: Int, arg2: Int, other: C) : this(arg1, arg2, 0) {
         println(this.arg1 + other.arg2)
     }
 }
 
 internal class User {
-    internal fun foo() {
+    fun foo() {
         val c1 = C(100, 100, 100)
         val c2 = C(100, 100, c1)
     }

j2k/testData/fileOrElement/constructors/secondaryConstructorsInInnerClass.kt

@@ -48,7 +48,7 @@ internal class Outer {
         }
     }
 
-    internal fun foo() {
+    fun foo() {
         val inner1 = Inner1(1)
         val inner2 = Inner2(2)
         val inner3 = Inner3(3)

j2k/testData/fileOrElement/constructors/secondaryConstructorsInNestedClass.kt

@@ -48,7 +48,7 @@ internal object Outer {
         }
     }
 
-    internal fun foo() {
+    fun foo() {
         val nested1 = Nested1(1)
         val nested2 = Nested2(2)
         val nested3 = Nested3(3)

j2k/testData/fileOrElement/constructors/secondaryConstructorsVisibility.kt

@@ -6,7 +6,7 @@ internal class A() {
     protected constructor(c: Char) : this() {
     }
 
-    internal constructor(f: Float) : this() {
+    constructor(f: Float) : this() {
     }
 
     private constructor(d: Double) : this() {

j2k/testData/fileOrElement/constructors/staticFieldRefInFactoryFun.kt

@@ -1,6 +1,6 @@
-internal class C internal constructor() {
+internal class C() {
 
-    internal constructor(p: Int) : this() {
+    constructor(p: Int) : this() {
         println(staticField1 + C.staticField2)
     }