diff --git a/idea/testData/copyPaste/conversion/AddImports.expected.kt b/idea/testData/copyPaste/conversion/AddImports.expected.kt index 216bd16c88e..68c97e9f991 100644 --- a/idea/testData/copyPaste/conversion/AddImports.expected.kt +++ b/idea/testData/copyPaste/conversion/AddImports.expected.kt @@ -1,5 +1,5 @@ import java.io.File -fun foo(file: File): List { +internal fun foo(file: File): List { return emptyList() } diff --git a/idea/testData/copyPaste/conversion/AddImportsWithExplicitImports.expected.kt b/idea/testData/copyPaste/conversion/AddImportsWithExplicitImports.expected.kt index a81e713696a..739fb2d85f8 100644 --- a/idea/testData/copyPaste/conversion/AddImportsWithExplicitImports.expected.kt +++ b/idea/testData/copyPaste/conversion/AddImportsWithExplicitImports.expected.kt @@ -1,11 +1,11 @@ import java.io.File -class C { +internal class C { private fun memberFun(file: File) { } companion object { - JvmStatic public fun main(args: Array) { + JvmStatic fun main(args: Array) { } } } \ No newline at end of file diff --git a/idea/testData/copyPaste/conversion/AddKClassImport.expected.kt b/idea/testData/copyPaste/conversion/AddKClassImport.expected.kt index 83519c13d59..47d889c5f67 100644 --- a/idea/testData/copyPaste/conversion/AddKClassImport.expected.kt +++ b/idea/testData/copyPaste/conversion/AddKClassImport.expected.kt @@ -2,4 +2,4 @@ package to import kotlin.reflect.KClass -annotation class Ann(public val value: KClass) +annotation internal class Ann(val value: KClass) \ No newline at end of file diff --git a/idea/testData/copyPaste/conversion/ClassWithNoDocComment.expected.kt b/idea/testData/copyPaste/conversion/ClassWithNoDocComment.expected.kt index db736576254..69fe8b49ac4 100644 --- a/idea/testData/copyPaste/conversion/ClassWithNoDocComment.expected.kt +++ b/idea/testData/copyPaste/conversion/ClassWithNoDocComment.expected.kt @@ -1,6 +1,6 @@ package to -public class JavaClass : Runnable { +class JavaClass : Runnable { override fun run() { } diff --git a/idea/testData/copyPaste/conversion/ClassWithOverrides.expected.kt b/idea/testData/copyPaste/conversion/ClassWithOverrides.expected.kt index b5e0d956703..02eeb02512f 100644 --- a/idea/testData/copyPaste/conversion/ClassWithOverrides.expected.kt +++ b/idea/testData/copyPaste/conversion/ClassWithOverrides.expected.kt @@ -2,7 +2,7 @@ package to import javaPack.I -public class C : I { +class C : I { override fun foo(): String { return "" } diff --git a/idea/testData/copyPaste/conversion/ConversionInCorrectContext.expected.kt b/idea/testData/copyPaste/conversion/ConversionInCorrectContext.expected.kt index d7026fe8098..9f33f3fd57f 100644 --- a/idea/testData/copyPaste/conversion/ConversionInCorrectContext.expected.kt +++ b/idea/testData/copyPaste/conversion/ConversionInCorrectContext.expected.kt @@ -1,3 +1,3 @@ -fun foo(p: Dependency): Double { +internal fun foo(p: Dependency): Double { return p.getInt().toDouble() // explicit conversion to Double must be added on conversion (if type Dependency) is correctly resolved } diff --git a/idea/testData/copyPaste/conversion/FieldWithNoModifierAndNoSemicolon.expected.kt b/idea/testData/copyPaste/conversion/FieldWithNoModifierAndNoSemicolon.expected.kt index 6cd37e21ddc..24b7d42c6c4 100644 --- a/idea/testData/copyPaste/conversion/FieldWithNoModifierAndNoSemicolon.expected.kt +++ b/idea/testData/copyPaste/conversion/FieldWithNoModifierAndNoSemicolon.expected.kt @@ -1,3 +1,3 @@ package to -Volatile var field = 1 \ No newline at end of file +Volatile internal var field = 1 \ No newline at end of file diff --git a/idea/testData/copyPaste/conversion/FileWithNoPackageStatement.expected.kt b/idea/testData/copyPaste/conversion/FileWithNoPackageStatement.expected.kt index 44cf4e2ce78..6cd156c6a49 100644 --- a/idea/testData/copyPaste/conversion/FileWithNoPackageStatement.expected.kt +++ b/idea/testData/copyPaste/conversion/FileWithNoPackageStatement.expected.kt @@ -1,7 +1,7 @@ package to -public object JavaClass { - JvmStatic public fun main(args: Array) { +object JavaClass { + JvmStatic fun main(args: Array) { println("Hello, world!") } } \ No newline at end of file diff --git a/idea/testData/copyPaste/conversion/HalfTheWhiteSpace.expected.kt b/idea/testData/copyPaste/conversion/HalfTheWhiteSpace.expected.kt index d92740a572c..55cda45cfb0 100644 --- a/idea/testData/copyPaste/conversion/HalfTheWhiteSpace.expected.kt +++ b/idea/testData/copyPaste/conversion/HalfTheWhiteSpace.expected.kt @@ -1,10 +1,10 @@ class A { - fun foo() { + internal fun foo() { } - fun bar() { + internal fun bar() { } diff --git a/idea/testData/copyPaste/conversion/MethodDeclarationWithNoBody.expected.kt b/idea/testData/copyPaste/conversion/MethodDeclarationWithNoBody.expected.kt index bc15168ac57..6ea83f686a9 100644 --- a/idea/testData/copyPaste/conversion/MethodDeclarationWithNoBody.expected.kt +++ b/idea/testData/copyPaste/conversion/MethodDeclarationWithNoBody.expected.kt @@ -1,3 +1,3 @@ package to -fun foo(p: Int) +internal fun foo(p: Int) \ No newline at end of file diff --git a/idea/testData/copyPaste/conversion/MethodWithNoAnnotation.expected.kt b/idea/testData/copyPaste/conversion/MethodWithNoAnnotation.expected.kt index 738ccbff007..475b62a40fb 100644 --- a/idea/testData/copyPaste/conversion/MethodWithNoAnnotation.expected.kt +++ b/idea/testData/copyPaste/conversion/MethodWithNoAnnotation.expected.kt @@ -1,5 +1,5 @@ package to -public fun foo(): String { +fun foo(): String { return "" } diff --git a/idea/testData/copyPaste/conversion/MethodWithOnlyOneAnnotation.expected.kt b/idea/testData/copyPaste/conversion/MethodWithOnlyOneAnnotation.expected.kt index e8c6629a30c..91a31a8c20a 100644 --- a/idea/testData/copyPaste/conversion/MethodWithOnlyOneAnnotation.expected.kt +++ b/idea/testData/copyPaste/conversion/MethodWithOnlyOneAnnotation.expected.kt @@ -1,6 +1,6 @@ package to SomeAnnotation -public fun foo(): String { +fun foo(): String { return "" } diff --git a/idea/testData/copyPaste/conversion/SeveralMethodsSample.expected.kt b/idea/testData/copyPaste/conversion/SeveralMethodsSample.expected.kt index e938d94ba9c..125711996f1 100644 --- a/idea/testData/copyPaste/conversion/SeveralMethodsSample.expected.kt +++ b/idea/testData/copyPaste/conversion/SeveralMethodsSample.expected.kt @@ -27,7 +27,7 @@ class A { return "#org.jetbrains.kotlin.idea.refactoring.safeDelete.KotlinOverridingDialog" } - public fun getSelected(): ArrayList { + fun getSelected(): ArrayList { val result = ArrayList() for (i in 0..myChecked.length - 1) { if (myChecked[i]) { diff --git a/idea/testData/refactoring/pullUp/j2k/fromClassToClass.kt.after b/idea/testData/refactoring/pullUp/j2k/fromClassToClass.kt.after index e2c44f4590d..e7fc45de86d 100644 --- a/idea/testData/refactoring/pullUp/j2k/fromClassToClass.kt.after +++ b/idea/testData/refactoring/pullUp/j2k/fromClassToClass.kt.after @@ -1,27 +1,27 @@ abstract class A { // INFO: {"checked": "true"} - var x = 2 * 3 + internal var x = 2 * 3 // INFO: {"checked": "true"} - inner class X + internal inner class X // INFO: {"checked": "true"} - class Y + internal class Y // INFO: {"checked": "true"} - fun foo(n: Int): Boolean { + internal fun foo(n: Int): Boolean { return n > 0 } // INFO: {"checked": "true"} - abstract fun bar(s: String): Int + internal abstract fun bar(s: String): Int companion object { // INFO: {"checked": "true"} - var X = "1" + "2" + internal var X = "1" + "2" // INFO: {"checked": "true"} - JvmStatic fun foo2(n: Int): String { + JvmStatic internal fun foo2(n: Int): String { return "_" + n + "_" } } diff --git a/idea/testData/refactoring/pullUp/j2k/fromClassToClassAndMakeAbstract.kt.after b/idea/testData/refactoring/pullUp/j2k/fromClassToClassAndMakeAbstract.kt.after index 294fdb7b7a0..ee1c7df60b7 100644 --- a/idea/testData/refactoring/pullUp/j2k/fromClassToClassAndMakeAbstract.kt.after +++ b/idea/testData/refactoring/pullUp/j2k/fromClassToClassAndMakeAbstract.kt.after @@ -1,25 +1,25 @@ abstract class A { // INFO: {"checked": "true", "toAbstract": "true"} - var x = 2 * 3 + internal var x = 2 * 3 // INFO: {"checked": "true", "toAbstract": "true"} - inner class X + internal inner class X // INFO: {"checked": "true", "toAbstract": "true"} - class Y + internal class Y // INFO: {"checked": "true", "toAbstract": "true"} - abstract fun foo(n: Int): Boolean + internal abstract fun foo(n: Int): Boolean // INFO: {"checked": "true", "toAbstract": "true"} - abstract fun bar(s: String): Int + internal abstract fun bar(s: String): Int companion object { // INFO: {"checked": "true", "toAbstract": "true"} - var X = "1" + "2" + internal var X = "1" + "2" // INFO: {"checked": "true", "toAbstract": "true"} - JvmStatic fun foo2(n: Int): String { + JvmStatic internal fun foo2(n: Int): String { return "_" + n + "_" } } diff --git a/idea/testData/refactoring/pullUp/j2k/fromClassToClassWithGenerics.kt.after b/idea/testData/refactoring/pullUp/j2k/fromClassToClassWithGenerics.kt.after index b1ae7338e63..be54f5d16bf 100644 --- a/idea/testData/refactoring/pullUp/j2k/fromClassToClassWithGenerics.kt.after +++ b/idea/testData/refactoring/pullUp/j2k/fromClassToClassWithGenerics.kt.after @@ -4,19 +4,19 @@ interface Z open class A { // INFO: {"checked": "true"} - var foo1: T + internal var foo1: T // INFO: {"checked": "true"} - var foo2: Z + internal var foo2: Z // INFO: {"checked": "true"} - var foo3: Any + internal var foo3: Any // INFO: {"checked": "true"} - var foo4: Z + internal var foo4: Z // INFO: {"checked": "true"} - inner class Foo : A>(), Z + internal inner class Foo : A>(), Z // INFO: {"checked": "true"} - fun foo(x1: T, x2: Z, y1: Any, y2: Z, w1: I, w2: Z, s1: S, s2: Z) { + internal fun foo(x1: T, x2: Z, y1: Any, y2: Z, w1: I, w2: Z, s1: S, s2: Z) { } } \ No newline at end of file diff --git a/idea/testData/refactoring/pullUp/j2k/fromClassToInterface.kt.after b/idea/testData/refactoring/pullUp/j2k/fromClassToInterface.kt.after index 3ff920fa998..319bbb74747 100644 --- a/idea/testData/refactoring/pullUp/j2k/fromClassToInterface.kt.after +++ b/idea/testData/refactoring/pullUp/j2k/fromClassToInterface.kt.after @@ -1,21 +1,21 @@ interface A { // INFO: {"checked": "true"} - class Y + internal class Y // INFO: {"checked": "true"} - fun foo(n: Int): Boolean { + internal fun foo(n: Int): Boolean { return n > 0 } // INFO: {"checked": "true"} - fun bar(s: String): Int + internal fun bar(s: String): Int companion object { // INFO: {"checked": "true"} - var X = "1" + "2" + internal var X = "1" + "2" // INFO: {"checked": "true"} - JvmStatic fun foo2(n: Int): String { + JvmStatic internal fun foo2(n: Int): String { return "_" + n + "_" } } diff --git a/idea/testData/refactoring/pullUp/j2k/fromClassToNestedClass.kt.after b/idea/testData/refactoring/pullUp/j2k/fromClassToNestedClass.kt.after index 6ce799fffbe..a16e23f7357 100644 --- a/idea/testData/refactoring/pullUp/j2k/fromClassToNestedClass.kt.after +++ b/idea/testData/refactoring/pullUp/j2k/fromClassToNestedClass.kt.after @@ -2,28 +2,28 @@ class T { class U { abstract class A { // INFO: {"checked": "true"} - var x = 2 * 3 + internal var x = 2 * 3 // INFO: {"checked": "true"} - inner class X + internal inner class X // INFO: {"checked": "true"} - class Y + internal class Y // INFO: {"checked": "true"} - fun foo(n: Int): Boolean { + internal fun foo(n: Int): Boolean { return n > 0 } // INFO: {"checked": "true"} - abstract fun bar(s: String): Int + internal abstract fun bar(s: String): Int companion object { // INFO: {"checked": "true"} - var X = "1" + "2" + internal var X = "1" + "2" // INFO: {"checked": "true"} - JvmStatic fun foo2(n: Int): String { + JvmStatic internal fun foo2(n: Int): String { return "_" + n + "_" } } diff --git a/j2k/src/org/jetbrains/kotlin/j2k/Converter.kt b/j2k/src/org/jetbrains/kotlin/j2k/Converter.kt index 2838d38cc81..738adbd4093 100644 --- a/j2k/src/org/jetbrains/kotlin/j2k/Converter.kt +++ b/j2k/src/org/jetbrains/kotlin/j2k/Converter.kt @@ -572,7 +572,8 @@ class Converter private constructor( PsiModifier.ABSTRACT to Modifier.ABSTRACT, PsiModifier.PUBLIC to Modifier.PUBLIC, PsiModifier.PROTECTED to Modifier.PROTECTED, - PsiModifier.PRIVATE to Modifier.PRIVATE + PsiModifier.PRIVATE to Modifier.PRIVATE, + PsiModifier.PACKAGE_LOCAL to Modifier.INTERNAL ) private fun convertThrows(method: PsiMethod): Annotations { diff --git a/j2k/src/org/jetbrains/kotlin/j2k/ast/Modifier.kt b/j2k/src/org/jetbrains/kotlin/j2k/ast/Modifier.kt index a604783c9d4..a262d8aff5e 100644 --- a/j2k/src/org/jetbrains/kotlin/j2k/ast/Modifier.kt +++ b/j2k/src/org/jetbrains/kotlin/j2k/ast/Modifier.kt @@ -16,13 +16,13 @@ package org.jetbrains.kotlin.j2k.ast -import org.jetbrains.kotlin.j2k.* -import java.util.HashSet +import org.jetbrains.kotlin.j2k.CodeBuilder enum class Modifier(val name: String) { PUBLIC("public"), PROTECTED("protected"), PRIVATE("private"), + INTERNAL("internal"), ABSTRACT("abstract"), OPEN("open"), OVERRIDE("override"), @@ -31,13 +31,18 @@ enum class Modifier(val name: String) { public fun toKotlin(): String = name } -val ACCESS_MODIFIERS = setOf(Modifier.PUBLIC, Modifier.PROTECTED, Modifier.PRIVATE) +val ACCESS_MODIFIERS = setOf(Modifier.PUBLIC, Modifier.PROTECTED, Modifier.PRIVATE, Modifier.INTERNAL) class Modifiers(modifiers: Collection) : Element() { val modifiers = modifiers.toSet() override fun generateCode(builder: CodeBuilder) { - builder.append(modifiers.sortBy { it.ordinal() }.map { it.toKotlin() }.joinToString(" ")) + val text = modifiers + .sortedBy { it.ordinal() } + .filter { it != Modifier.PUBLIC } + .map { it.toKotlin() } + .joinToString(" ") + builder.append(text) } override val isEmpty: Boolean @@ -55,7 +60,7 @@ class Modifiers(modifiers: Collection) : Element() { val isPublic: Boolean get() = contains(Modifier.PUBLIC) val isPrivate: Boolean get() = contains(Modifier.PRIVATE) val isProtected: Boolean get() = contains(Modifier.PROTECTED) - val isInternal: Boolean get() = accessModifier() == null + val isInternal: Boolean get() = contains(Modifier.INTERNAL) fun accessModifier(): Modifier? = modifiers.firstOrNull { it in ACCESS_MODIFIERS } diff --git a/j2k/testData/fileOrElement/annotations/annotationInterface1.kt b/j2k/testData/fileOrElement/annotations/annotationInterface1.kt index e4654208c47..0ea8bb844c4 100644 --- a/j2k/testData/fileOrElement/annotations/annotationInterface1.kt +++ b/j2k/testData/fileOrElement/annotations/annotationInterface1.kt @@ -1,12 +1,12 @@ -annotation class Anon(public val stringArray: Array, public val intArray: IntArray, // string - public val string: String) +annotation internal class Anon(val stringArray: Array, 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 diff --git a/j2k/testData/fileOrElement/annotations/annotationInterface2.kt b/j2k/testData/fileOrElement/annotations/annotationInterface2.kt index 925de6ba94c..189b9469c55 100644 --- a/j2k/testData/fileOrElement/annotations/annotationInterface2.kt +++ b/j2k/testData/fileOrElement/annotations/annotationInterface2.kt @@ -1,4 +1,4 @@ -annotation class Anon(public val s: String = "a", public val stringArray: Array = arrayOf("a", "b"), public val intArray: IntArray) +annotation internal class Anon(val s: String = "a", val stringArray: Array = arrayOf("a", "b"), val intArray: IntArray) Anon(intArray = intArrayOf(1, 2)) -class A \ No newline at end of file +internal class A diff --git a/j2k/testData/fileOrElement/annotations/annotationInterface3.kt b/j2k/testData/fileOrElement/annotations/annotationInterface3.kt index 40a676a0d58..ea9a23a0404 100644 --- a/j2k/testData/fileOrElement/annotations/annotationInterface3.kt +++ b/j2k/testData/fileOrElement/annotations/annotationInterface3.kt @@ -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 } } \ No newline at end of file diff --git a/j2k/testData/fileOrElement/annotations/annotationInterface4.kt b/j2k/testData/fileOrElement/annotations/annotationInterface4.kt index 50021260c55..092fcc03351 100644 --- a/j2k/testData/fileOrElement/annotations/annotationInterface4.kt +++ b/j2k/testData/fileOrElement/annotations/annotationInterface4.kt @@ -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 diff --git a/j2k/testData/fileOrElement/annotations/annotationUsages.kt b/j2k/testData/fileOrElement/annotations/annotationUsages.kt index 6b397140f48..41023487d11 100644 --- a/j2k/testData/fileOrElement/annotations/annotationUsages.kt +++ b/j2k/testData/fileOrElement/annotations/annotationUsages.kt @@ -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() { } } diff --git a/j2k/testData/fileOrElement/annotations/javaClassArgument.kt b/j2k/testData/fileOrElement/annotations/javaClassArgument.kt index 0df37436724..179f9ed03c9 100644 --- a/j2k/testData/fileOrElement/annotations/javaClassArgument.kt +++ b/j2k/testData/fileOrElement/annotations/javaClassArgument.kt @@ -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 \ No newline at end of file +internal class C \ No newline at end of file diff --git a/j2k/testData/fileOrElement/annotations/javaClassArrayArgument.kt b/j2k/testData/fileOrElement/annotations/javaClassArrayArgument.kt index 526985efc57..ce7c64a95a4 100644 --- a/j2k/testData/fileOrElement/annotations/javaClassArrayArgument.kt +++ b/j2k/testData/fileOrElement/annotations/javaClassArrayArgument.kt @@ -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 \ No newline at end of file diff --git a/j2k/testData/fileOrElement/annotations/jetbrainsNotNull.kt b/j2k/testData/fileOrElement/annotations/jetbrainsNotNull.kt index 56f9929057e..9319f5aad26 100644 --- a/j2k/testData/fileOrElement/annotations/jetbrainsNotNull.kt +++ b/j2k/testData/fileOrElement/annotations/jetbrainsNotNull.kt @@ -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) diff --git a/j2k/testData/fileOrElement/annotations/jetbrainsNotNullChainExpr.kt b/j2k/testData/fileOrElement/annotations/jetbrainsNotNullChainExpr.kt index 9b4ceebf396..bde72df5289 100644 --- a/j2k/testData/fileOrElement/annotations/jetbrainsNotNullChainExpr.kt +++ b/j2k/testData/fileOrElement/annotations/jetbrainsNotNullChainExpr.kt @@ -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() diff --git a/j2k/testData/fileOrElement/annotations/jetbrainsNullable.kt b/j2k/testData/fileOrElement/annotations/jetbrainsNullable.kt index 828ca361888..ff38c4a4cd7 100644 --- a/j2k/testData/fileOrElement/annotations/jetbrainsNullable.kt +++ b/j2k/testData/fileOrElement/annotations/jetbrainsNullable.kt @@ -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) diff --git a/j2k/testData/fileOrElement/annotations/primaryConstructorAnnotation.kt b/j2k/testData/fileOrElement/annotations/primaryConstructorAnnotation.kt index bcd8fa669e0..1924cfaeae1 100644 --- a/j2k/testData/fileOrElement/annotations/primaryConstructorAnnotation.kt +++ b/j2k/testData/fileOrElement/annotations/primaryConstructorAnnotation.kt @@ -1,2 +1,2 @@ -class C Deprecated("") +internal class C Deprecated("") constructor() diff --git a/j2k/testData/fileOrElement/anonymousBlock/oneAnonBlock.kt b/j2k/testData/fileOrElement/anonymousBlock/oneAnonBlock.kt index b83a57d0a86..69abb195232 100644 --- a/j2k/testData/fileOrElement/anonymousBlock/oneAnonBlock.kt +++ b/j2k/testData/fileOrElement/anonymousBlock/oneAnonBlock.kt @@ -1,5 +1,5 @@ -class Test { - var str: String +internal class Test { + internal var str: String init { str = "Ola" diff --git a/j2k/testData/fileOrElement/anonymousBlock/oneStaticAnonBlock.kt b/j2k/testData/fileOrElement/anonymousBlock/oneStaticAnonBlock.kt index 677aefb057f..b2fb9d2b815 100644 --- a/j2k/testData/fileOrElement/anonymousBlock/oneStaticAnonBlock.kt +++ b/j2k/testData/fileOrElement/anonymousBlock/oneStaticAnonBlock.kt @@ -1,5 +1,5 @@ -object Test { - var str: String +internal object Test { + internal var str: String init { str = "Ola" diff --git a/j2k/testData/fileOrElement/arrayType/methodArrayArgs.kt b/j2k/testData/fileOrElement/arrayType/methodArrayArgs.kt index 5be1e8e5db5..100512358fb 100644 --- a/j2k/testData/fileOrElement/arrayType/methodArrayArgs.kt +++ b/j2k/testData/fileOrElement/arrayType/methodArrayArgs.kt @@ -1,2 +1,2 @@ -fun fromArrayToCollection(a: Array) { +internal fun fromArrayToCollection(a: Array) { } \ No newline at end of file diff --git a/j2k/testData/fileOrElement/assignmentExpression/nullability-settings.kt b/j2k/testData/fileOrElement/assignmentExpression/nullability-settings.kt index 26851db9e21..31804eba374 100644 --- a/j2k/testData/fileOrElement/assignmentExpression/nullability-settings.kt +++ b/j2k/testData/fileOrElement/assignmentExpression/nullability-settings.kt @@ -2,8 +2,8 @@ // !specifyLocalVariableTypeByDefault: true import java.util.HashSet -class Foo { - fun foo(o: HashSet?) { +internal class Foo { + internal fun foo(o: HashSet?) { val o2: HashSet? = o var foo: Int = 0 foo = o2!!.size() diff --git a/j2k/testData/fileOrElement/assignmentExpression/nullability.kt b/j2k/testData/fileOrElement/assignmentExpression/nullability.kt index 20af0a1b1ce..6bc968ed732 100644 --- a/j2k/testData/fileOrElement/assignmentExpression/nullability.kt +++ b/j2k/testData/fileOrElement/assignmentExpression/nullability.kt @@ -1,7 +1,7 @@ import java.util.HashSet -class Foo { - fun foo(o: HashSet) { +internal class Foo { + internal fun foo(o: HashSet) { val o2 = o var foo = 0 foo = o2.size() diff --git a/j2k/testData/fileOrElement/blocks/Blocks.kt b/j2k/testData/fileOrElement/blocks/Blocks.kt index f1644d4da0e..827ace24bc2 100644 --- a/j2k/testData/fileOrElement/blocks/Blocks.kt +++ b/j2k/testData/fileOrElement/blocks/Blocks.kt @@ -1,4 +1,4 @@ -fun foo() { +internal fun foo() { run { val a = 1 bar(a) diff --git a/j2k/testData/fileOrElement/boxedType/Boxing.kt b/j2k/testData/fileOrElement/boxedType/Boxing.kt index eac6c023ad9..434a837cd28 100644 --- a/j2k/testData/fileOrElement/boxedType/Boxing.kt +++ b/j2k/testData/fileOrElement/boxedType/Boxing.kt @@ -1,7 +1,7 @@ import java.util.ArrayList -class Boxing { - fun test() { +internal class Boxing { + internal fun test() { var i: Int? = 0 val n = 0.0f i = 1 diff --git a/j2k/testData/fileOrElement/boxedType/kt-671.kt b/j2k/testData/fileOrElement/boxedType/kt-671.kt index 3fe5164ad98..606d4433a97 100644 --- a/j2k/testData/fileOrElement/boxedType/kt-671.kt +++ b/j2k/testData/fileOrElement/boxedType/kt-671.kt @@ -1,8 +1,8 @@ // ERROR: None of the following functions can be called with the arguments supplied: public open fun valueOf(p0: kotlin.Short): kotlin.Short! defined in java.lang.Short public open fun valueOf(p0: kotlin.String!): kotlin.Short! defined in java.lang.Short package demo -class Test { - fun test() { +internal class Test { + internal fun test() { val i = Integer.valueOf(100) val s = 3 val ss = java.lang.Short.valueOf(s) diff --git a/j2k/testData/fileOrElement/callChainExpression/libraryFieldCall.kt b/j2k/testData/fileOrElement/callChainExpression/libraryFieldCall.kt index 0679ce1b8fb..f8ec85e4c97 100644 --- a/j2k/testData/fileOrElement/callChainExpression/libraryFieldCall.kt +++ b/j2k/testData/fileOrElement/callChainExpression/libraryFieldCall.kt @@ -1,10 +1,10 @@ // ERROR: Property must be initialized or be abstract -object Library { - val ourOut: java.io.PrintStream +internal object Library { + internal val ourOut: java.io.PrintStream } -class User { - fun main() { +internal class User { + internal fun main() { Library.ourOut.print(1) } } \ No newline at end of file diff --git a/j2k/testData/fileOrElement/callChainExpression/libraryMethodCall.kt b/j2k/testData/fileOrElement/callChainExpression/libraryMethodCall.kt index 78c2a848339..341b00902d7 100644 --- a/j2k/testData/fileOrElement/callChainExpression/libraryMethodCall.kt +++ b/j2k/testData/fileOrElement/callChainExpression/libraryMethodCall.kt @@ -1,14 +1,14 @@ -object Library { - fun call() { +internal object Library { + internal fun call() { } - fun getString(): String { + internal fun getString(): String { return "" } } -class User { - fun main() { +internal class User { + internal fun main() { Library.call() Library.getString().isEmpty() } diff --git a/j2k/testData/fileOrElement/callChainExpression/libraryMethodCallFromInstance-settings.kt b/j2k/testData/fileOrElement/callChainExpression/libraryMethodCallFromInstance-settings.kt index 8e0a26dbf3f..4a31418ac07 100644 --- a/j2k/testData/fileOrElement/callChainExpression/libraryMethodCallFromInstance-settings.kt +++ b/j2k/testData/fileOrElement/callChainExpression/libraryMethodCallFromInstance-settings.kt @@ -1,16 +1,16 @@ // !forceNotNullTypes: false // !specifyLocalVariableTypeByDefault: true -class Library { - fun call() { +internal class Library { + internal fun call() { } - fun getString(): String? { + internal fun getString(): String? { return "" } } -class User { - fun main() { +internal class User { + internal fun main() { val lib: Library = Library() lib.call() lib.getString()!!.isEmpty() diff --git a/j2k/testData/fileOrElement/callChainExpression/libraryMethodCallFromInstance.kt b/j2k/testData/fileOrElement/callChainExpression/libraryMethodCallFromInstance.kt index 81ea87620ba..8b51cfef8c9 100644 --- a/j2k/testData/fileOrElement/callChainExpression/libraryMethodCallFromInstance.kt +++ b/j2k/testData/fileOrElement/callChainExpression/libraryMethodCallFromInstance.kt @@ -1,14 +1,14 @@ -class Library { - fun call() { +internal class Library { + internal fun call() { } - fun getString(): String { + internal fun getString(): String { return "" } } -class User { - fun main() { +internal class User { + internal fun main() { val lib = Library() lib.call() lib.getString().isEmpty() diff --git a/j2k/testData/fileOrElement/callChainExpression/libraryStringFieldCall.kt b/j2k/testData/fileOrElement/callChainExpression/libraryStringFieldCall.kt index d123ca88db0..e3e6f49be3c 100644 --- a/j2k/testData/fileOrElement/callChainExpression/libraryStringFieldCall.kt +++ b/j2k/testData/fileOrElement/callChainExpression/libraryStringFieldCall.kt @@ -1,10 +1,10 @@ // ERROR: Property must be initialized or be abstract -class Library { - public val myString: String +internal class Library { + val myString: String } -class User { - fun main() { +internal class User { + internal fun main() { Library().myString.isEmpty() } } \ No newline at end of file diff --git a/j2k/testData/fileOrElement/class/ClassShadowing.kt b/j2k/testData/fileOrElement/class/ClassShadowing.kt index d81cff5139f..01f362f259c 100644 --- a/j2k/testData/fileOrElement/class/ClassShadowing.kt +++ b/j2k/testData/fileOrElement/class/ClassShadowing.kt @@ -1,15 +1,15 @@ package test -public class Short(s: String) { +class Short(s: String) { companion object { - public fun valueOf(value: String): Short { + fun valueOf(value: String): Short { return Short(value) } } } -object Test { - public fun test() { +internal object Test { + fun test() { test.Short.valueOf("1") test.Short.valueOf("1") java.lang.Short.valueOf("1") diff --git a/j2k/testData/fileOrElement/class/abstractClass.kt b/j2k/testData/fileOrElement/class/abstractClass.kt index 3df8819901f..555e7c97658 100644 --- a/j2k/testData/fileOrElement/class/abstractClass.kt +++ b/j2k/testData/fileOrElement/class/abstractClass.kt @@ -1,7 +1,7 @@ -abstract class A { - abstract fun callme() +internal abstract class A { + internal abstract fun callme() - fun callmetoo() { + internal fun callmetoo() { print("This is a concrete method.") } } \ No newline at end of file diff --git a/j2k/testData/fileOrElement/class/abstractClassShape.kt b/j2k/testData/fileOrElement/class/abstractClassShape.kt index d262fa91d72..8c4f6422d3c 100644 --- a/j2k/testData/fileOrElement/class/abstractClassShape.kt +++ b/j2k/testData/fileOrElement/class/abstractClassShape.kt @@ -1,4 +1,4 @@ -abstract class Shape { - public var color: String - public abstract fun area(): Double +internal abstract class Shape { + var color: String + abstract fun area(): Double } \ No newline at end of file diff --git a/j2k/testData/fileOrElement/class/class.kt b/j2k/testData/fileOrElement/class/class.kt index f7e70c7b871..8954620677f 100644 --- a/j2k/testData/fileOrElement/class/class.kt +++ b/j2k/testData/fileOrElement/class/class.kt @@ -1 +1 @@ -class Test \ No newline at end of file +internal class Test \ No newline at end of file diff --git a/j2k/testData/fileOrElement/class/classWithEmptyMethods.kt b/j2k/testData/fileOrElement/class/classWithEmptyMethods.kt index 28e77e2b4dd..f58c67f6561 100644 --- a/j2k/testData/fileOrElement/class/classWithEmptyMethods.kt +++ b/j2k/testData/fileOrElement/class/classWithEmptyMethods.kt @@ -1,10 +1,10 @@ -class T { - fun main() { +internal class T { + internal fun main() { } - fun i(): Int { + internal fun i(): Int { } - fun s(): String { + internal fun s(): String { } } \ No newline at end of file diff --git a/j2k/testData/fileOrElement/class/classWithFields.kt b/j2k/testData/fileOrElement/class/classWithFields.kt index 6b3ba3b8191..21b0019262b 100644 --- a/j2k/testData/fileOrElement/class/classWithFields.kt +++ b/j2k/testData/fileOrElement/class/classWithFields.kt @@ -1,4 +1,4 @@ -class T { - var a = "abc" - var b = 10 +internal class T { + internal var a = "abc" + internal var b = 10 } \ No newline at end of file diff --git a/j2k/testData/fileOrElement/class/classWithMultiplyFields.kt b/j2k/testData/fileOrElement/class/classWithMultiplyFields.kt index e7a76502a02..1dca8d30706 100644 --- a/j2k/testData/fileOrElement/class/classWithMultiplyFields.kt +++ b/j2k/testData/fileOrElement/class/classWithMultiplyFields.kt @@ -1,5 +1,5 @@ -class T { - var a: String - var b: String - var c = "abc" +internal class T { + internal var a: String + internal var b: String + internal var c = "abc" } \ No newline at end of file diff --git a/j2k/testData/fileOrElement/class/emptyClass.kt b/j2k/testData/fileOrElement/class/emptyClass.kt index fb7337ede5b..37804607f77 100644 --- a/j2k/testData/fileOrElement/class/emptyClass.kt +++ b/j2k/testData/fileOrElement/class/emptyClass.kt @@ -1 +1 @@ -class A \ No newline at end of file +internal class A \ No newline at end of file diff --git a/j2k/testData/fileOrElement/class/extendsOneClassAndImplementsOneInterface.kt b/j2k/testData/fileOrElement/class/extendsOneClassAndImplementsOneInterface.kt index a2bdf3b6fcc..a06efb21b5f 100644 --- a/j2k/testData/fileOrElement/class/extendsOneClassAndImplementsOneInterface.kt +++ b/j2k/testData/fileOrElement/class/extendsOneClassAndImplementsOneInterface.kt @@ -1 +1 @@ -class A : Base(), I \ No newline at end of file +internal class A : Base(), I \ No newline at end of file diff --git a/j2k/testData/fileOrElement/class/extendsOneClassAndImplementsSeveralInterfaces.kt b/j2k/testData/fileOrElement/class/extendsOneClassAndImplementsSeveralInterfaces.kt index ba4daad7631..6e0b895a30c 100644 --- a/j2k/testData/fileOrElement/class/extendsOneClassAndImplementsSeveralInterfaces.kt +++ b/j2k/testData/fileOrElement/class/extendsOneClassAndImplementsSeveralInterfaces.kt @@ -1 +1 @@ -class A : Base(), I0, I1, I2 \ No newline at end of file +internal class A : Base(), I0, I1, I2 \ No newline at end of file diff --git a/j2k/testData/fileOrElement/class/finalClass.kt b/j2k/testData/fileOrElement/class/finalClass.kt index f7e70c7b871..8954620677f 100644 --- a/j2k/testData/fileOrElement/class/finalClass.kt +++ b/j2k/testData/fileOrElement/class/finalClass.kt @@ -1 +1 @@ -class Test \ No newline at end of file +internal class Test \ No newline at end of file diff --git a/j2k/testData/fileOrElement/class/genericClass.kt b/j2k/testData/fileOrElement/class/genericClass.kt index c09b8199b10..bb4c2ab2ea3 100644 --- a/j2k/testData/fileOrElement/class/genericClass.kt +++ b/j2k/testData/fileOrElement/class/genericClass.kt @@ -1 +1 @@ -class Entry \ No newline at end of file +internal class Entry \ No newline at end of file diff --git a/j2k/testData/fileOrElement/class/innerClassInInterface.kt b/j2k/testData/fileOrElement/class/innerClassInInterface.kt index 4d4f2dfea6c..a211222293e 100644 --- a/j2k/testData/fileOrElement/class/innerClassInInterface.kt +++ b/j2k/testData/fileOrElement/class/innerClassInInterface.kt @@ -1,3 +1,3 @@ -interface A { - public class B +internal interface A { + class B } \ No newline at end of file diff --git a/j2k/testData/fileOrElement/class/innerEmptyClass.kt b/j2k/testData/fileOrElement/class/innerEmptyClass.kt index d4fad9808f7..4a27305c578 100644 --- a/j2k/testData/fileOrElement/class/innerEmptyClass.kt +++ b/j2k/testData/fileOrElement/class/innerEmptyClass.kt @@ -1,3 +1,3 @@ -class A { - inner class B +internal class A { + internal inner class B } \ No newline at end of file diff --git a/j2k/testData/fileOrElement/class/innerEnum.kt b/j2k/testData/fileOrElement/class/innerEnum.kt index 3be13d7e019..25ba8f727a3 100644 --- a/j2k/testData/fileOrElement/class/innerEnum.kt +++ b/j2k/testData/fileOrElement/class/innerEnum.kt @@ -1,5 +1,5 @@ -class A { - enum class E { +internal class A { + internal enum class E { A, B, C diff --git a/j2k/testData/fileOrElement/class/innerInterface.kt b/j2k/testData/fileOrElement/class/innerInterface.kt index 74236cf4865..68e9b547aa7 100644 --- a/j2k/testData/fileOrElement/class/innerInterface.kt +++ b/j2k/testData/fileOrElement/class/innerInterface.kt @@ -1,3 +1,3 @@ -class A { - interface I +internal class A { + internal interface I } \ No newline at end of file diff --git a/j2k/testData/fileOrElement/class/innerStaticClass.kt b/j2k/testData/fileOrElement/class/innerStaticClass.kt index 4355eab3bcb..a8f95f15f95 100644 --- a/j2k/testData/fileOrElement/class/innerStaticClass.kt +++ b/j2k/testData/fileOrElement/class/innerStaticClass.kt @@ -1,3 +1,3 @@ -class S { - class Inner +internal class S { + internal class Inner } \ No newline at end of file diff --git a/j2k/testData/fileOrElement/class/internalClass.kt b/j2k/testData/fileOrElement/class/internalClass.kt index f7e70c7b871..8954620677f 100644 --- a/j2k/testData/fileOrElement/class/internalClass.kt +++ b/j2k/testData/fileOrElement/class/internalClass.kt @@ -1 +1 @@ -class Test \ No newline at end of file +internal class Test \ No newline at end of file diff --git a/j2k/testData/fileOrElement/class/kt-639.kt b/j2k/testData/fileOrElement/class/kt-639.kt index be66bbb2d5a..cf4bef16bc3 100644 --- a/j2k/testData/fileOrElement/class/kt-639.kt +++ b/j2k/testData/fileOrElement/class/kt-639.kt @@ -4,16 +4,16 @@ package demo import java.util.HashMap -class Test { - constructor() { +internal class Test { + internal constructor() { } - constructor(s: String) { + internal constructor(s: String) { } } -class User { - fun main() { +internal class User { + internal fun main() { val m = HashMap(1) val m2 = HashMap(10) diff --git a/j2k/testData/fileOrElement/class/notUtilityClass.kt b/j2k/testData/fileOrElement/class/notUtilityClass.kt index a8aa2f0c803..e792e26c7b4 100644 --- a/j2k/testData/fileOrElement/class/notUtilityClass.kt +++ b/j2k/testData/fileOrElement/class/notUtilityClass.kt @@ -1,10 +1,10 @@ -open class Base { +internal open class Base { companion object { - public val CONSTANT: Int = 10 + val CONSTANT: Int = 10 } } -class Derived : Base() { - fun foo() { +internal class Derived : Base() { + internal fun foo() { } } diff --git a/j2k/testData/fileOrElement/class/oneStaticFieldOneNonStatic.kt b/j2k/testData/fileOrElement/class/oneStaticFieldOneNonStatic.kt index 3ff347c05cb..88228e93f01 100644 --- a/j2k/testData/fileOrElement/class/oneStaticFieldOneNonStatic.kt +++ b/j2k/testData/fileOrElement/class/oneStaticFieldOneNonStatic.kt @@ -1,9 +1,9 @@ -class S { - fun sB(): Boolean { +internal class S { + internal fun sB(): Boolean { return true } companion object { - var myI = 10 + internal var myI = 10 } } \ No newline at end of file diff --git a/j2k/testData/fileOrElement/class/oneStaticMethod.kt b/j2k/testData/fileOrElement/class/oneStaticMethod.kt index 50a2ad352db..669db1aef11 100644 --- a/j2k/testData/fileOrElement/class/oneStaticMethod.kt +++ b/j2k/testData/fileOrElement/class/oneStaticMethod.kt @@ -1,5 +1,5 @@ -object S { - fun staticF(): Boolean { +internal object S { + internal fun staticF(): Boolean { return true } } \ No newline at end of file diff --git a/j2k/testData/fileOrElement/class/oneStaticMethodOneNonStatic.kt b/j2k/testData/fileOrElement/class/oneStaticMethodOneNonStatic.kt index c8902c8ef92..ca3a268a131 100644 --- a/j2k/testData/fileOrElement/class/oneStaticMethodOneNonStatic.kt +++ b/j2k/testData/fileOrElement/class/oneStaticMethodOneNonStatic.kt @@ -1,10 +1,10 @@ -class S { - fun sB(): Boolean { +internal class S { + internal fun sB(): Boolean { return true } companion object { - fun sI(): Int { + internal fun sI(): Int { return 1 } } diff --git a/j2k/testData/fileOrElement/class/privateInit.kt b/j2k/testData/fileOrElement/class/privateInit.kt index 1f2043f1c62..6c44c8963eb 100644 --- a/j2k/testData/fileOrElement/class/privateInit.kt +++ b/j2k/testData/fileOrElement/class/privateInit.kt @@ -1,4 +1,4 @@ -public class MyClass { +class MyClass { private fun init(arg1: Int, arg2: Int, arg3: Int) { } } \ No newline at end of file diff --git a/j2k/testData/fileOrElement/class/publicClass.kt b/j2k/testData/fileOrElement/class/publicClass.kt index 687781bece7..f7e70c7b871 100644 --- a/j2k/testData/fileOrElement/class/publicClass.kt +++ b/j2k/testData/fileOrElement/class/publicClass.kt @@ -1 +1 @@ -public class Test \ No newline at end of file +class Test \ No newline at end of file diff --git a/j2k/testData/fileOrElement/class/simpleInheritance.kt b/j2k/testData/fileOrElement/class/simpleInheritance.kt index d1599597ecd..5ce62bd2699 100644 --- a/j2k/testData/fileOrElement/class/simpleInheritance.kt +++ b/j2k/testData/fileOrElement/class/simpleInheritance.kt @@ -1 +1 @@ -class A : Base() \ No newline at end of file +internal class A : Base() \ No newline at end of file diff --git a/j2k/testData/fileOrElement/class/twoStaticMethod.kt b/j2k/testData/fileOrElement/class/twoStaticMethod.kt index 23096273c0d..115e136cbcf 100644 --- a/j2k/testData/fileOrElement/class/twoStaticMethod.kt +++ b/j2k/testData/fileOrElement/class/twoStaticMethod.kt @@ -1,9 +1,9 @@ -object S { - fun sB(): Boolean { +internal object S { + internal fun sB(): Boolean { return true } - fun sI(): Int { + internal fun sI(): Int { return 1 } } \ No newline at end of file diff --git a/j2k/testData/fileOrElement/class/utilityClass1.kt b/j2k/testData/fileOrElement/class/utilityClass1.kt index cd8917e0263..424d737e919 100644 --- a/j2k/testData/fileOrElement/class/utilityClass1.kt +++ b/j2k/testData/fileOrElement/class/utilityClass1.kt @@ -1,9 +1,9 @@ -object Util { - public fun util1() { +internal object Util { + fun util1() { } - public fun util2() { + fun util2() { } - public val CONSTANT: Int = 10 + val CONSTANT: Int = 10 } diff --git a/j2k/testData/fileOrElement/class/utilityClass2.kt b/j2k/testData/fileOrElement/class/utilityClass2.kt index ba6d3c5cd66..ff81bea9ed1 100644 --- a/j2k/testData/fileOrElement/class/utilityClass2.kt +++ b/j2k/testData/fileOrElement/class/utilityClass2.kt @@ -1,10 +1,10 @@ -object Util { +internal object Util { - public fun util1() { + fun util1() { } - public fun util2() { + fun util2() { } - public val CONSTANT: Int = 10 + val CONSTANT: Int = 10 } diff --git a/j2k/testData/fileOrElement/class/utilityClass3.kt b/j2k/testData/fileOrElement/class/utilityClass3.kt index cd8917e0263..424d737e919 100644 --- a/j2k/testData/fileOrElement/class/utilityClass3.kt +++ b/j2k/testData/fileOrElement/class/utilityClass3.kt @@ -1,9 +1,9 @@ -object Util { - public fun util1() { +internal object Util { + fun util1() { } - public fun util2() { + fun util2() { } - public val CONSTANT: Int = 10 + val CONSTANT: Int = 10 } diff --git a/j2k/testData/fileOrElement/classExpression/primitivesAndArrays.kt b/j2k/testData/fileOrElement/classExpression/primitivesAndArrays.kt index 19ddb553d44..9c937a2cf59 100644 --- a/j2k/testData/fileOrElement/classExpression/primitivesAndArrays.kt +++ b/j2k/testData/fileOrElement/classExpression/primitivesAndArrays.kt @@ -1,5 +1,5 @@ -public object A { - JvmStatic public fun main(args: Array) { +object A { + JvmStatic fun main(args: Array) { println(Void.TYPE) println(Integer.TYPE) println(java.lang.Double.TYPE) diff --git a/j2k/testData/fileOrElement/codeSimplifications/IfNullReturnToElvis.kt b/j2k/testData/fileOrElement/codeSimplifications/IfNullReturnToElvis.kt index 30e6ebdbfdf..f78c45c4b93 100644 --- a/j2k/testData/fileOrElement/codeSimplifications/IfNullReturnToElvis.kt +++ b/j2k/testData/fileOrElement/codeSimplifications/IfNullReturnToElvis.kt @@ -1,7 +1,7 @@ import java.io.File -class C { - fun foo(file: File): String { +internal class C { + internal fun foo(file: File): String { val parent = file.parentFile ?: return "" return parent.name } diff --git a/j2k/testData/fileOrElement/codeSimplifications/IfToElvis.kt b/j2k/testData/fileOrElement/codeSimplifications/IfToElvis.kt index 5472b8dc6fb..81c38cf7b29 100644 --- a/j2k/testData/fileOrElement/codeSimplifications/IfToElvis.kt +++ b/j2k/testData/fileOrElement/codeSimplifications/IfToElvis.kt @@ -1,5 +1,5 @@ -class C { - fun foo(s: String?): String { +internal class C { + internal fun foo(s: String?): String { return s ?: "" } } diff --git a/j2k/testData/fileOrElement/codeSimplifications/IfToSafeCall.kt b/j2k/testData/fileOrElement/codeSimplifications/IfToSafeCall.kt index a1ce0a99c3e..d4c54952984 100644 --- a/j2k/testData/fileOrElement/codeSimplifications/IfToSafeCall.kt +++ b/j2k/testData/fileOrElement/codeSimplifications/IfToSafeCall.kt @@ -1,7 +1,7 @@ import java.io.File -class C { - fun foo(file: File?) { +internal class C { + internal fun foo(file: File?) { file?.delete() } } diff --git a/j2k/testData/fileOrElement/codeSimplifications/NotIs.kt b/j2k/testData/fileOrElement/codeSimplifications/NotIs.kt index 6f513993628..014ca39e7fb 100644 --- a/j2k/testData/fileOrElement/codeSimplifications/NotIs.kt +++ b/j2k/testData/fileOrElement/codeSimplifications/NotIs.kt @@ -1,5 +1,5 @@ -class C { - fun foo(o: Any) { +internal class C { + internal fun foo(o: Any) { if (o !is String) return println("String") } diff --git a/j2k/testData/fileOrElement/codeSimplifications/RedundantTypeCast.kt b/j2k/testData/fileOrElement/codeSimplifications/RedundantTypeCast.kt index 51e2be44fec..03bb4b6c517 100644 --- a/j2k/testData/fileOrElement/codeSimplifications/RedundantTypeCast.kt +++ b/j2k/testData/fileOrElement/codeSimplifications/RedundantTypeCast.kt @@ -1,5 +1,5 @@ -class C { - fun foo(o: Any) { +internal class C { + internal fun foo(o: Any) { if (o is String) { val l = o.length() } diff --git a/j2k/testData/fileOrElement/codeSimplifications/RedundantTypeCastAndInline.kt b/j2k/testData/fileOrElement/codeSimplifications/RedundantTypeCastAndInline.kt index 0ca5725938a..8db04db9969 100644 --- a/j2k/testData/fileOrElement/codeSimplifications/RedundantTypeCastAndInline.kt +++ b/j2k/testData/fileOrElement/codeSimplifications/RedundantTypeCastAndInline.kt @@ -1,5 +1,5 @@ -class C { - fun foo(o: Any) { +internal class C { + internal fun foo(o: Any) { if (o is String) { val l = o.length() val substring = o.substring(l - 2) diff --git a/j2k/testData/fileOrElement/codeSimplifications/SyntheticExtensionPropertyAccess.kt b/j2k/testData/fileOrElement/codeSimplifications/SyntheticExtensionPropertyAccess.kt index ce07aff8581..dbde27a2c79 100644 --- a/j2k/testData/fileOrElement/codeSimplifications/SyntheticExtensionPropertyAccess.kt +++ b/j2k/testData/fileOrElement/codeSimplifications/SyntheticExtensionPropertyAccess.kt @@ -1,7 +1,7 @@ import javaApi.Base -class C : Base() { - public fun f() { +internal class C : Base() { + fun f() { val other = Base() val value = other.property + property other.property = 1 diff --git a/j2k/testData/fileOrElement/comments/comments.kt b/j2k/testData/fileOrElement/comments/comments.kt index 66fc696c282..17b8227846c 100644 --- a/j2k/testData/fileOrElement/comments/comments.kt +++ b/j2k/testData/fileOrElement/comments/comments.kt @@ -7,8 +7,8 @@ package foo import java.util.ArrayList // we need ArrayList // let's declare a class: -class A /* just a sample name*/ : Runnable /* let's implement Runnable */ { - fun foo/* again a sample name */(p: Int /* parameter p */, c: Char /* parameter c */) { +internal class A /* just a sample name*/ : Runnable /* let's implement Runnable */ { + internal fun foo/* again a sample name */(p: Int /* parameter p */, c: Char /* parameter c */) { // let's print something: println("1") // print 1 println("2") // print 2 diff --git a/j2k/testData/fileOrElement/comments/comments2.kt b/j2k/testData/fileOrElement/comments/comments2.kt index 6f8dca67001..14e002b11fe 100644 --- a/j2k/testData/fileOrElement/comments/comments2.kt +++ b/j2k/testData/fileOrElement/comments/comments2.kt @@ -2,20 +2,20 @@ // ERROR: A 'return' expression required in a function with a block body ('{...}') package foo -class A { - fun /* nothing to return */ foo(/* no parameters at all */) { +internal class A { + internal fun /* nothing to return */ foo(/* no parameters at all */) { // let declare a variable // with 2 comments before val /*int*/ a /* it's a */ = 2 /* it's 2 */ + 1 /* it's 1 */ // variable a declared } // end of foo - fun /* we return int*/ foo(/*int*/ p: Int/* parameter p */): Int { + internal fun /* we return int*/ foo(/*int*/ p: Int/* parameter p */): Int { /* body is empty */ } private /*it's private*/ val field = 0 - public /*it's public*/ fun foo(s: String): Char { + /*it's public*/ fun foo(s: String): Char { } protected /*it's protected*/ fun foo(c: Char) { @@ -23,6 +23,6 @@ class A { companion object { - public /*it's public*//*and static*//*and final*/ val C: Int = 1 + /*it's public*//*and static*//*and final*/ val C: Int = 1 } } \ No newline at end of file diff --git a/j2k/testData/fileOrElement/comments/commentsForConstructors.java b/j2k/testData/fileOrElement/comments/commentsForConstructors.java index 00afdebc0ef..00e5dc30b39 100644 --- a/j2k/testData/fileOrElement/comments/commentsForConstructors.java +++ b/j2k/testData/fileOrElement/comments/commentsForConstructors.java @@ -21,7 +21,7 @@ class B { private int x; // this constructor will disappear - B(int x) { + public B(int x) { this.x = x; } // end of constructor body diff --git a/j2k/testData/fileOrElement/comments/commentsForConstructors.kt b/j2k/testData/fileOrElement/comments/commentsForConstructors.kt index 51ab1a88b15..92f14dcd6b6 100644 --- a/j2k/testData/fileOrElement/comments/commentsForConstructors.kt +++ b/j2k/testData/fileOrElement/comments/commentsForConstructors.kt @@ -1,5 +1,5 @@ -class A// this is a primary constructor -JvmOverloads constructor(p: Int = 1) { +internal class A// this is a primary constructor +JvmOverloads internal constructor(p: Int = 1) { private val v: Int init { @@ -7,15 +7,15 @@ JvmOverloads constructor(p: Int = 1) { } // end of primary constructor body // this is a secondary constructor 2 - constructor(s: String) : this(s.length()) { + internal constructor(s: String) : this(s.length()) { } // end of secondary constructor 2 body }// this is a secondary constructor 1 // end of secondary constructor 1 body -class B// this constructor will disappear +internal class B// this constructor will disappear (private val x: Int) // end of constructor body { - fun foo() { + internal fun foo() { } } \ No newline at end of file diff --git a/j2k/testData/fileOrElement/comments/fieldWithEndOfLineComment.kt b/j2k/testData/fileOrElement/comments/fieldWithEndOfLineComment.kt index 6bd72ab934a..f6f064b828e 100644 --- a/j2k/testData/fileOrElement/comments/fieldWithEndOfLineComment.kt +++ b/j2k/testData/fileOrElement/comments/fieldWithEndOfLineComment.kt @@ -1,3 +1,3 @@ -class A { +internal class A { private val isOpen = true // ideally should be atomic boolean } \ No newline at end of file diff --git a/j2k/testData/fileOrElement/comments/fieldsInitializedFromParams.kt b/j2k/testData/fileOrElement/comments/fieldsInitializedFromParams.kt index f8654e83f46..c2fb444e878 100644 --- a/j2k/testData/fileOrElement/comments/fieldsInitializedFromParams.kt +++ b/j2k/testData/fileOrElement/comments/fieldsInitializedFromParams.kt @@ -1,6 +1,6 @@ -class C(private val p1: Int /* parameter p1 */ // field p1 - , - /** - * Field myP2 - */ - private val myP2: Int, /* Field p3 */ public var p3: Int) +internal class C(private val p1: Int /* parameter p1 */ // field p1 + , + /** + * Field myP2 + */ + private val myP2: Int, /* Field p3 */ var p3: Int) diff --git a/j2k/testData/fileOrElement/conditionalExpression/multiline.kt b/j2k/testData/fileOrElement/conditionalExpression/multiline.kt index 2f5f828b244..b06f56af97d 100644 --- a/j2k/testData/fileOrElement/conditionalExpression/multiline.kt +++ b/j2k/testData/fileOrElement/conditionalExpression/multiline.kt @@ -1,4 +1,4 @@ -fun foo(b: Boolean) { +internal fun foo(b: Boolean) { if (b) println("true") else diff --git a/j2k/testData/fileOrElement/constructors/allCallsPrimary.kt b/j2k/testData/fileOrElement/constructors/allCallsPrimary.kt index f084ec1197d..ccf4d8345a9 100644 --- a/j2k/testData/fileOrElement/constructors/allCallsPrimary.kt +++ b/j2k/testData/fileOrElement/constructors/allCallsPrimary.kt @@ -1,9 +1,9 @@ package pack -class C JvmOverloads constructor(arg1: Int, arg2: Int = 0, arg3: Int = 0) +internal class C JvmOverloads internal constructor(arg1: Int, arg2: Int = 0, arg3: Int = 0) -public object User { - public fun main() { +object User { + fun main() { val c1 = C(100, 100, 100) val c2 = C(100, 100) val c3 = C(100) diff --git a/j2k/testData/fileOrElement/constructors/allCallsPrimary2.kt b/j2k/testData/fileOrElement/constructors/allCallsPrimary2.kt index c0578f608fa..68673b4f397 100644 --- a/j2k/testData/fileOrElement/constructors/allCallsPrimary2.kt +++ b/j2k/testData/fileOrElement/constructors/allCallsPrimary2.kt @@ -1,13 +1,13 @@ -class C(val myArg1: Int) { - var myArg2: Int = 0 - var myArg3: Int = 0 +internal class C internal constructor(internal val myArg1: Int) { + internal var myArg2: Int = 0 + internal var myArg3: Int = 0 - constructor(arg1: Int, arg2: Int, arg3: Int) : this(arg1) { + internal constructor(arg1: Int, arg2: Int, arg3: Int) : this(arg1) { myArg2 = arg2 myArg3 = arg3 } - constructor(arg1: Int, arg2: Int) : this(arg1) { + internal constructor(arg1: Int, arg2: Int) : this(arg1) { myArg2 = arg2 myArg3 = 0 } @@ -18,8 +18,8 @@ class C(val myArg1: Int) { } } -public object User { - public fun main() { +object User { + fun main() { val c1 = C(100, 100, 100) val c2 = C(100, 100) val c3 = C(100) diff --git a/j2k/testData/fileOrElement/constructors/artificialPrimary.kt b/j2k/testData/fileOrElement/constructors/artificialPrimary.kt index 07c8e8c69b4..bd1ce6350ea 100644 --- a/j2k/testData/fileOrElement/constructors/artificialPrimary.kt +++ b/j2k/testData/fileOrElement/constructors/artificialPrimary.kt @@ -1,14 +1,14 @@ // ERROR: Property must be initialized or be abstract -public class Test { +class Test { private val s: String - var b: Boolean = false - var d: Double = 0.toDouble() + internal var b: Boolean = false + internal var d: Double = 0.toDouble() - public constructor() { + constructor() { b = true } - public constructor(s: String) { + constructor(s: String) { this.s = s } } diff --git a/j2k/testData/fileOrElement/constructors/chain.kt b/j2k/testData/fileOrElement/constructors/chain.kt index 2d8e83d690f..47c66dcdb14 100644 --- a/j2k/testData/fileOrElement/constructors/chain.kt +++ b/j2k/testData/fileOrElement/constructors/chain.kt @@ -1,16 +1,16 @@ -class C(arg1: Int, arg2: Int, arg3: Int) { +internal class C internal constructor(arg1: Int, arg2: Int, arg3: Int) { - constructor(arg1: Int, arg2: Int) : this(arg1, arg2, 0) { + internal constructor(arg1: Int, arg2: Int) : this(arg1, arg2, 0) { println() } - constructor(arg1: Int) : this(arg1, 0) { + internal constructor(arg1: Int) : this(arg1, 0) { println() } } -public object User { - public fun main() { +object User { + fun main() { val c1 = C(1, 2, 3) val c2 = C(5, 6) val c3 = C(7) diff --git a/j2k/testData/fileOrElement/constructors/constructorAnnotations.kt b/j2k/testData/fileOrElement/constructors/constructorAnnotations.kt index 214b599acd7..a6edb85fae5 100644 --- a/j2k/testData/fileOrElement/constructors/constructorAnnotations.kt +++ b/j2k/testData/fileOrElement/constructors/constructorAnnotations.kt @@ -1,16 +1,16 @@ import javaApi.Anon5 -class A +internal class A Anon5(10) constructor(private val a: Int, private val b: Int) { Deprecated("") // this constructor will not be replaced by default parameter value in primary because of this annotation - public constructor(a: Int) : this(a, 1) { + constructor(a: Int) : this(a, 1) { } } -class B Anon5(11) +internal class B Anon5(11) constructor() -class C Anon5(12) +internal class C Anon5(12) private constructor() \ No newline at end of file diff --git a/j2k/testData/fileOrElement/constructors/customerBuilder.kt b/j2k/testData/fileOrElement/constructors/customerBuilder.kt index fcad06b3967..7eb8bf4b730 100644 --- a/j2k/testData/fileOrElement/constructors/customerBuilder.kt +++ b/j2k/testData/fileOrElement/constructors/customerBuilder.kt @@ -1,6 +1,6 @@ package org.test.customer -class Customer(public val firstName: String, public val lastName: String) { +internal class Customer internal constructor(val firstName: String, val lastName: String) { init { doSmthBefore() @@ -14,27 +14,27 @@ class Customer(public val firstName: String, public val lastName: String) { } } -class CustomerBuilder { - public var _firstName: String = "Homer" - public var _lastName: String = "Simpson" +internal class CustomerBuilder { + var _firstName: String = "Homer" + var _lastName: String = "Simpson" - public fun WithFirstName(firstName: String): CustomerBuilder { + fun WithFirstName(firstName: String): CustomerBuilder { _firstName = firstName return this } - public fun WithLastName(lastName: String): CustomerBuilder { + fun WithLastName(lastName: String): CustomerBuilder { _lastName = lastName return this } - public fun Build(): Customer { + fun Build(): Customer { return Customer(_firstName, _lastName) } } -public object User { - public fun main() { +object User { + fun main() { val customer = CustomerBuilder().WithFirstName("Homer").WithLastName("Simpson").Build() println(customer.firstName) println(customer.lastName) diff --git a/j2k/testData/fileOrElement/constructors/fieldsInitializedFromParams1.kt b/j2k/testData/fileOrElement/constructors/fieldsInitializedFromParams1.kt index f95f76bfb79..3e1266c4caa 100644 --- a/j2k/testData/fileOrElement/constructors/fieldsInitializedFromParams1.kt +++ b/j2k/testData/fileOrElement/constructors/fieldsInitializedFromParams1.kt @@ -1 +1 @@ -class C(private val p1: Int, private val myP2: Int, public var p3: Int) \ No newline at end of file +internal class C(private val p1: Int, private val myP2: Int, var p3: Int) diff --git a/j2k/testData/fileOrElement/constructors/fieldsInitializedFromParams2.kt b/j2k/testData/fileOrElement/constructors/fieldsInitializedFromParams2.kt index 85afec15675..c5d8f3ae4a9 100644 --- a/j2k/testData/fileOrElement/constructors/fieldsInitializedFromParams2.kt +++ b/j2k/testData/fileOrElement/constructors/fieldsInitializedFromParams2.kt @@ -1,4 +1,4 @@ -class C(private val field: Int) { +internal class C(private val field: Int) { init { println(field) diff --git a/j2k/testData/fileOrElement/constructors/fieldsInitializedFromParams3.kt b/j2k/testData/fileOrElement/constructors/fieldsInitializedFromParams3.kt index 8667c94e3ee..d07876b0ec4 100644 --- a/j2k/testData/fileOrElement/constructors/fieldsInitializedFromParams3.kt +++ b/j2k/testData/fileOrElement/constructors/fieldsInitializedFromParams3.kt @@ -1,4 +1,4 @@ -class C(p: Int) { +internal class C(p: Int) { private val p: Int init { diff --git a/j2k/testData/fileOrElement/constructors/fieldsInitializedFromParams4.kt b/j2k/testData/fileOrElement/constructors/fieldsInitializedFromParams4.kt index c9106dd9f28..74a3ea7124f 100644 --- a/j2k/testData/fileOrElement/constructors/fieldsInitializedFromParams4.kt +++ b/j2k/testData/fileOrElement/constructors/fieldsInitializedFromParams4.kt @@ -1,5 +1,5 @@ -class C(p: Int, c: C) { - public var p: Int = 0 +internal class C(p: Int, c: C) { + var p: Int = 0 init { c.p = p diff --git a/j2k/testData/fileOrElement/constructors/fieldsInitializedFromParams5.kt b/j2k/testData/fileOrElement/constructors/fieldsInitializedFromParams5.kt index fd7c4fdf957..a0dbf10bd5d 100644 --- a/j2k/testData/fileOrElement/constructors/fieldsInitializedFromParams5.kt +++ b/j2k/testData/fileOrElement/constructors/fieldsInitializedFromParams5.kt @@ -1,5 +1,5 @@ -class C(p: Int) { - public var p: Int = 0 +internal class C(p: Int) { + var p: Int = 0 init { this.p = 0 diff --git a/j2k/testData/fileOrElement/constructors/fieldsInitializedFromParams6.kt b/j2k/testData/fileOrElement/constructors/fieldsInitializedFromParams6.kt index c36238cca74..70b5c3efde6 100644 --- a/j2k/testData/fileOrElement/constructors/fieldsInitializedFromParams6.kt +++ b/j2k/testData/fileOrElement/constructors/fieldsInitializedFromParams6.kt @@ -1,5 +1,5 @@ -class C(x: String) { - public var x: Any +internal class C(x: String) { + var x: Any init { this.x = x diff --git a/j2k/testData/fileOrElement/constructors/fieldsInitializedFromParams7.kt b/j2k/testData/fileOrElement/constructors/fieldsInitializedFromParams7.kt index 7c85b86d000..685e82c55c2 100644 --- a/j2k/testData/fileOrElement/constructors/fieldsInitializedFromParams7.kt +++ b/j2k/testData/fileOrElement/constructors/fieldsInitializedFromParams7.kt @@ -1,6 +1,6 @@ // ERROR: Property must be initialized or be abstract -class C(x: Any, b: Boolean) { - public var x: Any +internal class C(x: Any, b: Boolean) { + var x: Any init { if (b) { diff --git a/j2k/testData/fileOrElement/constructors/fieldsInitializedFromParams8.kt b/j2k/testData/fileOrElement/constructors/fieldsInitializedFromParams8.kt index ae4ba352bb6..fd179e70e28 100644 --- a/j2k/testData/fileOrElement/constructors/fieldsInitializedFromParams8.kt +++ b/j2k/testData/fileOrElement/constructors/fieldsInitializedFromParams8.kt @@ -1,3 +1,3 @@ -open class Base(o: Any, l: Int) +internal open class Base internal constructor(o: Any, l: Int) -class C(private val string: String) : Base(string, string.length()) \ No newline at end of file +internal class C(private val string: String) : Base(string, string.length()) diff --git a/j2k/testData/fileOrElement/constructors/fieldsInitializedFromParams9.kt b/j2k/testData/fileOrElement/constructors/fieldsInitializedFromParams9.kt index d67b110520b..a8b16f29385 100644 --- a/j2k/testData/fileOrElement/constructors/fieldsInitializedFromParams9.kt +++ b/j2k/testData/fileOrElement/constructors/fieldsInitializedFromParams9.kt @@ -1 +1 @@ -class C JvmOverloads constructor(private val string: String, a: Int = string.length()) +internal class C JvmOverloads constructor(private val string: String, a: Int = string.length()) diff --git a/j2k/testData/fileOrElement/constructors/fieldsInitializedFromParamsAnnotations.kt b/j2k/testData/fileOrElement/constructors/fieldsInitializedFromParamsAnnotations.kt index 1b5dd6ad989..877bb59b7a7 100644 --- a/j2k/testData/fileOrElement/constructors/fieldsInitializedFromParamsAnnotations.kt +++ b/j2k/testData/fileOrElement/constructors/fieldsInitializedFromParamsAnnotations.kt @@ -1,3 +1,3 @@ import java.lang.SuppressWarnings -class C(Deprecated("") private val p1: Int, Deprecated("") private val myP2: Int, Deprecated("") SuppressWarnings("x") public var p3: Int) +internal class C(Deprecated("") private val p1: Int, Deprecated("") private val myP2: Int, Deprecated("") SuppressWarnings("x") var p3: Int) diff --git a/j2k/testData/fileOrElement/constructors/genericIdentifier.kt b/j2k/testData/fileOrElement/constructors/genericIdentifier.kt index 3c3d2c8bde3..9a45b297ad9 100644 --- a/j2k/testData/fileOrElement/constructors/genericIdentifier.kt +++ b/j2k/testData/fileOrElement/constructors/genericIdentifier.kt @@ -1,27 +1,27 @@ // ERROR: Property must be initialized or be abstract -public class Identifier { - public val name: T +class Identifier { + val name: T private val myHasDollar: Boolean private var myNullable = true - public constructor(name: T) { + constructor(name: T) { this.name = name } - public constructor(name: T, isNullable: Boolean) { + constructor(name: T, isNullable: Boolean) { this.name = name myNullable = isNullable } - public constructor(name: T, hasDollar: Boolean, isNullable: Boolean) { + constructor(name: T, hasDollar: Boolean, isNullable: Boolean) { this.name = name myHasDollar = hasDollar myNullable = isNullable } } -public object User { - public fun main() { +object User { + fun main() { val i1 = Identifier("name", false, true) val i2 = Identifier("name", false) val i3 = Identifier("name") diff --git a/j2k/testData/fileOrElement/constructors/identifier.kt b/j2k/testData/fileOrElement/constructors/identifier.kt index 5c666187ffd..3b9b512fa20 100644 --- a/j2k/testData/fileOrElement/constructors/identifier.kt +++ b/j2k/testData/fileOrElement/constructors/identifier.kt @@ -1,27 +1,27 @@ // ERROR: Property must be initialized or be abstract -public class Identifier { - public val name: String +class Identifier { + val name: String private val myHasDollar: Boolean private var myNullable = true - public constructor(name: String) { + constructor(name: String) { this.name = name } - public constructor(name: String, isNullable: Boolean) { + constructor(name: String, isNullable: Boolean) { this.name = name myNullable = isNullable } - public constructor(name: String, hasDollar: Boolean, isNullable: Boolean) { + constructor(name: String, hasDollar: Boolean, isNullable: Boolean) { this.name = name myHasDollar = hasDollar myNullable = isNullable } } -public object User { - public fun main() { +object User { + fun main() { val i1 = Identifier("name", false, true) val i2 = Identifier("name", false) val i3 = Identifier("name") diff --git a/j2k/testData/fileOrElement/constructors/lineBreaksBetweenParameters.kt b/j2k/testData/fileOrElement/constructors/lineBreaksBetweenParameters.kt index 76d12031d20..6cc0c952a08 100644 --- a/j2k/testData/fileOrElement/constructors/lineBreaksBetweenParameters.kt +++ b/j2k/testData/fileOrElement/constructors/lineBreaksBetweenParameters.kt @@ -1,12 +1,12 @@ -class C1(arg1: Int, - arg2: Int, - arg3: Int) { +internal class C1 internal constructor(arg1: Int, + arg2: Int, + arg3: Int) { - constructor(x: Int, - y: Int) : this(x, x + y, 0) { + internal constructor(x: Int, + y: Int) : this(x, x + y, 0) { } } -class C2(private val arg1: Int, - private val arg2: Int, - arg3: Int) +internal class C2 internal constructor(private val arg1: Int, + private val arg2: Int, + arg3: Int) diff --git a/j2k/testData/fileOrElement/constructors/methodCallInFactoryFun.kt b/j2k/testData/fileOrElement/constructors/methodCallInFactoryFun.kt index 083cd2d74ef..b974607b4eb 100644 --- a/j2k/testData/fileOrElement/constructors/methodCallInFactoryFun.kt +++ b/j2k/testData/fileOrElement/constructors/methodCallInFactoryFun.kt @@ -1,10 +1,10 @@ -class C(private val arg1: Int, private val arg2: Int, private val arg3: Int) { +internal class C internal constructor(private val arg1: Int, private val arg2: Int, private val arg3: Int) { - fun foo(p: Int): Int { + internal fun foo(p: Int): Int { return p } - constructor(arg1: Int, arg2: Int, other: C) : this(arg1, arg2, 0) { + internal 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)) } @@ -13,7 +13,7 @@ class C(private val arg1: Int, private val arg2: Int, private val arg3: Int) { return p } - public fun staticFoo2(): Int { + fun staticFoo2(): Int { return 0 } } diff --git a/j2k/testData/fileOrElement/constructors/nestedClassNameInParameterDefaults.kt b/j2k/testData/fileOrElement/constructors/nestedClassNameInParameterDefaults.kt index c9d56ab41b8..3aef7e81102 100644 --- a/j2k/testData/fileOrElement/constructors/nestedClassNameInParameterDefaults.kt +++ b/j2k/testData/fileOrElement/constructors/nestedClassNameInParameterDefaults.kt @@ -1,9 +1,9 @@ -class A JvmOverloads constructor(nested: A.Nested = A.Nested(A.Nested.FIELD)) { +internal class A JvmOverloads internal constructor(nested: A.Nested = A.Nested(A.Nested.FIELD)) { - class Nested(p: Int) { + internal class Nested internal constructor(p: Int) { companion object { - public val FIELD: Int = 0 + val FIELD: Int = 0 } } } \ No newline at end of file diff --git a/j2k/testData/fileOrElement/constructors/nestedClassNameInParameterDefaults2.kt b/j2k/testData/fileOrElement/constructors/nestedClassNameInParameterDefaults2.kt index a0934eb53f1..a32ed72883a 100644 --- a/j2k/testData/fileOrElement/constructors/nestedClassNameInParameterDefaults2.kt +++ b/j2k/testData/fileOrElement/constructors/nestedClassNameInParameterDefaults2.kt @@ -1,16 +1,16 @@ // ERROR: Property must be initialized or be abstract import A.Nested -class A JvmOverloads constructor(nested: Nested = Nested(Nested.FIELD)) { +internal class A JvmOverloads internal constructor(nested: Nested = Nested(Nested.FIELD)) { - class Nested(p: Int) { + internal class Nested internal constructor(p: Int) { companion object { - public val FIELD: Int = 0 + val FIELD: Int = 0 } } } -class B { - var nested: Nested +internal class B { + internal var nested: Nested } \ No newline at end of file diff --git a/j2k/testData/fileOrElement/constructors/nestedClassNameInParameterDefaults3.kt b/j2k/testData/fileOrElement/constructors/nestedClassNameInParameterDefaults3.kt index e9681c33051..80c94531db0 100644 --- a/j2k/testData/fileOrElement/constructors/nestedClassNameInParameterDefaults3.kt +++ b/j2k/testData/fileOrElement/constructors/nestedClassNameInParameterDefaults3.kt @@ -3,16 +3,16 @@ package pack import pack.A.Nested -class A JvmOverloads constructor(nested: Nested = Nested(Nested.FIELD)) { +internal class A JvmOverloads internal constructor(nested: Nested = Nested(Nested.FIELD)) { - class Nested(p: Int) { + internal class Nested internal constructor(p: Int) { companion object { - public val FIELD: Int = 0 + val FIELD: Int = 0 } } } -class B { - var nested: Nested +internal class B { + internal var nested: Nested } \ No newline at end of file diff --git a/j2k/testData/fileOrElement/constructors/nestedClassNameInParameterDefaults4.kt b/j2k/testData/fileOrElement/constructors/nestedClassNameInParameterDefaults4.kt index ef9ce050d27..de90041c1af 100644 --- a/j2k/testData/fileOrElement/constructors/nestedClassNameInParameterDefaults4.kt +++ b/j2k/testData/fileOrElement/constructors/nestedClassNameInParameterDefaults4.kt @@ -3,16 +3,16 @@ package pack import pack.A.* -class A JvmOverloads constructor(nested: Nested = Nested(Nested.FIELD)) { +internal class A JvmOverloads internal constructor(nested: Nested = Nested(Nested.FIELD)) { - class Nested(p: Int) { + internal class Nested internal constructor(p: Int) { companion object { - public val FIELD: Int = 0 + val FIELD: Int = 0 } } } -class B { - var nested: Nested +internal class B { + internal var nested: Nested } \ No newline at end of file diff --git a/j2k/testData/fileOrElement/constructors/nestedClassNameInSuperParameters.kt b/j2k/testData/fileOrElement/constructors/nestedClassNameInSuperParameters.kt index e9a4d885329..5fbcb64dfda 100644 --- a/j2k/testData/fileOrElement/constructors/nestedClassNameInSuperParameters.kt +++ b/j2k/testData/fileOrElement/constructors/nestedClassNameInSuperParameters.kt @@ -1,11 +1,11 @@ -open class Base(nested: Base.Nested) { +internal open class Base internal constructor(nested: Base.Nested) { - class Nested(p: Int) { + internal class Nested internal constructor(p: Int) { companion object { - public val FIELD: Int = 0 + val FIELD: Int = 0 } } } -class Derived : Base(Base.Nested(Base.Nested.FIELD)) \ No newline at end of file +internal class Derived internal constructor() : Base(Base.Nested(Base.Nested.FIELD)) \ No newline at end of file diff --git a/j2k/testData/fileOrElement/constructors/noPrimary.kt b/j2k/testData/fileOrElement/constructors/noPrimary.kt index 83c6ffa9975..73cdf3b354e 100644 --- a/j2k/testData/fileOrElement/constructors/noPrimary.kt +++ b/j2k/testData/fileOrElement/constructors/noPrimary.kt @@ -1,20 +1,20 @@ -open class Base +internal open class Base -class C : Base { - constructor(arg1: Int, arg2: Int, arg3: Int) { +internal class C : Base { + internal constructor(arg1: Int, arg2: Int, arg3: Int) { } - constructor(arg1: Int, arg2: Int) : this(arg1, arg2, 0) { + internal constructor(arg1: Int, arg2: Int) : this(arg1, arg2, 0) { println() } - constructor(arg: Int) { + internal constructor(arg: Int) { println(arg) } } -public object User { - public fun main() { +object User { + fun main() { val c1 = C(1, 2, 3) val c2 = C(5, 6) val c3 = C(7) diff --git a/j2k/testData/fileOrElement/constructors/parameterDefaults1.kt b/j2k/testData/fileOrElement/constructors/parameterDefaults1.kt index a60a322945b..7b1924f85c9 100644 --- a/j2k/testData/fileOrElement/constructors/parameterDefaults1.kt +++ b/j2k/testData/fileOrElement/constructors/parameterDefaults1.kt @@ -1,7 +1,7 @@ package pack -class C JvmOverloads constructor(a: Int = 0, b: Int = 0, c: Int = 0, d: Int = 0, e: Int = 0) { +internal class C JvmOverloads internal constructor(a: Int = 0, b: Int = 0, c: Int = 0, d: Int = 0, e: Int = 0) { - constructor(a: Int) : this(a, 0, 0, 0, 1) { + internal constructor(a: Int) : this(a, 0, 0, 0, 1) { } } diff --git a/j2k/testData/fileOrElement/constructors/parameterDefaults2.kt b/j2k/testData/fileOrElement/constructors/parameterDefaults2.kt index d13e03a972f..176822fddf7 100644 --- a/j2k/testData/fileOrElement/constructors/parameterDefaults2.kt +++ b/j2k/testData/fileOrElement/constructors/parameterDefaults2.kt @@ -1,10 +1,10 @@ package pack -class C JvmOverloads constructor(a: Int = 0, b: Int = 0, c: Int = 0, d: Int = 0, e: Int = 0) { +internal class C JvmOverloads internal constructor(a: Int = 0, b: Int = 0, c: Int = 0, d: Int = 0, e: Int = 0) { - constructor(a1: Int, b1: Int, c1: Int) : this(a1, b1, c1, 0, 0) { + internal constructor(a1: Int, b1: Int, c1: Int) : this(a1, b1, c1, 0, 0) { } - constructor(b: Byte) : this(b.toInt(), 0, 0, 0, 0) { + internal constructor(b: Byte) : this(b.toInt(), 0, 0, 0, 0) { } } diff --git a/j2k/testData/fileOrElement/constructors/parameterDefaults3.kt b/j2k/testData/fileOrElement/constructors/parameterDefaults3.kt index 1081025ae95..996215679e4 100644 --- a/j2k/testData/fileOrElement/constructors/parameterDefaults3.kt +++ b/j2k/testData/fileOrElement/constructors/parameterDefaults3.kt @@ -1,7 +1,7 @@ package pack -class C JvmOverloads constructor(a: Int = 0, b: Int = 0, c: Int = 0, d: Int = 0, e: Int = 0) { +internal class C JvmOverloads internal constructor(a: Int = 0, b: Int = 0, c: Int = 0, d: Int = 0, e: Int = 0) { - constructor(a: Int, b: Int, c: Int) : this(b, a, c, 0, 0) { + internal constructor(a: Int, b: Int, c: Int) : this(b, a, c, 0, 0) { } } diff --git a/j2k/testData/fileOrElement/constructors/parameterDefaults4.kt b/j2k/testData/fileOrElement/constructors/parameterDefaults4.kt index 5ee254277cf..a6e224b0613 100644 --- a/j2k/testData/fileOrElement/constructors/parameterDefaults4.kt +++ b/j2k/testData/fileOrElement/constructors/parameterDefaults4.kt @@ -1,3 +1,3 @@ package pack -class C JvmOverloads constructor(a: Int = 1, b: Int = 2, c: Int = 3, d: Int = 4, e: Int = 5) +internal class C JvmOverloads internal constructor(a: Int = 1, b: Int = 2, c: Int = 3, d: Int = 4, e: Int = 5) diff --git a/j2k/testData/fileOrElement/constructors/parameterDefaults5.kt b/j2k/testData/fileOrElement/constructors/parameterDefaults5.kt index 5ee254277cf..a6e224b0613 100644 --- a/j2k/testData/fileOrElement/constructors/parameterDefaults5.kt +++ b/j2k/testData/fileOrElement/constructors/parameterDefaults5.kt @@ -1,3 +1,3 @@ package pack -class C JvmOverloads constructor(a: Int = 1, b: Int = 2, c: Int = 3, d: Int = 4, e: Int = 5) +internal class C JvmOverloads internal constructor(a: Int = 1, b: Int = 2, c: Int = 3, d: Int = 4, e: Int = 5) diff --git a/j2k/testData/fileOrElement/constructors/parameterModification.kt b/j2k/testData/fileOrElement/constructors/parameterModification.kt index c4175b496ec..904c71117da 100644 --- a/j2k/testData/fileOrElement/constructors/parameterModification.kt +++ b/j2k/testData/fileOrElement/constructors/parameterModification.kt @@ -1,4 +1,4 @@ -class C JvmOverloads constructor(arg1: Int, arg2: Int = 0, arg3: Int = 0) { +internal class C JvmOverloads internal constructor(arg1: Int, arg2: Int = 0, arg3: Int = 0) { private val field: Int init { @@ -10,14 +10,14 @@ class C JvmOverloads constructor(arg1: Int, arg2: Int = 0, arg3: Int = 0) { arg3++ } - constructor(arg1: Int, arg2: Int) : this(arg1, arg2, 0) { + internal constructor(arg1: Int, arg2: Int) : this(arg1, arg2, 0) { var arg2 = arg2 arg2++ } } -public object User { - public fun main() { +object User { + fun main() { val c1 = C(100, 100, 100) val c2 = C(100, 100) val c3 = C(100) diff --git a/j2k/testData/fileOrElement/constructors/privateConstructors.kt b/j2k/testData/fileOrElement/constructors/privateConstructors.kt index ab666511241..45c14cd7d32 100644 --- a/j2k/testData/fileOrElement/constructors/privateConstructors.kt +++ b/j2k/testData/fileOrElement/constructors/privateConstructors.kt @@ -1,5 +1,5 @@ -class C private constructor(arg1: Int, arg2: Int, arg3: Int = 0) { +internal class C private constructor(arg1: Int, arg2: Int, arg3: Int = 0) { - public constructor(arg1: Int) : this(arg1, 0, 0) { + constructor(arg1: Int) : this(arg1, 0, 0) { } } diff --git a/j2k/testData/fileOrElement/constructors/qualifiedRefInFactoryFun.kt b/j2k/testData/fileOrElement/constructors/qualifiedRefInFactoryFun.kt index 45baf9b89d5..28d86ddbfbb 100644 --- a/j2k/testData/fileOrElement/constructors/qualifiedRefInFactoryFun.kt +++ b/j2k/testData/fileOrElement/constructors/qualifiedRefInFactoryFun.kt @@ -1,12 +1,12 @@ -class C(private val arg1: Int, private val arg2: Int, private val arg3: Int) { +internal class C internal constructor(private val arg1: Int, private val arg2: Int, private val arg3: Int) { - constructor(arg1: Int, arg2: Int, other: C) : this(arg1, arg2, 0) { + internal constructor(arg1: Int, arg2: Int, other: C) : this(arg1, arg2, 0) { println(this.arg1 + other.arg2) } } -class User { - fun foo() { +internal class User { + internal fun foo() { val c1 = C(100, 100, 100) val c2 = C(100, 100, c1) } diff --git a/j2k/testData/fileOrElement/constructors/secondaryConstructorWithDefaultValues.kt b/j2k/testData/fileOrElement/constructors/secondaryConstructorWithDefaultValues.kt index 4cdb44e282b..211dab393d0 100644 --- a/j2k/testData/fileOrElement/constructors/secondaryConstructorWithDefaultValues.kt +++ b/j2k/testData/fileOrElement/constructors/secondaryConstructorWithDefaultValues.kt @@ -1,13 +1,13 @@ // ERROR: Val cannot be reassigned // ERROR: Val cannot be reassigned -class A { +internal class A { private val s = "" private val x = 0 - public constructor() { + constructor() { } - JvmOverloads public constructor(p: Int, s: String, x: Int = 1) { + JvmOverloads constructor(p: Int, s: String, x: Int = 1) { this.s = s this.x = x } diff --git a/j2k/testData/fileOrElement/constructors/secondaryConstructorWithDefaultValues2.kt b/j2k/testData/fileOrElement/constructors/secondaryConstructorWithDefaultValues2.kt index b180c4db4f5..19877626cda 100644 --- a/j2k/testData/fileOrElement/constructors/secondaryConstructorWithDefaultValues2.kt +++ b/j2k/testData/fileOrElement/constructors/secondaryConstructorWithDefaultValues2.kt @@ -1,10 +1,10 @@ // ERROR: Val cannot be reassigned // ERROR: Val cannot be reassigned -class A() { +internal class A() { private val s = "" private val x = 0 - JvmOverloads public constructor(p: Int, s: String, x: Int = 1) : this() { + JvmOverloads constructor(p: Int, s: String, x: Int = 1) : this() { this.s = s this.x = x } diff --git a/j2k/testData/fileOrElement/constructors/secondaryConstructorsInInnerClass.kt b/j2k/testData/fileOrElement/constructors/secondaryConstructorsInInnerClass.kt index 3395ddc7e0d..7e332358d4b 100644 --- a/j2k/testData/fileOrElement/constructors/secondaryConstructorsInInnerClass.kt +++ b/j2k/testData/fileOrElement/constructors/secondaryConstructorsInInnerClass.kt @@ -1,7 +1,7 @@ -class Outer { +internal class Outer { private inner class Inner1() { - public constructor(a: Int) : this() { + constructor(a: Int) : this() { } protected constructor(c: Char) : this() { @@ -13,7 +13,7 @@ class Outer { protected inner class Inner2() { - public constructor(a: Int) : this() { + constructor(a: Int) : this() { } protected constructor(c: Char) : this() { @@ -24,9 +24,9 @@ class Outer { } - inner class Inner3() { + internal inner class Inner3() { - public constructor(a: Int) : this() { + constructor(a: Int) : this() { } protected constructor(c: Char) : this() { @@ -36,9 +36,9 @@ class Outer { } } - public inner class Inner4() { + inner class Inner4() { - public constructor(a: Int) : this() { + constructor(a: Int) : this() { } protected constructor(c: Char) : this() { @@ -48,7 +48,7 @@ class Outer { } } - fun foo() { + internal fun foo() { val inner1 = Inner1(1) val inner2 = Inner2(2) val inner3 = Inner3(3) diff --git a/j2k/testData/fileOrElement/constructors/secondaryConstructorsInNestedClass.kt b/j2k/testData/fileOrElement/constructors/secondaryConstructorsInNestedClass.kt index aa836bfe7b0..74c9e1ce7b1 100644 --- a/j2k/testData/fileOrElement/constructors/secondaryConstructorsInNestedClass.kt +++ b/j2k/testData/fileOrElement/constructors/secondaryConstructorsInNestedClass.kt @@ -1,7 +1,7 @@ -object Outer { +internal object Outer { private class Nested1() { - public constructor(a: Int) : this() { + constructor(a: Int) : this() { } protected constructor(c: Char) : this() { @@ -13,7 +13,7 @@ object Outer { protected class Nested2() { - public constructor(a: Int) : this() { + constructor(a: Int) : this() { } protected constructor(c: Char) : this() { @@ -24,9 +24,9 @@ object Outer { } - class Nested3() { + internal class Nested3() { - public constructor(a: Int) : this() { + constructor(a: Int) : this() { } protected constructor(c: Char) : this() { @@ -36,9 +36,9 @@ object Outer { } } - public class Nested4() { + class Nested4() { - public constructor(a: Int) : this() { + constructor(a: Int) : this() { } protected constructor(c: Char) : this() { @@ -48,7 +48,7 @@ object Outer { } } - fun foo() { + internal fun foo() { val nested1 = Nested1(1) val nested2 = Nested2(2) val nested3 = Nested3(3) diff --git a/j2k/testData/fileOrElement/constructors/secondaryConstructorsVisibility.kt b/j2k/testData/fileOrElement/constructors/secondaryConstructorsVisibility.kt index 496abbc0f4f..091ae10a14f 100644 --- a/j2k/testData/fileOrElement/constructors/secondaryConstructorsVisibility.kt +++ b/j2k/testData/fileOrElement/constructors/secondaryConstructorsVisibility.kt @@ -1,27 +1,27 @@ -class A() { +internal class A() { - public constructor(a: Int) : this() { + constructor(a: Int) : this() { } protected constructor(c: Char) : this() { } - constructor(f: Float) : this() { + internal constructor(f: Float) : this() { } private constructor(d: Double) : this() { } } -public class B() { +class B() { - public constructor(a: Int) : this() { + constructor(a: Int) : this() { } protected constructor(c: Char) : this() { } - constructor(f: Float) : this() { + internal constructor(f: Float) : this() { } private constructor(d: Double) : this() { diff --git a/j2k/testData/fileOrElement/constructors/staticFieldRefInFactoryFun.kt b/j2k/testData/fileOrElement/constructors/staticFieldRefInFactoryFun.kt index 5eb6e618d83..31a0e03fbcf 100644 --- a/j2k/testData/fileOrElement/constructors/staticFieldRefInFactoryFun.kt +++ b/j2k/testData/fileOrElement/constructors/staticFieldRefInFactoryFun.kt @@ -1,6 +1,6 @@ -class C() { +internal class C internal constructor() { - constructor(p: Int) : this() { + internal constructor(p: Int) : this() { println(staticField1 + C.staticField2) } diff --git a/j2k/testData/fileOrElement/constructors/withManyDefaultParams.kt b/j2k/testData/fileOrElement/constructors/withManyDefaultParams.kt index fad1a94554c..b14e24ca915 100644 --- a/j2k/testData/fileOrElement/constructors/withManyDefaultParams.kt +++ b/j2k/testData/fileOrElement/constructors/withManyDefaultParams.kt @@ -1,31 +1,31 @@ // ERROR: Property must be initialized or be abstract -public class Test { +class Test { private val myName: String - var a: Boolean = false - var b: Double = 0.toDouble() - var c: Float = 0.toFloat() - var d: Long = 0 - var e: Int = 0 + internal var a: Boolean = false + internal var b: Double = 0.toDouble() + internal var c: Float = 0.toFloat() + internal var d: Long = 0 + internal var e: Int = 0 protected var f: Short = 0 protected var g: Char = ' ' - public constructor() { + constructor() { } - public constructor(name: String) { + constructor(name: String) { myName = foo(name) } companion object { - fun foo(n: String): String { + internal fun foo(n: String): String { return "" } } } -public object User { - public fun main() { +object User { + fun main() { val t = Test("name") } } \ No newline at end of file diff --git a/j2k/testData/fileOrElement/docComments/deprecatedDocTag.kt b/j2k/testData/fileOrElement/docComments/deprecatedDocTag.kt index e73e7677573..094bbc1f51f 100644 --- a/j2k/testData/fileOrElement/docComments/deprecatedDocTag.kt +++ b/j2k/testData/fileOrElement/docComments/deprecatedDocTag.kt @@ -2,4 +2,4 @@ * This is a deprecated class. */ Deprecated("do not use") -class C +internal class C diff --git a/j2k/testData/fileOrElement/docComments/docCommentWithParamTag.kt b/j2k/testData/fileOrElement/docComments/docCommentWithParamTag.kt index 64d12bfd689..8767b6f9ea9 100644 --- a/j2k/testData/fileOrElement/docComments/docCommentWithParamTag.kt +++ b/j2k/testData/fileOrElement/docComments/docCommentWithParamTag.kt @@ -1,4 +1,4 @@ /** * @param T This is the **parameter** of class `C` */ -class C +internal class C diff --git a/j2k/testData/fileOrElement/docComments/htmlInDocComment.kt b/j2k/testData/fileOrElement/docComments/htmlInDocComment.kt index 66b4a23ab53..91ab5f71f41 100644 --- a/j2k/testData/fileOrElement/docComments/htmlInDocComment.kt +++ b/j2k/testData/fileOrElement/docComments/htmlInDocComment.kt @@ -13,4 +13,4 @@ * 1. Second * */ -public class C \ No newline at end of file +class C \ No newline at end of file diff --git a/j2k/testData/fileOrElement/docComments/inlineTagsInDocComment.kt b/j2k/testData/fileOrElement/docComments/inlineTagsInDocComment.kt index 4a33b2661ab..a96f652a35c 100644 --- a/j2k/testData/fileOrElement/docComments/inlineTagsInDocComment.kt +++ b/j2k/testData/fileOrElement/docComments/inlineTagsInDocComment.kt @@ -1,4 +1,4 @@ /** * `A<B` */ -public class C \ No newline at end of file +class C diff --git a/j2k/testData/fileOrElement/docComments/linkTag.kt b/j2k/testData/fileOrElement/docComments/linkTag.kt index c0b56078645..f54881f4eee 100644 --- a/j2k/testData/fileOrElement/docComments/linkTag.kt +++ b/j2k/testData/fileOrElement/docComments/linkTag.kt @@ -1,7 +1,7 @@ /** * [C.foo] */ -class C { - fun foo(i: Int) { +internal class C { + internal fun foo(i: Int) { } } diff --git a/j2k/testData/fileOrElement/docComments/linkTagWithLabel.kt b/j2k/testData/fileOrElement/docComments/linkTagWithLabel.kt index 46594f5df48..86b4b7ea116 100644 --- a/j2k/testData/fileOrElement/docComments/linkTagWithLabel.kt +++ b/j2k/testData/fileOrElement/docComments/linkTagWithLabel.kt @@ -1,7 +1,7 @@ /** * [the best foo method ever][C.foo] */ -class C { - fun foo(i: Int) { +internal class C { + internal fun foo(i: Int) { } } diff --git a/j2k/testData/fileOrElement/docComments/onlyDeprecatedDocTag.kt b/j2k/testData/fileOrElement/docComments/onlyDeprecatedDocTag.kt index 1732718c742..f33a26a5c61 100644 --- a/j2k/testData/fileOrElement/docComments/onlyDeprecatedDocTag.kt +++ b/j2k/testData/fileOrElement/docComments/onlyDeprecatedDocTag.kt @@ -1,2 +1,2 @@ Deprecated("do not use") -class C +internal class C diff --git a/j2k/testData/fileOrElement/docComments/seeTag.kt b/j2k/testData/fileOrElement/docComments/seeTag.kt index 1ff9d740985..f1f97425bec 100644 --- a/j2k/testData/fileOrElement/docComments/seeTag.kt +++ b/j2k/testData/fileOrElement/docComments/seeTag.kt @@ -1,7 +1,7 @@ /** * @see C.foo */ -class C { - fun foo(i: Int) { +internal class C { + internal fun foo(i: Int) { } } diff --git a/j2k/testData/fileOrElement/dropAccessors/AccessInGetterWithThis.kt b/j2k/testData/fileOrElement/dropAccessors/AccessInGetterWithThis.kt index aa2614ee957..6e15dccf50a 100644 --- a/j2k/testData/fileOrElement/dropAccessors/AccessInGetterWithThis.kt +++ b/j2k/testData/fileOrElement/dropAccessors/AccessInGetterWithThis.kt @@ -1,3 +1,3 @@ -public class AAA { - public val x: Int = 42 +class AAA { + val x: Int = 42 } diff --git a/j2k/testData/fileOrElement/dropAccessors/AccessorsImplementInterface.kt b/j2k/testData/fileOrElement/dropAccessors/AccessorsImplementInterface.kt index 5ef632893e6..e9637970db8 100644 --- a/j2k/testData/fileOrElement/dropAccessors/AccessorsImplementInterface.kt +++ b/j2k/testData/fileOrElement/dropAccessors/AccessorsImplementInterface.kt @@ -1,9 +1,9 @@ -interface I { - public fun getX(): Int - public fun setX(x: Int) +internal interface I { + fun getX(): Int + fun setX(x: Int) } -class A(private var x: Int) : I { +internal class A(private var x: Int) : I { override fun getX(): Int { return x diff --git a/j2k/testData/fileOrElement/dropAccessors/AnonymousClass.kt b/j2k/testData/fileOrElement/dropAccessors/AnonymousClass.kt index bd9ecef2dde..4b2225c4da7 100644 --- a/j2k/testData/fileOrElement/dropAccessors/AnonymousClass.kt +++ b/j2k/testData/fileOrElement/dropAccessors/AnonymousClass.kt @@ -1,7 +1,7 @@ -public class X { - fun foo() { +class X { + internal fun foo() { val runnable = object : Runnable { - var value = 10 + internal var value = 10 override fun run() { println(value) diff --git a/j2k/testData/fileOrElement/dropAccessors/CannotDropOnlySetter.kt b/j2k/testData/fileOrElement/dropAccessors/CannotDropOnlySetter.kt index 99073d68531..c4da7fdfde8 100644 --- a/j2k/testData/fileOrElement/dropAccessors/CannotDropOnlySetter.kt +++ b/j2k/testData/fileOrElement/dropAccessors/CannotDropOnlySetter.kt @@ -1,7 +1,7 @@ -public class AAA { +class AAA { private var x = 42 - public fun setX(x: Int) { + fun setX(x: Int) { this.x = x } } diff --git a/j2k/testData/fileOrElement/dropAccessors/DataClass.kt b/j2k/testData/fileOrElement/dropAccessors/DataClass.kt index cf394fd9879..cd720d34dda 100644 --- a/j2k/testData/fileOrElement/dropAccessors/DataClass.kt +++ b/j2k/testData/fileOrElement/dropAccessors/DataClass.kt @@ -1,4 +1,4 @@ -public class Test(public var id: String?, public val name: String, public val age: Int) { +class Test(var id: String?, val name: String, val age: Int) { init { println(age) diff --git a/j2k/testData/fileOrElement/dropAccessors/DataClassWithMutableField.kt b/j2k/testData/fileOrElement/dropAccessors/DataClassWithMutableField.kt index 8d306ec747e..ae84e1ca6e2 100644 --- a/j2k/testData/fileOrElement/dropAccessors/DataClassWithMutableField.kt +++ b/j2k/testData/fileOrElement/dropAccessors/DataClassWithMutableField.kt @@ -1,12 +1,12 @@ -public class Test(count: Int) { - public var count: Int = 0 +class Test(count: Int) { + var count: Int = 0 private set init { this.count = count } - public fun inc() { + fun inc() { count++ } } diff --git a/j2k/testData/fileOrElement/dropAccessors/DifferentFieldName.kt b/j2k/testData/fileOrElement/dropAccessors/DifferentFieldName.kt index 2f463cc3261..0942672f666 100644 --- a/j2k/testData/fileOrElement/dropAccessors/DifferentFieldName.kt +++ b/j2k/testData/fileOrElement/dropAccessors/DifferentFieldName.kt @@ -1,8 +1,8 @@ -public class AAA { - public var x: Int = 42 +class AAA { + var x: Int = 42 private set - public fun foo(other: AAA) { + fun foo(other: AAA) { println(x) println(other.x) x = 10 diff --git a/j2k/testData/fileOrElement/dropAccessors/DifferentFieldNameAndDefaultParameterValue.kt b/j2k/testData/fileOrElement/dropAccessors/DifferentFieldNameAndDefaultParameterValue.kt index 083d7a2eb05..48a4ea8f774 100644 --- a/j2k/testData/fileOrElement/dropAccessors/DifferentFieldNameAndDefaultParameterValue.kt +++ b/j2k/testData/fileOrElement/dropAccessors/DifferentFieldNameAndDefaultParameterValue.kt @@ -1 +1 @@ -public class C JvmOverloads constructor(c: C, public val x: Int = c.x) +class C JvmOverloads internal constructor(c: C, val x: Int = c.x) diff --git a/j2k/testData/fileOrElement/dropAccessors/DifferentFieldNameAndSuperClass.kt b/j2k/testData/fileOrElement/dropAccessors/DifferentFieldNameAndSuperClass.kt index 13af7b76eae..c874a782c22 100644 --- a/j2k/testData/fileOrElement/dropAccessors/DifferentFieldNameAndSuperClass.kt +++ b/j2k/testData/fileOrElement/dropAccessors/DifferentFieldNameAndSuperClass.kt @@ -1,5 +1,5 @@ -public open class Base(x: Int) { - public var x: Int = 42 +open class Base internal constructor(x: Int) { + var x: Int = 42 protected set init { @@ -7,4 +7,4 @@ public open class Base(x: Int) { } } -class Derived(b: Base) : Base(b.x) \ No newline at end of file +internal class Derived internal constructor(b: Base) : Base(b.x) diff --git a/j2k/testData/fileOrElement/dropAccessors/DifferentProtectedFieldName.kt b/j2k/testData/fileOrElement/dropAccessors/DifferentProtectedFieldName.kt index 4946197a59c..0329d77b8af 100644 --- a/j2k/testData/fileOrElement/dropAccessors/DifferentProtectedFieldName.kt +++ b/j2k/testData/fileOrElement/dropAccessors/DifferentProtectedFieldName.kt @@ -1,16 +1,16 @@ -public open class AAA { - public var x: Int = 42 +open class AAA { + var x: Int = 42 protected set - public fun foo(other: AAA) { + fun foo(other: AAA) { println(x) println(other.x) x = 10 } } -class BBB : AAA() { - fun bar() { +internal class BBB : AAA() { + internal fun bar() { println(x) x = 10 } diff --git a/j2k/testData/fileOrElement/dropAccessors/DropGetter.kt b/j2k/testData/fileOrElement/dropAccessors/DropGetter.kt index aa2614ee957..6e15dccf50a 100644 --- a/j2k/testData/fileOrElement/dropAccessors/DropGetter.kt +++ b/j2k/testData/fileOrElement/dropAccessors/DropGetter.kt @@ -1,3 +1,3 @@ -public class AAA { - public val x: Int = 42 +class AAA { + val x: Int = 42 } diff --git a/j2k/testData/fileOrElement/dropAccessors/DropGetterAndSetter.kt b/j2k/testData/fileOrElement/dropAccessors/DropGetterAndSetter.kt index 0074fc2d309..b24ea0bd173 100644 --- a/j2k/testData/fileOrElement/dropAccessors/DropGetterAndSetter.kt +++ b/j2k/testData/fileOrElement/dropAccessors/DropGetterAndSetter.kt @@ -1,3 +1,3 @@ -public class AAA { - public var x: Int = 42 +class AAA { + var x: Int = 42 } diff --git a/j2k/testData/fileOrElement/dropAccessors/DropGetterForMutable.kt b/j2k/testData/fileOrElement/dropAccessors/DropGetterForMutable.kt index 4c1a7d6a7eb..53462ec057f 100644 --- a/j2k/testData/fileOrElement/dropAccessors/DropGetterForMutable.kt +++ b/j2k/testData/fileOrElement/dropAccessors/DropGetterForMutable.kt @@ -1,8 +1,8 @@ -public class AAA { - public var x: Int = 42 +class AAA { + var x: Int = 42 private set - public fun foo() { + fun foo() { x = 10 } } diff --git a/j2k/testData/fileOrElement/dropAccessors/FalseGetter.kt b/j2k/testData/fileOrElement/dropAccessors/FalseGetter.kt index ffab977787b..3d247c84c34 100644 --- a/j2k/testData/fileOrElement/dropAccessors/FalseGetter.kt +++ b/j2k/testData/fileOrElement/dropAccessors/FalseGetter.kt @@ -1,8 +1,8 @@ -public class AAA { +class AAA { private val x = 42 private val other = AAA() - public fun getX(): Int { + fun getX(): Int { return other.x } } diff --git a/j2k/testData/fileOrElement/dropAccessors/FalseSetter.kt b/j2k/testData/fileOrElement/dropAccessors/FalseSetter.kt index 55c8bd57c68..c486409ce26 100644 --- a/j2k/testData/fileOrElement/dropAccessors/FalseSetter.kt +++ b/j2k/testData/fileOrElement/dropAccessors/FalseSetter.kt @@ -1,8 +1,8 @@ -public class AAA { - public var x: Int = 42 +class AAA { + var x: Int = 42 private set - public fun setX(x: Int) { + fun setX(x: Int) { this.x += x } } diff --git a/j2k/testData/fileOrElement/dropAccessors/FieldUsagesInFactoryMethods.kt b/j2k/testData/fileOrElement/dropAccessors/FieldUsagesInFactoryMethods.kt index 25b7775fd07..141b935cf2f 100644 --- a/j2k/testData/fileOrElement/dropAccessors/FieldUsagesInFactoryMethods.kt +++ b/j2k/testData/fileOrElement/dropAccessors/FieldUsagesInFactoryMethods.kt @@ -1,13 +1,13 @@ -class C(val arg1: Int) { - var arg2: Int = 0 - var arg3: Int = 0 +internal class C internal constructor(internal val arg1: Int) { + internal var arg2: Int = 0 + internal var arg3: Int = 0 - constructor(arg1: Int, arg2: Int, arg3: Int) : this(arg1) { + internal constructor(arg1: Int, arg2: Int, arg3: Int) : this(arg1) { this.arg2 = arg2 this.arg3 = arg3 } - constructor(arg1: Int, arg2: Int) : this(arg1) { + internal constructor(arg1: Int, arg2: Int) : this(arg1) { this.arg2 = arg2 arg3 = 0 } diff --git a/j2k/testData/fileOrElement/dropAccessors/GetterAndSetterNamesDifferent.kt b/j2k/testData/fileOrElement/dropAccessors/GetterAndSetterNamesDifferent.kt index 27688bd3314..d6cea756ec0 100644 --- a/j2k/testData/fileOrElement/dropAccessors/GetterAndSetterNamesDifferent.kt +++ b/j2k/testData/fileOrElement/dropAccessors/GetterAndSetterNamesDifferent.kt @@ -1,8 +1,8 @@ -public class AAA { - public var x: Int = 42 +class AAA { + var x: Int = 42 private set - public fun setY(x: Int) { + fun setY(x: Int) { this.x = x } } diff --git a/j2k/testData/fileOrElement/dropAccessors/GetterSetterUsages.kt b/j2k/testData/fileOrElement/dropAccessors/GetterSetterUsages.kt index 26fcdebb4aa..3be033fe630 100644 --- a/j2k/testData/fileOrElement/dropAccessors/GetterSetterUsages.kt +++ b/j2k/testData/fileOrElement/dropAccessors/GetterSetterUsages.kt @@ -1,17 +1,17 @@ -public class AAA { - public var x: Int = 42 +class AAA { + var x: Int = 42 - public fun foo() { + fun foo() { x = x + 1 } - public fun bar(other: AAA) { + fun bar(other: AAA) { other.x = other.x + 1 } } -class B { - fun foo(a: AAA) { +internal class B { + internal fun foo(a: AAA) { a.x = a.x + 1 } } diff --git a/j2k/testData/fileOrElement/dropAccessors/GetterTypeNotMatch.kt b/j2k/testData/fileOrElement/dropAccessors/GetterTypeNotMatch.kt index 865c3a376f3..a7cfbc7390a 100644 --- a/j2k/testData/fileOrElement/dropAccessors/GetterTypeNotMatch.kt +++ b/j2k/testData/fileOrElement/dropAccessors/GetterTypeNotMatch.kt @@ -1,8 +1,8 @@ // ERROR: Type mismatch: inferred type is kotlin.String? but kotlin.Any was expected -class A { +internal class A { private val s: String? = null - public fun getValue(): Any { + fun getValue(): Any { return s } } diff --git a/j2k/testData/fileOrElement/dropAccessors/InCompanionObject.kt b/j2k/testData/fileOrElement/dropAccessors/InCompanionObject.kt index e3b114106b7..4119dede5d5 100644 --- a/j2k/testData/fileOrElement/dropAccessors/InCompanionObject.kt +++ b/j2k/testData/fileOrElement/dropAccessors/InCompanionObject.kt @@ -1,10 +1,10 @@ -public class AAA { - public fun foo() { +class AAA { + fun foo() { x = x + 1 } companion object { - public var x: Int = 42 + var x: Int = 42 } } diff --git a/j2k/testData/fileOrElement/dropAccessors/InObject.kt b/j2k/testData/fileOrElement/dropAccessors/InObject.kt index 6678b7a8b60..436ca0bfebc 100644 --- a/j2k/testData/fileOrElement/dropAccessors/InObject.kt +++ b/j2k/testData/fileOrElement/dropAccessors/InObject.kt @@ -1,13 +1,13 @@ -public object AAA { - public var x: Int = 42 - public var y: Int = 0 - public val z: Int = 0 +object AAA { + var x: Int = 42 + var y: Int = 0 + val z: Int = 0 - public fun setZ(z: Int) { + fun setZ(z: Int) { Other.z = z } } -object Other { - public var z: Int = 0 +internal object Other { + var z: Int = 0 } diff --git a/j2k/testData/fileOrElement/dropAccessors/JavaKeywordPropertyName.kt b/j2k/testData/fileOrElement/dropAccessors/JavaKeywordPropertyName.kt index 550e132958f..69e3ec7976a 100644 --- a/j2k/testData/fileOrElement/dropAccessors/JavaKeywordPropertyName.kt +++ b/j2k/testData/fileOrElement/dropAccessors/JavaKeywordPropertyName.kt @@ -1,7 +1,7 @@ -class C { - public val default: Int = 0 +internal class C { + val default: Int = 0 - fun foo() { + internal fun foo() { println(default) } } diff --git a/j2k/testData/fileOrElement/dropAccessors/KeywordPropertyName.kt b/j2k/testData/fileOrElement/dropAccessors/KeywordPropertyName.kt index c3e69808ad8..7b126e2be34 100644 --- a/j2k/testData/fileOrElement/dropAccessors/KeywordPropertyName.kt +++ b/j2k/testData/fileOrElement/dropAccessors/KeywordPropertyName.kt @@ -1,7 +1,7 @@ -class C { - public val `this`: Int = 0 +internal class C { + val `this`: Int = 0 - fun foo() { + internal fun foo() { println(`this`) } } \ No newline at end of file diff --git a/j2k/testData/fileOrElement/dropAccessors/SetterTypeNotMatch.kt b/j2k/testData/fileOrElement/dropAccessors/SetterTypeNotMatch.kt index 39e94a07031..7ed5e276dbc 100644 --- a/j2k/testData/fileOrElement/dropAccessors/SetterTypeNotMatch.kt +++ b/j2k/testData/fileOrElement/dropAccessors/SetterTypeNotMatch.kt @@ -1,8 +1,8 @@ -class A { - public var value: Any? = null +internal class A { + var value: Any? = null private set - public fun setValue(s: String) { + fun setValue(s: String) { value = s } } diff --git a/j2k/testData/fileOrElement/enum/colorEnum.kt b/j2k/testData/fileOrElement/enum/colorEnum.kt index e0be3de3982..65c2706bef9 100644 --- a/j2k/testData/fileOrElement/enum/colorEnum.kt +++ b/j2k/testData/fileOrElement/enum/colorEnum.kt @@ -1,6 +1,6 @@ package demo -enum class MyEnum private constructor(public val color: Int) { +internal enum class MyEnum private constructor(val color: Int) { RED(10), BLUE(20) } \ No newline at end of file diff --git a/j2k/testData/fileOrElement/enum/companionObject.kt b/j2k/testData/fileOrElement/enum/companionObject.kt index aaa023de3a5..63a79baaa70 100644 --- a/j2k/testData/fileOrElement/enum/companionObject.kt +++ b/j2k/testData/fileOrElement/enum/companionObject.kt @@ -1,18 +1,18 @@ -public enum class TestEnum { +enum class TestEnum { A, B; companion object { - public fun parse(): TestEnum { + fun parse(): TestEnum { return A } } } -class Go { - fun fn() { +internal class Go { + internal fun fn() { val x = TestEnum.parse() } } diff --git a/j2k/testData/fileOrElement/enum/constantsWithBody1.kt b/j2k/testData/fileOrElement/enum/constantsWithBody1.kt index e90e1f09e3b..fececb01de8 100644 --- a/j2k/testData/fileOrElement/enum/constantsWithBody1.kt +++ b/j2k/testData/fileOrElement/enum/constantsWithBody1.kt @@ -1,4 +1,4 @@ -public enum class E { +enum class E { A, B { @@ -6,6 +6,6 @@ public enum class E { } }; - open fun bar() { + internal open fun bar() { } } diff --git a/j2k/testData/fileOrElement/enum/constantsWithBody2.kt b/j2k/testData/fileOrElement/enum/constantsWithBody2.kt index 45be9a7f9dc..829d7e2a98d 100644 --- a/j2k/testData/fileOrElement/enum/constantsWithBody2.kt +++ b/j2k/testData/fileOrElement/enum/constantsWithBody2.kt @@ -1,5 +1,5 @@ // ERROR: Cannot access 'p': it is 'invisible_fake' in 'A' -public enum class E private constructor(private val p: Int) { +enum class E private constructor(private val p: Int) { A(1) { override fun bar() { foo(this.p) @@ -11,8 +11,8 @@ public enum class E private constructor(private val p: Int) { } }; - fun foo(p: Int) { + internal fun foo(p: Int) { } - abstract fun bar() + internal abstract fun bar() } \ No newline at end of file diff --git a/j2k/testData/fileOrElement/enum/emptyEnum.kt b/j2k/testData/fileOrElement/enum/emptyEnum.kt index 7bce4477266..afa68d91cf4 100644 --- a/j2k/testData/fileOrElement/enum/emptyEnum.kt +++ b/j2k/testData/fileOrElement/enum/emptyEnum.kt @@ -1 +1 @@ -enum class A \ No newline at end of file +internal enum class A \ No newline at end of file diff --git a/j2k/testData/fileOrElement/enum/enumConstantIsNotNull.kt b/j2k/testData/fileOrElement/enum/enumConstantIsNotNull.kt index 799373e6f4d..a9c2b78f9fa 100644 --- a/j2k/testData/fileOrElement/enum/enumConstantIsNotNull.kt +++ b/j2k/testData/fileOrElement/enum/enumConstantIsNotNull.kt @@ -1,7 +1,7 @@ -enum class E { +internal enum class E { FOO; - fun foo() { + internal fun foo() { FOO.toString() } } \ No newline at end of file diff --git a/j2k/testData/fileOrElement/enum/enumImplementsOneInterface.kt b/j2k/testData/fileOrElement/enum/enumImplementsOneInterface.kt index da87d3bc15c..14a37a00a8b 100644 --- a/j2k/testData/fileOrElement/enum/enumImplementsOneInterface.kt +++ b/j2k/testData/fileOrElement/enum/enumImplementsOneInterface.kt @@ -1 +1 @@ -enum class A : I \ No newline at end of file +internal enum class A : I \ No newline at end of file diff --git a/j2k/testData/fileOrElement/enum/enumImplementsSeveralInterfaces.kt b/j2k/testData/fileOrElement/enum/enumImplementsSeveralInterfaces.kt index 7aef4bc20ed..3f3f5cc15b7 100644 --- a/j2k/testData/fileOrElement/enum/enumImplementsSeveralInterfaces.kt +++ b/j2k/testData/fileOrElement/enum/enumImplementsSeveralInterfaces.kt @@ -1 +1 @@ -enum class A : I0, I1, I2 \ No newline at end of file +internal enum class A : I0, I1, I2 \ No newline at end of file diff --git a/j2k/testData/fileOrElement/enum/enumWithNameField.kt b/j2k/testData/fileOrElement/enum/enumWithNameField.kt index 253017b4396..e1da0beb928 100644 --- a/j2k/testData/fileOrElement/enum/enumWithNameField.kt +++ b/j2k/testData/fileOrElement/enum/enumWithNameField.kt @@ -1,4 +1,4 @@ -enum class E { +internal enum class E { I; private val name: String? = null diff --git a/j2k/testData/fileOrElement/enum/fieldsWithPrimaryPrivateConstructor.kt b/j2k/testData/fileOrElement/enum/fieldsWithPrimaryPrivateConstructor.kt index f0f503b4628..6ed7c424bcb 100644 --- a/j2k/testData/fileOrElement/enum/fieldsWithPrimaryPrivateConstructor.kt +++ b/j2k/testData/fileOrElement/enum/fieldsWithPrimaryPrivateConstructor.kt @@ -1,3 +1,3 @@ -enum class Color private constructor(public val code: Int) { +internal enum class Color private constructor(val code: Int) { WHITE(21), BLACK(22), RED(23), YELLOW(24), BLUE(25) } \ No newline at end of file diff --git a/j2k/testData/fileOrElement/enum/internalEnum.kt b/j2k/testData/fileOrElement/enum/internalEnum.kt index 6153151d301..914ab19e794 100644 --- a/j2k/testData/fileOrElement/enum/internalEnum.kt +++ b/j2k/testData/fileOrElement/enum/internalEnum.kt @@ -1 +1 @@ -enum class Test \ No newline at end of file +internal enum class Test \ No newline at end of file diff --git a/j2k/testData/fileOrElement/enum/overrideToString.kt b/j2k/testData/fileOrElement/enum/overrideToString.kt index e35942ce9e2..0d8fab6d202 100644 --- a/j2k/testData/fileOrElement/enum/overrideToString.kt +++ b/j2k/testData/fileOrElement/enum/overrideToString.kt @@ -1,4 +1,4 @@ -enum class Color { +internal enum class Color { WHITE, BLACK, RED, YELLOW, BLUE; override fun toString(): String { diff --git a/j2k/testData/fileOrElement/enum/primaryPrivateConstructor.kt b/j2k/testData/fileOrElement/enum/primaryPrivateConstructor.kt index ad2897eb93e..718be6dc1ec 100644 --- a/j2k/testData/fileOrElement/enum/primaryPrivateConstructor.kt +++ b/j2k/testData/fileOrElement/enum/primaryPrivateConstructor.kt @@ -1,3 +1,3 @@ package demo -enum class Color private constructor(public val code: Int) \ No newline at end of file +internal enum class Color private constructor(val code: Int) \ No newline at end of file diff --git a/j2k/testData/fileOrElement/enum/publicEnum.kt b/j2k/testData/fileOrElement/enum/publicEnum.kt index 8fc2d84c388..6153151d301 100644 --- a/j2k/testData/fileOrElement/enum/publicEnum.kt +++ b/j2k/testData/fileOrElement/enum/publicEnum.kt @@ -1 +1 @@ -public enum class Test \ No newline at end of file +enum class Test \ No newline at end of file diff --git a/j2k/testData/fileOrElement/enum/runnableImplementation.kt b/j2k/testData/fileOrElement/enum/runnableImplementation.kt index b98ef8c5fcd..45527e6b2a6 100644 --- a/j2k/testData/fileOrElement/enum/runnableImplementation.kt +++ b/j2k/testData/fileOrElement/enum/runnableImplementation.kt @@ -1,4 +1,4 @@ -enum class Color : Runnable { +internal enum class Color : Runnable { WHITE, BLACK, RED, YELLOW, BLUE; override fun run() { diff --git a/j2k/testData/fileOrElement/enum/typeSafeEnum.kt b/j2k/testData/fileOrElement/enum/typeSafeEnum.kt index efd813b561a..41ce2ff4a2e 100644 --- a/j2k/testData/fileOrElement/enum/typeSafeEnum.kt +++ b/j2k/testData/fileOrElement/enum/typeSafeEnum.kt @@ -1,3 +1,3 @@ -enum class Coin { +internal enum class Coin { PENNY, NICKEL, DIME, QUARTER } \ No newline at end of file diff --git a/j2k/testData/fileOrElement/equals/EqOperator.kt b/j2k/testData/fileOrElement/equals/EqOperator.kt index b551d93ef08..142127612c8 100644 --- a/j2k/testData/fileOrElement/equals/EqOperator.kt +++ b/j2k/testData/fileOrElement/equals/EqOperator.kt @@ -1,29 +1,29 @@ -interface I +internal interface I -class C +internal class C -class O +internal class O -class E { +internal class E { override fun equals(o: Any?): Boolean { return super.equals(o) } } -open class B { +internal open class B { override fun equals(o: Any?): Boolean { return super.equals(o) } } -class BB : B() +internal class BB : B() -enum class EE { +internal enum class EE { A, B, C } -class X { - fun foo(i1: I?, i2: I?, s1: String, s2: String, c1: C, c2: C, i: Int, o1: O, o2: O, e1: E, e2: E, bb1: BB, bb2: BB, arr1: IntArray, arr2: IntArray, ee1: EE?, ee2: EE) { +internal class X { + internal fun foo(i1: I?, i2: I?, s1: String, s2: String, c1: C, c2: C, i: Int, o1: O, o2: O, e1: E, e2: E, bb1: BB, bb2: BB, arr1: IntArray, arr2: IntArray, ee1: EE?, ee2: EE) { if (i1 === i2) return if (s1 === s2) return if (c1 == c2) return diff --git a/j2k/testData/fileOrElement/equals/Equals1.kt b/j2k/testData/fileOrElement/equals/Equals1.kt index e2ac569cd4f..0f854fa62df 100644 --- a/j2k/testData/fileOrElement/equals/Equals1.kt +++ b/j2k/testData/fileOrElement/equals/Equals1.kt @@ -1,11 +1,11 @@ -interface I +internal interface I -class C { - fun foo1(i1: I, i2: I): Boolean { +internal class C { + internal fun foo1(i1: I, i2: I): Boolean { return i1 == i2 } - fun foo2(i1: I, i2: I): Boolean { + internal fun foo2(i1: I, i2: I): Boolean { return i1 != i2 } } \ No newline at end of file diff --git a/j2k/testData/fileOrElement/equals/Equals2.kt b/j2k/testData/fileOrElement/equals/Equals2.kt index c1fac3a125d..332f40cc475 100644 --- a/j2k/testData/fileOrElement/equals/Equals2.kt +++ b/j2k/testData/fileOrElement/equals/Equals2.kt @@ -1,9 +1,9 @@ -class C { - fun foo1(s1: String, s2: String): Boolean { +internal class C { + internal fun foo1(s1: String, s2: String): Boolean { return s1 == s2 } - fun foo2(s1: String, s2: String): Boolean { + internal fun foo2(s1: String, s2: String): Boolean { return s1 != s2 } } \ No newline at end of file diff --git a/j2k/testData/fileOrElement/equals/Equals3.kt b/j2k/testData/fileOrElement/equals/Equals3.kt index 37de7d423e5..2ac99c8b9bb 100644 --- a/j2k/testData/fileOrElement/equals/Equals3.kt +++ b/j2k/testData/fileOrElement/equals/Equals3.kt @@ -1,9 +1,9 @@ -class C { - public fun equals(c: C): Boolean { +internal class C { + fun equals(c: C): Boolean { return false } - fun foo(c1: C, c2: C): Boolean { + internal fun foo(c1: C, c2: C): Boolean { return c1.equals(c2) } } \ No newline at end of file diff --git a/j2k/testData/fileOrElement/equals/Equals4.kt b/j2k/testData/fileOrElement/equals/Equals4.kt index 991b9cbc217..a6699e157a8 100644 --- a/j2k/testData/fileOrElement/equals/Equals4.kt +++ b/j2k/testData/fileOrElement/equals/Equals4.kt @@ -1,5 +1,5 @@ -class C { - fun foo(s1: String, s2: String, s3: String, s4: String): Boolean { +internal class C { + internal fun foo(s1: String, s2: String, s3: String, s4: String): Boolean { return s1 == s2 == (s3 != s4) } } \ No newline at end of file diff --git a/j2k/testData/fileOrElement/equals/ObjectsEquals.kt b/j2k/testData/fileOrElement/equals/ObjectsEquals.kt index 1faa8707d70..4b692fc8327 100644 --- a/j2k/testData/fileOrElement/equals/ObjectsEquals.kt +++ b/j2k/testData/fileOrElement/equals/ObjectsEquals.kt @@ -1,13 +1,13 @@ import java.util.Objects -interface I +internal interface I -class C { - fun foo1(i1: I, i2: I): Boolean { +internal class C { + internal fun foo1(i1: I, i2: I): Boolean { return i1 == i2 } - fun foo2(i1: I, i2: I): Boolean { + internal fun foo2(i1: I, i2: I): Boolean { return i1 != i2 } } \ No newline at end of file diff --git a/j2k/testData/fileOrElement/field/classChildExtendsBase.kt b/j2k/testData/fileOrElement/field/classChildExtendsBase.kt index aa79a9be0b5..f642e61cc75 100644 --- a/j2k/testData/fileOrElement/field/classChildExtendsBase.kt +++ b/j2k/testData/fileOrElement/field/classChildExtendsBase.kt @@ -1,7 +1,7 @@ -open class Base { +internal open class Base { private val myFirst: String? = null } -class Child : Base() { +internal class Child : Base() { private val mySecond: String? = null } \ No newline at end of file diff --git a/j2k/testData/fileOrElement/field/conversion.kt b/j2k/testData/fileOrElement/field/conversion.kt index 07673e1b1e8..36a1031dae2 100644 --- a/j2k/testData/fileOrElement/field/conversion.kt +++ b/j2k/testData/fileOrElement/field/conversion.kt @@ -1,13 +1,13 @@ -class A { +internal class A { private var i: Int? = getByte().toInt() - fun foo() { + internal fun foo() { i = 10 } companion object { - fun getByte(): Byte { + internal fun getByte(): Byte { return 0 } } diff --git a/j2k/testData/fileOrElement/field/internalField.kt b/j2k/testData/fileOrElement/field/internalField.kt index 7ebec51eb31..1325f2c11fe 100644 --- a/j2k/testData/fileOrElement/field/internalField.kt +++ b/j2k/testData/fileOrElement/field/internalField.kt @@ -1,5 +1,5 @@ // ERROR: Unresolved reference: Foo // ERROR: Property must be initialized or be abstract -class C { - var f: Foo +internal class C { + internal var f: Foo } \ No newline at end of file diff --git a/j2k/testData/fileOrElement/field/privateField.kt b/j2k/testData/fileOrElement/field/privateField.kt index a078e3aba9f..0940da03b4c 100644 --- a/j2k/testData/fileOrElement/field/privateField.kt +++ b/j2k/testData/fileOrElement/field/privateField.kt @@ -1,4 +1,4 @@ // ERROR: Unresolved reference: Foo -class C { +internal class C { private val f: Foo? = null } diff --git a/j2k/testData/fileOrElement/field/protectedField.kt b/j2k/testData/fileOrElement/field/protectedField.kt index 44cf88b02ac..bfa318f3d9f 100644 --- a/j2k/testData/fileOrElement/field/protectedField.kt +++ b/j2k/testData/fileOrElement/field/protectedField.kt @@ -1,5 +1,5 @@ // ERROR: Unresolved reference: Foo // ERROR: Property must be initialized or be abstract -class C { +internal class C { protected var f: Foo } \ No newline at end of file diff --git a/j2k/testData/fileOrElement/field/publicField.kt b/j2k/testData/fileOrElement/field/publicField.kt index 99478b79517..c49abd9c60d 100644 --- a/j2k/testData/fileOrElement/field/publicField.kt +++ b/j2k/testData/fileOrElement/field/publicField.kt @@ -1,5 +1,5 @@ // ERROR: Unresolved reference: Foo // ERROR: Property must be initialized or be abstract -class C { - public var f: Foo +internal class C { + var f: Foo } \ No newline at end of file diff --git a/j2k/testData/fileOrElement/field/specifyType.kt b/j2k/testData/fileOrElement/field/specifyType.kt index 09e03d7629c..45350cc088a 100644 --- a/j2k/testData/fileOrElement/field/specifyType.kt +++ b/j2k/testData/fileOrElement/field/specifyType.kt @@ -1,25 +1,25 @@ import java.util.* -class A { +internal class A { private val field1 = ArrayList() - val field2: List = ArrayList() - public val field3: Int = 0 + internal val field2: List = ArrayList() + val field3: Int = 0 protected val field4: Int = 0 private var field5: List = ArrayList() - var field6: List = ArrayList() + internal var field6: List = ArrayList() private var field7 = 0 - var field8 = 0 + internal var field8 = 0 private var field9: String? = "a" private var field10: String? = foo() - fun foo(): String { + internal fun foo(): String { return "x" } - fun bar() { + internal fun bar() { field5 = ArrayList() field7++ field8++ diff --git a/j2k/testData/fileOrElement/field/valOrVar.kt b/j2k/testData/fileOrElement/field/valOrVar.kt index ff02eb56354..56611fe898c 100644 --- a/j2k/testData/fileOrElement/field/valOrVar.kt +++ b/j2k/testData/fileOrElement/field/valOrVar.kt @@ -1,9 +1,9 @@ -class A(private val field6: Int, private val field8: Int, a: A) { +internal class A internal constructor(private val field6: Int, private val field8: Int, a: A) { private val field1 = 0 private val field2 = 0 private var field3 = 0 - val field4 = 0 - var field5 = 0 + internal val field4 = 0 + internal var field5 = 0 private val field7: Int private val field9: Int private var field10: Int = 0 @@ -18,7 +18,7 @@ class A(private val field6: Int, private val field8: Int, a: A) { a.field11 = 10 } - fun foo() { + internal fun foo() { field3 = field2 } } \ No newline at end of file diff --git a/j2k/testData/fileOrElement/field/valWithInit.kt b/j2k/testData/fileOrElement/field/valWithInit.kt index 041b2d4f7b6..d43fe3e3060 100644 --- a/j2k/testData/fileOrElement/field/valWithInit.kt +++ b/j2k/testData/fileOrElement/field/valWithInit.kt @@ -1,4 +1,4 @@ // ERROR: Unresolved reference: Foo -class C { - val f = Foo(1, 2) +internal class C { + internal val f = Foo(1, 2) } \ No newline at end of file diff --git a/j2k/testData/fileOrElement/field/varWithInit.kt b/j2k/testData/fileOrElement/field/varWithInit.kt index 9afd61a5bb8..4a26bd9d5be 100644 --- a/j2k/testData/fileOrElement/field/varWithInit.kt +++ b/j2k/testData/fileOrElement/field/varWithInit.kt @@ -1,4 +1,4 @@ // ERROR: Unresolved reference: Foo -class C { - var f = Foo(1, 2) +internal class C { + internal var f = Foo(1, 2) } \ No newline at end of file diff --git a/j2k/testData/fileOrElement/field/varWithoutInit.kt b/j2k/testData/fileOrElement/field/varWithoutInit.kt index 7ebec51eb31..1325f2c11fe 100644 --- a/j2k/testData/fileOrElement/field/varWithoutInit.kt +++ b/j2k/testData/fileOrElement/field/varWithoutInit.kt @@ -1,5 +1,5 @@ // ERROR: Unresolved reference: Foo // ERROR: Property must be initialized or be abstract -class C { - var f: Foo +internal class C { + internal var f: Foo } \ No newline at end of file diff --git a/j2k/testData/fileOrElement/field/volatileTransientAndStrictFp.kt b/j2k/testData/fileOrElement/field/volatileTransientAndStrictFp.kt index e6bea60120e..5e66ad12e3f 100644 --- a/j2k/testData/fileOrElement/field/volatileTransientAndStrictFp.kt +++ b/j2k/testData/fileOrElement/field/volatileTransientAndStrictFp.kt @@ -1,10 +1,10 @@ // ERROR: This annotation is not applicable to target 'member property' -class A { +internal class A { Deprecated("") - Volatile var field1 = 0 + Volatile internal var field1 = 0 - Transient var field2 = 1 + Transient internal var field2 = 1 // Should work even for bad modifiers - Strictfp var field3 = 2.0 + Strictfp internal var field3 = 2.0 } \ No newline at end of file diff --git a/j2k/testData/fileOrElement/for/arrayIndicesReversed.kt b/j2k/testData/fileOrElement/for/arrayIndicesReversed.kt index aa28a630363..ccee98faeaa 100644 --- a/j2k/testData/fileOrElement/for/arrayIndicesReversed.kt +++ b/j2k/testData/fileOrElement/for/arrayIndicesReversed.kt @@ -1,5 +1,5 @@ -public class A { - fun foo(array: Array) { +class A { + internal fun foo(array: Array) { for (i in array.indices.reversed()) { println(i) } diff --git a/j2k/testData/fileOrElement/for/downTo1.kt b/j2k/testData/fileOrElement/for/downTo1.kt index 62368716e8d..9069b9fe91b 100644 --- a/j2k/testData/fileOrElement/for/downTo1.kt +++ b/j2k/testData/fileOrElement/for/downTo1.kt @@ -1,5 +1,5 @@ -public class A { - fun foo() { +class A { + internal fun foo() { for (i in 10 downTo 0) { println(i) } diff --git a/j2k/testData/fileOrElement/for/downTo2.kt b/j2k/testData/fileOrElement/for/downTo2.kt index cda0f8495a2..6db840e6ffa 100644 --- a/j2k/testData/fileOrElement/for/downTo2.kt +++ b/j2k/testData/fileOrElement/for/downTo2.kt @@ -1,5 +1,5 @@ -public class A { - fun foo() { +class A { + internal fun foo() { for (i in 10 downTo 1) { println(i) } diff --git a/j2k/testData/fileOrElement/for/downTo3.kt b/j2k/testData/fileOrElement/for/downTo3.kt index 26f4ace7aee..cacbc3f79cf 100644 --- a/j2k/testData/fileOrElement/for/downTo3.kt +++ b/j2k/testData/fileOrElement/for/downTo3.kt @@ -1,5 +1,5 @@ -public class A { - fun foo(min: Int) { +class A { + internal fun foo(min: Int) { for (i in 10 downTo min + 1) { println(i) } diff --git a/j2k/testData/fileOrElement/for/downTo4.kt b/j2k/testData/fileOrElement/for/downTo4.kt index 26f4ace7aee..cacbc3f79cf 100644 --- a/j2k/testData/fileOrElement/for/downTo4.kt +++ b/j2k/testData/fileOrElement/for/downTo4.kt @@ -1,5 +1,5 @@ -public class A { - fun foo(min: Int) { +class A { + internal fun foo(min: Int) { for (i in 10 downTo min + 1) { println(i) } diff --git a/j2k/testData/fileOrElement/for/falseArrayIndicesReversed.kt b/j2k/testData/fileOrElement/for/falseArrayIndicesReversed.kt index d74a5689397..12fa54f9c7c 100644 --- a/j2k/testData/fileOrElement/for/falseArrayIndicesReversed.kt +++ b/j2k/testData/fileOrElement/for/falseArrayIndicesReversed.kt @@ -1,5 +1,5 @@ -public class A { - fun foo(array: Array) { +class A { + internal fun foo(array: Array) { for (i in array.size() downTo 0) { println(i) } diff --git a/j2k/testData/fileOrElement/for/falseArrayIndicesReversed2.kt b/j2k/testData/fileOrElement/for/falseArrayIndicesReversed2.kt index bd833edb0ea..34f33c7b096 100644 --- a/j2k/testData/fileOrElement/for/falseArrayIndicesReversed2.kt +++ b/j2k/testData/fileOrElement/for/falseArrayIndicesReversed2.kt @@ -1,5 +1,5 @@ -public class A { - fun foo(array: Array) { +class A { + internal fun foo(array: Array) { for (i in array.size() - 2 downTo 0) { println(i) } diff --git a/j2k/testData/fileOrElement/for/falseIndicesReversed.kt b/j2k/testData/fileOrElement/for/falseIndicesReversed.kt index 882797a658a..50cb9386344 100644 --- a/j2k/testData/fileOrElement/for/falseIndicesReversed.kt +++ b/j2k/testData/fileOrElement/for/falseIndicesReversed.kt @@ -1,5 +1,5 @@ -public class A { - fun foo(collection: Collection) { +class A { + internal fun foo(collection: Collection) { for (i in collection.size() downTo 0) { println(i) } diff --git a/j2k/testData/fileOrElement/for/forThroughCollectionIndices.kt b/j2k/testData/fileOrElement/for/forThroughCollectionIndices.kt index a86309ed398..3cb33fa8a94 100644 --- a/j2k/testData/fileOrElement/for/forThroughCollectionIndices.kt +++ b/j2k/testData/fileOrElement/for/forThroughCollectionIndices.kt @@ -1,7 +1,7 @@ import java.lang.System -class C { - fun foo1(collection: Collection) { +internal class C { + internal fun foo1(collection: Collection) { for (i in collection.indices) { print(i) } diff --git a/j2k/testData/fileOrElement/for/forThroughListIndices.kt b/j2k/testData/fileOrElement/for/forThroughListIndices.kt index b1a4aa02b6a..a518268e29b 100644 --- a/j2k/testData/fileOrElement/for/forThroughListIndices.kt +++ b/j2k/testData/fileOrElement/for/forThroughListIndices.kt @@ -1,13 +1,13 @@ import java.util.ArrayList -class C { - fun foo1(list: MutableList) { +internal class C { + internal fun foo1(list: MutableList) { for (i in list.indices) { list.set(i, "a") } } - fun foo2(list: ArrayList) { + internal fun foo2(list: ArrayList) { for (i in list.indices) { list.set(i, "a") } diff --git a/j2k/testData/fileOrElement/for/forThroughListIndicesNE.kt b/j2k/testData/fileOrElement/for/forThroughListIndicesNE.kt index 2772d545c26..de4a150cb79 100644 --- a/j2k/testData/fileOrElement/for/forThroughListIndicesNE.kt +++ b/j2k/testData/fileOrElement/for/forThroughListIndicesNE.kt @@ -1,7 +1,7 @@ import java.util.ArrayList -class C { - fun foo(list: MutableList) { +internal class C { + internal fun foo(list: MutableList) { for (i in list.indices) { list.set(i, "a") } diff --git a/j2k/testData/fileOrElement/for/forThroughNonArrayIndices.kt b/j2k/testData/fileOrElement/for/forThroughNonArrayIndices.kt index ce8b1a95934..9a3007773b9 100644 --- a/j2k/testData/fileOrElement/for/forThroughNonArrayIndices.kt +++ b/j2k/testData/fileOrElement/for/forThroughNonArrayIndices.kt @@ -1,9 +1,9 @@ -class X { - public var length: Int = 5 +internal class X { + var length: Int = 5 } -class C { - fun foo(x: X) { +internal class C { + internal fun foo(x: X) { for (i in 0..x.length - 1) { print(i) } diff --git a/j2k/testData/fileOrElement/for/forThroughNonCollectionIndices.kt b/j2k/testData/fileOrElement/for/forThroughNonCollectionIndices.kt index 56f1597b67b..3f29b04b980 100644 --- a/j2k/testData/fileOrElement/for/forThroughNonCollectionIndices.kt +++ b/j2k/testData/fileOrElement/for/forThroughNonCollectionIndices.kt @@ -1,11 +1,11 @@ -class X { - public fun size(): Int { +internal class X { + fun size(): Int { return 5 } } -class C { - fun foo(x: X) { +internal class C { + internal fun foo(x: X) { for (i in 0..x.size() - 1) { print(i) } diff --git a/j2k/testData/fileOrElement/for/indicesReversed.kt b/j2k/testData/fileOrElement/for/indicesReversed.kt index fcbc7164bd7..b0bd637f6ed 100644 --- a/j2k/testData/fileOrElement/for/indicesReversed.kt +++ b/j2k/testData/fileOrElement/for/indicesReversed.kt @@ -1,5 +1,5 @@ -public class A { - fun foo(collection: Collection) { +class A { + internal fun foo(collection: Collection) { for (i in collection.indices.reversed()) { println(i) } diff --git a/j2k/testData/fileOrElement/for/infiniteFor.kt b/j2k/testData/fileOrElement/for/infiniteFor.kt index 2bf8960aea3..baef7912f1a 100644 --- a/j2k/testData/fileOrElement/for/infiniteFor.kt +++ b/j2k/testData/fileOrElement/for/infiniteFor.kt @@ -1,4 +1,4 @@ -fun foo() { +internal fun foo() { while (true) { if (!stop()) break } diff --git a/j2k/testData/fileOrElement/for/nameConflict1.kt b/j2k/testData/fileOrElement/for/nameConflict1.kt index 26afacd2870..56d14f07dfa 100644 --- a/j2k/testData/fileOrElement/for/nameConflict1.kt +++ b/j2k/testData/fileOrElement/for/nameConflict1.kt @@ -1,5 +1,5 @@ -class A { - fun foo() { +internal class A { + internal fun foo() { run { var i = 1 while (i < 1000) { diff --git a/j2k/testData/fileOrElement/for/nameConflict2.kt b/j2k/testData/fileOrElement/for/nameConflict2.kt index 5a2cb0b4dfe..3df622553ce 100644 --- a/j2k/testData/fileOrElement/for/nameConflict2.kt +++ b/j2k/testData/fileOrElement/for/nameConflict2.kt @@ -1,5 +1,5 @@ -class A { - fun foo() { +internal class A { + internal fun foo() { run { var i = 1 var j = 0 diff --git a/j2k/testData/fileOrElement/for/nameConflict3.kt b/j2k/testData/fileOrElement/for/nameConflict3.kt index 72fb192d2a0..cd12212c3c6 100644 --- a/j2k/testData/fileOrElement/for/nameConflict3.kt +++ b/j2k/testData/fileOrElement/for/nameConflict3.kt @@ -1,7 +1,7 @@ -class A { - var i = 1 +internal class A { + internal var i = 1 - fun foo() { + internal fun foo() { run { var i = 1 while (i < 1000) { diff --git a/j2k/testData/fileOrElement/for/nameConflict4.kt b/j2k/testData/fileOrElement/for/nameConflict4.kt index a18911f6b84..0e8067d923e 100644 --- a/j2k/testData/fileOrElement/for/nameConflict4.kt +++ b/j2k/testData/fileOrElement/for/nameConflict4.kt @@ -1,5 +1,5 @@ -class A { - fun foo(p: Boolean) { +internal class A { + internal fun foo(p: Boolean) { run { var i = 1 while (i < 1000) { diff --git a/j2k/testData/fileOrElement/for/nameConflict5.kt b/j2k/testData/fileOrElement/for/nameConflict5.kt index fb5cbf4bc4e..b10509188c3 100644 --- a/j2k/testData/fileOrElement/for/nameConflict5.kt +++ b/j2k/testData/fileOrElement/for/nameConflict5.kt @@ -1,5 +1,5 @@ -class A { - fun foo(p: Boolean) { +internal class A { + internal fun foo(p: Boolean) { if (p) { val i = 10 } diff --git a/j2k/testData/fileOrElement/for/notInBlock.kt b/j2k/testData/fileOrElement/for/notInBlock.kt index ca4055c495a..d998ee4ec9f 100644 --- a/j2k/testData/fileOrElement/for/notInBlock.kt +++ b/j2k/testData/fileOrElement/for/notInBlock.kt @@ -1,5 +1,5 @@ -class A { - fun foo(p: Boolean) { +internal class A { + internal fun foo(p: Boolean) { if (p) { var i = 1 while (i < 1000) { diff --git a/j2k/testData/fileOrElement/for/withContinue1.kt b/j2k/testData/fileOrElement/for/withContinue1.kt index 46d3c4ba253..549df3fb4aa 100644 --- a/j2k/testData/fileOrElement/for/withContinue1.kt +++ b/j2k/testData/fileOrElement/for/withContinue1.kt @@ -1,5 +1,5 @@ -public object TestClass { - JvmStatic public fun main(args: Array) { +object TestClass { + JvmStatic fun main(args: Array) { var i = 0 while (i < 10) { if (i == 4 || i == 8) { diff --git a/j2k/testData/fileOrElement/for/withContinue2.kt b/j2k/testData/fileOrElement/for/withContinue2.kt index 622207d0352..f3fd46edc35 100644 --- a/j2k/testData/fileOrElement/for/withContinue2.kt +++ b/j2k/testData/fileOrElement/for/withContinue2.kt @@ -1,5 +1,5 @@ -public object TestClass { - JvmStatic public fun main(args: Array) { +object TestClass { + JvmStatic fun main(args: Array) { var i = 0 var j = 1 while (i < 10) { diff --git a/j2k/testData/fileOrElement/for/withContinue3.kt b/j2k/testData/fileOrElement/for/withContinue3.kt index e64fa17f859..0aedf4ac398 100644 --- a/j2k/testData/fileOrElement/for/withContinue3.kt +++ b/j2k/testData/fileOrElement/for/withContinue3.kt @@ -1,5 +1,5 @@ -public object TestClass { - JvmStatic public fun main(args: Array) { +object TestClass { + JvmStatic fun main(args: Array) { var i = 1 while (i < 1000) { if (i == 4 || i == 8) { diff --git a/j2k/testData/fileOrElement/for/withContinueAndLabels.kt b/j2k/testData/fileOrElement/for/withContinueAndLabels.kt index b3777bfe1f6..ed2e7836a80 100644 --- a/j2k/testData/fileOrElement/for/withContinueAndLabels.kt +++ b/j2k/testData/fileOrElement/for/withContinueAndLabels.kt @@ -1,5 +1,5 @@ -public object TestClass { - JvmStatic public fun main(args: Array) { +object TestClass { + JvmStatic fun main(args: Array) { var i = 1 OuterLoop1@ OuterLoop2@ while (i < 1000) { var j = 1 diff --git a/j2k/testData/fileOrElement/foreachStatement/nullableIterable.kt b/j2k/testData/fileOrElement/foreachStatement/nullableIterable.kt index a682e597b51..9817153f701 100644 --- a/j2k/testData/fileOrElement/foreachStatement/nullableIterable.kt +++ b/j2k/testData/fileOrElement/foreachStatement/nullableIterable.kt @@ -1,7 +1,7 @@ -class A { - var list: List? = null +internal class A { + internal var list: List? = null - fun foo() { + internal fun foo() { for (e in list!!) { println(e) } diff --git a/j2k/testData/fileOrElement/formatting/lineBreaksBetweenArguments.kt b/j2k/testData/fileOrElement/formatting/lineBreaksBetweenArguments.kt index f9674a2a7eb..cff39866012 100644 --- a/j2k/testData/fileOrElement/formatting/lineBreaksBetweenArguments.kt +++ b/j2k/testData/fileOrElement/formatting/lineBreaksBetweenArguments.kt @@ -1,8 +1,8 @@ -class F { - fun f1(p1: Int, p2: Int, p3: Int, p4: Int, vararg p5: Int) { +internal class F { + internal fun f1(p1: Int, p2: Int, p3: Int, p4: Int, vararg p5: Int) { } - fun f2(array: IntArray) { + internal fun f2(array: IntArray) { f1(1, 2, 3, 4, *array) diff --git a/j2k/testData/fileOrElement/formatting/nonStaticMembers.kt b/j2k/testData/fileOrElement/formatting/nonStaticMembers.kt index 1f539b29b1e..ce5d40249fe 100644 --- a/j2k/testData/fileOrElement/formatting/nonStaticMembers.kt +++ b/j2k/testData/fileOrElement/formatting/nonStaticMembers.kt @@ -1,14 +1,14 @@ -class F { +internal class F { - fun f1() { + internal fun f1() { } - fun f2() { + internal fun f2() { } - var i: Int? = 0 + internal var i: Int? = 0 - fun f3() { + internal fun f3() { } } \ No newline at end of file diff --git a/j2k/testData/fileOrElement/formatting/nonStaticMembersWithComments.kt b/j2k/testData/fileOrElement/formatting/nonStaticMembersWithComments.kt index e013b7ff0f8..f93cb14548f 100644 --- a/j2k/testData/fileOrElement/formatting/nonStaticMembersWithComments.kt +++ b/j2k/testData/fileOrElement/formatting/nonStaticMembersWithComments.kt @@ -1,10 +1,10 @@ -class F { +internal class F { //c1 /*c2*/ - fun f1() { + internal fun f1() { } @@ -13,12 +13,12 @@ class F { //c4 - fun f2() { + internal fun f2() { } - var i: Int? = 0 + internal var i: Int? = 0 - fun f3() { + internal fun f3() { } //c5 diff --git a/j2k/testData/fileOrElement/formatting/staticAndNonStaticMembersWithComments.kt b/j2k/testData/fileOrElement/formatting/staticAndNonStaticMembersWithComments.kt index 7e14f14f9d9..909f3283a0e 100644 --- a/j2k/testData/fileOrElement/formatting/staticAndNonStaticMembersWithComments.kt +++ b/j2k/testData/fileOrElement/formatting/staticAndNonStaticMembersWithComments.kt @@ -1,4 +1,4 @@ -class F { +internal class F { //c3 @@ -6,13 +6,13 @@ class F { //c4 - fun f2() { + internal fun f2() { } - fun f3() { + internal fun f3() { } - fun f4() { + internal fun f4() { } companion object { @@ -21,14 +21,14 @@ class F { /*c2*/ - fun f1() { + internal fun f1() { } - var i: Int? = 0 + internal var i: Int? = 0 //c5 - fun f5() { + internal fun f5() { } } diff --git a/j2k/testData/fileOrElement/formatting/staticMembersWithComments.kt b/j2k/testData/fileOrElement/formatting/staticMembersWithComments.kt index e8e04ad0a1d..883572c8a8d 100644 --- a/j2k/testData/fileOrElement/formatting/staticMembersWithComments.kt +++ b/j2k/testData/fileOrElement/formatting/staticMembersWithComments.kt @@ -1,10 +1,10 @@ -object F { +internal object F { //c1 /*c2*/ - fun f1() { + internal fun f1() { } @@ -13,12 +13,12 @@ object F { //c4 - fun f2() { + internal fun f2() { } - var i: Int? = 0 + internal var i: Int? = 0 - fun f3() { + internal fun f3() { } //c5 diff --git a/j2k/testData/fileOrElement/function/abstractMethod.kt b/j2k/testData/fileOrElement/function/abstractMethod.kt index 7fcdd037e33..12c044ea709 100644 --- a/j2k/testData/fileOrElement/function/abstractMethod.kt +++ b/j2k/testData/fileOrElement/function/abstractMethod.kt @@ -1 +1 @@ -abstract fun getNoofGears(): Int \ No newline at end of file +internal abstract fun getNoofGears(): Int \ No newline at end of file diff --git a/j2k/testData/fileOrElement/function/classGenericParam.kt b/j2k/testData/fileOrElement/function/classGenericParam.kt index 9286b7acb4b..343de375765 100644 --- a/j2k/testData/fileOrElement/function/classGenericParam.kt +++ b/j2k/testData/fileOrElement/function/classGenericParam.kt @@ -1,2 +1,2 @@ -fun getT(): T { +internal fun getT(): T { } \ No newline at end of file diff --git a/j2k/testData/fileOrElement/function/emptyVoidMethod.kt b/j2k/testData/fileOrElement/function/emptyVoidMethod.kt index e97bc7ec751..ab779625e2c 100644 --- a/j2k/testData/fileOrElement/function/emptyVoidMethod.kt +++ b/j2k/testData/fileOrElement/function/emptyVoidMethod.kt @@ -1,2 +1,2 @@ -fun main() { +internal fun main() { } \ No newline at end of file diff --git a/j2k/testData/fileOrElement/function/extendsBaseWhichExtendsObject.kt b/j2k/testData/fileOrElement/function/extendsBaseWhichExtendsObject.kt index dfb93723294..9f8606526cd 100644 --- a/j2k/testData/fileOrElement/function/extendsBaseWhichExtendsObject.kt +++ b/j2k/testData/fileOrElement/function/extendsBaseWhichExtendsObject.kt @@ -2,7 +2,7 @@ // ERROR: Unresolved reference: finalize package test -class Test : Base() { +internal class Test : Base() { override fun hashCode(): Int { return super.hashCode() } @@ -26,7 +26,7 @@ class Test : Base() { } } -open class Base { +internal open class Base { override fun hashCode(): Int { return super.hashCode() } diff --git a/j2k/testData/fileOrElement/function/final.kt b/j2k/testData/fileOrElement/function/final.kt index 836f70823d6..dfa82dd5eff 100644 --- a/j2k/testData/fileOrElement/function/final.kt +++ b/j2k/testData/fileOrElement/function/final.kt @@ -1,3 +1,3 @@ -fun getString(): String { +internal fun getString(): String { return "" } \ No newline at end of file diff --git a/j2k/testData/fileOrElement/function/functionInFinalClass.kt b/j2k/testData/fileOrElement/function/functionInFinalClass.kt index 7653fdd6b8a..c7369a87963 100644 --- a/j2k/testData/fileOrElement/function/functionInFinalClass.kt +++ b/j2k/testData/fileOrElement/function/functionInFinalClass.kt @@ -1,6 +1,6 @@ package demo -class Final { - fun test() { +internal class Final { + internal fun test() { } } \ No newline at end of file diff --git a/j2k/testData/fileOrElement/function/internal.kt b/j2k/testData/fileOrElement/function/internal.kt index a7a0a149d8b..ba9eda2cf58 100644 --- a/j2k/testData/fileOrElement/function/internal.kt +++ b/j2k/testData/fileOrElement/function/internal.kt @@ -1,2 +1,2 @@ -fun test() { +internal fun test() { } \ No newline at end of file diff --git a/j2k/testData/fileOrElement/function/java8Lambdas.kt b/j2k/testData/fileOrElement/function/java8Lambdas.kt index 229fc15c45c..c859748f29b 100644 --- a/j2k/testData/fileOrElement/function/java8Lambdas.kt +++ b/j2k/testData/fileOrElement/function/java8Lambdas.kt @@ -4,20 +4,20 @@ // ERROR: Type mismatch: inferred type is kotlin.String but kotlin.Unit was expected // ERROR: 'return' is not allowed here // ERROR: Type mismatch: inferred type is kotlin.String but kotlin.Unit was expected -public class Java8Class { - public fun foo0(r: Function0) { +class Java8Class { + fun foo0(r: Function0) { } - public fun foo1(r: Function1) { + fun foo1(r: Function1) { } - public fun foo2(r: Function2) { + fun foo2(r: Function2) { } - public fun helper() { + fun helper() { } - public fun foo() { + fun foo() { foo0 { "42" } foo0 { "42" } foo0 { diff --git a/j2k/testData/fileOrElement/function/java8MRKFunctionExpectedType.kt b/j2k/testData/fileOrElement/function/java8MRKFunctionExpectedType.kt index fc15fcd7cca..9ee418c870f 100644 --- a/j2k/testData/fileOrElement/function/java8MRKFunctionExpectedType.kt +++ b/j2k/testData/fileOrElement/function/java8MRKFunctionExpectedType.kt @@ -3,31 +3,31 @@ package test import java.util.Collections -class Test { - public fun memberFun(): Int { +internal class Test { + fun memberFun(): Int { return 1 } companion object { - public var field: Java8Class = Java8Class() - public fun staticFun(): Java8Class { + var field: Java8Class = Java8Class() + fun staticFun(): Java8Class { return Java8Class() } - public fun testOverloads(): String { + fun testOverloads(): String { return "1" } - public fun testOverloads(i: Int): String { + fun testOverloads(i: Int): String { return "2" } } } -class Java8Class { +internal class Java8Class { private val field = Java8Class() - public fun testStaticFunction() { + fun testStaticFunction() { val staticFunFromSameClass = { staticFun() } staticFunFromSameClass.invoke() @@ -35,12 +35,12 @@ class Java8Class { staticFunFromAnotherClass.invoke() } - public fun testMemberFunctionThroughClass() { + fun testMemberFunctionThroughClass() { val memberFunFromClass = { obj: Java8Class -> obj.memberFun() } memberFunFromClass.invoke(Java8Class()) } - public fun testMemberFunctionThroughObject() { + fun testMemberFunctionThroughObject() { val obj = Java8Class() val memberFunFromSameClass = { obj.memberFun() } memberFunFromSameClass.invoke() @@ -57,7 +57,7 @@ class Java8Class { memberFunThroughObj3.invoke() } - public fun testConstructor() { + fun testConstructor() { val constructorSameClass = { Java8Class() } constructorSameClass.invoke() @@ -71,12 +71,12 @@ class Java8Class { qualifiedConstructorAnotherClass.invoke() } - public fun testLibraryFunctions() { + fun testLibraryFunctions() { val memberFunFromClass = { obj: String -> obj.length() } memberFunFromClass.invoke("str") } - public fun testOverloads() { + fun testOverloads() { val constructorWithoutParams = { Test.testOverloads() } constructorWithoutParams.invoke() @@ -84,18 +84,18 @@ class Java8Class { constructorWithParam.invoke(2) } - public fun testGenericFunctions() { + fun testGenericFunctions() { val emptyList = { Collections.emptyList() } emptyList.invoke() } - public fun memberFun(): Int { + fun memberFun(): Int { return 1 } companion object { - public fun staticFun(): Int { + fun staticFun(): Int { return 1 } } diff --git a/j2k/testData/fileOrElement/function/java8MRSamConstructor.kt b/j2k/testData/fileOrElement/function/java8MRSamConstructor.kt index d7864f29dac..1b822e0363a 100644 --- a/j2k/testData/fileOrElement/function/java8MRSamConstructor.kt +++ b/j2k/testData/fileOrElement/function/java8MRSamConstructor.kt @@ -3,40 +3,40 @@ package test import javaApi.* import java.util.Collections -class Test { - public fun memberFun(): Int { +internal class Test { + fun memberFun(): Int { return 1 } - public constructor(i: Int) : super() { + constructor(i: Int) : super() { } - public constructor() { + constructor() { } companion object { - public var field: Java8Class = Java8Class() - public fun staticFun(): Java8Class { + var field: Java8Class = Java8Class() + fun staticFun(): Java8Class { return Java8Class() } - public fun testOverloads(): String { + fun testOverloads(): String { return "1" } - public fun testOverloads(i: Int): String { + fun testOverloads(i: Int): String { return "2" } } } -class Test2 +internal class Test2 -class Java8Class { +internal class Java8Class { private val field = Java8Class() private val h = MethodReferenceHelperClass() - public fun testStaticFunction() { + fun testStaticFunction() { val staticFunFromSameClass = JFunction0 { staticFun() } staticFunFromSameClass.foo() MethodReferenceHelperClass.staticFun0 { staticFun() } @@ -48,14 +48,14 @@ class Java8Class { h.memberFun0 { Test.staticFun() } } - public fun testMemberFunctionThroughClass() { + fun testMemberFunctionThroughClass() { val memberFunFromClass = JFunction2 { it.memberFun() } memberFunFromClass.foo(Java8Class()) MethodReferenceHelperClass.staticFun2(JFunction2 { memberFun() }) h.memberFun2(JFunction2 { memberFun() }) } - public fun testMemberFunctionThroughObject() { + fun testMemberFunctionThroughObject() { val obj = Java8Class() val memberFunFromSameClass = JFunction0 { obj.memberFun() } memberFunFromSameClass.foo() @@ -84,7 +84,7 @@ class Java8Class { h.memberFun0 { Test.staticFun().memberFun() } } - public fun testConstructor() { + fun testConstructor() { val constructorSameClass = JFunction0 { Java8Class() } constructorSameClass.foo() MethodReferenceHelperClass.staticFun0 { Java8Class() } @@ -116,7 +116,7 @@ class Java8Class { h.memberFun0 { Test2() } } - public fun testLibraryFunctions() { + fun testLibraryFunctions() { val memberFunFromClass = JFunction2 { it.length() } memberFunFromClass.foo("str") @@ -124,7 +124,7 @@ class Java8Class { Runnable { System.out.println() }.run() } - public fun testOverloads() { + fun testOverloads() { val constructorWithoutParams = JFunction1 { Test.testOverloads() } constructorWithoutParams.foo() MethodReferenceHelperClass.staticFun1 { Test.testOverloads() } @@ -136,20 +136,20 @@ class Java8Class { h.memberFun2(JFunction2 { Test.testOverloads(it) }) } - public fun testGenericFunctions() { + fun testGenericFunctions() { val emptyList = JFunction1> { Collections.emptyList() } emptyList.foo() MethodReferenceHelperClass.staticFun1(JFunction1> { Collections.emptyList() }) h.memberFun1(JFunction1> { Collections.emptyList() }) } - public fun memberFun(): Int { + fun memberFun(): Int { return 1 } companion object { - public fun staticFun(): Int { + fun staticFun(): Int { return 1 } } diff --git a/j2k/testData/fileOrElement/function/lineBreaksBetweenParameters.kt b/j2k/testData/fileOrElement/function/lineBreaksBetweenParameters.kt index 959616fa353..38d9527b9fb 100644 --- a/j2k/testData/fileOrElement/function/lineBreaksBetweenParameters.kt +++ b/j2k/testData/fileOrElement/function/lineBreaksBetweenParameters.kt @@ -1,17 +1,17 @@ -class C { - public fun foo1(p1: Int, p2: Int) { +internal class C { + fun foo1(p1: Int, p2: Int) { } - public fun foo2( + fun foo2( p1: Int, p2: Int) { } - public fun foo3(p1: Int, - p2: Int) { + fun foo3(p1: Int, + p2: Int) { } - public fun foo4( + fun foo4( p1: Int, p2: Int, p3: Int, p4: Int) { } diff --git a/j2k/testData/fileOrElement/function/main.kt b/j2k/testData/fileOrElement/function/main.kt index fc11692272b..64da132258e 100644 --- a/j2k/testData/fileOrElement/function/main.kt +++ b/j2k/testData/fileOrElement/function/main.kt @@ -1,2 +1,2 @@ -JvmStatic public fun main(args: Array) { +JvmStatic fun main(args: Array) { } \ No newline at end of file diff --git a/j2k/testData/fileOrElement/function/main2.kt b/j2k/testData/fileOrElement/function/main2.kt index 61cc457dd3e..9d272f4375e 100644 --- a/j2k/testData/fileOrElement/function/main2.kt +++ b/j2k/testData/fileOrElement/function/main2.kt @@ -1,4 +1,4 @@ -public object A { - JvmStatic public fun main(args: Array) { +object A { + JvmStatic fun main(args: Array) { } } \ No newline at end of file diff --git a/j2k/testData/fileOrElement/function/mainAndNullabilitySetting.kt b/j2k/testData/fileOrElement/function/mainAndNullabilitySetting.kt index e356de2fc23..344b0741ab0 100644 --- a/j2k/testData/fileOrElement/function/mainAndNullabilitySetting.kt +++ b/j2k/testData/fileOrElement/function/mainAndNullabilitySetting.kt @@ -1,5 +1,5 @@ // !forceNotNullTypes: false -public object A { - JvmStatic public fun main(args: Array) { +object A { + JvmStatic fun main(args: Array) { } } \ No newline at end of file diff --git a/j2k/testData/fileOrElement/function/methodClassType.kt b/j2k/testData/fileOrElement/function/methodClassType.kt index 0124d08ad5b..85f1e90f715 100644 --- a/j2k/testData/fileOrElement/function/methodClassType.kt +++ b/j2k/testData/fileOrElement/function/methodClassType.kt @@ -1,2 +1,2 @@ -fun main(): String { +internal fun main(): String { } \ No newline at end of file diff --git a/j2k/testData/fileOrElement/function/methodPrimitiveType.kt b/j2k/testData/fileOrElement/function/methodPrimitiveType.kt index bf6eb1424e4..8b7707df208 100644 --- a/j2k/testData/fileOrElement/function/methodPrimitiveType.kt +++ b/j2k/testData/fileOrElement/function/methodPrimitiveType.kt @@ -1,2 +1,2 @@ -fun main(): Int { +internal fun main(): Int { } \ No newline at end of file diff --git a/j2k/testData/fileOrElement/function/methodPrimitiveType2.kt b/j2k/testData/fileOrElement/function/methodPrimitiveType2.kt index 388e4288f4c..1a8452252bb 100644 --- a/j2k/testData/fileOrElement/function/methodPrimitiveType2.kt +++ b/j2k/testData/fileOrElement/function/methodPrimitiveType2.kt @@ -1,2 +1,2 @@ -fun main(): Boolean { +internal fun main(): Boolean { } \ No newline at end of file diff --git a/j2k/testData/fileOrElement/function/methodWithReturnStatement.kt b/j2k/testData/fileOrElement/function/methodWithReturnStatement.kt index f2cd6c4849c..f9ad532fe10 100644 --- a/j2k/testData/fileOrElement/function/methodWithReturnStatement.kt +++ b/j2k/testData/fileOrElement/function/methodWithReturnStatement.kt @@ -1,3 +1,3 @@ -fun isTrue(): Boolean { +internal fun isTrue(): Boolean { return true } \ No newline at end of file diff --git a/j2k/testData/fileOrElement/function/open.kt b/j2k/testData/fileOrElement/function/open.kt index 836f70823d6..dfa82dd5eff 100644 --- a/j2k/testData/fileOrElement/function/open.kt +++ b/j2k/testData/fileOrElement/function/open.kt @@ -1,3 +1,3 @@ -fun getString(): String { +internal fun getString(): String { return "" } \ No newline at end of file diff --git a/j2k/testData/fileOrElement/function/override.kt b/j2k/testData/fileOrElement/function/override.kt index 087ef852166..83325a430b1 100644 --- a/j2k/testData/fileOrElement/function/override.kt +++ b/j2k/testData/fileOrElement/function/override.kt @@ -1,9 +1,9 @@ -open class A { - open fun a() { +internal open class A { + internal open fun a() { } } -class B : A() { +internal class B : A() { override fun a() { } } \ No newline at end of file diff --git a/j2k/testData/fileOrElement/function/overrideAndOpen.kt b/j2k/testData/fileOrElement/function/overrideAndOpen.kt index b078947fa4c..9344695aec3 100644 --- a/j2k/testData/fileOrElement/function/overrideAndOpen.kt +++ b/j2k/testData/fileOrElement/function/overrideAndOpen.kt @@ -1,14 +1,14 @@ -open class A { - open fun foo() { +internal open class A { + internal open fun foo() { } } -open class B : A() { +internal open class B : A() { override fun foo() { } } -class C : B() { +internal class C : B() { override fun foo() { } } \ No newline at end of file diff --git a/j2k/testData/fileOrElement/function/overrideObject.kt b/j2k/testData/fileOrElement/function/overrideObject.kt index f861860fd2e..5a78de59862 100644 --- a/j2k/testData/fileOrElement/function/overrideObject.kt +++ b/j2k/testData/fileOrElement/function/overrideObject.kt @@ -1,5 +1,5 @@ // ERROR: Unresolved reference: clone -class X { +internal class X { override fun hashCode(): Int { return super.hashCode() } @@ -18,7 +18,7 @@ class X { } } -class Y : Thread() { +internal class Y : Thread() { Throws(CloneNotSupportedException::class) override fun clone(): Any { return super.clone() diff --git a/j2k/testData/fileOrElement/function/overrideObject2.kt b/j2k/testData/fileOrElement/function/overrideObject2.kt index 6791e86c5e5..b459e049e59 100644 --- a/j2k/testData/fileOrElement/function/overrideObject2.kt +++ b/j2k/testData/fileOrElement/function/overrideObject2.kt @@ -1,7 +1,7 @@ // ERROR: Unresolved reference: clone -open class Base +internal open class Base -class X : Base() { +internal class X : Base() { override fun hashCode(): Int { return super.hashCode() } diff --git a/j2k/testData/fileOrElement/function/overrideObject3.kt b/j2k/testData/fileOrElement/function/overrideObject3.kt index af223b01449..6893010b38d 100644 --- a/j2k/testData/fileOrElement/function/overrideObject3.kt +++ b/j2k/testData/fileOrElement/function/overrideObject3.kt @@ -1,10 +1,10 @@ -open class Base { +internal open class Base { override fun equals(o: Any?): Boolean { return super.equals(o) } } -class X : Base() { +internal class X : Base() { override fun equals(o: Any?): Boolean { return super.equals(o) } diff --git a/j2k/testData/fileOrElement/function/ownGenericParam.kt b/j2k/testData/fileOrElement/function/ownGenericParam.kt index e0a4fa6e530..a6a7d15c3d3 100644 --- a/j2k/testData/fileOrElement/function/ownGenericParam.kt +++ b/j2k/testData/fileOrElement/function/ownGenericParam.kt @@ -1,2 +1,2 @@ -fun putU(u: U) { +internal fun putU(u: U) { } \ No newline at end of file diff --git a/j2k/testData/fileOrElement/function/ownSeveralGenericParams.kt b/j2k/testData/fileOrElement/function/ownSeveralGenericParams.kt index 6f04d1b814f..c9da1a73b37 100644 --- a/j2k/testData/fileOrElement/function/ownSeveralGenericParams.kt +++ b/j2k/testData/fileOrElement/function/ownSeveralGenericParams.kt @@ -1,2 +1,2 @@ -fun putUVW(u: U, v: V, w: W) { +internal fun putUVW(u: U, v: V, w: W) { } \ No newline at end of file diff --git a/j2k/testData/fileOrElement/function/parameterModification.kt b/j2k/testData/fileOrElement/function/parameterModification.kt index 6f9e8b853e1..59d7ec29b54 100644 --- a/j2k/testData/fileOrElement/function/parameterModification.kt +++ b/j2k/testData/fileOrElement/function/parameterModification.kt @@ -1,4 +1,4 @@ -fun foo(p1: Int, p2: Int, p3: Int): Int { +internal fun foo(p1: Int, p2: Int, p3: Int): Int { var p1 = p1 var p3 = p3 p1++ diff --git a/j2k/testData/fileOrElement/function/public.kt b/j2k/testData/fileOrElement/function/public.kt index 327abedcdb0..a7a0a149d8b 100644 --- a/j2k/testData/fileOrElement/function/public.kt +++ b/j2k/testData/fileOrElement/function/public.kt @@ -1,2 +1,2 @@ -public fun test() { +fun test() { } \ No newline at end of file diff --git a/j2k/testData/fileOrElement/function/synchronizedMethod.kt b/j2k/testData/fileOrElement/function/synchronizedMethod.kt index d326682081f..05d1f78fd5d 100644 --- a/j2k/testData/fileOrElement/function/synchronizedMethod.kt +++ b/j2k/testData/fileOrElement/function/synchronizedMethod.kt @@ -1,8 +1,8 @@ -class A { - Synchronized fun foo() { +internal class A { + Synchronized internal fun foo() { bar() } - fun bar() { + internal fun bar() { } } \ No newline at end of file diff --git a/j2k/testData/fileOrElement/function/throws.kt b/j2k/testData/fileOrElement/function/throws.kt index d84a06ff7e3..3ba5bb50182 100644 --- a/j2k/testData/fileOrElement/function/throws.kt +++ b/j2k/testData/fileOrElement/function/throws.kt @@ -1,2 +1,2 @@ Throws(IOException::class, SerializationException::class) -fun foo() \ No newline at end of file +internal fun foo() \ No newline at end of file diff --git a/j2k/testData/fileOrElement/function/varVararg.kt b/j2k/testData/fileOrElement/function/varVararg.kt index 1b36a318c04..e46f9ddaf62 100644 --- a/j2k/testData/fileOrElement/function/varVararg.kt +++ b/j2k/testData/fileOrElement/function/varVararg.kt @@ -1,7 +1,7 @@ package demo -class Test { - fun test(vararg args: Any) { +internal class Test { + internal fun test(vararg args: Any) { var args = args args = arrayOf(1, 2, 3) } diff --git a/j2k/testData/fileOrElement/identifier/finalFieldReference.kt b/j2k/testData/fileOrElement/identifier/finalFieldReference.kt index bc2557930ab..d94c48c911c 100644 --- a/j2k/testData/fileOrElement/identifier/finalFieldReference.kt +++ b/j2k/testData/fileOrElement/identifier/finalFieldReference.kt @@ -1,10 +1,10 @@ -class `$$$$$` +internal class `$$$$$` -open class `$` +internal open class `$` -class `$$`(val `$$$`: `$$$$$`) : `$`() { +internal class `$$`(internal val `$$$`: `$$$$$`) : `$`() { - public fun `$$$$$$`(): `$$$$$` { + fun `$$$$$$`(): `$$$$$` { return `$$$` } } \ No newline at end of file diff --git a/j2k/testData/fileOrElement/ifStatement/elseIf.kt b/j2k/testData/fileOrElement/ifStatement/elseIf.kt index 318da3fef2c..1fb64066cd6 100644 --- a/j2k/testData/fileOrElement/ifStatement/elseIf.kt +++ b/j2k/testData/fileOrElement/ifStatement/elseIf.kt @@ -1,4 +1,4 @@ -fun foo() { +internal fun foo() { if (a) println("a") else if (b) diff --git a/j2k/testData/fileOrElement/importStatement/importWithKeywords.kt b/j2k/testData/fileOrElement/importStatement/importWithKeywords.kt index 3cc700d9195..4f6cc97a0b1 100644 --- a/j2k/testData/fileOrElement/importStatement/importWithKeywords.kt +++ b/j2k/testData/fileOrElement/importStatement/importWithKeywords.kt @@ -3,4 +3,4 @@ package test import `as`.type.`val`.`var`.`fun`.`is`.`in`.`object`.`when`.`trait`.`This` -class Test \ No newline at end of file +internal class Test \ No newline at end of file diff --git a/j2k/testData/fileOrElement/importStatement/importWithStar.kt b/j2k/testData/fileOrElement/importStatement/importWithStar.kt index fc3e21ec12d..396b8cc1190 100644 --- a/j2k/testData/fileOrElement/importStatement/importWithStar.kt +++ b/j2k/testData/fileOrElement/importStatement/importWithStar.kt @@ -2,4 +2,4 @@ package test.j2k import org.jetbrains.annotations.* -public class Converter +class Converter \ No newline at end of file diff --git a/j2k/testData/fileOrElement/importStatement/simpleImport.kt b/j2k/testData/fileOrElement/importStatement/simpleImport.kt index 6b3c5f27850..ceff0eb8219 100644 --- a/j2k/testData/fileOrElement/importStatement/simpleImport.kt +++ b/j2k/testData/fileOrElement/importStatement/simpleImport.kt @@ -1,3 +1,3 @@ package test.j2k -public class Converter +class Converter diff --git a/j2k/testData/fileOrElement/inheritance/classOneExtendsBaseGeneric.kt b/j2k/testData/fileOrElement/inheritance/classOneExtendsBaseGeneric.kt index 5b5830a9aed..7d1141c33ce 100644 --- a/j2k/testData/fileOrElement/inheritance/classOneExtendsBaseGeneric.kt +++ b/j2k/testData/fileOrElement/inheritance/classOneExtendsBaseGeneric.kt @@ -1,3 +1,3 @@ -open class Base(name: T) +internal open class Base internal constructor(name: T) -class One(name: T, private val mySecond: K) : Base(name) \ No newline at end of file +internal class One internal constructor(name: T, private val mySecond: K) : Base(name) \ No newline at end of file diff --git a/j2k/testData/fileOrElement/inheritance/classOneExtendsBaseWithOneParam.kt b/j2k/testData/fileOrElement/inheritance/classOneExtendsBaseWithOneParam.kt index 9db60c1d361..b904efc60b9 100644 --- a/j2k/testData/fileOrElement/inheritance/classOneExtendsBaseWithOneParam.kt +++ b/j2k/testData/fileOrElement/inheritance/classOneExtendsBaseWithOneParam.kt @@ -1,3 +1,3 @@ -open class Base(name: String) +internal open class Base internal constructor(name: String) -class One(name: String, second: String) : Base(name) \ No newline at end of file +internal class One internal constructor(name: String, second: String) : Base(name) \ No newline at end of file diff --git a/j2k/testData/fileOrElement/inheritance/classOneExtendsBaseWithZeroParams.kt b/j2k/testData/fileOrElement/inheritance/classOneExtendsBaseWithZeroParams.kt index 43957f55245..87686be531d 100644 --- a/j2k/testData/fileOrElement/inheritance/classOneExtendsBaseWithZeroParams.kt +++ b/j2k/testData/fileOrElement/inheritance/classOneExtendsBaseWithZeroParams.kt @@ -1,3 +1,3 @@ -open class Base +internal open class Base -class One : Base() \ No newline at end of file +internal class One : Base() \ No newline at end of file diff --git a/j2k/testData/fileOrElement/inheritance/classOneExtendsBaseWithZeroParamsNonEmptyConstructor.kt b/j2k/testData/fileOrElement/inheritance/classOneExtendsBaseWithZeroParamsNonEmptyConstructor.kt index 38d7e3d8a2e..35905f9cb4c 100644 --- a/j2k/testData/fileOrElement/inheritance/classOneExtendsBaseWithZeroParamsNonEmptyConstructor.kt +++ b/j2k/testData/fileOrElement/inheritance/classOneExtendsBaseWithZeroParamsNonEmptyConstructor.kt @@ -1,3 +1,3 @@ -open class Base(name: String) +internal open class Base internal constructor(name: String) -class One(name: String, private val mySecond: String) : Base(name) \ No newline at end of file +internal class One internal constructor(name: String, private val mySecond: String) : Base(name) \ No newline at end of file diff --git a/j2k/testData/fileOrElement/inheritance/openModifier.kt b/j2k/testData/fileOrElement/inheritance/openModifier.kt index c702e2825d6..b7eac93a180 100644 --- a/j2k/testData/fileOrElement/inheritance/openModifier.kt +++ b/j2k/testData/fileOrElement/inheritance/openModifier.kt @@ -1,47 +1,47 @@ import java.lang.Void -open class A { - public open fun f1() { +internal open class A { + open fun f1() { } - public fun f2() { + fun f2() { } private fun f3() { } } -open class B : A() { +internal open class B : A() { override fun f1() { super.f1() } } -class C : B() { +internal class C : B() { override fun f1() { super.f1() } } -interface I { - public fun f() +internal interface I { + fun f() } -class D : I { +internal class D : I { override fun f() { } } -abstract class E { - abstract fun f1() - open fun f2() { +internal abstract class E { + internal abstract fun f1() + internal open fun f2() { } - fun f3() { + internal fun f3() { } } -class F : E() { +internal class F : E() { override fun f1() { } diff --git a/j2k/testData/fileOrElement/issues/arrayLength.kt b/j2k/testData/fileOrElement/issues/arrayLength.kt index 9d464033315..db928458047 100644 --- a/j2k/testData/fileOrElement/issues/arrayLength.kt +++ b/j2k/testData/fileOrElement/issues/arrayLength.kt @@ -1,5 +1,5 @@ -object Test { - public fun foo(args: Array): Int { +internal object Test { + fun foo(args: Array): Int { return args.size() } } \ No newline at end of file diff --git a/j2k/testData/fileOrElement/issues/comments.kt b/j2k/testData/fileOrElement/issues/comments.kt index 2b37baa03af..f440792e73c 100644 --- a/j2k/testData/fileOrElement/issues/comments.kt +++ b/j2k/testData/fileOrElement/issues/comments.kt @@ -9,7 +9,7 @@ This is a block comment //one line comment of class //another one /*another doc*/ -class C { +internal class C { // This is a class comment /** @@ -20,25 +20,25 @@ class C { /** * This is a function doc comment. */ - public fun foo() { + fun foo() { /* This is a function comment */ } //simple one line comment for function - fun f1() { + internal fun f1() { } //simple one line comment for field - var j: Int = 0 + internal var j: Int = 0 //double c style //comment before function - fun f2() { + internal fun f2() { } //double c style //comment before field - var k: Int = 0 + internal var k: Int = 0 //combination /** of @@ -48,7 +48,7 @@ class C { * different */ //comments - fun f3() { + internal fun f3() { } //combination @@ -59,8 +59,8 @@ class C { * different */ //comments - var l: Int = 0 + internal var l: Int = 0 /*two*/ /*comments*//*line*/ - var z: Int = 0 + internal var z: Int = 0 } \ No newline at end of file diff --git a/j2k/testData/fileOrElement/issues/doNotQualifyStatic.kt b/j2k/testData/fileOrElement/issues/doNotQualifyStatic.kt index 72b57e31998..f559b9177ce 100644 --- a/j2k/testData/fileOrElement/issues/doNotQualifyStatic.kt +++ b/j2k/testData/fileOrElement/issues/doNotQualifyStatic.kt @@ -1,8 +1,8 @@ -object Outer { - public var o: Any? = Object() +internal object Outer { + var o: Any? = Object() - public class Nested { - public fun foo() { + class Nested { + fun foo() { o = null } } diff --git a/j2k/testData/fileOrElement/issues/kt-1016.kt b/j2k/testData/fileOrElement/issues/kt-1016.kt index 1c05eab009f..2b5d4bfa1d0 100644 --- a/j2k/testData/fileOrElement/issues/kt-1016.kt +++ b/j2k/testData/fileOrElement/issues/kt-1016.kt @@ -1,3 +1,3 @@ package demo -class C(private val i: Int) \ No newline at end of file +internal class C(private val i: Int) \ No newline at end of file diff --git a/j2k/testData/fileOrElement/issues/kt-1048.kt b/j2k/testData/fileOrElement/issues/kt-1048.kt index 62fa00f085e..3e924538bd2 100644 --- a/j2k/testData/fileOrElement/issues/kt-1048.kt +++ b/j2k/testData/fileOrElement/issues/kt-1048.kt @@ -2,15 +2,15 @@ // ERROR: Type inference failed: Not enough information to infer parameter K in constructor HashMap() Please specify it explicitly. import java.util.HashMap -class G(t: T) +internal class G(t: T) -public class Java { - fun test() { +class Java { + internal fun test() { val m = HashMap() m.put(1, 1) } - fun test2() { + internal fun test2() { val m = HashMap() val g = G("") val g2 = G("") diff --git a/j2k/testData/fileOrElement/issues/kt-1074.kt b/j2k/testData/fileOrElement/issues/kt-1074.kt index 51baf35f29a..16b0f00721b 100644 --- a/j2k/testData/fileOrElement/issues/kt-1074.kt +++ b/j2k/testData/fileOrElement/issues/kt-1074.kt @@ -1,7 +1,7 @@ package demo -object Test { - fun subListRangeCheck(fromIndex: Int, toIndex: Int, size: Int) { +internal object Test { + internal fun subListRangeCheck(fromIndex: Int, toIndex: Int, size: Int) { if (fromIndex < 0) throw IndexOutOfBoundsException("fromIndex = " + fromIndex) if (toIndex > size) diff --git a/j2k/testData/fileOrElement/issues/kt-5294.kt b/j2k/testData/fileOrElement/issues/kt-5294.kt index afbba72669b..8c5a4277ab4 100644 --- a/j2k/testData/fileOrElement/issues/kt-5294.kt +++ b/j2k/testData/fileOrElement/issues/kt-5294.kt @@ -1,4 +1,4 @@ -class X(private val list: List) { +internal class X internal constructor(private val list: List) { - inner class Y + internal inner class Y } \ No newline at end of file diff --git a/j2k/testData/fileOrElement/issues/kt-5400.kt b/j2k/testData/fileOrElement/issues/kt-5400.kt index 3bacf033316..7ff2504dbc5 100644 --- a/j2k/testData/fileOrElement/issues/kt-5400.kt +++ b/j2k/testData/fileOrElement/issues/kt-5400.kt @@ -1,8 +1,8 @@ // ERROR: Property must be initialized or be abstract -open class Base { - inner class Nested +internal open class Base { + internal inner class Nested } -class Derived : Base() { - var field: Base.Nested +internal class Derived : Base() { + internal var field: Base.Nested } \ No newline at end of file diff --git a/j2k/testData/fileOrElement/issues/kt-543-boxed.kt b/j2k/testData/fileOrElement/issues/kt-543-boxed.kt index 71580b0d3dd..1d9d1c7bc3a 100644 --- a/j2k/testData/fileOrElement/issues/kt-543-boxed.kt +++ b/j2k/testData/fileOrElement/issues/kt-543-boxed.kt @@ -1,10 +1,10 @@ package demo -class Test { - fun putInt(i: Int?) { +internal class Test { + internal fun putInt(i: Int?) { } - fun test() { + internal fun test() { val b = 10 putInt(b.toInt()) diff --git a/j2k/testData/fileOrElement/issues/kt-543-mixed.kt b/j2k/testData/fileOrElement/issues/kt-543-mixed.kt index 7d4aa3b0b1a..04135d80b21 100644 --- a/j2k/testData/fileOrElement/issues/kt-543-mixed.kt +++ b/j2k/testData/fileOrElement/issues/kt-543-mixed.kt @@ -1,10 +1,10 @@ package demo -class Test { - fun putInt(i: Int?) { +internal class Test { + internal fun putInt(i: Int?) { } - fun test() { + internal fun test() { val i = 10 putInt(i) } diff --git a/j2k/testData/fileOrElement/issues/kt-543.kt b/j2k/testData/fileOrElement/issues/kt-543.kt index b8d25d24a58..55fc6eea636 100644 --- a/j2k/testData/fileOrElement/issues/kt-543.kt +++ b/j2k/testData/fileOrElement/issues/kt-543.kt @@ -1,10 +1,10 @@ package demo -class Test { - fun putInt(i: Int) { +internal class Test { + internal fun putInt(i: Int) { } - fun test() { + internal fun test() { val b = 10 putInt(b.toInt()) } diff --git a/j2k/testData/fileOrElement/issues/kt-638.kt b/j2k/testData/fileOrElement/issues/kt-638.kt index 38159892036..01d657216b3 100644 --- a/j2k/testData/fileOrElement/issues/kt-638.kt +++ b/j2k/testData/fileOrElement/issues/kt-638.kt @@ -1,27 +1,27 @@ // ERROR: Property must be initialized or be abstract -public class Identifier { - public val name: T +class Identifier { + val name: T private val myHasDollar: Boolean private var myNullable = true - public constructor(name: T) { + constructor(name: T) { this.name = name } - public constructor(name: T, isNullable: Boolean) { + constructor(name: T, isNullable: Boolean) { this.name = name myNullable = isNullable } - public constructor(name: T, hasDollar: Boolean, isNullable: Boolean) { + constructor(name: T, hasDollar: Boolean, isNullable: Boolean) { this.name = name myHasDollar = hasDollar myNullable = isNullable } } -public object User { - JvmStatic public fun main(args: Array) { +object User { + JvmStatic fun main(args: Array) { val i1 = Identifier("name", false, true) val i2 = Identifier("name", false) val i3 = Identifier("name") diff --git a/j2k/testData/fileOrElement/issues/kt-696.kt b/j2k/testData/fileOrElement/issues/kt-696.kt index 17d019de381..0a284403bfd 100644 --- a/j2k/testData/fileOrElement/issues/kt-696.kt +++ b/j2k/testData/fileOrElement/issues/kt-696.kt @@ -1,6 +1,6 @@ package test -open class Base { +internal open class Base { override fun hashCode(): Int { return super.hashCode() } @@ -14,7 +14,7 @@ open class Base { } } -class Child : Base() { +internal class Child : Base() { override fun hashCode(): Int { return super.hashCode() } diff --git a/j2k/testData/fileOrElement/issues/kt-792-mixed.kt b/j2k/testData/fileOrElement/issues/kt-792-mixed.kt index fc7c01c2318..25cdaf0ea87 100644 --- a/j2k/testData/fileOrElement/issues/kt-792-mixed.kt +++ b/j2k/testData/fileOrElement/issues/kt-792-mixed.kt @@ -1,8 +1,8 @@ package demo -class Test(i: Int?) { +internal class Test internal constructor(i: Int?) { - fun test() { + internal fun test() { val i = 10 Test(i) } diff --git a/j2k/testData/fileOrElement/issues/kt-792.kt b/j2k/testData/fileOrElement/issues/kt-792.kt index ec6ecf6b300..8489be57ac0 100644 --- a/j2k/testData/fileOrElement/issues/kt-792.kt +++ b/j2k/testData/fileOrElement/issues/kt-792.kt @@ -1,8 +1,8 @@ package demo -class Test(i: Int) { +internal class Test internal constructor(i: Int) { - fun test() { + internal fun test() { val b = 10 Test(b.toInt()) } diff --git a/j2k/testData/fileOrElement/issues/kt-794-mixed.kt b/j2k/testData/fileOrElement/issues/kt-794-mixed.kt index ce9bc1da7b9..e78997ce32f 100644 --- a/j2k/testData/fileOrElement/issues/kt-794-mixed.kt +++ b/j2k/testData/fileOrElement/issues/kt-794-mixed.kt @@ -1,11 +1,11 @@ package demo -class Test { - fun getInteger(i: Int?): Int? { +internal class Test { + internal fun getInteger(i: Int?): Int? { return i } - fun test() { + internal fun test() { val i = getInteger(10)!! } } \ No newline at end of file diff --git a/j2k/testData/fileOrElement/issues/kt-794.kt b/j2k/testData/fileOrElement/issues/kt-794.kt index 488c491a365..dd2be467e4d 100644 --- a/j2k/testData/fileOrElement/issues/kt-794.kt +++ b/j2k/testData/fileOrElement/issues/kt-794.kt @@ -1,5 +1,5 @@ -class Test { - fun getInt(): Int { +internal class Test { + internal fun getInt(): Int { val b = 10 return b.toInt() } diff --git a/j2k/testData/fileOrElement/issues/kt-807.kt b/j2k/testData/fileOrElement/issues/kt-807.kt index a18cf3ffa22..ff57d65ef36 100644 --- a/j2k/testData/fileOrElement/issues/kt-807.kt +++ b/j2k/testData/fileOrElement/issues/kt-807.kt @@ -4,8 +4,8 @@ // ERROR: Unresolved reference: close import java.io.* -object FileRead { - JvmStatic public fun main(args: Array) { +internal object FileRead { + JvmStatic fun main(args: Array) { try { val fstream = FileInputStream() val `in` = DataInputStream(fstream) diff --git a/j2k/testData/fileOrElement/issues/kt-809-string.kt b/j2k/testData/fileOrElement/issues/kt-809-string.kt index d97d12b1ea1..f391b655719 100644 --- a/j2k/testData/fileOrElement/issues/kt-809-string.kt +++ b/j2k/testData/fileOrElement/issues/kt-809-string.kt @@ -1,20 +1,20 @@ package demo -class Container { - var myString = "1" +internal class Container { + internal var myString = "1" } -object One { - var myContainer = Container() +internal object One { + internal var myContainer = Container() } -class StringContainer(s: String) +internal class StringContainer internal constructor(s: String) -class Test { - fun putString(s: String) { +internal class Test { + internal fun putString(s: String) { } - fun test() { + internal fun test() { putString(One.myContainer.myString) StringContainer(One.myContainer.myString) } diff --git a/j2k/testData/fileOrElement/issues/kt-809.kt b/j2k/testData/fileOrElement/issues/kt-809.kt index bd520a1328e..f670d95b52f 100644 --- a/j2k/testData/fileOrElement/issues/kt-809.kt +++ b/j2k/testData/fileOrElement/issues/kt-809.kt @@ -1,20 +1,20 @@ package demo -class Container { - var myInt = 1 +internal class Container { + internal var myInt = 1 } -object One { - var myContainer = Container() +internal object One { + internal var myContainer = Container() } -class IntContainer(i: Int) +internal class IntContainer internal constructor(i: Int) -class Test { - fun putInt(i: Int) { +internal class Test { + internal fun putInt(i: Int) { } - fun test() { + internal fun test() { putInt(One.myContainer.myInt) IntContainer(One.myContainer.myInt) } diff --git a/j2k/testData/fileOrElement/issues/kt-820-field.kt b/j2k/testData/fileOrElement/issues/kt-820-field.kt index 33ccd9633f4..fb5d804f9d4 100644 --- a/j2k/testData/fileOrElement/issues/kt-820-field.kt +++ b/j2k/testData/fileOrElement/issues/kt-820-field.kt @@ -1,13 +1,13 @@ package demo -class Container { - var myInt = 1 +internal class Container { + internal var myInt = 1 } -object One { - var myContainer = Container() +internal object One { + internal var myContainer = Container() } -class Test { - var b = One.myContainer.myInt.toByte() +internal class Test { + internal var b = One.myContainer.myInt.toByte() } \ No newline at end of file diff --git a/j2k/testData/fileOrElement/issues/kt-820-string.kt b/j2k/testData/fileOrElement/issues/kt-820-string.kt index 96f08524056..a408a592f62 100644 --- a/j2k/testData/fileOrElement/issues/kt-820-string.kt +++ b/j2k/testData/fileOrElement/issues/kt-820-string.kt @@ -1,5 +1,5 @@ -object Test { - public fun toFileSystemSafeName(name: String): String { +internal object Test { + fun toFileSystemSafeName(name: String): String { val size = name.length() return name } diff --git a/j2k/testData/fileOrElement/issues/kt-820.kt b/j2k/testData/fileOrElement/issues/kt-820.kt index 8365f322a62..e245d07e359 100644 --- a/j2k/testData/fileOrElement/issues/kt-820.kt +++ b/j2k/testData/fileOrElement/issues/kt-820.kt @@ -1,15 +1,15 @@ package demo -class Container { - var myInt = 1 +internal class Container { + internal var myInt = 1 } -object One { - var myContainer = Container() +internal object One { + internal var myContainer = Container() } -class Test { - fun test() { +internal class Test { + internal fun test() { val b = One.myContainer.myInt.toByte() } } \ No newline at end of file diff --git a/j2k/testData/fileOrElement/issues/kt-824-isDir.kt b/j2k/testData/fileOrElement/issues/kt-824-isDir.kt index ea45e7794bf..35757d42d68 100644 --- a/j2k/testData/fileOrElement/issues/kt-824-isDir.kt +++ b/j2k/testData/fileOrElement/issues/kt-824-isDir.kt @@ -5,8 +5,8 @@ import java.io.File /** * User: ignatov */ -public object Test { - public fun isDir(parent: File?): Boolean { +object Test { + fun isDir(parent: File?): Boolean { if (parent == null || !parent.exists()) { return false } diff --git a/j2k/testData/fileOrElement/issues/kt-824.kt b/j2k/testData/fileOrElement/issues/kt-824.kt index f609c240018..e8293ce0ee4 100644 --- a/j2k/testData/fileOrElement/issues/kt-824.kt +++ b/j2k/testData/fileOrElement/issues/kt-824.kt @@ -1,15 +1,15 @@ package demo -class Container { - var myBoolean = true +internal class Container { + internal var myBoolean = true } -object One { - var myContainer = Container() +internal object One { + internal var myContainer = Container() } -class Test { - fun test() { +internal class Test { + internal fun test() { if (One.myContainer.myBoolean) println("Ok") diff --git a/j2k/testData/fileOrElement/issues/kt-828.kt b/j2k/testData/fileOrElement/issues/kt-828.kt index 9a4abf4068a..dd02c0161c2 100644 --- a/j2k/testData/fileOrElement/issues/kt-828.kt +++ b/j2k/testData/fileOrElement/issues/kt-828.kt @@ -1,5 +1,5 @@ -class Test { - fun test() { +internal class Test { + internal fun test() { var res = true res = res and false res = res or false diff --git a/j2k/testData/fileOrElement/issues/kt-836.kt b/j2k/testData/fileOrElement/issues/kt-836.kt index 9a47fad0caf..d69dba75102 100644 --- a/j2k/testData/fileOrElement/issues/kt-836.kt +++ b/j2k/testData/fileOrElement/issues/kt-836.kt @@ -2,7 +2,7 @@ package com.voltvoodoo.saplo4j.model import java.io.Serializable -public class Language(protected var code: String) : Serializable { +class Language(protected var code: String) : Serializable { override fun toString(): String { return this.code @@ -10,8 +10,8 @@ public class Language(protected var code: String) : Serializable { } -open class Base { - open fun test() { +internal open class Base { + internal open fun test() { } override fun toString(): String { @@ -19,7 +19,7 @@ open class Base { } } -class Child : Base() { +internal class Child : Base() { override fun test() { } diff --git a/j2k/testData/fileOrElement/issues/kt-837.kt b/j2k/testData/fileOrElement/issues/kt-837.kt index 6900a62f38d..14746cb5e9e 100644 --- a/j2k/testData/fileOrElement/issues/kt-837.kt +++ b/j2k/testData/fileOrElement/issues/kt-837.kt @@ -2,15 +2,15 @@ package com.voltvoodoo.saplo4j.model import java.io.Serializable -public class Language(protected var code: String) : Serializable { +class Language(protected var code: String) : Serializable { - public fun equals(other: Language): Boolean { + fun equals(other: Language): Boolean { return other.toString() == this.toString() } companion object { - public var ENGLISH: Language = Language("en") - public var SWEDISH: Language = Language("sv") + var ENGLISH: Language = Language("en") + var SWEDISH: Language = Language("sv") private val serialVersionUID = -2442762969929206780L } } \ No newline at end of file diff --git a/j2k/testData/fileOrElement/issues/kt-851.kt b/j2k/testData/fileOrElement/issues/kt-851.kt index d4051b329fe..f72c8526364 100644 --- a/j2k/testData/fileOrElement/issues/kt-851.kt +++ b/j2k/testData/fileOrElement/issues/kt-851.kt @@ -1,8 +1,8 @@ -class Test { - fun putInt(i: Int) { +internal class Test { + internal fun putInt(i: Int) { } - fun test() { + internal fun test() { val b = 10 putInt(b.toInt()) } diff --git a/j2k/testData/fileOrElement/issues/kt-852.kt b/j2k/testData/fileOrElement/issues/kt-852.kt index 4f01eb44bb3..e80a3e3783b 100644 --- a/j2k/testData/fileOrElement/issues/kt-852.kt +++ b/j2k/testData/fileOrElement/issues/kt-852.kt @@ -1,7 +1,7 @@ package demo -class Test { - fun test(): String { +internal class Test { + internal fun test(): String { val s1 = "" val s2 = "" val s3 = "" diff --git a/j2k/testData/fileOrElement/issues/kt-871.kt b/j2k/testData/fileOrElement/issues/kt-871.kt index ab558e2a720..10500ce0bb2 100644 --- a/j2k/testData/fileOrElement/issues/kt-871.kt +++ b/j2k/testData/fileOrElement/issues/kt-871.kt @@ -1,7 +1,7 @@ package demo -object Program { - JvmStatic public fun main(args: Array) { +internal object Program { + JvmStatic fun main(args: Array) { println("Halo!") } } \ No newline at end of file diff --git a/j2k/testData/fileOrElement/issues/kt-879.kt b/j2k/testData/fileOrElement/issues/kt-879.kt index f88c93fd429..9bf8fcef596 100644 --- a/j2k/testData/fileOrElement/issues/kt-879.kt +++ b/j2k/testData/fileOrElement/issues/kt-879.kt @@ -1,5 +1,5 @@ -object Test { - public fun getInt(i: Int): Int { +internal object Test { + fun getInt(i: Int): Int { when (i) { 0 -> return 0 1 -> return 1 diff --git a/j2k/testData/fileOrElement/issues/kt-893.kt b/j2k/testData/fileOrElement/issues/kt-893.kt index 7c4162736e1..dd55fb8c960 100644 --- a/j2k/testData/fileOrElement/issues/kt-893.kt +++ b/j2k/testData/fileOrElement/issues/kt-893.kt @@ -1,7 +1,7 @@ package demo -class Test { - fun test() { +internal class Test { + internal fun test() { for (i in 0..9) { println(i) } diff --git a/j2k/testData/fileOrElement/issues/kt-899.kt b/j2k/testData/fileOrElement/issues/kt-899.kt index b86ae7e52d3..9babd04368c 100644 --- a/j2k/testData/fileOrElement/issues/kt-899.kt +++ b/j2k/testData/fileOrElement/issues/kt-899.kt @@ -1,5 +1,5 @@ -class Test { - public fun printNumbers(number: Int) { +internal class Test { + fun printNumbers(number: Int) { for (i in 2..Math.sqrt(number.toDouble()) + 1 - 1) println(i) } diff --git a/j2k/testData/fileOrElement/issues/kt-963.kt b/j2k/testData/fileOrElement/issues/kt-963.kt index c70038edd49..a0ae82e854b 100644 --- a/j2k/testData/fileOrElement/issues/kt-963.kt +++ b/j2k/testData/fileOrElement/issues/kt-963.kt @@ -1,10 +1,10 @@ // ERROR: Variable cannot be initialized before declaration package demo -class C(a: Int) { +internal class C(a: Int) { init { abc = a * 2 } - var abc = 0 + internal var abc = 0 } \ No newline at end of file diff --git a/j2k/testData/fileOrElement/issues/qualifyStatic.kt b/j2k/testData/fileOrElement/issues/qualifyStatic.kt index 065bb49ce5f..fdbf6b728a2 100644 --- a/j2k/testData/fileOrElement/issues/qualifyStatic.kt +++ b/j2k/testData/fileOrElement/issues/qualifyStatic.kt @@ -1,7 +1,7 @@ import java.util.Calendar -abstract class MyCalendar : Calendar() { - public fun foo() { +internal abstract class MyCalendar : Calendar() { + fun foo() { val i = Calendar.ALL_STYLES } } \ No newline at end of file diff --git a/j2k/testData/fileOrElement/issues/spaceBeforeAssignment.kt b/j2k/testData/fileOrElement/issues/spaceBeforeAssignment.kt index 3dc5b76be6d..e2deff34289 100644 --- a/j2k/testData/fileOrElement/issues/spaceBeforeAssignment.kt +++ b/j2k/testData/fileOrElement/issues/spaceBeforeAssignment.kt @@ -1,5 +1,5 @@ import java.util.* -class A { - var list: List = ArrayList() +internal class A { + internal var list: List = ArrayList() } \ No newline at end of file diff --git a/j2k/testData/fileOrElement/kotlinApiAccess/ClassObjectMembers.kt b/j2k/testData/fileOrElement/kotlinApiAccess/ClassObjectMembers.kt index f9213e02d8b..391a2b43c66 100644 --- a/j2k/testData/fileOrElement/kotlinApiAccess/ClassObjectMembers.kt +++ b/j2k/testData/fileOrElement/kotlinApiAccess/ClassObjectMembers.kt @@ -1,7 +1,7 @@ import kotlinApi.KotlinClass -class C { - fun foo(): Int { +internal class C { + internal fun foo(): Int { KotlinClass.staticVar = KotlinClass.staticVar * 2 KotlinClass.staticProperty = KotlinClass.staticVar + KotlinClass.staticProperty return KotlinClass.staticFun(1) diff --git a/j2k/testData/fileOrElement/kotlinApiAccess/CorrectFunNullabilityDetected.kt b/j2k/testData/fileOrElement/kotlinApiAccess/CorrectFunNullabilityDetected.kt index 0062ee03271..d3e46189e06 100644 --- a/j2k/testData/fileOrElement/kotlinApiAccess/CorrectFunNullabilityDetected.kt +++ b/j2k/testData/fileOrElement/kotlinApiAccess/CorrectFunNullabilityDetected.kt @@ -1,7 +1,7 @@ import kotlinApi.* -class A { - fun foo(t: KotlinTrait): Int { +internal class A { + internal fun foo(t: KotlinTrait): Int { return t.nullableFun()!!.length() + t.notNullableFun().length() } } \ No newline at end of file diff --git a/j2k/testData/fileOrElement/kotlinApiAccess/CorrectNullabilityDetected.kt b/j2k/testData/fileOrElement/kotlinApiAccess/CorrectNullabilityDetected.kt index d48213e8d99..41a818c54de 100644 --- a/j2k/testData/fileOrElement/kotlinApiAccess/CorrectNullabilityDetected.kt +++ b/j2k/testData/fileOrElement/kotlinApiAccess/CorrectNullabilityDetected.kt @@ -1,7 +1,7 @@ import kotlinApi.* -class A { - fun foo(c: KotlinClass): Int { +internal class A { + internal fun foo(c: KotlinClass): Int { return c.nullableProperty!!.length() + c.property.length() + KotlinClass.nullableStaticVar!! + KotlinClass.staticVar + KotlinClass.nullableStaticFun(1)!! + KotlinClass.staticFun(1) + nullableGlobalFunction("")!!.length() + globalFunction("").length() } } \ No newline at end of file diff --git a/j2k/testData/fileOrElement/kotlinApiAccess/ExtensionFunction.kt b/j2k/testData/fileOrElement/kotlinApiAccess/ExtensionFunction.kt index ddfed2e0823..880f3a3c99a 100644 --- a/j2k/testData/fileOrElement/kotlinApiAccess/ExtensionFunction.kt +++ b/j2k/testData/fileOrElement/kotlinApiAccess/ExtensionFunction.kt @@ -1,7 +1,7 @@ import kotlinApi.* -class C { - fun foo() { +internal class C { + internal fun foo() { val s = 1.extensionFunction() } } \ No newline at end of file diff --git a/j2k/testData/fileOrElement/kotlinApiAccess/ExtensionProperty.kt b/j2k/testData/fileOrElement/kotlinApiAccess/ExtensionProperty.kt index c1bf65fe1b4..6757eaf0105 100644 --- a/j2k/testData/fileOrElement/kotlinApiAccess/ExtensionProperty.kt +++ b/j2k/testData/fileOrElement/kotlinApiAccess/ExtensionProperty.kt @@ -1,7 +1,7 @@ import kotlinApi.* -class C { - fun foo(): Int { +internal class C { + internal fun foo(): Int { "a".extensionProperty = 1 return "b".extensionProperty } diff --git a/j2k/testData/fileOrElement/kotlinApiAccess/GlobalFunction.kt b/j2k/testData/fileOrElement/kotlinApiAccess/GlobalFunction.kt index 0083a05a497..887040c8488 100644 --- a/j2k/testData/fileOrElement/kotlinApiAccess/GlobalFunction.kt +++ b/j2k/testData/fileOrElement/kotlinApiAccess/GlobalFunction.kt @@ -1,7 +1,7 @@ import kotlinApi.* -class C { - fun foo() { +internal class C { + internal fun foo() { val s = globalFunction("x") } } diff --git a/j2k/testData/fileOrElement/kotlinApiAccess/GlobalGenericFunction.kt b/j2k/testData/fileOrElement/kotlinApiAccess/GlobalGenericFunction.kt index 25445a074d4..64c63b0819f 100644 --- a/j2k/testData/fileOrElement/kotlinApiAccess/GlobalGenericFunction.kt +++ b/j2k/testData/fileOrElement/kotlinApiAccess/GlobalGenericFunction.kt @@ -1,7 +1,7 @@ import kotlinApi.* -class C { - fun foo() { +internal class C { + internal fun foo() { val v = globalGenericFunction(1) } } \ No newline at end of file diff --git a/j2k/testData/fileOrElement/kotlinApiAccess/GlobalValue1.kt b/j2k/testData/fileOrElement/kotlinApiAccess/GlobalValue1.kt index ef04fb2d976..26336929c94 100644 --- a/j2k/testData/fileOrElement/kotlinApiAccess/GlobalValue1.kt +++ b/j2k/testData/fileOrElement/kotlinApiAccess/GlobalValue1.kt @@ -1,7 +1,7 @@ import kotlinApi.* -class C { - fun foo(): Int { +internal class C { + internal fun foo(): Int { globalValue1 = 0 return globalValue1 } diff --git a/j2k/testData/fileOrElement/kotlinApiAccess/GlobalValue2.kt b/j2k/testData/fileOrElement/kotlinApiAccess/GlobalValue2.kt index f9927da5b66..b03d9ca09a9 100644 --- a/j2k/testData/fileOrElement/kotlinApiAccess/GlobalValue2.kt +++ b/j2k/testData/fileOrElement/kotlinApiAccess/GlobalValue2.kt @@ -1,7 +1,7 @@ import kotlinApi.* -class C { - fun foo(): Int { +internal class C { + internal fun foo(): Int { globalValue2 = 0 return globalValue2 } diff --git a/j2k/testData/fileOrElement/kotlinApiAccess/InheritedProperty.kt b/j2k/testData/fileOrElement/kotlinApiAccess/InheritedProperty.kt index 83e2b034af4..4ade6160bca 100644 --- a/j2k/testData/fileOrElement/kotlinApiAccess/InheritedProperty.kt +++ b/j2k/testData/fileOrElement/kotlinApiAccess/InheritedProperty.kt @@ -1,8 +1,8 @@ // ERROR: No value passed for parameter field import kotlinApi.* -class C : KotlinClass() { - fun foo() { +internal class C : KotlinClass() { + internal fun foo() { println(property) property = "a" } diff --git a/j2k/testData/fileOrElement/kotlinApiAccess/ObjectMembers.kt b/j2k/testData/fileOrElement/kotlinApiAccess/ObjectMembers.kt index bbe2a37c094..7d7e091e235 100644 --- a/j2k/testData/fileOrElement/kotlinApiAccess/ObjectMembers.kt +++ b/j2k/testData/fileOrElement/kotlinApiAccess/ObjectMembers.kt @@ -1,7 +1,7 @@ import kotlinApi.KotlinObject -class C { - fun foo(): Int { +internal class C { + internal fun foo(): Int { KotlinObject.property1 = 1 KotlinObject.property2 = 2 return KotlinObject.foo() + KotlinObject.property1 + KotlinObject.property2 diff --git a/j2k/testData/fileOrElement/kotlinApiAccess/Property.kt b/j2k/testData/fileOrElement/kotlinApiAccess/Property.kt index 42a944ce306..d822e6b656e 100644 --- a/j2k/testData/fileOrElement/kotlinApiAccess/Property.kt +++ b/j2k/testData/fileOrElement/kotlinApiAccess/Property.kt @@ -1,7 +1,7 @@ import kotlinApi.* -class C { - fun foo(k: KotlinClass) { +internal class C { + internal fun foo(k: KotlinClass) { println(k.property) k.property = "a" } diff --git a/j2k/testData/fileOrElement/kotlinApiAccess/Property2.kt b/j2k/testData/fileOrElement/kotlinApiAccess/Property2.kt index b187ac445a0..e1dd60bd1b1 100644 --- a/j2k/testData/fileOrElement/kotlinApiAccess/Property2.kt +++ b/j2k/testData/fileOrElement/kotlinApiAccess/Property2.kt @@ -1,7 +1,7 @@ import kotlinApi.* -class C { - fun foo(k: KotlinClass) { +internal class C { + internal fun foo(k: KotlinClass) { println(k.field) k.field = 1 } diff --git a/j2k/testData/fileOrElement/list/ForEach.kt b/j2k/testData/fileOrElement/list/ForEach.kt index 67f9bd3b087..e4e5aa49dde 100644 --- a/j2k/testData/fileOrElement/list/ForEach.kt +++ b/j2k/testData/fileOrElement/list/ForEach.kt @@ -1,8 +1,8 @@ // ERROR: Unresolved reference: LinkedList import java.util.* -public class ForEach { - public fun test() { +class ForEach { + fun test() { val xs = ArrayList() val ys = LinkedList() for (x in xs) { diff --git a/j2k/testData/fileOrElement/list/Lists.kt b/j2k/testData/fileOrElement/list/Lists.kt index eeed46cf148..56455ceb7bc 100644 --- a/j2k/testData/fileOrElement/list/Lists.kt +++ b/j2k/testData/fileOrElement/list/Lists.kt @@ -3,8 +3,8 @@ // ERROR: Null can not be a value of a non-null type kotlin.Any import java.util.* -public class Lists { - public fun test() { +class Lists { + fun test() { val xs = ArrayList() val ys = LinkedList() val zs = ArrayList() diff --git a/j2k/testData/fileOrElement/literalExpression/char.kt b/j2k/testData/fileOrElement/literalExpression/char.kt index 83a67bdb64e..38355d2bab2 100644 --- a/j2k/testData/fileOrElement/literalExpression/char.kt +++ b/j2k/testData/fileOrElement/literalExpression/char.kt @@ -1,5 +1,5 @@ -class Test { - fun test() { +internal class Test { + internal fun test() { val c1 = 'c' val c2 = 'C' } diff --git a/j2k/testData/fileOrElement/literalExpression/dollarInsideString.kt b/j2k/testData/fileOrElement/literalExpression/dollarInsideString.kt index fa0313781e5..29a2cc42078 100644 --- a/j2k/testData/fileOrElement/literalExpression/dollarInsideString.kt +++ b/j2k/testData/fileOrElement/literalExpression/dollarInsideString.kt @@ -1,7 +1,7 @@ package demo -class Test { - fun test() { +internal class Test { + internal fun test() { var name = "$$$$" name = name.replaceAll("\\$[0-9]+", "\\$") diff --git a/j2k/testData/fileOrElement/literalExpression/double.kt b/j2k/testData/fileOrElement/literalExpression/double.kt index b7f35e7e3c9..280ccbe2873 100644 --- a/j2k/testData/fileOrElement/literalExpression/double.kt +++ b/j2k/testData/fileOrElement/literalExpression/double.kt @@ -1,4 +1,4 @@ -class A { +internal class A { private var d1 = 1.0 private var d2 = 1.0 private val d3 = 1.0 @@ -7,13 +7,13 @@ class A { private val d6 = 1.0 private val d7 = Math.sqrt(2.0) - 1 - fun foo1(d: Double) { + internal fun foo1(d: Double) { } - fun foo2(d: Double?) { + internal fun foo2(d: Double?) { } - fun bar() { + internal fun bar() { foo1(1.0) foo1(1.0) foo1(1.0) diff --git a/j2k/testData/fileOrElement/literalExpression/endsWithDFL.kt b/j2k/testData/fileOrElement/literalExpression/endsWithDFL.kt index 20835569c22..93888b19a9b 100644 --- a/j2k/testData/fileOrElement/literalExpression/endsWithDFL.kt +++ b/j2k/testData/fileOrElement/literalExpression/endsWithDFL.kt @@ -1,5 +1,5 @@ -class Test { - fun test() { +internal class Test { + internal fun test() { val l1 = 10L val d1 = 10.0 val f1 = 10.0f @@ -9,7 +9,7 @@ class Test { val f2 = 10.0f } - fun testBoxed() { + internal fun testBoxed() { val l1 = 10L val d1 = 10.0 val f1 = 10.0f diff --git a/j2k/testData/fileOrElement/literalExpression/float.kt b/j2k/testData/fileOrElement/literalExpression/float.kt index c314ac76f84..bc2c6cbf652 100644 --- a/j2k/testData/fileOrElement/literalExpression/float.kt +++ b/j2k/testData/fileOrElement/literalExpression/float.kt @@ -1,4 +1,4 @@ -class A { +internal class A { private var f1 = 1.0f private val f2 = 1.0f private val f3 = 1f @@ -8,13 +8,13 @@ class A { private val f7 = -1f private val f8 = +1f - fun foo1(f: Float) { + internal fun foo1(f: Float) { } - fun foo2(f: Float?) { + internal fun foo2(f: Float?) { } - fun bar() { + internal fun bar() { foo1(1f) foo2(1f) foo1(1f) diff --git a/j2k/testData/fileOrElement/literalExpression/hex.kt b/j2k/testData/fileOrElement/literalExpression/hex.kt index 1d8bbc18bb8..9c736026746 100644 --- a/j2k/testData/fileOrElement/literalExpression/hex.kt +++ b/j2k/testData/fileOrElement/literalExpression/hex.kt @@ -1,5 +1,5 @@ -class Test { - fun test() { +internal class Test { + internal fun test() { val i1 = 33 val i2 = 51 } diff --git a/j2k/testData/fileOrElement/literalExpression/long.kt b/j2k/testData/fileOrElement/literalExpression/long.kt index 3033ca11e38..8a34f586aef 100644 --- a/j2k/testData/fileOrElement/literalExpression/long.kt +++ b/j2k/testData/fileOrElement/literalExpression/long.kt @@ -1,4 +1,4 @@ -class A { +internal class A { private var l1 = 1L private var l2: Long = 1 private val l3 = 1L @@ -8,13 +8,13 @@ class A { private val l7 = +1 private val l8 = +1L - fun foo1(l: Long) { + internal fun foo1(l: Long) { } - fun foo2(l: Long?) { + internal fun foo2(l: Long?) { } - fun bar() { + internal fun bar() { foo1(1) foo1(1L) foo2(1L) diff --git a/j2k/testData/fileOrElement/literalExpression/octal.kt b/j2k/testData/fileOrElement/literalExpression/octal.kt index 06b706dfb32..bb68e9e4fdd 100644 --- a/j2k/testData/fileOrElement/literalExpression/octal.kt +++ b/j2k/testData/fileOrElement/literalExpression/octal.kt @@ -1,5 +1,5 @@ -class Test { - fun test() { +internal class Test { + internal fun test() { val i1 = 37 val i2 = 26 } diff --git a/j2k/testData/fileOrElement/literalExpression/trueOrFalse.kt b/j2k/testData/fileOrElement/literalExpression/trueOrFalse.kt index a0db5294a2c..ae4a7b22f43 100644 --- a/j2k/testData/fileOrElement/literalExpression/trueOrFalse.kt +++ b/j2k/testData/fileOrElement/literalExpression/trueOrFalse.kt @@ -1,5 +1,5 @@ -class Test { - fun test() { +internal class Test { + internal fun test() { val t1 = true val t2 = true diff --git a/j2k/testData/fileOrElement/localVariable/autoBangBang.kt b/j2k/testData/fileOrElement/localVariable/autoBangBang.kt index 076cff468aa..a36e6f2e7dc 100644 --- a/j2k/testData/fileOrElement/localVariable/autoBangBang.kt +++ b/j2k/testData/fileOrElement/localVariable/autoBangBang.kt @@ -1,4 +1,4 @@ -fun foo(i: Int?) { +internal fun foo(i: Int?) { var i1 = i!! i1++ } \ No newline at end of file diff --git a/j2k/testData/fileOrElement/localVariable/conversion.kt b/j2k/testData/fileOrElement/localVariable/conversion.kt index 292c6507953..9c1c18fc549 100644 --- a/j2k/testData/fileOrElement/localVariable/conversion.kt +++ b/j2k/testData/fileOrElement/localVariable/conversion.kt @@ -1,4 +1,4 @@ -fun foo(b: Byte) { +internal fun foo(b: Byte) { var i: Int? = b.toInt() if (p) i = 10 } \ No newline at end of file diff --git a/j2k/testData/fileOrElement/localVariable/literalConversion.kt b/j2k/testData/fileOrElement/localVariable/literalConversion.kt index e7a2ba90a3f..bbb6352d916 100644 --- a/j2k/testData/fileOrElement/localVariable/literalConversion.kt +++ b/j2k/testData/fileOrElement/localVariable/literalConversion.kt @@ -1,4 +1,4 @@ -fun foo() { +internal fun foo() { var i: Long = 1 if (p) i = 10 } \ No newline at end of file diff --git a/j2k/testData/fileOrElement/localVariable/unboxing.kt b/j2k/testData/fileOrElement/localVariable/unboxing.kt index 8cf5718da49..a2920eb4fbb 100644 --- a/j2k/testData/fileOrElement/localVariable/unboxing.kt +++ b/j2k/testData/fileOrElement/localVariable/unboxing.kt @@ -1,4 +1,4 @@ -fun foo() { +internal fun foo() { var i: Int? = 1 if (p) i = null } \ No newline at end of file diff --git a/j2k/testData/fileOrElement/localVariable/valTypeDoNotMatch.kt b/j2k/testData/fileOrElement/localVariable/valTypeDoNotMatch.kt index 50cdf727ad9..8eef363c729 100644 --- a/j2k/testData/fileOrElement/localVariable/valTypeDoNotMatch.kt +++ b/j2k/testData/fileOrElement/localVariable/valTypeDoNotMatch.kt @@ -1,3 +1,3 @@ -fun foo() { +internal fun foo() { val o = "" } \ No newline at end of file diff --git a/j2k/testData/fileOrElement/localVariable/varTypeDoNotMatch.kt b/j2k/testData/fileOrElement/localVariable/varTypeDoNotMatch.kt index 498ad219164..70926216813 100644 --- a/j2k/testData/fileOrElement/localVariable/varTypeDoNotMatch.kt +++ b/j2k/testData/fileOrElement/localVariable/varTypeDoNotMatch.kt @@ -1,4 +1,4 @@ -fun foo() { +internal fun foo() { var o: Any? = "" if (p) o = null } \ No newline at end of file diff --git a/j2k/testData/fileOrElement/localVariable/varWithNoInitializer.kt b/j2k/testData/fileOrElement/localVariable/varWithNoInitializer.kt index 5f3791281bb..44313a06059 100644 --- a/j2k/testData/fileOrElement/localVariable/varWithNoInitializer.kt +++ b/j2k/testData/fileOrElement/localVariable/varWithNoInitializer.kt @@ -1,5 +1,5 @@ -class C { - fun foo(p: Boolean): Int { +internal class C { + internal fun foo(p: Boolean): Int { var a: Int var b: Int a = 10 diff --git a/j2k/testData/fileOrElement/methodCallExpression/collectionsMethods.kt b/j2k/testData/fileOrElement/methodCallExpression/collectionsMethods.kt index b30397069ac..3f48e74311e 100644 --- a/j2k/testData/fileOrElement/methodCallExpression/collectionsMethods.kt +++ b/j2k/testData/fileOrElement/methodCallExpression/collectionsMethods.kt @@ -1,7 +1,7 @@ import java.util.* -class A { - fun foo(): Map { +internal class A { + internal fun foo(): Map { val list1 = emptyList() val list2 = listOf(1) val set1 = emptySet() diff --git a/j2k/testData/fileOrElement/methodCallExpression/collectionsMethods2.kt b/j2k/testData/fileOrElement/methodCallExpression/collectionsMethods2.kt index f4e0d0dc11d..3c351964b15 100644 --- a/j2k/testData/fileOrElement/methodCallExpression/collectionsMethods2.kt +++ b/j2k/testData/fileOrElement/methodCallExpression/collectionsMethods2.kt @@ -2,8 +2,8 @@ // ERROR: Null can not be a value of a non-null type kotlin.String import java.util.* -class A { - fun foo() { +internal class A { + internal fun foo() { val list = listOf(null) val set = setOf(null) } diff --git a/j2k/testData/fileOrElement/methodCallExpression/genericMethod.kt b/j2k/testData/fileOrElement/methodCallExpression/genericMethod.kt index 4c3af1783d7..26bfdf4f868 100644 --- a/j2k/testData/fileOrElement/methodCallExpression/genericMethod.kt +++ b/j2k/testData/fileOrElement/methodCallExpression/genericMethod.kt @@ -1,12 +1,12 @@ package demo -class Map { - fun put(k: K?, v: V) { +internal class Map { + internal fun put(k: K?, v: V) { } } -class U { - fun test() { +internal class U { + internal fun test() { val m = Map() m.put(null, 10) } diff --git a/j2k/testData/fileOrElement/methodCallExpression/getClass.kt b/j2k/testData/fileOrElement/methodCallExpression/getClass.kt index 68c2d6922b7..4734b9c1db5 100644 --- a/j2k/testData/fileOrElement/methodCallExpression/getClass.kt +++ b/j2k/testData/fileOrElement/methodCallExpression/getClass.kt @@ -1,5 +1,5 @@ -class A { - fun foo(o: Any) { +internal class A { + internal fun foo(o: Any) { println(o.javaClass) println(javaClass) } diff --git a/j2k/testData/fileOrElement/methodCallExpression/systemOut.kt b/j2k/testData/fileOrElement/methodCallExpression/systemOut.kt index cb2e61fa0df..d0796fd2180 100644 --- a/j2k/testData/fileOrElement/methodCallExpression/systemOut.kt +++ b/j2k/testData/fileOrElement/methodCallExpression/systemOut.kt @@ -1,5 +1,5 @@ -class A { - fun foo() { +internal class A { + internal fun foo() { println() println(1) println("1") diff --git a/j2k/testData/fileOrElement/methodCallExpression/vararg1.kt b/j2k/testData/fileOrElement/methodCallExpression/vararg1.kt index 8d4627eeb39..95b682f0027 100644 --- a/j2k/testData/fileOrElement/methodCallExpression/vararg1.kt +++ b/j2k/testData/fileOrElement/methodCallExpression/vararg1.kt @@ -1,8 +1,8 @@ import java.lang.reflect.Constructor -object X { +internal object X { Throws(Exception::class) - fun foo(constructor: Constructor, args1: Array, args2: Array) { + internal fun foo(constructor: Constructor, args1: Array, args2: Array) { constructor.newInstance(*args1) constructor.newInstance(args1, args2) } diff --git a/j2k/testData/fileOrElement/methodCallExpression/vararg2.kt b/j2k/testData/fileOrElement/methodCallExpression/vararg2.kt index 5fd1fffbc93..d9004f86425 100644 --- a/j2k/testData/fileOrElement/methodCallExpression/vararg2.kt +++ b/j2k/testData/fileOrElement/methodCallExpression/vararg2.kt @@ -1,7 +1,7 @@ import javaApi.WithVarargConstructor -class X { - fun foo() { +internal class X { + internal fun foo() { val o1 = WithVarargConstructor(1, *arrayOf("a")) val o2 = WithVarargConstructor(2, arrayOf("a"), arrayOf("b")) val o3 = WithVarargConstructor(2, "a") diff --git a/j2k/testData/fileOrElement/misc/packageWithClass.kt b/j2k/testData/fileOrElement/misc/packageWithClass.kt index f254cfd1c83..928b55493bf 100644 --- a/j2k/testData/fileOrElement/misc/packageWithClass.kt +++ b/j2k/testData/fileOrElement/misc/packageWithClass.kt @@ -1,3 +1,3 @@ package test -class C \ No newline at end of file +internal class C \ No newline at end of file diff --git a/j2k/testData/fileOrElement/misc/packageWithClasses.kt b/j2k/testData/fileOrElement/misc/packageWithClasses.kt index f2097f5e516..e2c8f382b48 100644 --- a/j2k/testData/fileOrElement/misc/packageWithClasses.kt +++ b/j2k/testData/fileOrElement/misc/packageWithClasses.kt @@ -1,2 +1,2 @@ -class A -class B \ No newline at end of file +internal class A +internal class B \ No newline at end of file diff --git a/j2k/testData/fileOrElement/misc/packageWithOpenClass.kt b/j2k/testData/fileOrElement/misc/packageWithOpenClass.kt index f254cfd1c83..928b55493bf 100644 --- a/j2k/testData/fileOrElement/misc/packageWithOpenClass.kt +++ b/j2k/testData/fileOrElement/misc/packageWithOpenClass.kt @@ -1,3 +1,3 @@ package test -class C \ No newline at end of file +internal class C \ No newline at end of file diff --git a/j2k/testData/fileOrElement/mutableCollections/FunctionParameters.kt b/j2k/testData/fileOrElement/mutableCollections/FunctionParameters.kt index 0d7419538a0..063d3756ceb 100644 --- a/j2k/testData/fileOrElement/mutableCollections/FunctionParameters.kt +++ b/j2k/testData/fileOrElement/mutableCollections/FunctionParameters.kt @@ -1,11 +1,11 @@ // ERROR: Type mismatch: inferred type is T? but T was expected import java.util.* -class A { - fun foo(nonMutableCollection: Collection, - mutableCollection: MutableCollection, - mutableSet: MutableSet, - mutableMap: MutableMap) { +internal class A { + internal fun foo(nonMutableCollection: Collection, + mutableCollection: MutableCollection, + mutableSet: MutableSet, + mutableMap: MutableMap) { mutableCollection.addAll(nonMutableCollection) mutableSet.add(mutableMap.remove("a")) } diff --git a/j2k/testData/fileOrElement/mutableCollections/FunctionParameters2.kt b/j2k/testData/fileOrElement/mutableCollections/FunctionParameters2.kt index 9196cafcdec..c1d1f664117 100644 --- a/j2k/testData/fileOrElement/mutableCollections/FunctionParameters2.kt +++ b/j2k/testData/fileOrElement/mutableCollections/FunctionParameters2.kt @@ -1,11 +1,11 @@ import java.util.* -class A { - fun foo(set: MutableSet) { +internal class A { + internal fun foo(set: MutableSet) { bar(set) } - fun bar(collection: MutableCollection) { + internal fun bar(collection: MutableCollection) { collection.add("a") } } diff --git a/j2k/testData/fileOrElement/mutableCollections/FunctionReturnValue.kt b/j2k/testData/fileOrElement/mutableCollections/FunctionReturnValue.kt index 465fab13d33..17be8c5fd4f 100644 --- a/j2k/testData/fileOrElement/mutableCollections/FunctionReturnValue.kt +++ b/j2k/testData/fileOrElement/mutableCollections/FunctionReturnValue.kt @@ -1,11 +1,11 @@ import java.util.* -class A { - fun createCollection(): MutableCollection { +internal class A { + internal fun createCollection(): MutableCollection { return ArrayList() } - fun foo(): Collection { + internal fun foo(): Collection { val collection = createCollection() collection.add("a") return collection diff --git a/j2k/testData/fileOrElement/mutableCollections/FunctionReturnValue2.kt b/j2k/testData/fileOrElement/mutableCollections/FunctionReturnValue2.kt index 0999d4bc881..faf98eaea92 100644 --- a/j2k/testData/fileOrElement/mutableCollections/FunctionReturnValue2.kt +++ b/j2k/testData/fileOrElement/mutableCollections/FunctionReturnValue2.kt @@ -1,21 +1,21 @@ import java.util.* -class A { +internal class A internal constructor() { private val collection: MutableCollection init { collection = createCollection() } - fun createCollection(): MutableCollection { + internal fun createCollection(): MutableCollection { return ArrayList() } - public fun foo() { + fun foo() { collection.add("1") } - public fun getCollection(): Collection { + fun getCollection(): Collection { return collection } } diff --git a/j2k/testData/fileOrElement/mutableCollections/Overrides.kt b/j2k/testData/fileOrElement/mutableCollections/Overrides.kt index fb200792300..39aa620872d 100644 --- a/j2k/testData/fileOrElement/mutableCollections/Overrides.kt +++ b/j2k/testData/fileOrElement/mutableCollections/Overrides.kt @@ -2,7 +2,7 @@ package javaApi import kotlinApi.KotlinClass -public abstract class C(field: Int) : KotlinClass(field) { +abstract class C(field: Int) : KotlinClass(field) { override fun foo(mutableCollection: MutableCollection, nullableCollection: Collection?): MutableList { return super.foo(mutableCollection, nullableCollection) diff --git a/j2k/testData/fileOrElement/mutableCollections/Recursion.kt b/j2k/testData/fileOrElement/mutableCollections/Recursion.kt index e9b690abf81..5953c36ff22 100644 --- a/j2k/testData/fileOrElement/mutableCollections/Recursion.kt +++ b/j2k/testData/fileOrElement/mutableCollections/Recursion.kt @@ -1,11 +1,11 @@ import java.util.* -class A { - fun foo(collection: MutableCollection) { +internal class A { + internal fun foo(collection: MutableCollection) { bar(collection) } - fun bar(collection: MutableCollection) { + internal fun bar(collection: MutableCollection) { if (collection.size() < 5) { foo(collection) } else { diff --git a/j2k/testData/fileOrElement/newClassExpression/fullQualifiedName.kt b/j2k/testData/fileOrElement/newClassExpression/fullQualifiedName.kt index ba6f2d51a8b..19f08a2b0bd 100644 --- a/j2k/testData/fileOrElement/newClassExpression/fullQualifiedName.kt +++ b/j2k/testData/fileOrElement/newClassExpression/fullQualifiedName.kt @@ -1,8 +1,8 @@ // ERROR: Type inference failed: Not enough information to infer parameter E in constructor ArrayList() Please specify it explicitly. package test -class User { - fun main() { +internal class User { + internal fun main() { val list = java.util.ArrayList() } } \ No newline at end of file diff --git a/j2k/testData/fileOrElement/newClassExpression/fullQualifiedName2.kt b/j2k/testData/fileOrElement/newClassExpression/fullQualifiedName2.kt index ba6f2d51a8b..19f08a2b0bd 100644 --- a/j2k/testData/fileOrElement/newClassExpression/fullQualifiedName2.kt +++ b/j2k/testData/fileOrElement/newClassExpression/fullQualifiedName2.kt @@ -1,8 +1,8 @@ // ERROR: Type inference failed: Not enough information to infer parameter E in constructor ArrayList() Please specify it explicitly. package test -class User { - fun main() { +internal class User { + internal fun main() { val list = java.util.ArrayList() } } \ No newline at end of file diff --git a/j2k/testData/fileOrElement/newClassExpression/genericClassInvocation.kt b/j2k/testData/fileOrElement/newClassExpression/genericClassInvocation.kt index 0493e2ee2bf..8be554970fb 100644 --- a/j2k/testData/fileOrElement/newClassExpression/genericClassInvocation.kt +++ b/j2k/testData/fileOrElement/newClassExpression/genericClassInvocation.kt @@ -1,7 +1,7 @@ import java.util.ArrayList -class User { - fun main() { +internal class User { + internal fun main() { val list = ArrayList() } } \ No newline at end of file diff --git a/j2k/testData/fileOrElement/newClassExpression/lineBreaks.kt b/j2k/testData/fileOrElement/newClassExpression/lineBreaks.kt index 0360b5286d6..193baeb73b9 100644 --- a/j2k/testData/fileOrElement/newClassExpression/lineBreaks.kt +++ b/j2k/testData/fileOrElement/newClassExpression/lineBreaks.kt @@ -1,7 +1,7 @@ -class C(p1: Int, p2: Int, p3: Int) +internal class C internal constructor(p1: Int, p2: Int, p3: Int) -class User { - fun foo() { +internal class User { + internal fun foo() { C(1, 2, 3) diff --git a/j2k/testData/fileOrElement/newClassExpression/newAnonymousClass2.kt b/j2k/testData/fileOrElement/newClassExpression/newAnonymousClass2.kt index 8bd268c94ae..8f231152fcd 100644 --- a/j2k/testData/fileOrElement/newClassExpression/newAnonymousClass2.kt +++ b/j2k/testData/fileOrElement/newClassExpression/newAnonymousClass2.kt @@ -1,7 +1,7 @@ -abstract class A +internal abstract class A -class C { - fun foo() { +internal class C { + internal fun foo() { val a = object : A() { override fun toString(): String { return "a" diff --git a/j2k/testData/fileOrElement/newClassExpression/newAnonymousClass3.kt b/j2k/testData/fileOrElement/newClassExpression/newAnonymousClass3.kt index 8b1b510ca54..166ff9fba80 100644 --- a/j2k/testData/fileOrElement/newClassExpression/newAnonymousClass3.kt +++ b/j2k/testData/fileOrElement/newClassExpression/newAnonymousClass3.kt @@ -1,7 +1,7 @@ import kotlinApi.KotlinTrait -class C { - fun foo() { +internal class C { + internal fun foo() { val t = object : KotlinTrait { override fun nullableFun(): String? { return null diff --git a/j2k/testData/fileOrElement/newClassExpression/newClassByFullName.kt b/j2k/testData/fileOrElement/newClassExpression/newClassByFullName.kt index 0a808230939..cb8dfda4a5b 100644 --- a/j2k/testData/fileOrElement/newClassExpression/newClassByFullName.kt +++ b/j2k/testData/fileOrElement/newClassExpression/newClassByFullName.kt @@ -1,9 +1,9 @@ package org.test -class Library +internal class Library -class User { - fun main() { +internal class User { + internal fun main() { val lib = Library() } } \ No newline at end of file diff --git a/j2k/testData/fileOrElement/newClassExpression/newInnerClass.kt b/j2k/testData/fileOrElement/newClassExpression/newInnerClass.kt index c8be6da852e..9769ee1c1df 100644 --- a/j2k/testData/fileOrElement/newClassExpression/newInnerClass.kt +++ b/j2k/testData/fileOrElement/newClassExpression/newInnerClass.kt @@ -1,11 +1,11 @@ package org.test -class OuterClass { - inner class InnerClass +internal class OuterClass { + internal inner class InnerClass } -class User { - fun main() { +internal class User { + internal fun main() { val outerObject = OuterClass() val innerObject = outerObject.InnerClass() } diff --git a/j2k/testData/fileOrElement/newClassExpression/newListAndNewMember.kt b/j2k/testData/fileOrElement/newClassExpression/newListAndNewMember.kt index 847ed6c4523..2a0186cdee8 100644 --- a/j2k/testData/fileOrElement/newClassExpression/newListAndNewMember.kt +++ b/j2k/testData/fileOrElement/newClassExpression/newListAndNewMember.kt @@ -2,10 +2,10 @@ package org.test import java.util.ArrayList -class Member +internal class Member -class User { - fun main() { +internal class User { + internal fun main() { val members = ArrayList() members.add(Member()) } diff --git a/j2k/testData/fileOrElement/newClassExpression/newStaticInnerClass.kt b/j2k/testData/fileOrElement/newClassExpression/newStaticInnerClass.kt index 06ef67b9c35..4ce8fe98604 100644 --- a/j2k/testData/fileOrElement/newClassExpression/newStaticInnerClass.kt +++ b/j2k/testData/fileOrElement/newClassExpression/newStaticInnerClass.kt @@ -1,11 +1,11 @@ package demo -class Foo { - class Bar +internal class Foo { + internal class Bar } -class User { - fun main() { +internal class User { + internal fun main() { val boo = Foo.Bar() } } \ No newline at end of file diff --git a/j2k/testData/fileOrElement/nullability/FieldAssignedWithNull.kt b/j2k/testData/fileOrElement/nullability/FieldAssignedWithNull.kt index 94bf2521ce9..9e6309536d9 100644 --- a/j2k/testData/fileOrElement/nullability/FieldAssignedWithNull.kt +++ b/j2k/testData/fileOrElement/nullability/FieldAssignedWithNull.kt @@ -1,7 +1,7 @@ -class C { +internal class C { private var s: String? = "" - fun foo() { + internal fun foo() { s = null } } \ No newline at end of file diff --git a/j2k/testData/fileOrElement/nullability/FieldComparedWithNull.kt b/j2k/testData/fileOrElement/nullability/FieldComparedWithNull.kt index c3ba4348fae..8bd1d9dc0cd 100644 --- a/j2k/testData/fileOrElement/nullability/FieldComparedWithNull.kt +++ b/j2k/testData/fileOrElement/nullability/FieldComparedWithNull.kt @@ -1,8 +1,8 @@ // ERROR: Unresolved reference: x -class C { +internal class C { private val s = x() - fun foo() { + internal fun foo() { if (s == null) { print("null") } diff --git a/j2k/testData/fileOrElement/nullability/FieldComparedWithNull2.kt b/j2k/testData/fileOrElement/nullability/FieldComparedWithNull2.kt index db4fd9c21ef..7996fdb1902 100644 --- a/j2k/testData/fileOrElement/nullability/FieldComparedWithNull2.kt +++ b/j2k/testData/fileOrElement/nullability/FieldComparedWithNull2.kt @@ -1,6 +1,6 @@ -class C(private val s: String?) { +internal class C(private val s: String?) { - fun foo() { + internal fun foo() { if (s != null) { print("not null") } diff --git a/j2k/testData/fileOrElement/nullability/FieldComparedWithNull3.kt b/j2k/testData/fileOrElement/nullability/FieldComparedWithNull3.kt index 76d36e80d78..c627b52f32b 100644 --- a/j2k/testData/fileOrElement/nullability/FieldComparedWithNull3.kt +++ b/j2k/testData/fileOrElement/nullability/FieldComparedWithNull3.kt @@ -1,9 +1,9 @@ -class C { - public var s: String? = "" +internal class C { + var s: String? = "" } -class D { - fun foo(c: C) { +internal class D { + internal fun foo(c: C) { if (null == c.s) { println("null") } diff --git a/j2k/testData/fileOrElement/nullability/FieldComparedWithNull4.kt b/j2k/testData/fileOrElement/nullability/FieldComparedWithNull4.kt index 0a596c34676..54b82dfd538 100644 --- a/j2k/testData/fileOrElement/nullability/FieldComparedWithNull4.kt +++ b/j2k/testData/fileOrElement/nullability/FieldComparedWithNull4.kt @@ -1,4 +1,4 @@ -class C(private val s: String?) { +internal class C(private val s: String?) { init { if (s == null) { diff --git a/j2k/testData/fileOrElement/nullability/FieldInitializedWithNull.kt b/j2k/testData/fileOrElement/nullability/FieldInitializedWithNull.kt index 866bb77f3d0..b287666a6b0 100644 --- a/j2k/testData/fileOrElement/nullability/FieldInitializedWithNull.kt +++ b/j2k/testData/fileOrElement/nullability/FieldInitializedWithNull.kt @@ -1,7 +1,7 @@ -class C { +internal class C { private var s: String? = null - fun foo() { + internal fun foo() { s = "x" } } \ No newline at end of file diff --git a/j2k/testData/fileOrElement/nullability/IndirectOverride.kt b/j2k/testData/fileOrElement/nullability/IndirectOverride.kt index fef09177b77..84632f29652 100644 --- a/j2k/testData/fileOrElement/nullability/IndirectOverride.kt +++ b/j2k/testData/fileOrElement/nullability/IndirectOverride.kt @@ -1,4 +1,4 @@ -class C : javaApi.Derived() { +internal class C : javaApi.Derived() { override fun foo(s: String?): String? { return s } diff --git a/j2k/testData/fileOrElement/nullability/MethodInvokedWithNullArg.kt b/j2k/testData/fileOrElement/nullability/MethodInvokedWithNullArg.kt index 94b09459e43..1dab01027cb 100644 --- a/j2k/testData/fileOrElement/nullability/MethodInvokedWithNullArg.kt +++ b/j2k/testData/fileOrElement/nullability/MethodInvokedWithNullArg.kt @@ -1,8 +1,8 @@ -class C { +internal class C { private fun foo(s: String?) { } - fun bar() { + internal fun bar() { foo(null) } } \ No newline at end of file diff --git a/j2k/testData/fileOrElement/nullability/MethodInvokedWithNullArg2.kt b/j2k/testData/fileOrElement/nullability/MethodInvokedWithNullArg2.kt index 4f9a384c53f..40979a40272 100644 --- a/j2k/testData/fileOrElement/nullability/MethodInvokedWithNullArg2.kt +++ b/j2k/testData/fileOrElement/nullability/MethodInvokedWithNullArg2.kt @@ -1,10 +1,10 @@ -class C { - public fun foo(s: String?) { +internal class C { + fun foo(s: String?) { } } -class D { - fun bar(c: C) { +internal class D { + internal fun bar(c: C) { c.foo(null) } } \ No newline at end of file diff --git a/j2k/testData/fileOrElement/nullability/MethodInvokedWithTernaryNullArg.kt b/j2k/testData/fileOrElement/nullability/MethodInvokedWithTernaryNullArg.kt index 39332b41048..673ebde9e8e 100644 --- a/j2k/testData/fileOrElement/nullability/MethodInvokedWithTernaryNullArg.kt +++ b/j2k/testData/fileOrElement/nullability/MethodInvokedWithTernaryNullArg.kt @@ -1,8 +1,8 @@ -class C { +internal class C { private fun foo(s: String?) { } - fun bar(b: Boolean) { + internal fun bar(b: Boolean) { foo(if (b) "a" else null) } } \ No newline at end of file diff --git a/j2k/testData/fileOrElement/nullability/MethodResultComparedWithNull.kt b/j2k/testData/fileOrElement/nullability/MethodResultComparedWithNull.kt index 40ca83749a6..de3446658cb 100644 --- a/j2k/testData/fileOrElement/nullability/MethodResultComparedWithNull.kt +++ b/j2k/testData/fileOrElement/nullability/MethodResultComparedWithNull.kt @@ -1,9 +1,9 @@ -interface I { - public fun getString(): String? +internal interface I { + fun getString(): String? } -class C { - fun foo(i: I) { +internal class C { + internal fun foo(i: I) { if (i.getString() == null) { println("null") } diff --git a/j2k/testData/fileOrElement/nullability/MethodResultComparedWithNull2.kt b/j2k/testData/fileOrElement/nullability/MethodResultComparedWithNull2.kt index 156bf205e0e..57d92d4a23e 100644 --- a/j2k/testData/fileOrElement/nullability/MethodResultComparedWithNull2.kt +++ b/j2k/testData/fileOrElement/nullability/MethodResultComparedWithNull2.kt @@ -1,9 +1,9 @@ -interface I { - public fun getString(): String? +internal interface I { + fun getString(): String? } -class C { - fun foo(i: I) { +internal class C { + internal fun foo(i: I) { val result = i.getString() if (result != null) { print(result) diff --git a/j2k/testData/fileOrElement/nullability/MethodResultComparedWithNull3.kt b/j2k/testData/fileOrElement/nullability/MethodResultComparedWithNull3.kt index 156bf205e0e..57d92d4a23e 100644 --- a/j2k/testData/fileOrElement/nullability/MethodResultComparedWithNull3.kt +++ b/j2k/testData/fileOrElement/nullability/MethodResultComparedWithNull3.kt @@ -1,9 +1,9 @@ -interface I { - public fun getString(): String? +internal interface I { + fun getString(): String? } -class C { - fun foo(i: I) { +internal class C { + internal fun foo(i: I) { val result = i.getString() if (result != null) { print(result) diff --git a/j2k/testData/fileOrElement/nullability/MethodResultComparedWithNull4.kt b/j2k/testData/fileOrElement/nullability/MethodResultComparedWithNull4.kt index 2912db899cb..7a312961b1f 100644 --- a/j2k/testData/fileOrElement/nullability/MethodResultComparedWithNull4.kt +++ b/j2k/testData/fileOrElement/nullability/MethodResultComparedWithNull4.kt @@ -1,9 +1,9 @@ -interface I { - public fun getString(): String +internal interface I { + fun getString(): String } -class C { - fun foo(i: I, b: Boolean) { +internal class C { + internal fun foo(i: I, b: Boolean) { var result: String? = i.getString() if (b) result = null if (result != null) { diff --git a/j2k/testData/fileOrElement/nullability/MethodResultInitializesNullableField.kt b/j2k/testData/fileOrElement/nullability/MethodResultInitializesNullableField.kt index 746f1dcf4f3..2c100f7992c 100644 --- a/j2k/testData/fileOrElement/nullability/MethodResultInitializesNullableField.kt +++ b/j2k/testData/fileOrElement/nullability/MethodResultInitializesNullableField.kt @@ -1,10 +1,10 @@ // ERROR: Unresolved reference: x -class C { +internal class C { private val string = getString() companion object { - fun getString(): String? { + internal fun getString(): String? { return x() } } diff --git a/j2k/testData/fileOrElement/nullability/MethodReturnsNull.kt b/j2k/testData/fileOrElement/nullability/MethodReturnsNull.kt index eda5b559c71..b8f98854d78 100644 --- a/j2k/testData/fileOrElement/nullability/MethodReturnsNull.kt +++ b/j2k/testData/fileOrElement/nullability/MethodReturnsNull.kt @@ -1,5 +1,5 @@ -class C { - fun foo(b: Boolean): String? { +internal class C { + internal fun foo(b: Boolean): String? { if (b) { return "abc" } else { diff --git a/j2k/testData/fileOrElement/nullability/MethodReturnsNullInAnonymousClass.kt b/j2k/testData/fileOrElement/nullability/MethodReturnsNullInAnonymousClass.kt index 6eb4ee0f008..3c21a3e950a 100644 --- a/j2k/testData/fileOrElement/nullability/MethodReturnsNullInAnonymousClass.kt +++ b/j2k/testData/fileOrElement/nullability/MethodReturnsNullInAnonymousClass.kt @@ -1,10 +1,10 @@ // ERROR: Return type of 'get' is not a subtype of the return type of the overridden member 'public abstract fun get(): kotlin.String defined in Getter' -interface Getter { - public fun get(): String +internal interface Getter { + fun get(): String } -class C { - fun foo(b: Boolean): String { +internal class C { + internal fun foo(b: Boolean): String { val getter = object : Getter { override fun get(): String? { return null diff --git a/j2k/testData/fileOrElement/nullability/MethodReturnsNullInLocalClass.kt b/j2k/testData/fileOrElement/nullability/MethodReturnsNullInLocalClass.kt index 6f6e19d1ae4..a1b78836f35 100644 --- a/j2k/testData/fileOrElement/nullability/MethodReturnsNullInLocalClass.kt +++ b/j2k/testData/fileOrElement/nullability/MethodReturnsNullInLocalClass.kt @@ -1,7 +1,7 @@ -class C { - fun foo(): String { - class Local { - fun foo(): String? { +internal class C { + internal fun foo(): String { + internal class Local { + internal fun foo(): String? { return null } } diff --git a/j2k/testData/fileOrElement/nullability/MethodReturnsTernaryNull.kt b/j2k/testData/fileOrElement/nullability/MethodReturnsTernaryNull.kt index 195b0db07cb..f0ebc4ddd5f 100644 --- a/j2k/testData/fileOrElement/nullability/MethodReturnsTernaryNull.kt +++ b/j2k/testData/fileOrElement/nullability/MethodReturnsTernaryNull.kt @@ -1,5 +1,5 @@ -class C { - fun foo(b: Boolean): String? { +internal class C { + internal fun foo(b: Boolean): String? { return if (b) "abc" else null } } \ No newline at end of file diff --git a/j2k/testData/fileOrElement/nullability/NullableIntNoCrash.kt b/j2k/testData/fileOrElement/nullability/NullableIntNoCrash.kt index 6f87f2a411f..c0371b243d1 100644 --- a/j2k/testData/fileOrElement/nullability/NullableIntNoCrash.kt +++ b/j2k/testData/fileOrElement/nullability/NullableIntNoCrash.kt @@ -1,7 +1,7 @@ -class A { - var field = foo() +internal class A { + internal var field = foo() - fun foo(): Int { + internal fun foo(): Int { return 1 } } \ No newline at end of file diff --git a/j2k/testData/fileOrElement/nullability/NullableMethodDotAccess.kt b/j2k/testData/fileOrElement/nullability/NullableMethodDotAccess.kt index efcc16af0d3..ed038a8f235 100644 --- a/j2k/testData/fileOrElement/nullability/NullableMethodDotAccess.kt +++ b/j2k/testData/fileOrElement/nullability/NullableMethodDotAccess.kt @@ -1,9 +1,9 @@ -class C { - fun getString(b: Boolean): String? { +internal class C { + internal fun getString(b: Boolean): String? { return if (b) "a" else null } - fun foo(): Int { + internal fun foo(): Int { return getString(true)!!.length() } } diff --git a/j2k/testData/fileOrElement/nullability/NullableVariableDotAccess.kt b/j2k/testData/fileOrElement/nullability/NullableVariableDotAccess.kt index 677f73205fd..6736462e36e 100644 --- a/j2k/testData/fileOrElement/nullability/NullableVariableDotAccess.kt +++ b/j2k/testData/fileOrElement/nullability/NullableVariableDotAccess.kt @@ -1,4 +1,4 @@ -fun foo(s: String?, b: Boolean): Int { +internal fun foo(s: String?, b: Boolean): Int { if (s == null) println("null") if (b) return s!!.length() return 10 diff --git a/j2k/testData/fileOrElement/nullability/OverrideWithInheritanceLoop.kt b/j2k/testData/fileOrElement/nullability/OverrideWithInheritanceLoop.kt index 312c2d9ae1e..db6e85e9a42 100644 --- a/j2k/testData/fileOrElement/nullability/OverrideWithInheritanceLoop.kt +++ b/j2k/testData/fileOrElement/nullability/OverrideWithInheritanceLoop.kt @@ -1,11 +1,11 @@ // ERROR: There's a cycle in the inheritance hierarchy for this type // ERROR: There's a cycle in the inheritance hierarchy for this type -open class A : B() { - public open fun foo(s: String) { +internal open class A : B() { + open fun foo(s: String) { } } -open class B : A() { - public open fun foo(s: String) { +internal open class B : A() { + open fun foo(s: String) { } } diff --git a/j2k/testData/fileOrElement/nullability/Overrides.kt b/j2k/testData/fileOrElement/nullability/Overrides.kt index e4eee547d5a..5f41c03848d 100644 --- a/j2k/testData/fileOrElement/nullability/Overrides.kt +++ b/j2k/testData/fileOrElement/nullability/Overrides.kt @@ -1,22 +1,22 @@ -open class Base { - public open fun foo(s: String?): String? { +internal open class Base { + open fun foo(s: String?): String? { return "" } - public open fun bar(s: String?): String? { + open fun bar(s: String?): String? { return if (s != null) s + 1 else null } - public open fun zoo(o: Any): String { + open fun zoo(o: Any): String { return "" } } -interface I { - public fun zoo(o: Any?): String? +internal interface I { + fun zoo(o: Any?): String? } -class C : Base(), I { +internal class C : Base(), I { override fun foo(s: String?): String? { return "" } diff --git a/j2k/testData/fileOrElement/nullability/ParameterComparedWithNull.kt b/j2k/testData/fileOrElement/nullability/ParameterComparedWithNull.kt index 743fe1eedd4..c2dce0ad9d6 100644 --- a/j2k/testData/fileOrElement/nullability/ParameterComparedWithNull.kt +++ b/j2k/testData/fileOrElement/nullability/ParameterComparedWithNull.kt @@ -1,4 +1,4 @@ -fun foo(s: String?) { +internal fun foo(s: String?) { if (s != null) { zoo(s) } diff --git a/j2k/testData/fileOrElement/nullability/VariableAssignedWithNull.kt b/j2k/testData/fileOrElement/nullability/VariableAssignedWithNull.kt index 71c11a12390..ae5deed3517 100644 --- a/j2k/testData/fileOrElement/nullability/VariableAssignedWithNull.kt +++ b/j2k/testData/fileOrElement/nullability/VariableAssignedWithNull.kt @@ -1,5 +1,5 @@ // !specifyLocalVariableTypeByDefault: true -fun foo(b: Boolean) { +internal fun foo(b: Boolean) { var s: String? = "abc" if (b) { s = null diff --git a/j2k/testData/fileOrElement/nullability/VariableComparedWithNull.kt b/j2k/testData/fileOrElement/nullability/VariableComparedWithNull.kt index c95cb3f308d..ca85883e562 100644 --- a/j2k/testData/fileOrElement/nullability/VariableComparedWithNull.kt +++ b/j2k/testData/fileOrElement/nullability/VariableComparedWithNull.kt @@ -1,5 +1,5 @@ // !specifyLocalVariableTypeByDefault: true -fun foo() { +internal fun foo() { val s: String? = bar() if (s != null) { zoo(s) diff --git a/j2k/testData/fileOrElement/nullability/VariableInitializedWithNull.kt b/j2k/testData/fileOrElement/nullability/VariableInitializedWithNull.kt index 1c9b83d495b..4c96ef545b8 100644 --- a/j2k/testData/fileOrElement/nullability/VariableInitializedWithNull.kt +++ b/j2k/testData/fileOrElement/nullability/VariableInitializedWithNull.kt @@ -1,5 +1,5 @@ // !specifyLocalVariableTypeByDefault: true -fun foo(b: Boolean) { +internal fun foo(b: Boolean) { var s: String? = null if (b) { s = "abc" diff --git a/j2k/testData/fileOrElement/nullability/VariableInitializedWithTernaryNull.kt b/j2k/testData/fileOrElement/nullability/VariableInitializedWithTernaryNull.kt index caa9571090f..d5aa7926d5e 100644 --- a/j2k/testData/fileOrElement/nullability/VariableInitializedWithTernaryNull.kt +++ b/j2k/testData/fileOrElement/nullability/VariableInitializedWithTernaryNull.kt @@ -1,4 +1,4 @@ // !specifyLocalVariableTypeByDefault: true -fun foo(b: Boolean) { +internal fun foo(b: Boolean) { val s: String? = (if (b) "abc" else null) } \ No newline at end of file diff --git a/j2k/testData/fileOrElement/nullability/autoNotNull.kt b/j2k/testData/fileOrElement/nullability/autoNotNull.kt index ae7a34d9237..b7c6d9ae31a 100644 --- a/j2k/testData/fileOrElement/nullability/autoNotNull.kt +++ b/j2k/testData/fileOrElement/nullability/autoNotNull.kt @@ -1,5 +1,5 @@ -class A { - fun foo(s: String?): Int { +internal class A { + internal fun foo(s: String?): Int { if (s != null) { return s.length() } diff --git a/j2k/testData/fileOrElement/objectLiteral/MyFrame.kt b/j2k/testData/fileOrElement/objectLiteral/MyFrame.kt index 1624d93124d..61381665d40 100644 --- a/j2k/testData/fileOrElement/objectLiteral/MyFrame.kt +++ b/j2k/testData/fileOrElement/objectLiteral/MyFrame.kt @@ -1,23 +1,23 @@ package demo -interface WindowListener { - public fun windowClosing() +internal interface WindowListener { + fun windowClosing() } -interface EmptyWindowListener -open class EmptyWindowAdapter +internal interface EmptyWindowListener +internal open class EmptyWindowAdapter -open class WindowAdapter : WindowListener { +internal open class WindowAdapter : WindowListener { override fun windowClosing() { } } -open class Frame { - public fun addWindowListener(listener: WindowListener) { +internal open class Frame { + fun addWindowListener(listener: WindowListener) { } } -public class Client : Frame() { +class Client internal constructor() : Frame() { init { val a = object : WindowAdapter() { override fun windowClosing() { diff --git a/j2k/testData/fileOrElement/overloads/Abstract.kt b/j2k/testData/fileOrElement/overloads/Abstract.kt index 94bfd432178..1d2d4e72f73 100644 --- a/j2k/testData/fileOrElement/overloads/Abstract.kt +++ b/j2k/testData/fileOrElement/overloads/Abstract.kt @@ -1,7 +1,7 @@ -abstract class A { - public abstract fun foo(p: Int) +internal abstract class A { + abstract fun foo(p: Int) - public fun foo() { + fun foo() { foo(1) } } diff --git a/j2k/testData/fileOrElement/overloads/AccessorToDrop.kt b/j2k/testData/fileOrElement/overloads/AccessorToDrop.kt index 91861fa6054..071c81c29ac 100644 --- a/j2k/testData/fileOrElement/overloads/AccessorToDrop.kt +++ b/j2k/testData/fileOrElement/overloads/AccessorToDrop.kt @@ -1,7 +1,7 @@ -class A { - public var field: Int = 0 +internal class A { + var field: Int = 0 - public fun setField() { + fun setField() { field = 0 } } diff --git a/j2k/testData/fileOrElement/overloads/Annotations.kt b/j2k/testData/fileOrElement/overloads/Annotations.kt index 95b6e100532..0621f8b7497 100644 --- a/j2k/testData/fileOrElement/overloads/Annotations.kt +++ b/j2k/testData/fileOrElement/overloads/Annotations.kt @@ -1,35 +1,35 @@ // ERROR: Type mismatch: inferred type is kotlin.Any? but kotlin.Any was expected // ERROR: Type mismatch: inferred type is kotlin.Any? but kotlin.Any was expected -class A { - JvmOverloads fun foo(s: String? = null): Any { +internal class A { + JvmOverloads internal fun foo(s: String? = null): Any { println("s = " + s!!) return "" } - fun bar(s: String?): Any? { + internal fun bar(s: String?): Any? { println("s = " + s!!) return if (s == null) "" else null } - fun bar(): Any { + internal fun bar(): Any { return bar(null) } - public fun bar1(s: String?): Any? { + fun bar1(s: String?): Any? { println("s = " + s!!) return if (s == null) "" else null } - public fun bar1(): Any { + fun bar1(): Any { return bar1(null) } Deprecated("") - public fun f() { + fun f() { f(1) } - public fun f(p: Int) { + fun f(p: Int) { println("p = " + p) } } diff --git a/j2k/testData/fileOrElement/overloads/Override.kt b/j2k/testData/fileOrElement/overloads/Override.kt index 9fbf7956303..5c3191971ed 100644 --- a/j2k/testData/fileOrElement/overloads/Override.kt +++ b/j2k/testData/fileOrElement/overloads/Override.kt @@ -1,18 +1,18 @@ -interface I { - public fun foo(i: Int, c: Char, s: String) - public fun bar() +internal interface I { + fun foo(i: Int, c: Char, s: String) + fun bar() } -open class A : I { +internal open class A : I { override fun foo(i: Int, c: Char, s: String) { println("foo" + i + c + s) } - public fun foo(i: Int, c: Char) { + fun foo(i: Int, c: Char) { foo(i, c, "") } - public fun foo(i: Int) { + fun foo(i: Int) { foo(i, 'a', "") } @@ -20,25 +20,25 @@ open class A : I { bar(1) } - public fun bar(i: Int) { + fun bar(i: Int) { } - public open fun x() { + open fun x() { x(1) } - public fun x(i: Int) { + fun x(i: Int) { } - public fun y() { + fun y() { y(1) } - public open fun y(i: Int) { + open fun y(i: Int) { } } -class B : A() { +internal class B : A() { override fun x() { super.x() } diff --git a/j2k/testData/fileOrElement/overloads/Private.kt b/j2k/testData/fileOrElement/overloads/Private.kt index c4c1b0b9554..e77b6abf52c 100644 --- a/j2k/testData/fileOrElement/overloads/Private.kt +++ b/j2k/testData/fileOrElement/overloads/Private.kt @@ -1,4 +1,4 @@ -class A { +internal class A { private fun bar(s: String? = null): Int { println("s = " + s!!) return 0 diff --git a/j2k/testData/fileOrElement/overloads/Simple.kt b/j2k/testData/fileOrElement/overloads/Simple.kt index 3378530548b..f42158938ca 100644 --- a/j2k/testData/fileOrElement/overloads/Simple.kt +++ b/j2k/testData/fileOrElement/overloads/Simple.kt @@ -1,9 +1,9 @@ -class A { - JvmOverloads fun foo(i: Int, c: Char = 'a', s: String = "") { +internal class A { + JvmOverloads internal fun foo(i: Int, c: Char = 'a', s: String = "") { println("foo" + i + c + s) } - JvmOverloads fun bar(s: String? = null): Int { + JvmOverloads internal fun bar(s: String? = null): Int { println("s = " + s!!) return 0 } diff --git a/j2k/testData/fileOrElement/overloads/Synchronized.kt b/j2k/testData/fileOrElement/overloads/Synchronized.kt index abc5741ff98..1c27dd5415a 100644 --- a/j2k/testData/fileOrElement/overloads/Synchronized.kt +++ b/j2k/testData/fileOrElement/overloads/Synchronized.kt @@ -1,9 +1,9 @@ -class A { - public fun foo(p: Int) { +internal class A { + fun foo(p: Int) { println("p = [$p]") } - Synchronized public fun foo() { + Synchronized fun foo() { foo(calcSomething()) } diff --git a/j2k/testData/fileOrElement/packageStatement/keywordInPackageName.kt b/j2k/testData/fileOrElement/packageStatement/keywordInPackageName.kt index a205d648201..ad6f282064a 100644 --- a/j2k/testData/fileOrElement/packageStatement/keywordInPackageName.kt +++ b/j2k/testData/fileOrElement/packageStatement/keywordInPackageName.kt @@ -1,3 +1,3 @@ package test.j2k.`in` -public class Converter +class Converter diff --git a/j2k/testData/fileOrElement/projections/projections.kt b/j2k/testData/fileOrElement/projections/projections.kt index 7a9b8c411c5..5dffedbf01f 100644 --- a/j2k/testData/fileOrElement/projections/projections.kt +++ b/j2k/testData/fileOrElement/projections/projections.kt @@ -1,22 +1,22 @@ import java.util.ArrayList -class C { - fun foo1(src: Collection) { +internal class C { + internal fun foo1(src: Collection) { val t = src.iterator().next() } - fun foo2(src: ArrayList) { + internal fun foo2(src: ArrayList) { val t = src.iterator().next() } - fun foo3(dst: MutableCollection, t: T) { + internal fun foo3(dst: MutableCollection, t: T) { dst.add(t) } - fun foo4(comparable: Comparable, t: T): Int { + internal fun foo4(comparable: Comparable, t: T): Int { return comparable.compareTo(t) } - fun foo5(w: Collection<*>) { + internal fun foo5(w: Collection<*>) { } } diff --git a/j2k/testData/fileOrElement/rawGenerics/cycle.kt b/j2k/testData/fileOrElement/rawGenerics/cycle.kt index f9eecf9ef51..298fef2ffaf 100644 --- a/j2k/testData/fileOrElement/rawGenerics/cycle.kt +++ b/j2k/testData/fileOrElement/rawGenerics/cycle.kt @@ -1,3 +1,3 @@ -class JavaClass1>> +internal class JavaClass1>> -class JavaClass2>> +internal class JavaClass2>> \ No newline at end of file diff --git a/j2k/testData/fileOrElement/rawGenerics/kt-540-map.kt b/j2k/testData/fileOrElement/rawGenerics/kt-540-map.kt index 18c313ffc97..080146ce4bb 100644 --- a/j2k/testData/fileOrElement/rawGenerics/kt-540-map.kt +++ b/j2k/testData/fileOrElement/rawGenerics/kt-540-map.kt @@ -3,8 +3,8 @@ package demo import java.util.HashMap -class Test { - fun main() { +internal class Test { + internal fun main() { val commonMap = HashMap() val rawMap = HashMap() val superRawMap = HashMap() diff --git a/j2k/testData/fileOrElement/rawGenerics/kt-540-rawGenericClass.kt b/j2k/testData/fileOrElement/rawGenerics/kt-540-rawGenericClass.kt index b6ecad960b1..a25d2ae8dcf 100644 --- a/j2k/testData/fileOrElement/rawGenerics/kt-540-rawGenericClass.kt +++ b/j2k/testData/fileOrElement/rawGenerics/kt-540-rawGenericClass.kt @@ -1,13 +1,13 @@ package demo -class Collection(e: E) { +internal class Collection internal constructor(e: E) { init { println(e) } } -class Test { - fun main() { +internal class Test { + internal fun main() { val raw1 = Collection(1) val raw2 = Collection(1) val raw3 = Collection("1") diff --git a/j2k/testData/fileOrElement/rawGenerics/kt-540.kt b/j2k/testData/fileOrElement/rawGenerics/kt-540.kt index a0c4011f8fc..212981f8676 100644 --- a/j2k/testData/fileOrElement/rawGenerics/kt-540.kt +++ b/j2k/testData/fileOrElement/rawGenerics/kt-540.kt @@ -3,8 +3,8 @@ package demo import java.util.ArrayList -class Test { - fun main() { +internal class Test { + internal fun main() { val common = ArrayList() val raw = ArrayList() val superRaw = ArrayList() diff --git a/j2k/testData/fileOrElement/rawGenerics/rawGenericMethod.kt b/j2k/testData/fileOrElement/rawGenerics/rawGenericMethod.kt index 959f5048737..bc8e774ae7f 100644 --- a/j2k/testData/fileOrElement/rawGenerics/rawGenericMethod.kt +++ b/j2k/testData/fileOrElement/rawGenerics/rawGenericMethod.kt @@ -1,12 +1,12 @@ package demo -class TestT { - fun getT() { +internal class TestT { + internal fun getT() { } } -class U { - fun main() { +internal class U { + internal fun main() { val t = TestT() t.getT() t.getT() diff --git a/j2k/testData/fileOrElement/returnStatement/currentMethodBug.kt b/j2k/testData/fileOrElement/returnStatement/currentMethodBug.kt index 25001325d50..dce43f699e5 100644 --- a/j2k/testData/fileOrElement/returnStatement/currentMethodBug.kt +++ b/j2k/testData/fileOrElement/returnStatement/currentMethodBug.kt @@ -1,9 +1,9 @@ -interface I { - public fun getInt(): Int +internal interface I { + fun getInt(): Int } -class C { - fun getObject(): Any? { +internal class C { + internal fun getObject(): Any? { foo(object : I { override fun getInt(): Int { return 0 @@ -12,8 +12,8 @@ class C { return string } - fun foo(i: I) { + internal fun foo(i: I) { } - var string: String? = null + internal var string: String? = null } \ No newline at end of file diff --git a/j2k/testData/fileOrElement/settings/openByDefault.kt b/j2k/testData/fileOrElement/settings/openByDefault.kt index bb24bb1c815..5c30d23b374 100644 --- a/j2k/testData/fileOrElement/settings/openByDefault.kt +++ b/j2k/testData/fileOrElement/settings/openByDefault.kt @@ -1,37 +1,37 @@ // !openByDefault: true -open class A { - open fun foo1() { +internal open class A { + internal open fun foo1() { } private fun foo2() { } - fun foo3() { + internal fun foo3() { } } -class B { - fun foo() { +internal class B { + internal fun foo() { } } -abstract class C { - abstract fun foo() +internal abstract class C { + internal abstract fun foo() } -interface I { - public fun foo() +internal interface I { + fun foo() } -open class D : I { +internal open class D : I { override fun foo() { } } -enum class E { +internal enum class E { ; - fun foo(): Int { + internal fun foo(): Int { return 0 } } diff --git a/j2k/testData/fileOrElement/settings/specifyFieldTypeByDefault.kt b/j2k/testData/fileOrElement/settings/specifyFieldTypeByDefault.kt index 6254fca982f..17f314ac622 100644 --- a/j2k/testData/fileOrElement/settings/specifyFieldTypeByDefault.kt +++ b/j2k/testData/fileOrElement/settings/specifyFieldTypeByDefault.kt @@ -1,9 +1,9 @@ // !specifyFieldTypeByDefault: true import java.util.* -class A { +internal class A { private val field1: List = ArrayList() - val field2: List = ArrayList() - public val field3: Int = 0 + internal val field2: List = ArrayList() + val field3: Int = 0 protected val field4: Int = 0 } \ No newline at end of file diff --git a/j2k/testData/fileOrElement/settings/specifyLocalVariableTypeByDefault.kt b/j2k/testData/fileOrElement/settings/specifyLocalVariableTypeByDefault.kt index b0abb1e8ee3..99b32f26a69 100644 --- a/j2k/testData/fileOrElement/settings/specifyLocalVariableTypeByDefault.kt +++ b/j2k/testData/fileOrElement/settings/specifyLocalVariableTypeByDefault.kt @@ -1,5 +1,5 @@ // !specifyLocalVariableTypeByDefault: true -public fun foo() { +fun foo() { val i: Int = 1 val s: String = "" } \ No newline at end of file diff --git a/j2k/testData/fileOrElement/settings/specifyLocalVariableTypeByDefaultInFor.kt b/j2k/testData/fileOrElement/settings/specifyLocalVariableTypeByDefaultInFor.kt index cdfa76dca54..f6bbc21d984 100644 --- a/j2k/testData/fileOrElement/settings/specifyLocalVariableTypeByDefaultInFor.kt +++ b/j2k/testData/fileOrElement/settings/specifyLocalVariableTypeByDefaultInFor.kt @@ -1,5 +1,5 @@ // !specifyLocalVariableTypeByDefault: true -public fun foo(list: List) { +fun foo(list: List) { val array: IntArray = IntArray(10) for (i: Int in 0..9) { array[i] = i diff --git a/j2k/testData/fileOrElement/staticMembers/PrivateStaticMembers.kt b/j2k/testData/fileOrElement/staticMembers/PrivateStaticMembers.kt index 3e44b4a6588..10644b205b5 100644 --- a/j2k/testData/fileOrElement/staticMembers/PrivateStaticMembers.kt +++ b/j2k/testData/fileOrElement/staticMembers/PrivateStaticMembers.kt @@ -1,6 +1,6 @@ -class A { +internal class A { - public fun foo() { + fun foo() { privateStatic1() privateStatic2() } diff --git a/j2k/testData/fileOrElement/staticMembers/PrivateStaticMethods1.kt b/j2k/testData/fileOrElement/staticMembers/PrivateStaticMethods1.kt index 475ada7f9c7..e5258619042 100644 --- a/j2k/testData/fileOrElement/staticMembers/PrivateStaticMethods1.kt +++ b/j2k/testData/fileOrElement/staticMembers/PrivateStaticMethods1.kt @@ -1,5 +1,5 @@ -class A { - public fun foo() { +internal class A { + fun foo() { privateStatic1() privateStatic2() } diff --git a/j2k/testData/fileOrElement/staticMembers/PrivateStaticMethods2.kt b/j2k/testData/fileOrElement/staticMembers/PrivateStaticMethods2.kt index 403204f31f8..3a5399b7504 100644 --- a/j2k/testData/fileOrElement/staticMembers/PrivateStaticMethods2.kt +++ b/j2k/testData/fileOrElement/staticMembers/PrivateStaticMethods2.kt @@ -1,12 +1,12 @@ -class A { - public fun foo() { +internal class A { + fun foo() { privateStatic1() privateStatic2() } companion object { - public fun publicStatic() { + fun publicStatic() { privateStatic1() } diff --git a/j2k/testData/fileOrElement/staticMembers/PrivateStaticMethods3.kt b/j2k/testData/fileOrElement/staticMembers/PrivateStaticMethods3.kt index 29c099a014e..176a629a712 100644 --- a/j2k/testData/fileOrElement/staticMembers/PrivateStaticMethods3.kt +++ b/j2k/testData/fileOrElement/staticMembers/PrivateStaticMethods3.kt @@ -1,11 +1,11 @@ -class A { - public class Nested { - fun foo() { +internal class A { + class Nested { + internal fun foo() { privateStatic1() } } - fun bar() { + internal fun bar() { privateStatic2() } diff --git a/j2k/testData/fileOrElement/staticMembers/PrivateStaticMethods4.kt b/j2k/testData/fileOrElement/staticMembers/PrivateStaticMethods4.kt index 1aefdeb721e..f542100dc37 100644 --- a/j2k/testData/fileOrElement/staticMembers/PrivateStaticMethods4.kt +++ b/j2k/testData/fileOrElement/staticMembers/PrivateStaticMethods4.kt @@ -1,11 +1,11 @@ -class A { - public inner class Inner { - fun foo() { +internal class A { + inner class Inner { + internal fun foo() { privateStatic1() } } - fun bar() { + internal fun bar() { privateStatic2() } diff --git a/j2k/testData/fileOrElement/superExpression/classAdotSuperFoo.kt b/j2k/testData/fileOrElement/superExpression/classAdotSuperFoo.kt index 76be3a3ca0f..fc7839bb754 100644 --- a/j2k/testData/fileOrElement/superExpression/classAdotSuperFoo.kt +++ b/j2k/testData/fileOrElement/superExpression/classAdotSuperFoo.kt @@ -1,13 +1,13 @@ package a.b -open class Base { - fun foo() { +internal open class Base { + internal fun foo() { } } -class A : Base() { - inner class C { - fun test() { +internal class A : Base() { + internal inner class C { + internal fun test() { super@A.foo() } } diff --git a/j2k/testData/fileOrElement/superExpression/classAextendsB.kt b/j2k/testData/fileOrElement/superExpression/classAextendsB.kt index 9bf66f656ff..5dabaf0d197 100644 --- a/j2k/testData/fileOrElement/superExpression/classAextendsB.kt +++ b/j2k/testData/fileOrElement/superExpression/classAextendsB.kt @@ -1,10 +1,10 @@ -open class B(i: Int) { - open fun call(): Int { +internal open class B internal constructor(i: Int) { + internal open fun call(): Int { return 1 } } -class A : B(10) { +internal class A internal constructor() : B(10) { override fun call(): Int { return super.call() diff --git a/j2k/testData/fileOrElement/switch/caseWithBlock.kt b/j2k/testData/fileOrElement/switch/caseWithBlock.kt index cc5b7f41d77..0ca50428e5e 100644 --- a/j2k/testData/fileOrElement/switch/caseWithBlock.kt +++ b/j2k/testData/fileOrElement/switch/caseWithBlock.kt @@ -1,4 +1,4 @@ -fun foo() { +internal fun foo() { when (a) { 1 -> { val x = 1 diff --git a/j2k/testData/fileOrElement/switch/comlicatedFallDown.kt b/j2k/testData/fileOrElement/switch/comlicatedFallDown.kt index 734c7945e34..b24f74268e8 100644 --- a/j2k/testData/fileOrElement/switch/comlicatedFallDown.kt +++ b/j2k/testData/fileOrElement/switch/comlicatedFallDown.kt @@ -1,11 +1,11 @@ package demo -public object SwitchDemo { - public fun print(o: Any) { +object SwitchDemo { + fun print(o: Any) { println(o) } - public fun test(i: Int) { + fun test(i: Int) { var monthString = "" when (i) { 1 -> { @@ -76,7 +76,7 @@ public object SwitchDemo { println(monthString) } - JvmStatic public fun main(args: Array) { + JvmStatic fun main(args: Array) { for (i in 1..12) test(i) } diff --git a/j2k/testData/fileOrElement/switch/continueAndBreakWithLabel.kt b/j2k/testData/fileOrElement/switch/continueAndBreakWithLabel.kt index d76b7777695..e811ca4d5a7 100644 --- a/j2k/testData/fileOrElement/switch/continueAndBreakWithLabel.kt +++ b/j2k/testData/fileOrElement/switch/continueAndBreakWithLabel.kt @@ -1,4 +1,4 @@ -fun foo() { +internal fun foo() { Loop@ while (true) { when (take()) { 1 -> continue diff --git a/j2k/testData/fileOrElement/switch/emptySwitch.kt b/j2k/testData/fileOrElement/switch/emptySwitch.kt index 7d138911474..cf2d71a99e8 100644 --- a/j2k/testData/fileOrElement/switch/emptySwitch.kt +++ b/j2k/testData/fileOrElement/switch/emptySwitch.kt @@ -1,5 +1,5 @@ -public object NonDefault { - JvmStatic public fun main(args: Array) { +object NonDefault { + JvmStatic fun main(args: Array) { val value = 3 val valueString = "" diff --git a/j2k/testData/fileOrElement/switch/enumConstants.kt b/j2k/testData/fileOrElement/switch/enumConstants.kt index d0595794212..8f30b47c32a 100644 --- a/j2k/testData/fileOrElement/switch/enumConstants.kt +++ b/j2k/testData/fileOrElement/switch/enumConstants.kt @@ -1,9 +1,9 @@ -enum class ColorEnum { +internal enum class ColorEnum { GREEN } -class MyClass { - fun method(colorEnum: ColorEnum): Int { +internal class MyClass { + internal fun method(colorEnum: ColorEnum): Int { when (colorEnum) { ColorEnum.GREEN -> return 1 else -> return 2 diff --git a/j2k/testData/fileOrElement/switch/fallDown.kt b/j2k/testData/fileOrElement/switch/fallDown.kt index fb5ba278d46..95c7e657459 100644 --- a/j2k/testData/fileOrElement/switch/fallDown.kt +++ b/j2k/testData/fileOrElement/switch/fallDown.kt @@ -1,7 +1,7 @@ package switch_demo -public object SwitchDemo { - JvmStatic public fun main(args: Array) { +object SwitchDemo { + JvmStatic fun main(args: Array) { val month = 8 val monthString: String when (month) { diff --git a/j2k/testData/fileOrElement/switch/fallDownWithBlocks.kt b/j2k/testData/fileOrElement/switch/fallDownWithBlocks.kt index 96e3dcad364..6fc6a713709 100644 --- a/j2k/testData/fileOrElement/switch/fallDownWithBlocks.kt +++ b/j2k/testData/fileOrElement/switch/fallDownWithBlocks.kt @@ -1,5 +1,5 @@ -public object C { - JvmStatic public fun main(args: Array) { +object C { + JvmStatic fun main(args: Array) { when (args.size()) { 1 -> { run { diff --git a/j2k/testData/fileOrElement/switch/invalidSwitch.kt b/j2k/testData/fileOrElement/switch/invalidSwitch.kt index ec525e9c042..cc1768522df 100644 --- a/j2k/testData/fileOrElement/switch/invalidSwitch.kt +++ b/j2k/testData/fileOrElement/switch/invalidSwitch.kt @@ -1,4 +1,4 @@ -fun foo() { +internal fun foo() { when (a) { -> { println("1") diff --git a/j2k/testData/fileOrElement/switch/kt-539.kt b/j2k/testData/fileOrElement/switch/kt-539.kt index 19aaf4ca3b8..8ab5c492a2d 100644 --- a/j2k/testData/fileOrElement/switch/kt-539.kt +++ b/j2k/testData/fileOrElement/switch/kt-539.kt @@ -1,7 +1,7 @@ package switch_demo -public object SwitchDemo { - JvmStatic public fun main(args: Array) { +object SwitchDemo { + JvmStatic fun main(args: Array) { val month = 8 val monthString: String diff --git a/j2k/testData/fileOrElement/switch/nondefault.kt b/j2k/testData/fileOrElement/switch/nondefault.kt index af4e9ffa899..988e995bd7c 100644 --- a/j2k/testData/fileOrElement/switch/nondefault.kt +++ b/j2k/testData/fileOrElement/switch/nondefault.kt @@ -1,5 +1,5 @@ -public object NonDefault { - JvmStatic public fun main(args: Array) { +object NonDefault { + JvmStatic fun main(args: Array) { val value = 3 var valueString = "" diff --git a/j2k/testData/fileOrElement/switch/returnsAndThrows.kt b/j2k/testData/fileOrElement/switch/returnsAndThrows.kt index 0f406429c1f..54a17597c57 100644 --- a/j2k/testData/fileOrElement/switch/returnsAndThrows.kt +++ b/j2k/testData/fileOrElement/switch/returnsAndThrows.kt @@ -1,4 +1,4 @@ -fun foo(a: Int): Int { +internal fun foo(a: Int): Int { when (a) { 1 -> { println("1") diff --git a/j2k/testData/fileOrElement/thisExpression/classAdotThisFoo.kt b/j2k/testData/fileOrElement/thisExpression/classAdotThisFoo.kt index a5313fcd936..f1b2d37882d 100644 --- a/j2k/testData/fileOrElement/thisExpression/classAdotThisFoo.kt +++ b/j2k/testData/fileOrElement/thisExpression/classAdotThisFoo.kt @@ -1,13 +1,13 @@ package a.b -open class Base { - fun foo() { +internal open class Base { + internal fun foo() { } } -class A : Base() { - inner class C { - fun test() { +internal class A : Base() { + internal inner class C { + internal fun test() { this@A.foo() } } diff --git a/j2k/testData/fileOrElement/toKotlinClasses/TypeParameterBound.kt b/j2k/testData/fileOrElement/toKotlinClasses/TypeParameterBound.kt index f683fef0a95..a865dcb9d37 100644 --- a/j2k/testData/fileOrElement/toKotlinClasses/TypeParameterBound.kt +++ b/j2k/testData/fileOrElement/toKotlinClasses/TypeParameterBound.kt @@ -1,5 +1,5 @@ import java.util.* -interface I>> +internal interface I>> -class C : I>> +internal class C : I>> diff --git a/j2k/testData/fileOrElement/toKotlinClasses/iterableAndIterator.kt b/j2k/testData/fileOrElement/toKotlinClasses/iterableAndIterator.kt index 3244d70106c..3418633aab0 100644 --- a/j2k/testData/fileOrElement/toKotlinClasses/iterableAndIterator.kt +++ b/j2k/testData/fileOrElement/toKotlinClasses/iterableAndIterator.kt @@ -2,23 +2,23 @@ // ERROR: Return type of 'iterator' is not a subtype of the return type of the overridden member 'public abstract fun iterator(): kotlin.Iterator defined in kotlin.Iterable' package demo -class Test : Iterable { +internal class Test : Iterable { override fun iterator(): Iterator? { return null } - public fun push(i: Iterator): Iterator { + fun push(i: Iterator): Iterator { val j = i return j } } -class FullTest : Iterable { +internal class FullTest : Iterable { override fun iterator(): Iterator? { return null } - public fun push(i: Iterator): Iterator { + fun push(i: Iterator): Iterator { val j = i return j } diff --git a/j2k/testData/fileOrElement/toKotlinClasses/iterableAndIterator2.kt b/j2k/testData/fileOrElement/toKotlinClasses/iterableAndIterator2.kt index 33de5debc56..7e3c47ec96f 100644 --- a/j2k/testData/fileOrElement/toKotlinClasses/iterableAndIterator2.kt +++ b/j2k/testData/fileOrElement/toKotlinClasses/iterableAndIterator2.kt @@ -4,23 +4,23 @@ package demo import java.util.* -class Test : Iterable { +internal class Test : Iterable { override fun iterator(): Iterator? { return null } - public fun push(i: Iterator): Iterator { + fun push(i: Iterator): Iterator { val j = i return j } } -class FullTest : Iterable { +internal class FullTest : Iterable { override fun iterator(): Iterator? { return null } - public fun push(i: Iterator): Iterator { + fun push(i: Iterator): Iterator { val j = i return j } diff --git a/j2k/testData/fileOrElement/toKotlinClasses/iterableAndIterator3.kt b/j2k/testData/fileOrElement/toKotlinClasses/iterableAndIterator3.kt index 91948803e27..9877b696696 100644 --- a/j2k/testData/fileOrElement/toKotlinClasses/iterableAndIterator3.kt +++ b/j2k/testData/fileOrElement/toKotlinClasses/iterableAndIterator3.kt @@ -1,12 +1,12 @@ // ERROR: Return type of 'iterator' is not a subtype of the return type of the overridden member 'public abstract fun iterator(): kotlin.Iterator defined in kotlin.Iterable' package demo -class Test : Iterable { +internal class Test : Iterable { override fun iterator(): Iterator? { return null } - public fun push(i: Iterator): Iterator { + fun push(i: Iterator): Iterator { val j = i return j } diff --git a/j2k/testData/fileOrElement/trait/abstactInterface.kt b/j2k/testData/fileOrElement/trait/abstactInterface.kt index f555b842e56..f25bcf51cba 100644 --- a/j2k/testData/fileOrElement/trait/abstactInterface.kt +++ b/j2k/testData/fileOrElement/trait/abstactInterface.kt @@ -1 +1 @@ -interface I \ No newline at end of file +internal interface I \ No newline at end of file diff --git a/j2k/testData/fileOrElement/trait/emptyInterface.kt b/j2k/testData/fileOrElement/trait/emptyInterface.kt index 3c30d34f09c..9a132d6275b 100644 --- a/j2k/testData/fileOrElement/trait/emptyInterface.kt +++ b/j2k/testData/fileOrElement/trait/emptyInterface.kt @@ -1 +1 @@ -interface A \ No newline at end of file +internal interface A \ No newline at end of file diff --git a/j2k/testData/fileOrElement/trait/extendsOneClassAndImplementsSeveralInterfaces.kt b/j2k/testData/fileOrElement/trait/extendsOneClassAndImplementsSeveralInterfaces.kt index 79662ed5dc4..dedefaaf188 100644 --- a/j2k/testData/fileOrElement/trait/extendsOneClassAndImplementsSeveralInterfaces.kt +++ b/j2k/testData/fileOrElement/trait/extendsOneClassAndImplementsSeveralInterfaces.kt @@ -1 +1 @@ -interface A : I0, I1, I2 \ No newline at end of file +internal interface A : I0, I1, I2 \ No newline at end of file diff --git a/j2k/testData/fileOrElement/trait/extendsOneInterface.kt b/j2k/testData/fileOrElement/trait/extendsOneInterface.kt index f313552745e..45dcd02b6c8 100644 --- a/j2k/testData/fileOrElement/trait/extendsOneInterface.kt +++ b/j2k/testData/fileOrElement/trait/extendsOneInterface.kt @@ -1 +1 @@ -interface A : I \ No newline at end of file +internal interface A : I \ No newline at end of file diff --git a/j2k/testData/fileOrElement/trait/interfaceWithFields.kt b/j2k/testData/fileOrElement/trait/interfaceWithFields.kt index 71dd3a2c487..ce7fe720e31 100644 --- a/j2k/testData/fileOrElement/trait/interfaceWithFields.kt +++ b/j2k/testData/fileOrElement/trait/interfaceWithFields.kt @@ -1,7 +1,7 @@ -interface INode { +internal interface INode { companion object { - public val IN: String = "in" - public val AT: String = "@" - public val COMMA_WITH_SPACE: String = COMMA + SPACE + val IN: String = "in" + val AT: String = "@" + val COMMA_WITH_SPACE: String = COMMA + SPACE } } \ No newline at end of file diff --git a/j2k/testData/fileOrElement/trait/interfaceWithMethodDeclaration.kt b/j2k/testData/fileOrElement/trait/interfaceWithMethodDeclaration.kt index 807968af167..9d42e881704 100644 --- a/j2k/testData/fileOrElement/trait/interfaceWithMethodDeclaration.kt +++ b/j2k/testData/fileOrElement/trait/interfaceWithMethodDeclaration.kt @@ -1,4 +1,4 @@ -interface INode { - public fun getTag(): Tag - public fun toKotlin(): String +internal interface INode { + fun getTag(): Tag + fun toKotlin(): String } \ No newline at end of file diff --git a/j2k/testData/fileOrElement/trait/interfaceWithStaticFields.kt b/j2k/testData/fileOrElement/trait/interfaceWithStaticFields.kt index b911346f045..8a05c8f96fe 100644 --- a/j2k/testData/fileOrElement/trait/interfaceWithStaticFields.kt +++ b/j2k/testData/fileOrElement/trait/interfaceWithStaticFields.kt @@ -1,7 +1,7 @@ -public interface INode { +interface INode { companion object { - public val IN: String = "in" - public val AT: String = "@" - public val COMMA_WITH_SPACE: String = COMMA + SPACE + val IN: String = "in" + val AT: String = "@" + val COMMA_WITH_SPACE: String = COMMA + SPACE } } \ No newline at end of file diff --git a/j2k/testData/fileOrElement/trait/internalInterface.kt b/j2k/testData/fileOrElement/trait/internalInterface.kt index 616fc8d128e..14f817053ba 100644 --- a/j2k/testData/fileOrElement/trait/internalInterface.kt +++ b/j2k/testData/fileOrElement/trait/internalInterface.kt @@ -1 +1 @@ -interface Test \ No newline at end of file +internal interface Test \ No newline at end of file diff --git a/j2k/testData/fileOrElement/trait/publicInterface.kt b/j2k/testData/fileOrElement/trait/publicInterface.kt index d4774e1a183..616fc8d128e 100644 --- a/j2k/testData/fileOrElement/trait/publicInterface.kt +++ b/j2k/testData/fileOrElement/trait/publicInterface.kt @@ -1 +1 @@ -public interface Test \ No newline at end of file +interface Test \ No newline at end of file diff --git a/j2k/testData/fileOrElement/tryStatement/disjunctionType.kt b/j2k/testData/fileOrElement/tryStatement/disjunctionType.kt index 1f3031a48e6..3d2c7a5b70c 100644 --- a/j2k/testData/fileOrElement/tryStatement/disjunctionType.kt +++ b/j2k/testData/fileOrElement/tryStatement/disjunctionType.kt @@ -1,8 +1,8 @@ // ERROR: Unresolved reference: bar import java.io.IOException -class A { - fun foo() { +internal class A { + internal fun foo() { try { bar() } catch (e: RuntimeException) { diff --git a/j2k/testData/fileOrElement/tryWithResource/Multiline.kt b/j2k/testData/fileOrElement/tryWithResource/Multiline.kt index 2beca75872d..5feb502f60f 100644 --- a/j2k/testData/fileOrElement/tryWithResource/Multiline.kt +++ b/j2k/testData/fileOrElement/tryWithResource/Multiline.kt @@ -1,8 +1,8 @@ import java.io.* -public class C { +class C { Throws(IOException::class) - fun foo() { + internal fun foo() { ByteArrayInputStream(ByteArray(10)).use { stream -> // reading something val c = stream.read() diff --git a/j2k/testData/fileOrElement/tryWithResource/MultipleResources.kt b/j2k/testData/fileOrElement/tryWithResource/MultipleResources.kt index 3723fceb84a..a6fc4505eb2 100644 --- a/j2k/testData/fileOrElement/tryWithResource/MultipleResources.kt +++ b/j2k/testData/fileOrElement/tryWithResource/MultipleResources.kt @@ -1,8 +1,8 @@ import java.io.* -public class C { +class C { Throws(IOException::class) - fun foo() { + internal fun foo() { ByteArrayInputStream(ByteArray(10)).use { input -> ByteArrayOutputStream().use { output -> output.write(input.read()) diff --git a/j2k/testData/fileOrElement/tryWithResource/Simple.kt b/j2k/testData/fileOrElement/tryWithResource/Simple.kt index d6af44fc6b7..9440bbb0eaa 100644 --- a/j2k/testData/fileOrElement/tryWithResource/Simple.kt +++ b/j2k/testData/fileOrElement/tryWithResource/Simple.kt @@ -1,8 +1,8 @@ import java.io.* -public class C { +class C { Throws(IOException::class) - fun foo() { + internal fun foo() { ByteArrayInputStream(ByteArray(10)).use { stream -> println(stream.read()) } } } \ No newline at end of file diff --git a/j2k/testData/fileOrElement/tryWithResource/WithCatch.kt b/j2k/testData/fileOrElement/tryWithResource/WithCatch.kt index eb0a4ac1aae..950ca9c3f45 100644 --- a/j2k/testData/fileOrElement/tryWithResource/WithCatch.kt +++ b/j2k/testData/fileOrElement/tryWithResource/WithCatch.kt @@ -1,7 +1,7 @@ import java.io.* -public class C { - fun foo() { +class C { + internal fun foo() { try { ByteArrayInputStream(ByteArray(10)).use { stream -> // reading something diff --git a/j2k/testData/fileOrElement/tryWithResource/WithCatchAndFinally.kt b/j2k/testData/fileOrElement/tryWithResource/WithCatchAndFinally.kt index 33c747ade0d..df9f553fbcf 100644 --- a/j2k/testData/fileOrElement/tryWithResource/WithCatchAndFinally.kt +++ b/j2k/testData/fileOrElement/tryWithResource/WithCatchAndFinally.kt @@ -1,7 +1,7 @@ import java.io.* -public class C { - fun foo() { +class C { + internal fun foo() { try { ByteArrayInputStream(ByteArray(10)).use { stream -> // reading something diff --git a/j2k/testData/fileOrElement/tryWithResource/WithCatches.kt b/j2k/testData/fileOrElement/tryWithResource/WithCatches.kt index 04db5b1da42..5af91cf4616 100644 --- a/j2k/testData/fileOrElement/tryWithResource/WithCatches.kt +++ b/j2k/testData/fileOrElement/tryWithResource/WithCatches.kt @@ -1,7 +1,7 @@ import java.io.* -public class C { - fun foo() { +class C { + internal fun foo() { try { ByteArrayInputStream(ByteArray(10)).use { stream -> // reading something diff --git a/j2k/testData/fileOrElement/tryWithResource/WithFinally.kt b/j2k/testData/fileOrElement/tryWithResource/WithFinally.kt index 5107e6e289c..56574e55d16 100644 --- a/j2k/testData/fileOrElement/tryWithResource/WithFinally.kt +++ b/j2k/testData/fileOrElement/tryWithResource/WithFinally.kt @@ -1,8 +1,8 @@ import java.io.* -public class C { +class C { Throws(IOException::class) - fun foo() { + internal fun foo() { try { ByteArrayInputStream(ByteArray(10)).use { stream -> // reading something diff --git a/j2k/testData/fileOrElement/tryWithResource/WithReturnAtEnd.kt b/j2k/testData/fileOrElement/tryWithResource/WithReturnAtEnd.kt index d1e75e322c6..db3b330b694 100644 --- a/j2k/testData/fileOrElement/tryWithResource/WithReturnAtEnd.kt +++ b/j2k/testData/fileOrElement/tryWithResource/WithReturnAtEnd.kt @@ -1,7 +1,7 @@ import java.io.* -public class C { - fun foo(): Int { +class C { + internal fun foo(): Int { try { ByteArrayInputStream(ByteArray(10)).use { stream -> // reading something diff --git a/j2k/testData/fileOrElement/tryWithResource/WithReturnInAnonymousClass.kt b/j2k/testData/fileOrElement/tryWithResource/WithReturnInAnonymousClass.kt index 85c5b6a9b90..2769af1f4f0 100644 --- a/j2k/testData/fileOrElement/tryWithResource/WithReturnInAnonymousClass.kt +++ b/j2k/testData/fileOrElement/tryWithResource/WithReturnInAnonymousClass.kt @@ -1,13 +1,13 @@ import java.io.* -interface I { +internal interface I { Throws(IOException::class) - public fun doIt(stream: InputStream): Int + fun doIt(stream: InputStream): Int } -public class C { +class C { Throws(IOException::class) - fun foo() { + internal fun foo() { ByteArrayInputStream(ByteArray(10)).use { stream -> bar(object : I { Throws(IOException::class) @@ -19,7 +19,7 @@ public class C { } Throws(IOException::class) - fun bar(i: I, stream: InputStream): Int { + internal fun bar(i: I, stream: InputStream): Int { return i.doIt(stream) } } \ No newline at end of file diff --git a/j2k/testData/fileOrElement/tryWithResource/WithReturnInAnonymousClass2.kt b/j2k/testData/fileOrElement/tryWithResource/WithReturnInAnonymousClass2.kt index bf26a084f5d..67fa6176818 100644 --- a/j2k/testData/fileOrElement/tryWithResource/WithReturnInAnonymousClass2.kt +++ b/j2k/testData/fileOrElement/tryWithResource/WithReturnInAnonymousClass2.kt @@ -1,13 +1,13 @@ import java.io.* -interface I { +internal interface I { Throws(IOException::class) - public fun doIt(stream: InputStream): Int + fun doIt(stream: InputStream): Int } -public class C { +class C { Throws(IOException::class) - fun foo(): Int { + internal fun foo(): Int { ByteArrayInputStream(ByteArray(10)).use { stream -> return bar(object : I { Throws(IOException::class) @@ -19,7 +19,7 @@ public class C { } Throws(IOException::class) - fun bar(i: I, stream: InputStream): Int { + internal fun bar(i: I, stream: InputStream): Int { return i.doIt(stream) } } \ No newline at end of file diff --git a/j2k/testData/fileOrElement/typeCastExpression/castNullable.kt b/j2k/testData/fileOrElement/typeCastExpression/castNullable.kt index a67b620c445..9ca75153ab3 100644 --- a/j2k/testData/fileOrElement/typeCastExpression/castNullable.kt +++ b/j2k/testData/fileOrElement/typeCastExpression/castNullable.kt @@ -1,10 +1,10 @@ -class A { +internal class A { private fun foo(o: Any?, b: Boolean): String? { if (b) return o as String? return "" } - fun bar() { + internal fun bar() { if (foo(null, true) == null) { println("null") } diff --git a/j2k/testData/fileOrElement/typeParameters/classDoubleParametrizationWithTwoBoundsWithExtending.kt b/j2k/testData/fileOrElement/typeParameters/classDoubleParametrizationWithTwoBoundsWithExtending.kt index 69cf490e5d4..111e7daca53 100644 --- a/j2k/testData/fileOrElement/typeParameters/classDoubleParametrizationWithTwoBoundsWithExtending.kt +++ b/j2k/testData/fileOrElement/typeParameters/classDoubleParametrizationWithTwoBoundsWithExtending.kt @@ -1 +1 @@ -class CC : A() where T : Comparable, K : Collection \ No newline at end of file +internal class CC : A() where T : Comparable, K : Collection \ No newline at end of file diff --git a/j2k/testData/fileOrElement/typeParameters/classParametrizationWithTwoBounds.kt b/j2k/testData/fileOrElement/typeParameters/classParametrizationWithTwoBounds.kt index c3a5dc8940c..a3b80286417 100644 --- a/j2k/testData/fileOrElement/typeParameters/classParametrizationWithTwoBounds.kt +++ b/j2k/testData/fileOrElement/typeParameters/classParametrizationWithTwoBounds.kt @@ -1 +1 @@ -class C where T : Comparable \ No newline at end of file +internal class C where T : Comparable \ No newline at end of file diff --git a/j2k/testData/fileOrElement/typeParameters/classParametrizationWithTwoBoundsWithExtending.kt b/j2k/testData/fileOrElement/typeParameters/classParametrizationWithTwoBoundsWithExtending.kt index ddbd28056f1..2f74240f34f 100644 --- a/j2k/testData/fileOrElement/typeParameters/classParametrizationWithTwoBoundsWithExtending.kt +++ b/j2k/testData/fileOrElement/typeParameters/classParametrizationWithTwoBoundsWithExtending.kt @@ -1 +1 @@ -class C : A() where T : Comparable \ No newline at end of file +internal class C : A() where T : Comparable \ No newline at end of file diff --git a/j2k/testData/fileOrElement/typeParameters/complexExampleWithClassExtending.kt b/j2k/testData/fileOrElement/typeParameters/complexExampleWithClassExtending.kt index 6bbbc353e7e..fb7a3f87ee9 100644 --- a/j2k/testData/fileOrElement/typeParameters/complexExampleWithClassExtending.kt +++ b/j2k/testData/fileOrElement/typeParameters/complexExampleWithClassExtending.kt @@ -1 +1 @@ -interface CommandHandler \ No newline at end of file +internal interface CommandHandler \ No newline at end of file diff --git a/j2k/testData/fileOrElement/typeParameters/complexExampleWithClassMultiplyExtending.kt b/j2k/testData/fileOrElement/typeParameters/complexExampleWithClassMultiplyExtending.kt index 3d0fd4021d6..9841c115975 100644 --- a/j2k/testData/fileOrElement/typeParameters/complexExampleWithClassMultiplyExtending.kt +++ b/j2k/testData/fileOrElement/typeParameters/complexExampleWithClassMultiplyExtending.kt @@ -1 +1 @@ -interface CommandHandler \ No newline at end of file +internal interface CommandHandler \ No newline at end of file diff --git a/j2k/testData/fileOrElement/typeParameters/genericClass.kt b/j2k/testData/fileOrElement/typeParameters/genericClass.kt index 746e4d72cd9..b525981e5ff 100644 --- a/j2k/testData/fileOrElement/typeParameters/genericClass.kt +++ b/j2k/testData/fileOrElement/typeParameters/genericClass.kt @@ -1 +1 @@ -class Comparable \ No newline at end of file +internal class Comparable \ No newline at end of file diff --git a/j2k/testData/fileOrElement/typeParameters/methodDoubleParametrizationWithTwoBounds.kt b/j2k/testData/fileOrElement/typeParameters/methodDoubleParametrizationWithTwoBounds.kt index 6a7b22e6666..42787872dad 100644 --- a/j2k/testData/fileOrElement/typeParameters/methodDoubleParametrizationWithTwoBounds.kt +++ b/j2k/testData/fileOrElement/typeParameters/methodDoubleParametrizationWithTwoBounds.kt @@ -1,2 +1,2 @@ -fun max(coll: Collection): T where T : Comparable, K : Collection { +internal fun max(coll: Collection): T where T : Comparable, K : Collection { } \ No newline at end of file diff --git a/j2k/testData/fileOrElement/typeParameters/needTypeArgs.kt b/j2k/testData/fileOrElement/typeParameters/needTypeArgs.kt index ed704f37ec4..952873bfecd 100644 --- a/j2k/testData/fileOrElement/typeParameters/needTypeArgs.kt +++ b/j2k/testData/fileOrElement/typeParameters/needTypeArgs.kt @@ -1,16 +1,16 @@ import java.util.HashMap -class A { - fun foo() { +internal class A { + internal fun foo() { val map1 = getMap1() val map2 = getMap2("a", 1) } - fun getMap1(): Map { + internal fun getMap1(): Map { return HashMap() } - fun getMap2(k: K, v: V): Map { + internal fun getMap2(k: K, v: V): Map { val map = HashMap() map.put(k, v) return map diff --git a/j2k/testData/fileOrElement/typeParameters/rawTypeCast.kt b/j2k/testData/fileOrElement/typeParameters/rawTypeCast.kt index 519c20d2221..762e005b5f9 100644 --- a/j2k/testData/fileOrElement/typeParameters/rawTypeCast.kt +++ b/j2k/testData/fileOrElement/typeParameters/rawTypeCast.kt @@ -1,8 +1,8 @@ // ERROR: Type inference failed. Expected type mismatch: found: java.util.HashMap required: kotlin.Map import java.util.* -object A { - public fun foo(): Map { +internal object A { + fun foo(): Map { val props = Properties() return HashMap(props as Map) } diff --git a/j2k/testData/fileOrElement/typeParameters/traitDoubleParametrizationWithTwoBoundsWithExtending.kt b/j2k/testData/fileOrElement/typeParameters/traitDoubleParametrizationWithTwoBoundsWithExtending.kt index 324868ff658..4966cbb3831 100644 --- a/j2k/testData/fileOrElement/typeParameters/traitDoubleParametrizationWithTwoBoundsWithExtending.kt +++ b/j2k/testData/fileOrElement/typeParameters/traitDoubleParametrizationWithTwoBoundsWithExtending.kt @@ -1 +1 @@ -interface I : II where T : Comparable, K : Collection \ No newline at end of file +internal interface I : II where T : Comparable, K : Collection \ No newline at end of file diff --git a/j2k/testData/fileOrElement/typeParameters/typeFromOtherFile.kt b/j2k/testData/fileOrElement/typeParameters/typeFromOtherFile.kt index 9d2428deb2b..39eb68791b3 100644 --- a/j2k/testData/fileOrElement/typeParameters/typeFromOtherFile.kt +++ b/j2k/testData/fileOrElement/typeParameters/typeFromOtherFile.kt @@ -1,8 +1,8 @@ import java.util.* import javaApi.T -class A { - public fun foo(t: T): Any { +internal class A { + fun foo(t: T): Any { return Collections.nCopies(1, t.set) } } \ No newline at end of file diff --git a/j2k/testData/fileOrElement/typeParameters/where.kt b/j2k/testData/fileOrElement/typeParameters/where.kt index 4c6e6f81c15..385145671f1 100644 --- a/j2k/testData/fileOrElement/typeParameters/where.kt +++ b/j2k/testData/fileOrElement/typeParameters/where.kt @@ -1,2 +1,2 @@ -fun max(coll: Collection): T where T : Comparable { +internal fun max(coll: Collection): T where T : Comparable { } \ No newline at end of file diff --git a/j2k/testData/fileOrElement/varArg/ellipsisTypeSeveralParams.kt b/j2k/testData/fileOrElement/varArg/ellipsisTypeSeveralParams.kt index 28aec67d146..7c52d28ff45 100644 --- a/j2k/testData/fileOrElement/varArg/ellipsisTypeSeveralParams.kt +++ b/j2k/testData/fileOrElement/varArg/ellipsisTypeSeveralParams.kt @@ -1 +1 @@ -fun format(pattern: String, vararg arguments: Any): String \ No newline at end of file +internal fun format(pattern: String, vararg arguments: Any): String \ No newline at end of file diff --git a/j2k/testData/fileOrElement/varArg/ellipsisTypeSingleParams.kt b/j2k/testData/fileOrElement/varArg/ellipsisTypeSingleParams.kt index e1403964927..8adf755e20f 100644 --- a/j2k/testData/fileOrElement/varArg/ellipsisTypeSingleParams.kt +++ b/j2k/testData/fileOrElement/varArg/ellipsisTypeSingleParams.kt @@ -1,2 +1,2 @@ -fun pushAll(vararg objs: Any) { +internal fun pushAll(vararg objs: Any) { } \ No newline at end of file diff --git a/j2k/testData/multiFile/FieldToProperty/JavaClass.kt b/j2k/testData/multiFile/FieldToProperty/JavaClass.kt index e2cc5d3e9a6..8883e955ece 100644 --- a/j2k/testData/multiFile/FieldToProperty/JavaClass.kt +++ b/j2k/testData/multiFile/FieldToProperty/JavaClass.kt @@ -1,8 +1,8 @@ package test -open class JavaClass { - public var field: Int = 0 +internal open class JavaClass { + var field: Int = 0 - public var property: Int = 0 + var property: Int = 0 protected set } \ No newline at end of file diff --git a/j2k/testData/multiFile/GetterAndSetterUsages/1.kt b/j2k/testData/multiFile/GetterAndSetterUsages/1.kt index c93222292ee..d3db3e6f58e 100644 --- a/j2k/testData/multiFile/GetterAndSetterUsages/1.kt +++ b/j2k/testData/multiFile/GetterAndSetterUsages/1.kt @@ -1,11 +1,11 @@ -public class AAA { - public var x: Int = 42 +class AAA { + var x: Int = 42 - public fun foo() { + fun foo() { x = x + 1 } - public fun bar(b: B) { + fun bar(b: B) { println(b.YY) } } \ No newline at end of file diff --git a/j2k/testData/multiFile/GetterAndSetterUsages/2.kt b/j2k/testData/multiFile/GetterAndSetterUsages/2.kt index e51980f694a..46131db01ae 100644 --- a/j2k/testData/multiFile/GetterAndSetterUsages/2.kt +++ b/j2k/testData/multiFile/GetterAndSetterUsages/2.kt @@ -1,9 +1,9 @@ -class B { - fun foo(a: AAA) { +internal class B { + internal fun foo(a: AAA) { a.x = a.x + 1 YY += "a" } - public var YY: String = "" + var YY: String = "" private set } \ No newline at end of file diff --git a/j2k/testData/multiFile/ToCompanionObject/ClassWithStatics.kt b/j2k/testData/multiFile/ToCompanionObject/ClassWithStatics.kt index 9aff89443de..af906ee06da 100644 --- a/j2k/testData/multiFile/ToCompanionObject/ClassWithStatics.kt +++ b/j2k/testData/multiFile/ToCompanionObject/ClassWithStatics.kt @@ -1,16 +1,16 @@ package test -open class ClassWithStatics { - public fun instanceMethod() { +internal open class ClassWithStatics { + fun instanceMethod() { } companion object { - public fun staticMethod(p: Int) { + fun staticMethod(p: Int) { } - public val staticField: Int = 1 + val staticField: Int = 1 - public var value: Int = 0 + var value: Int = 0 } } \ No newline at end of file diff --git a/j2k/testData/multiFile/ToObject/PureUtils.kt b/j2k/testData/multiFile/ToObject/PureUtils.kt index 8cd2567e511..30b26629eeb 100644 --- a/j2k/testData/multiFile/ToObject/PureUtils.kt +++ b/j2k/testData/multiFile/ToObject/PureUtils.kt @@ -1,10 +1,10 @@ package test -object PureUtils { - public fun foo1(p: Int) { +internal object PureUtils { + fun foo1(p: Int) { } - public fun foo2(): Int { + fun foo2(): Int { return 1 } } diff --git a/j2k/testData/multiFile/ToObject/Utils.kt b/j2k/testData/multiFile/ToObject/Utils.kt index 093770f5316..2042426d9be 100644 --- a/j2k/testData/multiFile/ToObject/Utils.kt +++ b/j2k/testData/multiFile/ToObject/Utils.kt @@ -1,12 +1,12 @@ package test -object Utils { - public fun foo1(p: Int) { +internal object Utils { + fun foo1(p: Int) { } - public fun foo2(): Int { + fun foo2(): Int { return 1 } - public val staticField: Int = 1 + val staticField: Int = 1 } diff --git a/j2k/tests/org/jetbrains/kotlin/j2k/AbstractJavaToKotlinConverterSingleFileTest.kt b/j2k/tests/org/jetbrains/kotlin/j2k/AbstractJavaToKotlinConverterSingleFileTest.kt index 4e455f7e6a8..2b1b6303e04 100644 --- a/j2k/tests/org/jetbrains/kotlin/j2k/AbstractJavaToKotlinConverterSingleFileTest.kt +++ b/j2k/tests/org/jetbrains/kotlin/j2k/AbstractJavaToKotlinConverterSingleFileTest.kt @@ -16,20 +16,20 @@ package org.jetbrains.kotlin.j2k -import java.io.File -import com.intellij.openapi.util.io.FileUtil -import java.util.regex.Pattern -import com.intellij.testFramework.LightPlatformTestCase -import com.intellij.psi.codeStyle.CodeStyleManager -import org.jetbrains.kotlin.test.JetTestUtils -import com.intellij.openapi.project.Project import com.intellij.openapi.command.WriteCommandAction +import com.intellij.openapi.project.Project +import com.intellij.openapi.util.io.FileUtil +import com.intellij.psi.PsiJavaFile +import com.intellij.psi.codeStyle.CodeStyleManager +import com.intellij.testFramework.LightPlatformTestCase +import org.jetbrains.kotlin.idea.j2k.IdeaJavaToKotlinServices import org.jetbrains.kotlin.idea.j2k.J2kPostProcessor import org.jetbrains.kotlin.idea.test.JetWithJdkAndRuntimeLightProjectDescriptor -import com.intellij.psi.PsiJavaFile -import org.jetbrains.kotlin.idea.j2k.IdeaJavaToKotlinServices -import org.jetbrains.kotlin.psi.JetFile import org.jetbrains.kotlin.idea.test.dumpTextWithErrors +import org.jetbrains.kotlin.psi.JetFile +import org.jetbrains.kotlin.test.JetTestUtils +import java.io.File +import java.util.regex.Pattern public abstract class AbstractJavaToKotlinConverterSingleFileTest : AbstractJavaToKotlinConverterTest() { val testHeaderPattern = Pattern.compile("//(element|expression|statement|method|class|file|comp)\n") @@ -111,13 +111,13 @@ public abstract class AbstractJavaToKotlinConverterSingleFileTest : AbstractJava } private fun methodToKotlin(text: String, settings: ConverterSettings, project: Project): String { - val result = fileToKotlin("final class C {" + text + "}", settings, project).replace("class C {", "").replace("object C {", "") + val result = fileToKotlin("final class C {" + text + "}", settings, project).replace("internal class C {", "").replace("internal object C {", "") return result.substring(0, (result.lastIndexOf("}"))).trim() } private fun statementToKotlin(text: String, settings: ConverterSettings, project: Project): String { val result = methodToKotlin("void main() {" + text + "}", settings, project) - return result.substring(0, result.lastIndexOf("}")).replaceFirst("fun main() {", "").trim() + return result.substring(0, result.lastIndexOf("}")).replaceFirst("internal fun main() {", "").trim() } private fun expressionToKotlin(code: String, settings: ConverterSettings, project: Project): String {