From d0f0b9e35504a40a32760a12396e6e7bc1e21991 Mon Sep 17 00:00:00 2001 From: Ilya Kirillov Date: Mon, 7 Oct 2019 12:32:47 +0300 Subject: [PATCH] New J2K: do not allow field and method declarations to be internal For internal members new names are generated, So, references to them from Java will be broken --- .../InternalDeclarationConversion.kt | 55 +++++++------------ .../src/org/jetbrains/kotlin/nj2k/psiUtils.kt | 9 +++ .../testData/copyPaste/AddImports.expected.kt | 2 +- .../AddImportsWithExplicitImports.expected.kt | 2 +- .../copyPaste/AddKClassImport.expected.kt | 2 +- .../ConversionInCorrectContext.expected.kt | 2 +- ...ldWithNoModifierAndNoSemicolon.expected.kt | 2 +- .../copyPaste/HalfTheWhiteSpace.expected.kt | 4 +- .../MethodDeclarationWithNoBody.expected.kt | 2 +- .../ImportResolve.expected.kt | 6 +- .../InClassContextProperty.expected.kt | 2 +- .../copyPastePlainText/KT32603.expected.kt | 2 +- .../MembersIntoClass.expected.kt | 4 +- .../MembersToTopLevel.expected.kt | 4 +- .../PostProcessing.expected.kt | 4 +- .../TopLevelContextProperty.expected.kt | 2 +- .../copyPastePlainText/WholeFile.expected.kt | 4 +- .../newJ2k/annotations/jetbrainsNotNull.kt | 2 +- .../newJ2k/annotations/jetbrainsNullable.kt | 2 +- .../newJ2k/annotations/serialVersionUID.kt | 4 +- .../newJ2k/annotations/typeUseAnnotation.kt | 6 +- .../newJ2k/assertStatement/assertNotNull.kt | 4 +- nj2k/testData/newJ2k/class/abstractClass.kt | 2 +- nj2k/testData/newJ2k/class/utilityClass5.kt | 4 +- .../newJ2k/constructors/artificialPrimary.kt | 6 +- .../constructors/withManyDefaultParams.kt | 12 ++-- .../newJ2k/detectProperties/AnonymousClass.kt | 2 +- .../AssignFieldInsideSetter.kt | 1 - .../AssignFieldInsideSetter2.kt | 6 +- .../detectProperties/GetterWithSideEffect1.kt | 2 +- .../detectProperties/GetterWithSideEffect2.kt | 2 +- .../detectProperties/SetterWithSideEffect1.kt | 2 +- .../detectProperties/SetterWithSideEffect2.kt | 2 +- .../whileWithAssignmentAsExpression.kt | 6 +- .../newJ2k/enum/constantsWithBody1.kt | 2 +- .../newJ2k/enum/constantsWithBody2.kt | 4 +- .../newJ2k/for/arrayIndicesReversed.kt | 4 +- .../for/assignmentAsExpressionInBody.kt | 2 +- nj2k/testData/newJ2k/for/downTo1.kt | 4 +- nj2k/testData/newJ2k/for/downTo2.kt | 4 +- nj2k/testData/newJ2k/for/downTo3.kt | 4 +- nj2k/testData/newJ2k/for/downTo4.kt | 4 +- .../newJ2k/for/falseArrayIndicesReversed.kt | 4 +- .../newJ2k/for/falseArrayIndicesReversed2.kt | 4 +- .../newJ2k/for/falseIndicesReversed.kt | 4 +- nj2k/testData/newJ2k/for/indicesReversed.kt | 4 +- .../testData/newJ2k/formatting/chainedCall.kt | 4 +- .../newJ2k/function/abstractMethod.kt | 2 +- nj2k/testData/newJ2k/function/override.kt | 4 +- .../newJ2k/function/overrideAndOpen.kt | 4 +- .../ifStatement/assignmentAsExpressionInIf.kt | 2 +- .../newJ2k/inheritance/openModifier.kt | 10 ++-- nj2k/testData/newJ2k/issues/kt-1048.kt | 4 +- nj2k/testData/newJ2k/issues/kt-14248.kt | 3 +- nj2k/testData/newJ2k/issues/kt-19357.kt | 14 ++--- nj2k/testData/newJ2k/issues/kt-19636.kt | 4 +- nj2k/testData/newJ2k/issues/kt-21315.kt | 4 +- nj2k/testData/newJ2k/issues/kt-6790.kt | 2 +- nj2k/testData/newJ2k/issues/kt-836.kt | 4 +- .../StaticImportFromCompanionObject.kt | 2 +- .../StaticImportFromCompanionObject2.kt | 2 +- .../newJ2k/literalExpression/binary.kt | 12 ++-- .../newJ2k/literalExpression/underscores.kt | 14 ++--- .../conflictJavaMethodCall.kt | 2 +- ...nflictJavaMethodCallWithExplicitImports.kt | 4 +- .../mutableCollections/listOfMutableList.kt | 2 +- .../newJ2k/postProcessing/AnonymousObject.kt | 4 +- .../newJ2k/postProcessing/GuardClause.kt | 2 +- .../newJ2k/protected/constructorProperty.kt | 4 +- .../testData/newJ2k/settings/openByDefault.kt | 4 +- .../staticMembers/PrivateStaticMethods3.kt | 2 +- .../staticMembers/PrivateStaticMethods4.kt | 2 +- .../newJ2k/superExpression/classAextendsB.kt | 4 +- .../newJ2k/tryWithResource/Multiline.kt | 2 +- .../tryWithResource/MultipleResources.kt | 4 +- .../testData/newJ2k/tryWithResource/Simple.kt | 2 +- .../newJ2k/tryWithResource/WithCatch.kt | 2 +- .../tryWithResource/WithCatchAndFinally.kt | 2 +- .../newJ2k/tryWithResource/WithCatches.kt | 2 +- .../newJ2k/tryWithResource/WithFinally.kt | 2 +- .../newJ2k/tryWithResource/WithReturnAtEnd.kt | 2 +- .../WithReturnInAnonymousClass.kt | 6 +- .../WithReturnInAnonymousClass2.kt | 6 +- .../newJ2k/typeCastExpression/beforeDot.kt | 2 +- .../whileWithAssignmentAsExpression.kt | 6 +- 85 files changed, 185 insertions(+), 191 deletions(-) diff --git a/nj2k/src/org/jetbrains/kotlin/nj2k/conversions/InternalDeclarationConversion.kt b/nj2k/src/org/jetbrains/kotlin/nj2k/conversions/InternalDeclarationConversion.kt index d2c8d4d52f5..e06776ae81b 100644 --- a/nj2k/src/org/jetbrains/kotlin/nj2k/conversions/InternalDeclarationConversion.kt +++ b/nj2k/src/org/jetbrains/kotlin/nj2k/conversions/InternalDeclarationConversion.kt @@ -12,44 +12,31 @@ import org.jetbrains.kotlin.nj2k.tree.* class InternalDeclarationConversion(context: NewJ2kConverterContext) : RecursiveApplicableConversionBase(context) { override fun applyToElement(element: JKTreeElement): JKTreeElement { if (element !is JKVisibilityOwner || element !is JKModalityOwner) return recurse(element) + if (element.visibility != Visibility.INTERNAL) return recurse(element) + val containingClass = element.parentOfType() + val containingClassKind = containingClass?.classKind ?: element.psi()?.containingClass?.classKind?.toJk() - if (element is JKClass && element.isLocalClass()) { - element.visibility = Visibility.PUBLIC + val containingClassVisibility = containingClass?.visibility + ?: element.psi() + ?.containingClass + ?.visibility(context.converter.oldConverterServices.referenceSearcher, null) + ?.visibility + + element.visibility = when { + containingClassKind == JKClass.ClassKind.INTERFACE || containingClassKind == JKClass.ClassKind.ANNOTATION -> + Visibility.PUBLIC + containingClassKind == JKClass.ClassKind.ENUM && element is JKKtPrimaryConstructor -> + Visibility.PRIVATE + element is JKClass && !element.isLocalClass() -> + Visibility.INTERNAL + element is JKConstructor && containingClassVisibility != Visibility.INTERNAL -> + Visibility.INTERNAL + element is JKField || element is JKMethod -> + Visibility.PUBLIC + else -> Visibility.INTERNAL } - val containingClassVisibility = - containingClass?.visibility - ?: element.psi() - ?.containingClass - ?.visibility(context.converter.oldConverterServices.referenceSearcher, null) - ?.visibility - - val containingClassKind = - containingClass?.classKind - ?: element.psi() - ?.containingClass - ?.classKind - - if (containingClassVisibility == Visibility.INTERNAL - && element.visibility == Visibility.INTERNAL - && element.modality == Modality.FINAL - && (element is JKMethod || element is JKField) - ) { - element.visibility = Visibility.PUBLIC - } - - if (containingClassKind == JKClass.ClassKind.INTERFACE - || containingClassKind == JKClass.ClassKind.ANNOTATION - ) { - element.visibility = Visibility.PUBLIC - } - - if (containingClassKind == JKClass.ClassKind.ENUM - && element is JKKtPrimaryConstructor - ) { - element.visibility = Visibility.PRIVATE - } return recurse(element) } } \ No newline at end of file diff --git a/nj2k/src/org/jetbrains/kotlin/nj2k/psiUtils.kt b/nj2k/src/org/jetbrains/kotlin/nj2k/psiUtils.kt index a41b93321f7..3ae480e6195 100644 --- a/nj2k/src/org/jetbrains/kotlin/nj2k/psiUtils.kt +++ b/nj2k/src/org/jetbrains/kotlin/nj2k/psiUtils.kt @@ -6,11 +6,13 @@ package org.jetbrains.kotlin.nj2k import com.intellij.codeInsight.generation.GenerateEqualsHelper.getEqualsSignature +import com.intellij.lang.jvm.JvmClassKind import com.intellij.psi.* import com.intellij.psi.search.GlobalSearchScope import com.intellij.psi.util.InheritanceUtil import com.intellij.psi.util.MethodSignatureUtil import com.intellij.psi.util.PsiUtil +import org.jetbrains.kotlin.j2k.ClassKind import org.jetbrains.kotlin.j2k.ReferenceSearcher import org.jetbrains.kotlin.j2k.isNullLiteral import org.jetbrains.kotlin.nj2k.tree.* @@ -80,6 +82,13 @@ fun PsiMember.modality(assignNonCodeElements: ((JKFormattingOwner, PsiElement) - }?.firstOrNull() ?: JKModalityModifierElement(Modality.OPEN) +fun JvmClassKind.toJk() = when (this) { + JvmClassKind.CLASS -> JKClass.ClassKind.CLASS + JvmClassKind.INTERFACE -> JKClass.ClassKind.INTERFACE + JvmClassKind.ANNOTATION -> JKClass.ClassKind.ANNOTATION + JvmClassKind.ENUM -> JKClass.ClassKind.ENUM +} + private fun PsiMember.handleProtectedVisibility(referenceSearcher: ReferenceSearcher): Visibility { val originalClass = containingClass ?: return Visibility.PROTECTED // Search for usages only in Java because java-protected member cannot be used in Kotlin from same package diff --git a/nj2k/testData/copyPaste/AddImports.expected.kt b/nj2k/testData/copyPaste/AddImports.expected.kt index da92b99c283..0d10c33cdfd 100644 --- a/nj2k/testData/copyPaste/AddImports.expected.kt +++ b/nj2k/testData/copyPaste/AddImports.expected.kt @@ -1,5 +1,5 @@ import java.io.File -internal fun foo(file: File?): List? { +fun foo(file: File?): List? { return emptyList() } diff --git a/nj2k/testData/copyPaste/AddImportsWithExplicitImports.expected.kt b/nj2k/testData/copyPaste/AddImportsWithExplicitImports.expected.kt index 1589bce4b00..b9b8f631955 100644 --- a/nj2k/testData/copyPaste/AddImportsWithExplicitImports.expected.kt +++ b/nj2k/testData/copyPaste/AddImportsWithExplicitImports.expected.kt @@ -1,6 +1,6 @@ import java.io.File -class C { +internal class C { private fun memberFun(file: File) {} companion object { diff --git a/nj2k/testData/copyPaste/AddKClassImport.expected.kt b/nj2k/testData/copyPaste/AddKClassImport.expected.kt index 1ca56e30eeb..29ad36b1693 100644 --- a/nj2k/testData/copyPaste/AddKClassImport.expected.kt +++ b/nj2k/testData/copyPaste/AddKClassImport.expected.kt @@ -2,4 +2,4 @@ package to import kotlin.reflect.KClass -annotation class Ann(val value: KClass<*>) \ No newline at end of file +internal annotation class Ann(val value: KClass<*>) \ No newline at end of file diff --git a/nj2k/testData/copyPaste/ConversionInCorrectContext.expected.kt b/nj2k/testData/copyPaste/ConversionInCorrectContext.expected.kt index 9f33f3fd57f..d7026fe8098 100644 --- a/nj2k/testData/copyPaste/ConversionInCorrectContext.expected.kt +++ b/nj2k/testData/copyPaste/ConversionInCorrectContext.expected.kt @@ -1,3 +1,3 @@ -internal fun foo(p: Dependency): Double { +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/nj2k/testData/copyPaste/FieldWithNoModifierAndNoSemicolon.expected.kt b/nj2k/testData/copyPaste/FieldWithNoModifierAndNoSemicolon.expected.kt index 21b1689d4ae..d079c1453c7 100644 --- a/nj2k/testData/copyPaste/FieldWithNoModifierAndNoSemicolon.expected.kt +++ b/nj2k/testData/copyPaste/FieldWithNoModifierAndNoSemicolon.expected.kt @@ -1,4 +1,4 @@ package to @Volatile -internal var field = 1 \ No newline at end of file +var field = 1 \ No newline at end of file diff --git a/nj2k/testData/copyPaste/HalfTheWhiteSpace.expected.kt b/nj2k/testData/copyPaste/HalfTheWhiteSpace.expected.kt index 3ac91dff334..95d8d80727a 100644 --- a/nj2k/testData/copyPaste/HalfTheWhiteSpace.expected.kt +++ b/nj2k/testData/copyPaste/HalfTheWhiteSpace.expected.kt @@ -1,9 +1,9 @@ class A { - internal fun foo() {} + fun foo() {} - internal fun bar() {} + fun bar() {} fun f() {} diff --git a/nj2k/testData/copyPaste/MethodDeclarationWithNoBody.expected.kt b/nj2k/testData/copyPaste/MethodDeclarationWithNoBody.expected.kt index 6ea83f686a9..6ee0e06e614 100644 --- a/nj2k/testData/copyPaste/MethodDeclarationWithNoBody.expected.kt +++ b/nj2k/testData/copyPaste/MethodDeclarationWithNoBody.expected.kt @@ -1,3 +1,3 @@ package to -internal fun foo(p: Int) \ No newline at end of file +fun foo(p: Int) \ No newline at end of file diff --git a/nj2k/testData/copyPastePlainText/ImportResolve.expected.kt b/nj2k/testData/copyPastePlainText/ImportResolve.expected.kt index eeb1e48e87d..4ee49f60f2c 100644 --- a/nj2k/testData/copyPastePlainText/ImportResolve.expected.kt +++ b/nj2k/testData/copyPastePlainText/ImportResolve.expected.kt @@ -14,9 +14,9 @@ class Target { var hashMapOfNotImported: Map = HashMap() - internal fun acceptKotlinClass(tbi: ToBeImportedKotlin?) {} + fun acceptKotlinClass(tbi: ToBeImportedKotlin?) {} - internal fun acceptJavaClass(tbi: ToBeImportedJava?) {} + fun acceptJavaClass(tbi: ToBeImportedJava?) {} var ambiguousKotlin: IAmbiguousKotlin = AmbiguousKotlin() // Should not add import in case of 2 declarations in Kotlin @@ -25,7 +25,7 @@ class Target { var ambiguousJava: IAmbiguousJava = AmbiguousJava() // Should not add import in case of 2 declarations in Java - internal fun workWithStatics() { + fun workWithStatics() { val a = TO_BE_IMPORTED_CONST staticMethod() } diff --git a/nj2k/testData/copyPastePlainText/InClassContextProperty.expected.kt b/nj2k/testData/copyPastePlainText/InClassContextProperty.expected.kt index d86ef50ec52..4a61250355f 100644 --- a/nj2k/testData/copyPastePlainText/InClassContextProperty.expected.kt +++ b/nj2k/testData/copyPastePlainText/InClassContextProperty.expected.kt @@ -1,6 +1,6 @@ class A { val str: String = TODO() - internal fun f() { + fun f() { str.length } } \ No newline at end of file diff --git a/nj2k/testData/copyPastePlainText/KT32603.expected.kt b/nj2k/testData/copyPastePlainText/KT32603.expected.kt index 4de5f93af15..e8bb8a77de1 100644 --- a/nj2k/testData/copyPastePlainText/KT32603.expected.kt +++ b/nj2k/testData/copyPastePlainText/KT32603.expected.kt @@ -1,6 +1,6 @@ class Foo { var prop = 0 - internal fun foo() { + fun foo() { prop++ } } \ No newline at end of file diff --git a/nj2k/testData/copyPastePlainText/MembersIntoClass.expected.kt b/nj2k/testData/copyPastePlainText/MembersIntoClass.expected.kt index 10ba5dfcc8b..7ac811c75a2 100644 --- a/nj2k/testData/copyPastePlainText/MembersIntoClass.expected.kt +++ b/nj2k/testData/copyPastePlainText/MembersIntoClass.expected.kt @@ -3,11 +3,11 @@ import java.util.ArrayList class A { - internal fun foo() { + fun foo() { val list = ArrayList() list.add(1) } - internal fun bar() {} + fun bar() {} } \ No newline at end of file diff --git a/nj2k/testData/copyPastePlainText/MembersToTopLevel.expected.kt b/nj2k/testData/copyPastePlainText/MembersToTopLevel.expected.kt index e66a554e086..73aa6bc5693 100644 --- a/nj2k/testData/copyPastePlainText/MembersToTopLevel.expected.kt +++ b/nj2k/testData/copyPastePlainText/MembersToTopLevel.expected.kt @@ -3,9 +3,9 @@ package to import java.util.ArrayList -internal fun foo() { +fun foo() { val list = ArrayList() list.add(1) } -internal fun bar() {} +fun bar() {} diff --git a/nj2k/testData/copyPastePlainText/PostProcessing.expected.kt b/nj2k/testData/copyPastePlainText/PostProcessing.expected.kt index 44cd0814484..e2ffa57fdd8 100644 --- a/nj2k/testData/copyPastePlainText/PostProcessing.expected.kt +++ b/nj2k/testData/copyPastePlainText/PostProcessing.expected.kt @@ -4,8 +4,8 @@ import java.io.File import java.util.ArrayList -class JavaClass { - internal fun foo(file: File?, target: MutableList?) { +internal class JavaClass { + fun foo(file: File?, target: MutableList?) { val list = ArrayList() if (file != null) { list.add(file.name) diff --git a/nj2k/testData/copyPastePlainText/TopLevelContextProperty.expected.kt b/nj2k/testData/copyPastePlainText/TopLevelContextProperty.expected.kt index 143b23d89bd..b507452d915 100644 --- a/nj2k/testData/copyPastePlainText/TopLevelContextProperty.expected.kt +++ b/nj2k/testData/copyPastePlainText/TopLevelContextProperty.expected.kt @@ -1,4 +1,4 @@ val str: String = TODO() -internal fun f() { +fun f() { str.length } \ No newline at end of file diff --git a/nj2k/testData/copyPastePlainText/WholeFile.expected.kt b/nj2k/testData/copyPastePlainText/WholeFile.expected.kt index 11a8cf7b1fc..283d391ce21 100644 --- a/nj2k/testData/copyPastePlainText/WholeFile.expected.kt +++ b/nj2k/testData/copyPastePlainText/WholeFile.expected.kt @@ -3,8 +3,8 @@ package to import java.util.ArrayList -class JavaClass { - internal fun foo() { +internal class JavaClass { + fun foo() { val list = ArrayList() list.add(1) } diff --git a/nj2k/testData/newJ2k/annotations/jetbrainsNotNull.kt b/nj2k/testData/newJ2k/annotations/jetbrainsNotNull.kt index acda7c095f0..3706bff22e5 100644 --- a/nj2k/testData/newJ2k/annotations/jetbrainsNotNull.kt +++ b/nj2k/testData/newJ2k/annotations/jetbrainsNotNull.kt @@ -3,7 +3,7 @@ package test class Test(str: String) { - internal var myStr = "String2" + var myStr = "String2" fun sout(str: String) { // UNNECESSARY_NOT_NULL_ASSERTION heuristic does not work any more, instead we can skip generating !! altogether println(str) } diff --git a/nj2k/testData/newJ2k/annotations/jetbrainsNullable.kt b/nj2k/testData/newJ2k/annotations/jetbrainsNullable.kt index d0a481bf492..bce78af1e5b 100644 --- a/nj2k/testData/newJ2k/annotations/jetbrainsNullable.kt +++ b/nj2k/testData/newJ2k/annotations/jetbrainsNullable.kt @@ -2,7 +2,7 @@ package test class Test(str: String?) { - internal var myStr: String? = "String2" + var myStr: String? = "String2" fun sout(str: String?) { println(str) } diff --git a/nj2k/testData/newJ2k/annotations/serialVersionUID.kt b/nj2k/testData/newJ2k/annotations/serialVersionUID.kt index 77bed891dca..055d60be08e 100644 --- a/nj2k/testData/newJ2k/annotations/serialVersionUID.kt +++ b/nj2k/testData/newJ2k/annotations/serialVersionUID.kt @@ -1,7 +1,7 @@ import java.io.Serializable class Bar : Serializable { - internal var foobar = 0 + var foobar = 0 companion object { private const val serialVersionUID: Long = 0 @@ -9,7 +9,7 @@ class Bar : Serializable { } class Foo { - internal var foobar = 0 + var foobar = 0 companion object { private const val serialVersionUID: Long = 0 diff --git a/nj2k/testData/newJ2k/annotations/typeUseAnnotation.kt b/nj2k/testData/newJ2k/annotations/typeUseAnnotation.kt index 2114e820886..795097ea0c7 100644 --- a/nj2k/testData/newJ2k/annotations/typeUseAnnotation.kt +++ b/nj2k/testData/newJ2k/annotations/typeUseAnnotation.kt @@ -11,7 +11,7 @@ class TEST1 { } @Anon5(4) - internal var bar: @TypeUseAnon1 String? = null + var bar: @TypeUseAnon1 String? = null } class TEST2 { @@ -22,7 +22,7 @@ class TEST2 { } @Anon5(4) - internal var bar: @TypeUseAnon2 String? = null + var bar: @TypeUseAnon2 String? = null } class TEST3 { @@ -33,5 +33,5 @@ class TEST3 { } @Anon5(4) - internal var bar: @TypeUseAnon3 String? = null + var bar: @TypeUseAnon3 String? = null } \ No newline at end of file diff --git a/nj2k/testData/newJ2k/assertStatement/assertNotNull.kt b/nj2k/testData/newJ2k/assertStatement/assertNotNull.kt index 8a7bf0b36b3..10730d87875 100644 --- a/nj2k/testData/newJ2k/assertStatement/assertNotNull.kt +++ b/nj2k/testData/newJ2k/assertStatement/assertNotNull.kt @@ -5,6 +5,6 @@ internal abstract class C { val h = s2.hashCode() } - internal abstract fun f(): String? - internal abstract fun g(): String? + abstract fun f(): String? + abstract fun g(): String? } \ No newline at end of file diff --git a/nj2k/testData/newJ2k/class/abstractClass.kt b/nj2k/testData/newJ2k/class/abstractClass.kt index f84610d979e..26e45b9bbd3 100644 --- a/nj2k/testData/newJ2k/class/abstractClass.kt +++ b/nj2k/testData/newJ2k/class/abstractClass.kt @@ -1,5 +1,5 @@ internal abstract class A { - internal abstract fun callme() + abstract fun callme() fun callmetoo() { print("This is a concrete method.") } diff --git a/nj2k/testData/newJ2k/class/utilityClass5.kt b/nj2k/testData/newJ2k/class/utilityClass5.kt index 30dfb7265d5..f7c6c1c06e5 100644 --- a/nj2k/testData/newJ2k/class/utilityClass5.kt +++ b/nj2k/testData/newJ2k/class/utilityClass5.kt @@ -1,10 +1,10 @@ object Util { const val publicStr = "" internal const val protectedStr = "" - internal const val packageStr = "" + const val packageStr = "" private const val privateStr = "" fun publicMethod() {} internal fun protectedMethod() {} - internal fun packageMethod() {} + fun packageMethod() {} private fun privateMethod() {} } \ No newline at end of file diff --git a/nj2k/testData/newJ2k/constructors/artificialPrimary.kt b/nj2k/testData/newJ2k/constructors/artificialPrimary.kt index deb70acd949..9f7194234fa 100644 --- a/nj2k/testData/newJ2k/constructors/artificialPrimary.kt +++ b/nj2k/testData/newJ2k/constructors/artificialPrimary.kt @@ -1,8 +1,8 @@ // ERROR: Property must be initialized or be abstract class Test { private val s: String - internal var b = false - internal var d = 0.0 + var b = false + var d = 0.0 constructor() { b = true @@ -11,4 +11,4 @@ class Test { constructor(s: String) { this.s = s } -} +} \ No newline at end of file diff --git a/nj2k/testData/newJ2k/constructors/withManyDefaultParams.kt b/nj2k/testData/newJ2k/constructors/withManyDefaultParams.kt index 1dfe08d907c..869613e8e10 100644 --- a/nj2k/testData/newJ2k/constructors/withManyDefaultParams.kt +++ b/nj2k/testData/newJ2k/constructors/withManyDefaultParams.kt @@ -1,11 +1,11 @@ // ERROR: Property must be initialized or be abstract class Test { private val myName: String - internal var a = false - internal var b = 0.0 - internal var c = 0f - internal var d: Long = 0 - internal var e = 0 + var a = false + var b = 0.0 + var c = 0f + var d: Long = 0 + var e = 0 protected var f: Short = 0 protected var g = 0.toChar() @@ -15,7 +15,7 @@ class Test { } companion object { - internal fun foo(n: String?): String { + fun foo(n: String?): String { return "" } } diff --git a/nj2k/testData/newJ2k/detectProperties/AnonymousClass.kt b/nj2k/testData/newJ2k/detectProperties/AnonymousClass.kt index 924b51c5b40..910eb9ad126 100644 --- a/nj2k/testData/newJ2k/detectProperties/AnonymousClass.kt +++ b/nj2k/testData/newJ2k/detectProperties/AnonymousClass.kt @@ -1,5 +1,5 @@ class X { - internal fun foo() { + fun foo() { val runnable: Runnable = object : Runnable { var value = 10 diff --git a/nj2k/testData/newJ2k/detectProperties/AssignFieldInsideSetter.kt b/nj2k/testData/newJ2k/detectProperties/AssignFieldInsideSetter.kt index 871dfe809fd..2f7a79e84c1 100644 --- a/nj2k/testData/newJ2k/detectProperties/AssignFieldInsideSetter.kt +++ b/nj2k/testData/newJ2k/detectProperties/AssignFieldInsideSetter.kt @@ -1,5 +1,4 @@ class C { var x: String? = null - internal set } \ No newline at end of file diff --git a/nj2k/testData/newJ2k/detectProperties/AssignFieldInsideSetter2.kt b/nj2k/testData/newJ2k/detectProperties/AssignFieldInsideSetter2.kt index e7cf3ab19ad..9d457147f1f 100644 --- a/nj2k/testData/newJ2k/detectProperties/AssignFieldInsideSetter2.kt +++ b/nj2k/testData/newJ2k/detectProperties/AssignFieldInsideSetter2.kt @@ -1,15 +1,15 @@ class C { private var x = "" - internal var other: C? = null + var other: C? = null fun getX(): String { return x } - internal fun setX(x: String) { + fun setX(x: String) { println("setter invoked") if (other != null) { other!!.x = x } this.x = x } -} +} \ No newline at end of file diff --git a/nj2k/testData/newJ2k/detectProperties/GetterWithSideEffect1.kt b/nj2k/testData/newJ2k/detectProperties/GetterWithSideEffect1.kt index 8abd21e7496..58983d673a6 100644 --- a/nj2k/testData/newJ2k/detectProperties/GetterWithSideEffect1.kt +++ b/nj2k/testData/newJ2k/detectProperties/GetterWithSideEffect1.kt @@ -9,7 +9,7 @@ class C { myX = x } - internal fun foo() { + fun foo() { println("myX = $myX") } } \ No newline at end of file diff --git a/nj2k/testData/newJ2k/detectProperties/GetterWithSideEffect2.kt b/nj2k/testData/newJ2k/detectProperties/GetterWithSideEffect2.kt index 59baf9bc351..434fde9cc10 100644 --- a/nj2k/testData/newJ2k/detectProperties/GetterWithSideEffect2.kt +++ b/nj2k/testData/newJ2k/detectProperties/GetterWithSideEffect2.kt @@ -9,7 +9,7 @@ class C { this.x = x } - internal fun foo() { + fun foo() { println("x = $x") } } \ No newline at end of file diff --git a/nj2k/testData/newJ2k/detectProperties/SetterWithSideEffect1.kt b/nj2k/testData/newJ2k/detectProperties/SetterWithSideEffect1.kt index 939b8fd3ce8..6418b9ed160 100644 --- a/nj2k/testData/newJ2k/detectProperties/SetterWithSideEffect1.kt +++ b/nj2k/testData/newJ2k/detectProperties/SetterWithSideEffect1.kt @@ -7,7 +7,7 @@ class C { myX = x } - internal fun foo() { + fun foo() { myX = "a" } } \ No newline at end of file diff --git a/nj2k/testData/newJ2k/detectProperties/SetterWithSideEffect2.kt b/nj2k/testData/newJ2k/detectProperties/SetterWithSideEffect2.kt index b0bdc2a8c70..5a8e9c1371f 100644 --- a/nj2k/testData/newJ2k/detectProperties/SetterWithSideEffect2.kt +++ b/nj2k/testData/newJ2k/detectProperties/SetterWithSideEffect2.kt @@ -9,7 +9,7 @@ class C { this.x = x } - internal fun foo() { + fun foo() { x = "a" } } \ No newline at end of file diff --git a/nj2k/testData/newJ2k/doWhileStatement/whileWithAssignmentAsExpression.kt b/nj2k/testData/newJ2k/doWhileStatement/whileWithAssignmentAsExpression.kt index 5ca23e26f3f..8c4d349c424 100644 --- a/nj2k/testData/newJ2k/doWhileStatement/whileWithAssignmentAsExpression.kt +++ b/nj2k/testData/newJ2k/doWhileStatement/whileWithAssignmentAsExpression.kt @@ -1,7 +1,7 @@ class SomeClass { - internal var a = 0 - internal var b = 0 - internal fun doSomeWhile(i: Int) { + var a = 0 + var b = 0 + fun doSomeWhile(i: Int) { do { b = i a = b diff --git a/nj2k/testData/newJ2k/enum/constantsWithBody1.kt b/nj2k/testData/newJ2k/enum/constantsWithBody1.kt index 7bf6a66e9b9..aca30b7932e 100644 --- a/nj2k/testData/newJ2k/enum/constantsWithBody1.kt +++ b/nj2k/testData/newJ2k/enum/constantsWithBody1.kt @@ -3,5 +3,5 @@ enum class E { override fun bar() {} }; - internal open fun bar() {} + open fun bar() {} } \ No newline at end of file diff --git a/nj2k/testData/newJ2k/enum/constantsWithBody2.kt b/nj2k/testData/newJ2k/enum/constantsWithBody2.kt index d4eb0b09cb9..e3be5c80d8e 100644 --- a/nj2k/testData/newJ2k/enum/constantsWithBody2.kt +++ b/nj2k/testData/newJ2k/enum/constantsWithBody2.kt @@ -9,7 +9,7 @@ enum class E(private val p: Int) { override fun bar() {} }; - internal fun foo(p: Int) {} - internal abstract fun bar() + fun foo(p: Int) {} + abstract fun bar() } \ No newline at end of file diff --git a/nj2k/testData/newJ2k/for/arrayIndicesReversed.kt b/nj2k/testData/newJ2k/for/arrayIndicesReversed.kt index b7bc2962e9d..6d7d8a2abed 100644 --- a/nj2k/testData/newJ2k/for/arrayIndicesReversed.kt +++ b/nj2k/testData/newJ2k/for/arrayIndicesReversed.kt @@ -1,7 +1,7 @@ class A { - internal fun foo(array: Array) { + fun foo(array: Array) { for (i in array.indices.reversed()) { println(i) } } -} +} \ No newline at end of file diff --git a/nj2k/testData/newJ2k/for/assignmentAsExpressionInBody.kt b/nj2k/testData/newJ2k/for/assignmentAsExpressionInBody.kt index 0788c612138..5d8cb14f14a 100644 --- a/nj2k/testData/newJ2k/for/assignmentAsExpressionInBody.kt +++ b/nj2k/testData/newJ2k/for/assignmentAsExpressionInBody.kt @@ -1,5 +1,5 @@ class SomeClass { - internal fun doSomeFor() { + fun doSomeFor() { var a: Int var b: Int for (i in 0..9) { diff --git a/nj2k/testData/newJ2k/for/downTo1.kt b/nj2k/testData/newJ2k/for/downTo1.kt index 9069b9fe91b..ae9403d7d40 100644 --- a/nj2k/testData/newJ2k/for/downTo1.kt +++ b/nj2k/testData/newJ2k/for/downTo1.kt @@ -1,7 +1,7 @@ class A { - internal fun foo() { + fun foo() { for (i in 10 downTo 0) { println(i) } } -} +} \ No newline at end of file diff --git a/nj2k/testData/newJ2k/for/downTo2.kt b/nj2k/testData/newJ2k/for/downTo2.kt index 6db840e6ffa..9f9fe3aa26e 100644 --- a/nj2k/testData/newJ2k/for/downTo2.kt +++ b/nj2k/testData/newJ2k/for/downTo2.kt @@ -1,7 +1,7 @@ class A { - internal fun foo() { + fun foo() { for (i in 10 downTo 1) { println(i) } } -} +} \ No newline at end of file diff --git a/nj2k/testData/newJ2k/for/downTo3.kt b/nj2k/testData/newJ2k/for/downTo3.kt index cacbc3f79cf..5108b64cbe0 100644 --- a/nj2k/testData/newJ2k/for/downTo3.kt +++ b/nj2k/testData/newJ2k/for/downTo3.kt @@ -1,7 +1,7 @@ class A { - internal fun foo(min: Int) { + fun foo(min: Int) { for (i in 10 downTo min + 1) { println(i) } } -} +} \ No newline at end of file diff --git a/nj2k/testData/newJ2k/for/downTo4.kt b/nj2k/testData/newJ2k/for/downTo4.kt index cacbc3f79cf..5108b64cbe0 100644 --- a/nj2k/testData/newJ2k/for/downTo4.kt +++ b/nj2k/testData/newJ2k/for/downTo4.kt @@ -1,7 +1,7 @@ class A { - internal fun foo(min: Int) { + fun foo(min: Int) { for (i in 10 downTo min + 1) { println(i) } } -} +} \ No newline at end of file diff --git a/nj2k/testData/newJ2k/for/falseArrayIndicesReversed.kt b/nj2k/testData/newJ2k/for/falseArrayIndicesReversed.kt index 10661c2677c..efb7944f578 100644 --- a/nj2k/testData/newJ2k/for/falseArrayIndicesReversed.kt +++ b/nj2k/testData/newJ2k/for/falseArrayIndicesReversed.kt @@ -1,7 +1,7 @@ class A { - internal fun foo(array: Array) { + fun foo(array: Array) { for (i in array.size downTo 0) { println(i) } } -} +} \ No newline at end of file diff --git a/nj2k/testData/newJ2k/for/falseArrayIndicesReversed2.kt b/nj2k/testData/newJ2k/for/falseArrayIndicesReversed2.kt index 5a5cafb7879..6c3e44b02d4 100644 --- a/nj2k/testData/newJ2k/for/falseArrayIndicesReversed2.kt +++ b/nj2k/testData/newJ2k/for/falseArrayIndicesReversed2.kt @@ -1,7 +1,7 @@ class A { - internal fun foo(array: Array) { + fun foo(array: Array) { for (i in array.size - 2 downTo 0) { println(i) } } -} +} \ No newline at end of file diff --git a/nj2k/testData/newJ2k/for/falseIndicesReversed.kt b/nj2k/testData/newJ2k/for/falseIndicesReversed.kt index 95eea859899..8a61ea1f029 100644 --- a/nj2k/testData/newJ2k/for/falseIndicesReversed.kt +++ b/nj2k/testData/newJ2k/for/falseIndicesReversed.kt @@ -1,7 +1,7 @@ class A { - internal fun foo(collection: Collection) { + fun foo(collection: Collection) { for (i in collection.size downTo 0) { println(i) } } -} +} \ No newline at end of file diff --git a/nj2k/testData/newJ2k/for/indicesReversed.kt b/nj2k/testData/newJ2k/for/indicesReversed.kt index 11550e74f85..1662471b5ee 100644 --- a/nj2k/testData/newJ2k/for/indicesReversed.kt +++ b/nj2k/testData/newJ2k/for/indicesReversed.kt @@ -1,7 +1,7 @@ class A { - internal fun foo(collection: Collection) { + fun foo(collection: Collection) { for (i in collection.indices.reversed()) { println(i) } } -} +} \ No newline at end of file diff --git a/nj2k/testData/newJ2k/formatting/chainedCall.kt b/nj2k/testData/newJ2k/formatting/chainedCall.kt index 8c13a41b75d..c120cca456f 100644 --- a/nj2k/testData/newJ2k/formatting/chainedCall.kt +++ b/nj2k/testData/newJ2k/formatting/chainedCall.kt @@ -1,8 +1,8 @@ class C { - internal fun foo() { + fun foo() { val builder = StringBuilder() builder.append(1) .append(2).append(3) .append(4) } -} +} \ No newline at end of file diff --git a/nj2k/testData/newJ2k/function/abstractMethod.kt b/nj2k/testData/newJ2k/function/abstractMethod.kt index a511833eda8..1bb9e87216c 100644 --- a/nj2k/testData/newJ2k/function/abstractMethod.kt +++ b/nj2k/testData/newJ2k/function/abstractMethod.kt @@ -1 +1 @@ -internal abstract val noofGears: Int \ No newline at end of file +abstract val noofGears: Int \ No newline at end of file diff --git a/nj2k/testData/newJ2k/function/override.kt b/nj2k/testData/newJ2k/function/override.kt index 76f35e01ec6..71e742d933d 100644 --- a/nj2k/testData/newJ2k/function/override.kt +++ b/nj2k/testData/newJ2k/function/override.kt @@ -1,7 +1,7 @@ internal open class A { - internal open fun a() {} + open fun a() {} } internal class B : A() { - public override fun a() {} + override fun a() {} } \ No newline at end of file diff --git a/nj2k/testData/newJ2k/function/overrideAndOpen.kt b/nj2k/testData/newJ2k/function/overrideAndOpen.kt index 20750e36796..3e147624d3e 100644 --- a/nj2k/testData/newJ2k/function/overrideAndOpen.kt +++ b/nj2k/testData/newJ2k/function/overrideAndOpen.kt @@ -1,9 +1,9 @@ internal open class A { - internal open fun foo() {} + open fun foo() {} } internal open class B : A() { - public override fun foo() {} + override fun foo() {} } internal class C : B() { diff --git a/nj2k/testData/newJ2k/ifStatement/assignmentAsExpressionInIf.kt b/nj2k/testData/newJ2k/ifStatement/assignmentAsExpressionInIf.kt index 924632ea0e5..a89f1d698ad 100644 --- a/nj2k/testData/newJ2k/ifStatement/assignmentAsExpressionInIf.kt +++ b/nj2k/testData/newJ2k/ifStatement/assignmentAsExpressionInIf.kt @@ -1,5 +1,5 @@ class SomeClass { - internal fun doSomeIf(i: Int) { + fun doSomeIf(i: Int) { val a: Int val b: Int val c: Int diff --git a/nj2k/testData/newJ2k/inheritance/openModifier.kt b/nj2k/testData/newJ2k/inheritance/openModifier.kt index 2ff204cbd30..e4678cd6ff4 100644 --- a/nj2k/testData/newJ2k/inheritance/openModifier.kt +++ b/nj2k/testData/newJ2k/inheritance/openModifier.kt @@ -25,14 +25,14 @@ internal class D : I { } internal abstract class E { - internal abstract fun f1() - internal open fun f2() {} + abstract fun f1() + open fun f2() {} fun f3() {} } internal class F : E() { - public override fun f1() {} - public override fun f2() { + override fun f1() {} + override fun f2() { super.f2() } -} +} \ No newline at end of file diff --git a/nj2k/testData/newJ2k/issues/kt-1048.kt b/nj2k/testData/newJ2k/issues/kt-1048.kt index 2df6a082a50..cee28268f2c 100644 --- a/nj2k/testData/newJ2k/issues/kt-1048.kt +++ b/nj2k/testData/newJ2k/issues/kt-1048.kt @@ -5,12 +5,12 @@ import java.util.HashMap internal class G(t: T) class Java { - internal fun test() { + fun test() { val m: HashMap<*, *> = HashMap() m[1] = 1 } - internal fun test2() { + fun test2() { val m: HashMap<*, *> = HashMap() val g: G<*> = G("") val g2 = G("") diff --git a/nj2k/testData/newJ2k/issues/kt-14248.kt b/nj2k/testData/newJ2k/issues/kt-14248.kt index aee60d638d5..968beac27a0 100644 --- a/nj2k/testData/newJ2k/issues/kt-14248.kt +++ b/nj2k/testData/newJ2k/issues/kt-14248.kt @@ -1,2 +1 @@ -class AppInfo(internal var mName: String, internal var mIcon: String, internal var mLastUpdateTime: Long) - +class AppInfo(var mName: String, var mIcon: String, var mLastUpdateTime: Long) \ No newline at end of file diff --git a/nj2k/testData/newJ2k/issues/kt-19357.kt b/nj2k/testData/newJ2k/issues/kt-19357.kt index 67fe0390e84..493024bf49a 100644 --- a/nj2k/testData/newJ2k/issues/kt-19357.kt +++ b/nj2k/testData/newJ2k/issues/kt-19357.kt @@ -1,13 +1,13 @@ class TestPackagePrivateFieldInit { - internal var start: Any? = null - internal var end: Any? = null - internal var handler: Any? = null - internal var desc: String? = null - internal var type = 0 - internal var next: TestPackagePrivateFieldInit? = null + var start: Any? = null + var end: Any? = null + var handler: Any? = null + var desc: String? = null + var type = 0 + var next: TestPackagePrivateFieldInit? = null companion object { - internal fun doStuff(h: TestPackagePrivateFieldInit?, start: Any, end: Any?): TestPackagePrivateFieldInit? { + fun doStuff(h: TestPackagePrivateFieldInit?, start: Any, end: Any?): TestPackagePrivateFieldInit? { var h = h if (h == null) { return null diff --git a/nj2k/testData/newJ2k/issues/kt-19636.kt b/nj2k/testData/newJ2k/issues/kt-19636.kt index 4d359c9488a..c6ee3463231 100644 --- a/nj2k/testData/newJ2k/issues/kt-19636.kt +++ b/nj2k/testData/newJ2k/issues/kt-19636.kt @@ -1,5 +1,5 @@ class TestInitializeInTry { - internal var x: Any? = null + var x: Any? = null private var y: Any? = null init { @@ -12,4 +12,4 @@ class TestInitializeInTry { x.toString() y.toString() } -} +} \ No newline at end of file diff --git a/nj2k/testData/newJ2k/issues/kt-21315.kt b/nj2k/testData/newJ2k/issues/kt-21315.kt index f8c35d8f055..1f9ef37010a 100644 --- a/nj2k/testData/newJ2k/issues/kt-21315.kt +++ b/nj2k/testData/newJ2k/issues/kt-21315.kt @@ -1,8 +1,8 @@ class Test { - internal var foo = 1 + var foo = 1 init { foo = 2 val foo = foo } -} +} \ No newline at end of file diff --git a/nj2k/testData/newJ2k/issues/kt-6790.kt b/nj2k/testData/newJ2k/issues/kt-6790.kt index a7ad30c3b76..e9f63fe5262 100644 --- a/nj2k/testData/newJ2k/issues/kt-6790.kt +++ b/nj2k/testData/newJ2k/issues/kt-6790.kt @@ -1,3 +1,3 @@ class A { - internal fun foo(o: Map.Entry?) {} + fun foo(o: Map.Entry?) {} } \ No newline at end of file diff --git a/nj2k/testData/newJ2k/issues/kt-836.kt b/nj2k/testData/newJ2k/issues/kt-836.kt index fd164bfb5dd..367af9dd119 100644 --- a/nj2k/testData/newJ2k/issues/kt-836.kt +++ b/nj2k/testData/newJ2k/issues/kt-836.kt @@ -10,14 +10,14 @@ class Language(protected var code: String) : Serializable { } internal open class Base { - internal open fun test() {} + open fun test() {} override fun toString(): String { return "BASE" } } internal class Child : Base() { - public override fun test() {} + override fun test() {} override fun toString(): String { return "Child" } diff --git a/nj2k/testData/newJ2k/kotlinApiAccess/StaticImportFromCompanionObject.kt b/nj2k/testData/newJ2k/kotlinApiAccess/StaticImportFromCompanionObject.kt index 21323b6a3a9..269b9f55f55 100644 --- a/nj2k/testData/newJ2k/kotlinApiAccess/StaticImportFromCompanionObject.kt +++ b/nj2k/testData/newJ2k/kotlinApiAccess/StaticImportFromCompanionObject.kt @@ -1,7 +1,7 @@ import kotlinApi.KotlinClass class C { - internal fun bar() { + fun bar() { println(KotlinClass.CONST) } } \ No newline at end of file diff --git a/nj2k/testData/newJ2k/kotlinApiAccess/StaticImportFromCompanionObject2.kt b/nj2k/testData/newJ2k/kotlinApiAccess/StaticImportFromCompanionObject2.kt index 21323b6a3a9..269b9f55f55 100644 --- a/nj2k/testData/newJ2k/kotlinApiAccess/StaticImportFromCompanionObject2.kt +++ b/nj2k/testData/newJ2k/kotlinApiAccess/StaticImportFromCompanionObject2.kt @@ -1,7 +1,7 @@ import kotlinApi.KotlinClass class C { - internal fun bar() { + fun bar() { println(KotlinClass.CONST) } } \ No newline at end of file diff --git a/nj2k/testData/newJ2k/literalExpression/binary.kt b/nj2k/testData/newJ2k/literalExpression/binary.kt index 0f736412c73..acec8364588 100644 --- a/nj2k/testData/newJ2k/literalExpression/binary.kt +++ b/nj2k/testData/newJ2k/literalExpression/binary.kt @@ -1,8 +1,8 @@ class Binary { - internal var negativeBinaryInt = -1073741825 - internal var binaryInt = 1535 - internal var negativeBinaryLong = -4611686018427387905L - internal var binaryLong = 393215L - internal var binaryShort: Short = 32767 - internal var binaryByte: Byte = 83 + var negativeBinaryInt = -1073741825 + var binaryInt = 1535 + var negativeBinaryLong = -4611686018427387905L + var binaryLong = 393215L + var binaryShort: Short = 32767 + var binaryByte: Byte = 83 } \ No newline at end of file diff --git a/nj2k/testData/newJ2k/literalExpression/underscores.kt b/nj2k/testData/newJ2k/literalExpression/underscores.kt index 8307e2a4082..5389b8b5a91 100644 --- a/nj2k/testData/newJ2k/literalExpression/underscores.kt +++ b/nj2k/testData/newJ2k/literalExpression/underscores.kt @@ -1,9 +1,9 @@ class TestNumber { - internal var longLiteral: Long = 1234567 - internal var longHexLiteral: Long = -0x1321a2 - internal var intLiteral = 1234 - internal var floatLiteral = 1234f - internal var doubleLiteral = 1234.0 - internal var shortLiteral: Short = 123 - internal var byteLiteral: Byte = 123 + var longLiteral: Long = 1234567 + var longHexLiteral: Long = -0x1321a2 + var intLiteral = 1234 + var floatLiteral = 1234f + var doubleLiteral = 1234.0 + var shortLiteral: Short = 123 + var byteLiteral: Byte = 123 } \ No newline at end of file diff --git a/nj2k/testData/newJ2k/methodCallExpression/conflictJavaMethodCall.kt b/nj2k/testData/newJ2k/methodCallExpression/conflictJavaMethodCall.kt index 662dde8a62a..1111c5f477f 100644 --- a/nj2k/testData/newJ2k/methodCallExpression/conflictJavaMethodCall.kt +++ b/nj2k/testData/newJ2k/methodCallExpression/conflictJavaMethodCall.kt @@ -1,6 +1,6 @@ // RUNTIME_WITH_FULL_JDK class Test { - internal fun m() { + fun m() { java.lang.Double.isFinite(2.0) java.lang.Double.isNaN(2.0) java.lang.Float.isNaN(2.0f) diff --git a/nj2k/testData/newJ2k/methodCallExpression/conflictJavaMethodCallWithExplicitImports.kt b/nj2k/testData/newJ2k/methodCallExpression/conflictJavaMethodCallWithExplicitImports.kt index 75d80761ef7..860d62259be 100644 --- a/nj2k/testData/newJ2k/methodCallExpression/conflictJavaMethodCallWithExplicitImports.kt +++ b/nj2k/testData/newJ2k/methodCallExpression/conflictJavaMethodCallWithExplicitImports.kt @@ -1,8 +1,8 @@ class Test { - internal fun m() { + fun m() { java.lang.Double.isFinite(2.0) java.lang.Double.isNaN(2.0) java.lang.Float.isNaN(2.0f) java.lang.Float.isInfinite(2.0f) } -} +} \ No newline at end of file diff --git a/nj2k/testData/newJ2k/mutableCollections/listOfMutableList.kt b/nj2k/testData/newJ2k/mutableCollections/listOfMutableList.kt index d0eb8e6b025..47dd633ae1c 100644 --- a/nj2k/testData/newJ2k/mutableCollections/listOfMutableList.kt +++ b/nj2k/testData/newJ2k/mutableCollections/listOfMutableList.kt @@ -1,7 +1,7 @@ import java.util.ArrayList class Test { - internal var list: List> = ArrayList() + var list: List> = ArrayList() fun test() { list[0].add(1) } diff --git a/nj2k/testData/newJ2k/postProcessing/AnonymousObject.kt b/nj2k/testData/newJ2k/postProcessing/AnonymousObject.kt index 8c9455ab12c..ce4a289066c 100644 --- a/nj2k/testData/newJ2k/postProcessing/AnonymousObject.kt +++ b/nj2k/testData/newJ2k/postProcessing/AnonymousObject.kt @@ -1,7 +1,7 @@ import javax.swing.SwingUtilities class A { - internal fun foo() { + fun foo() { SwingUtilities.invokeLater { println("a") } } -} +} \ No newline at end of file diff --git a/nj2k/testData/newJ2k/postProcessing/GuardClause.kt b/nj2k/testData/newJ2k/postProcessing/GuardClause.kt index ed8fbcad9d1..8deffe3abe7 100644 --- a/nj2k/testData/newJ2k/postProcessing/GuardClause.kt +++ b/nj2k/testData/newJ2k/postProcessing/GuardClause.kt @@ -1,5 +1,5 @@ class Test { - internal fun test(s: String?) { + fun test(s: String?) { requireNotNull(s) { "s should not be null" } } } \ No newline at end of file diff --git a/nj2k/testData/newJ2k/protected/constructorProperty.kt b/nj2k/testData/newJ2k/protected/constructorProperty.kt index 019a4978c01..2149935825f 100644 --- a/nj2k/testData/newJ2k/protected/constructorProperty.kt +++ b/nj2k/testData/newJ2k/protected/constructorProperty.kt @@ -11,5 +11,5 @@ class Derived(value: Int) : Base(value) { } internal abstract class View { - internal abstract fun click() -} + abstract fun click() +} \ No newline at end of file diff --git a/nj2k/testData/newJ2k/settings/openByDefault.kt b/nj2k/testData/newJ2k/settings/openByDefault.kt index aa29dcec04b..6a8fdedb264 100644 --- a/nj2k/testData/newJ2k/settings/openByDefault.kt +++ b/nj2k/testData/newJ2k/settings/openByDefault.kt @@ -1,6 +1,6 @@ // !openByDefault: true internal open class A { - internal open fun foo1() {} + open fun foo1() {} private fun foo2() {} fun foo3() {} } @@ -10,7 +10,7 @@ internal class B { } internal abstract class C { - internal abstract fun foo() + abstract fun foo() } internal interface I { diff --git a/nj2k/testData/newJ2k/staticMembers/PrivateStaticMethods3.kt b/nj2k/testData/newJ2k/staticMembers/PrivateStaticMethods3.kt index f946bfd0104..90bb8eb857e 100644 --- a/nj2k/testData/newJ2k/staticMembers/PrivateStaticMethods3.kt +++ b/nj2k/testData/newJ2k/staticMembers/PrivateStaticMethods3.kt @@ -1,6 +1,6 @@ internal class A { class Nested { - internal fun foo() { + fun foo() { privateStatic1() } } diff --git a/nj2k/testData/newJ2k/staticMembers/PrivateStaticMethods4.kt b/nj2k/testData/newJ2k/staticMembers/PrivateStaticMethods4.kt index 7584ac3178c..c09238f04ca 100644 --- a/nj2k/testData/newJ2k/staticMembers/PrivateStaticMethods4.kt +++ b/nj2k/testData/newJ2k/staticMembers/PrivateStaticMethods4.kt @@ -1,6 +1,6 @@ internal class A { inner class Inner { - internal fun foo() { + fun foo() { privateStatic1() } } diff --git a/nj2k/testData/newJ2k/superExpression/classAextendsB.kt b/nj2k/testData/newJ2k/superExpression/classAextendsB.kt index 890c531a7f7..68c96ece692 100644 --- a/nj2k/testData/newJ2k/superExpression/classAextendsB.kt +++ b/nj2k/testData/newJ2k/superExpression/classAextendsB.kt @@ -1,11 +1,11 @@ internal open class B(i: Int) { - internal open fun call(): Int { + open fun call(): Int { return 1 } } internal class A : B(10) { - public override fun call(): Int { + override fun call(): Int { return super.call() } } \ No newline at end of file diff --git a/nj2k/testData/newJ2k/tryWithResource/Multiline.kt b/nj2k/testData/newJ2k/tryWithResource/Multiline.kt index 1eb2f1a2cea..75afd817e44 100644 --- a/nj2k/testData/newJ2k/tryWithResource/Multiline.kt +++ b/nj2k/testData/newJ2k/tryWithResource/Multiline.kt @@ -3,7 +3,7 @@ import java.io.IOException class C { @Throws(IOException::class) - internal fun foo() { + fun foo() { ByteArrayInputStream(ByteArray(10)).use { stream -> // reading something val c = stream.read() diff --git a/nj2k/testData/newJ2k/tryWithResource/MultipleResources.kt b/nj2k/testData/newJ2k/tryWithResource/MultipleResources.kt index 70bfbf1b3d4..ae08ffe0b61 100644 --- a/nj2k/testData/newJ2k/tryWithResource/MultipleResources.kt +++ b/nj2k/testData/newJ2k/tryWithResource/MultipleResources.kt @@ -4,7 +4,7 @@ import java.io.IOException class C { @Throws(IOException::class) - internal fun foo() { + fun foo() { ByteArrayInputStream(ByteArray(10)).use { input -> ByteArrayOutputStream().use { output -> output.write(input.read()) @@ -12,4 +12,4 @@ class C { } } } -} +} \ No newline at end of file diff --git a/nj2k/testData/newJ2k/tryWithResource/Simple.kt b/nj2k/testData/newJ2k/tryWithResource/Simple.kt index 092ee31f1d0..24f0ec2d570 100644 --- a/nj2k/testData/newJ2k/tryWithResource/Simple.kt +++ b/nj2k/testData/newJ2k/tryWithResource/Simple.kt @@ -3,7 +3,7 @@ import java.io.IOException class C { @Throws(IOException::class) - internal fun foo() { + fun foo() { ByteArrayInputStream(ByteArray(10)).use { stream -> println(stream.read()) } } } \ No newline at end of file diff --git a/nj2k/testData/newJ2k/tryWithResource/WithCatch.kt b/nj2k/testData/newJ2k/tryWithResource/WithCatch.kt index 640e1726bec..5284705d5bb 100644 --- a/nj2k/testData/newJ2k/tryWithResource/WithCatch.kt +++ b/nj2k/testData/newJ2k/tryWithResource/WithCatch.kt @@ -2,7 +2,7 @@ import java.io.ByteArrayInputStream import java.io.IOException class C { - internal fun foo() { + fun foo() { try { ByteArrayInputStream(ByteArray(10)).use { stream -> // reading something diff --git a/nj2k/testData/newJ2k/tryWithResource/WithCatchAndFinally.kt b/nj2k/testData/newJ2k/tryWithResource/WithCatchAndFinally.kt index 3a5bdee6506..1cae8c13c0e 100644 --- a/nj2k/testData/newJ2k/tryWithResource/WithCatchAndFinally.kt +++ b/nj2k/testData/newJ2k/tryWithResource/WithCatchAndFinally.kt @@ -2,7 +2,7 @@ import java.io.ByteArrayInputStream import java.io.IOException class C { - internal fun foo() { + fun foo() { try { ByteArrayInputStream(ByteArray(10)).use { stream -> // reading something diff --git a/nj2k/testData/newJ2k/tryWithResource/WithCatches.kt b/nj2k/testData/newJ2k/tryWithResource/WithCatches.kt index d8780c5b528..c347fee4c95 100644 --- a/nj2k/testData/newJ2k/tryWithResource/WithCatches.kt +++ b/nj2k/testData/newJ2k/tryWithResource/WithCatches.kt @@ -2,7 +2,7 @@ import java.io.ByteArrayInputStream import java.io.IOException class C { - internal fun foo() { + fun foo() { try { ByteArrayInputStream(ByteArray(10)).use { stream -> // reading something diff --git a/nj2k/testData/newJ2k/tryWithResource/WithFinally.kt b/nj2k/testData/newJ2k/tryWithResource/WithFinally.kt index a7f2417e7a7..75391e44ab9 100644 --- a/nj2k/testData/newJ2k/tryWithResource/WithFinally.kt +++ b/nj2k/testData/newJ2k/tryWithResource/WithFinally.kt @@ -3,7 +3,7 @@ import java.io.IOException class C { @Throws(IOException::class) - internal fun foo() { + fun foo() { try { ByteArrayInputStream(ByteArray(10)).use { stream -> // reading something diff --git a/nj2k/testData/newJ2k/tryWithResource/WithReturnAtEnd.kt b/nj2k/testData/newJ2k/tryWithResource/WithReturnAtEnd.kt index 57f6f73506c..abb03a18346 100644 --- a/nj2k/testData/newJ2k/tryWithResource/WithReturnAtEnd.kt +++ b/nj2k/testData/newJ2k/tryWithResource/WithReturnAtEnd.kt @@ -2,7 +2,7 @@ import java.io.ByteArrayInputStream import java.io.IOException class C { - internal fun foo(): Int { + fun foo(): Int { try { ByteArrayInputStream(ByteArray(10)).use { stream -> // reading something diff --git a/nj2k/testData/newJ2k/tryWithResource/WithReturnInAnonymousClass.kt b/nj2k/testData/newJ2k/tryWithResource/WithReturnInAnonymousClass.kt index 49fd4602a04..7b6b05e8a74 100644 --- a/nj2k/testData/newJ2k/tryWithResource/WithReturnInAnonymousClass.kt +++ b/nj2k/testData/newJ2k/tryWithResource/WithReturnInAnonymousClass.kt @@ -2,14 +2,14 @@ import java.io.ByteArrayInputStream import java.io.IOException import java.io.InputStream -internal interface I { +interface I { @Throws(IOException::class) fun doIt(stream: InputStream): Int } class C { @Throws(IOException::class) - internal fun foo() { + fun foo() { ByteArrayInputStream(ByteArray(10)).use { stream -> bar(object : I { @Throws(IOException::class) @@ -21,7 +21,7 @@ class C { } @Throws(IOException::class) - internal fun bar(i: I, stream: InputStream): Int { + fun bar(i: I, stream: InputStream): Int { return i.doIt(stream) } } \ No newline at end of file diff --git a/nj2k/testData/newJ2k/tryWithResource/WithReturnInAnonymousClass2.kt b/nj2k/testData/newJ2k/tryWithResource/WithReturnInAnonymousClass2.kt index 711f2f4ab00..c03eb1040be 100644 --- a/nj2k/testData/newJ2k/tryWithResource/WithReturnInAnonymousClass2.kt +++ b/nj2k/testData/newJ2k/tryWithResource/WithReturnInAnonymousClass2.kt @@ -2,14 +2,14 @@ import java.io.ByteArrayInputStream import java.io.IOException import java.io.InputStream -internal interface I { +interface I { @Throws(IOException::class) fun doIt(stream: InputStream): Int } class C { @Throws(IOException::class) - internal fun foo(): Int { + fun foo(): Int { ByteArrayInputStream(ByteArray(10)).use { stream -> return bar(object : I { @Throws(IOException::class) @@ -21,7 +21,7 @@ class C { } @Throws(IOException::class) - internal fun bar(i: I, stream: InputStream): Int { + fun bar(i: I, stream: InputStream): Int { return i.doIt(stream) } } \ No newline at end of file diff --git a/nj2k/testData/newJ2k/typeCastExpression/beforeDot.kt b/nj2k/testData/newJ2k/typeCastExpression/beforeDot.kt index 32f542ddd3a..768cd9190cd 100644 --- a/nj2k/testData/newJ2k/typeCastExpression/beforeDot.kt +++ b/nj2k/testData/newJ2k/typeCastExpression/beforeDot.kt @@ -1,5 +1,5 @@ class A { - internal fun foo(o: Any?) { + fun foo(o: Any?) { if (o == null) return val length = (o as String).length } diff --git a/nj2k/testData/newJ2k/whileStatement/whileWithAssignmentAsExpression.kt b/nj2k/testData/newJ2k/whileStatement/whileWithAssignmentAsExpression.kt index f63c1c3bfa7..99d47026a15 100644 --- a/nj2k/testData/newJ2k/whileStatement/whileWithAssignmentAsExpression.kt +++ b/nj2k/testData/newJ2k/whileStatement/whileWithAssignmentAsExpression.kt @@ -1,7 +1,7 @@ class SomeClass { - internal var a = 0 - internal var b = 0 - internal fun doSomeWhile(i: Int) { + var a = 0 + var b = 0 + fun doSomeWhile(i: Int) { while (i < 0) { b = i a = b