From bf4e27b1524e8539e74b5fc770cf32059dd98981 Mon Sep 17 00:00:00 2001 From: "Pavel V. Talanov" Date: Tue, 19 Nov 2013 15:21:20 +0400 Subject: [PATCH] Converter: Classes are final by default in plugin mode --- j2k/src/org/jetbrains/jet/j2k/ConverterSettings.kt | 9 ++++++--- j2k/src/org/jetbrains/jet/j2k/ast/Class.kt | 11 +++++------ j2k/src/org/jetbrains/jet/j2k/ast/Enum.kt | 4 ++-- j2k/src/org/jetbrains/jet/j2k/ast/Trait.kt | 4 ++-- .../testData/ast/annotations/jetbrainsNotNull.ide.kt | 2 +- .../ast/annotations/jetbrainsNotNullChainExpr.ide.kt | 6 +++--- .../testData/ast/anonymousBlock/oneAnonBlock.ide.kt | 2 +- .../ast/anonymousBlock/oneStaticAnonBlock.ide.kt | 2 +- .../ast/assignmentExpression/nullability.ide.kt | 2 +- j2k/tests/testData/ast/boxedType/Boxing.ide.kt | 2 +- j2k/tests/testData/ast/boxedType/kt-671.ide.kt | 2 +- .../ast/callChainExpression/libraryFieldCall.ide.kt | 4 ++-- .../ast/callChainExpression/libraryMethodCall.ide.kt | 4 ++-- .../libraryMethodCallFromInstance.ide.kt | 4 ++-- .../callChainExpression/libraryStringFieldCall.ide.kt | 4 ++-- j2k/tests/testData/ast/class/ClassShadowing.ide.kt | 4 ++-- j2k/tests/testData/ast/class/class.ide.kt | 2 +- j2k/tests/testData/ast/class/innerStaticClass.ide.kt | 2 +- j2k/tests/testData/ast/class/internalClass.ide.kt | 2 +- j2k/tests/testData/ast/class/kt-639.ide.kt | 4 ++-- j2k/tests/testData/ast/class/pivateClass.ide.kt | 2 +- j2k/tests/testData/ast/class/privateInit.ide.kt | 2 +- j2k/tests/testData/ast/class/protectedClass.ide.kt | 2 +- j2k/tests/testData/ast/class/publicClass.ide.kt | 2 +- .../testData/ast/constructors/allCallsPrimary.ide.kt | 4 ++-- .../testData/ast/constructors/allCallsPrimary2.ide.kt | 4 ++-- .../testData/ast/constructors/customerBuilder.ide.kt | 6 +++--- .../ast/constructors/genericIdentifier.ide.kt | 4 ++-- j2k/tests/testData/ast/constructors/identifier.ide.kt | 4 ++-- .../ast/constructors/withManyDefaultParams.ide.kt | 4 ++-- .../testData/ast/field/classChildExtendsBase.ide.kt | 4 ++-- j2k/tests/testData/ast/field/internalField.ide.kt | 2 +- j2k/tests/testData/ast/field/privateField.ide.kt | 2 +- j2k/tests/testData/ast/field/protectedField.ide.kt | 2 +- j2k/tests/testData/ast/field/publicField.ide.kt | 2 +- j2k/tests/testData/ast/field/valWithInit.ide.kt | 2 +- j2k/tests/testData/ast/field/varWithInit.ide.kt | 2 +- j2k/tests/testData/ast/field/varWithoutInit.ide.kt | 2 +- .../ast/function/extendsBaseWhichExtendsObject.ide.kt | 4 ++-- j2k/tests/testData/ast/function/override.ide.kt | 2 +- .../testData/ast/function/overrideAndOpen.ide.kt | 6 +++--- j2k/tests/testData/ast/function/overrideObject.ide.kt | 2 +- j2k/tests/testData/ast/function/varVararg.ide.kt | 2 +- .../testData/ast/function/writableParameter.ide.kt | 2 +- .../ast/identifier/finalFieldReference.ide.kt | 6 +++--- .../ast/importStatement/importWithKeywords.ide.kt | 2 +- .../ast/importStatement/importWithStar.ide.kt | 2 +- .../testData/ast/importStatement/simpleImport.ide.kt | 2 +- .../ast/inheritance/classOneExtendsBaseGeneric.ide.kt | 4 ++-- .../classOneExtendsBaseWithOneParam.ide.kt | 4 ++-- .../classOneExtendsBaseWithZeroParams.ide.kt | 4 ++-- ...xtendsBaseWithZeroParamsNonEmptyConstructor.ide.kt | 4 ++-- j2k/tests/testData/ast/issues/arrayLength.ide.kt | 2 +- j2k/tests/testData/ast/issues/comments.ide.kt | 2 +- j2k/tests/testData/ast/issues/kt-1016.ide.kt | 2 +- j2k/tests/testData/ast/issues/kt-1048.ide.kt | 4 ++-- j2k/tests/testData/ast/issues/kt-1074.ide.kt | 2 +- j2k/tests/testData/ast/issues/kt-543-boxed.ide.kt | 2 +- j2k/tests/testData/ast/issues/kt-543-mixed.ide.kt | 2 +- j2k/tests/testData/ast/issues/kt-543.ide.kt | 2 +- j2k/tests/testData/ast/issues/kt-638.ide.kt | 4 ++-- j2k/tests/testData/ast/issues/kt-696.ide.kt | 4 ++-- j2k/tests/testData/ast/issues/kt-792-mixed.ide.kt | 2 +- j2k/tests/testData/ast/issues/kt-792.ide.kt | 2 +- j2k/tests/testData/ast/issues/kt-794-mixed.ide.kt | 2 +- j2k/tests/testData/ast/issues/kt-794.ide.kt | 2 +- j2k/tests/testData/ast/issues/kt-809-string.ide.kt | 8 ++++---- j2k/tests/testData/ast/issues/kt-809.ide.kt | 8 ++++---- j2k/tests/testData/ast/issues/kt-820-field.ide.kt | 6 +++--- j2k/tests/testData/ast/issues/kt-820-string.ide.kt | 2 +- j2k/tests/testData/ast/issues/kt-820.ide.kt | 6 +++--- j2k/tests/testData/ast/issues/kt-824-isDir.ide.kt | 2 +- j2k/tests/testData/ast/issues/kt-824.ide.kt | 6 +++--- j2k/tests/testData/ast/issues/kt-828.ide.kt | 2 +- j2k/tests/testData/ast/issues/kt-836.ide.kt | 6 +++--- j2k/tests/testData/ast/issues/kt-837.ide.kt | 2 +- j2k/tests/testData/ast/issues/kt-852.ide.kt | 2 +- j2k/tests/testData/ast/issues/kt-871.ide.kt | 2 +- j2k/tests/testData/ast/issues/kt-879.ide.kt | 2 +- j2k/tests/testData/ast/issues/kt-893.ide.kt | 2 +- j2k/tests/testData/ast/issues/kt-963.ide.kt | 2 +- j2k/tests/testData/ast/kotlinExclusion/kt-656.ide.kt | 4 ++-- j2k/tests/testData/ast/list/ForEach.ide.kt | 2 +- j2k/tests/testData/ast/list/Lists.ide.kt | 2 +- j2k/tests/testData/ast/literalExpression/char.ide.kt | 2 +- .../ast/literalExpression/dollarInsideString.ide.kt | 2 +- .../testData/ast/literalExpression/endsWithDFL.ide.kt | 2 +- j2k/tests/testData/ast/literalExpression/hex.ide.kt | 2 +- j2k/tests/testData/ast/literalExpression/octal.ide.kt | 2 +- .../testData/ast/literalExpression/trueOrFalse.ide.kt | 2 +- .../ast/methodCallExpression/genericMethod.ide.kt | 4 ++-- .../testData/ast/misc/packageWithOpenClass.ide.kt | 2 +- .../ast/newClassExpression/fullQualifiedName.ide.kt | 2 +- .../ast/newClassExpression/fullQualifiedName2.ide.kt | 2 +- .../newClassExpression/genericClassInvocation.ide.kt | 2 +- .../ast/newClassExpression/newClassByFullName.ide.kt | 4 ++-- .../ast/newClassExpression/newInnerClass.ide.kt | 6 +++--- .../ast/newClassExpression/newListAndNewMember.ide.kt | 4 ++-- .../ast/newClassExpression/newStaticInnerClass.ide.kt | 6 +++--- j2k/tests/testData/ast/objectLiteral/MyFrame.ide.kt | 2 +- .../ast/packageStatement/orgJetbrainsJetJ2kIn.ide.kt | 2 +- j2k/tests/testData/ast/rawGenerics/kt-540-map.ide.kt | 2 +- .../ast/rawGenerics/kt-540-rawGenericClass.ide.kt | 4 ++-- j2k/tests/testData/ast/rawGenerics/kt-540.ide.kt | 2 +- .../testData/ast/rawGenerics/rawGenericMethod.ide.kt | 4 ++-- .../ast/superExpression/classAdotSuperFoo.ide.kt | 6 +++--- .../ast/superExpression/classAextendsB.ide.kt | 4 ++-- .../testData/ast/switch/comlicatedFallDown.ide.kt | 2 +- j2k/tests/testData/ast/switch/emptySwitch.ide.kt | 2 +- j2k/tests/testData/ast/switch/fallDown.ide.kt | 2 +- j2k/tests/testData/ast/switch/kt-539.ide.kt | 2 +- j2k/tests/testData/ast/switch/nondefault.ide.kt | 2 +- .../ast/thisExpression/classAdotThisFoo.ide.kt | 6 +++--- 113 files changed, 181 insertions(+), 179 deletions(-) diff --git a/j2k/src/org/jetbrains/jet/j2k/ConverterSettings.kt b/j2k/src/org/jetbrains/jet/j2k/ConverterSettings.kt index dfdf47fe485..974389c65b4 100644 --- a/j2k/src/org/jetbrains/jet/j2k/ConverterSettings.kt +++ b/j2k/src/org/jetbrains/jet/j2k/ConverterSettings.kt @@ -19,17 +19,20 @@ package org.jetbrains.jet.j2k public class ConverterSettings( val forceNotNullTypes: Boolean, val forceLocalVariableImmutability: Boolean, - val specifyLocalVariableTypeByDefault: Boolean + val specifyLocalVariableTypeByDefault: Boolean, + val openByDefault: Boolean ) {} public val PluginSettings: ConverterSettings = ConverterSettings( forceNotNullTypes = true, forceLocalVariableImmutability = true, - specifyLocalVariableTypeByDefault = false + specifyLocalVariableTypeByDefault = false, + openByDefault = false ) public val TestSettings: ConverterSettings = ConverterSettings( forceNotNullTypes = false, forceLocalVariableImmutability = false, - specifyLocalVariableTypeByDefault = true + specifyLocalVariableTypeByDefault = true, + openByDefault = true ) diff --git a/j2k/src/org/jetbrains/jet/j2k/ast/Class.kt b/j2k/src/org/jetbrains/jet/j2k/ast/Class.kt index 17dffc08705..55b88afdb74 100644 --- a/j2k/src/org/jetbrains/jet/j2k/ast/Class.kt +++ b/j2k/src/org/jetbrains/jet/j2k/ast/Class.kt @@ -111,21 +111,20 @@ public open class Class(val converter: Converter, if (modifier != null) { modifierList.add(modifier) } - if (needAbstractModifier()) { + if (isAbstract()) { modifierList.add(Modifier.ABSTRACT) } - - if (needOpenModifier()) { + else if (needsOpenModifier()) { modifierList.add(Modifier.OPEN) } return modifierList.toKotlin() } - open fun needOpenModifier() = !modifiers.contains(Modifier.FINAL) && !modifiers.contains(Modifier.ABSTRACT) + open fun isDefinitelyFinal() = modifiers.contains(Modifier.FINAL) - open fun needAbstractModifier() = isAbstract() + open fun needsOpenModifier() = !isDefinitelyFinal() && converter.settings.openByDefault - open fun bodyToKotlin(): String { + fun bodyToKotlin(): String { return " {\n" + getNonStatic(membersExceptConstructors()).toKotlin("\n") + "\n" + primaryConstructorBodyToKotlin() + "\n" + classObjectToKotlin() + "\n}" } diff --git a/j2k/src/org/jetbrains/jet/j2k/ast/Enum.kt b/j2k/src/org/jetbrains/jet/j2k/ast/Enum.kt index d0735cd7bd9..bdf3bfced26 100644 --- a/j2k/src/org/jetbrains/jet/j2k/ast/Enum.kt +++ b/j2k/src/org/jetbrains/jet/j2k/ast/Enum.kt @@ -19,7 +19,7 @@ package org.jetbrains.jet.j2k.ast import org.jetbrains.jet.j2k.Converter import org.jetbrains.jet.j2k.ast.types.Type -public open class Enum(converter: Converter, +public class Enum(converter: Converter, name: Identifier, docComments: List, modifiers: Set, @@ -35,7 +35,7 @@ public open class Enum(converter: Converter, return if (s.equals("()")) "" else s } - override fun needOpenModifier() = false + override fun isDefinitelyFinal() = true public override fun toKotlin(): String { val primaryConstructorBody = primaryConstructorBodyToKotlin() ?: "" diff --git a/j2k/src/org/jetbrains/jet/j2k/ast/Trait.kt b/j2k/src/org/jetbrains/jet/j2k/ast/Trait.kt index 7d4f2a6f2b2..cbd7a199bb9 100644 --- a/j2k/src/org/jetbrains/jet/j2k/ast/Trait.kt +++ b/j2k/src/org/jetbrains/jet/j2k/ast/Trait.kt @@ -19,7 +19,7 @@ package org.jetbrains.jet.j2k.ast import org.jetbrains.jet.j2k.Converter import org.jetbrains.jet.j2k.ast.types.Type -public open class Trait(converter: Converter, +public class Trait(converter: Converter, name: Identifier, docComments: List, modifiers: Set, @@ -34,5 +34,5 @@ public open class Trait(converter: Converter, get() = "trait" override fun primaryConstructorSignatureToKotlin() = "" - override fun needOpenModifier() = false + override fun needsOpenModifier() = false } diff --git a/j2k/tests/testData/ast/annotations/jetbrainsNotNull.ide.kt b/j2k/tests/testData/ast/annotations/jetbrainsNotNull.ide.kt index 862da16372f..7009d01f4ea 100644 --- a/j2k/tests/testData/ast/annotations/jetbrainsNotNull.ide.kt +++ b/j2k/tests/testData/ast/annotations/jetbrainsNotNull.ide.kt @@ -1,5 +1,5 @@ package test -public open class Test(str : String) { +public class Test(str : String) { var myStr : String = "String2" public open fun sout(str : String) { System.out.println(str) diff --git a/j2k/tests/testData/ast/annotations/jetbrainsNotNullChainExpr.ide.kt b/j2k/tests/testData/ast/annotations/jetbrainsNotNullChainExpr.ide.kt index a8157b37a38..73a458cbd23 100644 --- a/j2k/tests/testData/ast/annotations/jetbrainsNotNullChainExpr.ide.kt +++ b/j2k/tests/testData/ast/annotations/jetbrainsNotNullChainExpr.ide.kt @@ -1,13 +1,13 @@ package test -open class Foo() { +class Foo() { open fun execute() { } } -open class Bar() { +class Bar() { var fooNotNull : Foo = Foo() var fooNullable : Foo = null } -open class Test() { +class Test() { public open fun test(barNotNull : Bar, barNullable : Bar) { barNotNull.fooNotNull.execute() barNotNull.fooNullable.execute() diff --git a/j2k/tests/testData/ast/anonymousBlock/oneAnonBlock.ide.kt b/j2k/tests/testData/ast/anonymousBlock/oneAnonBlock.ide.kt index 592aa1a8f4b..22280a2ab6c 100644 --- a/j2k/tests/testData/ast/anonymousBlock/oneAnonBlock.ide.kt +++ b/j2k/tests/testData/ast/anonymousBlock/oneAnonBlock.ide.kt @@ -1,4 +1,4 @@ -open class Test() { +class Test() { var str : String = 0 { str = "Ola" diff --git a/j2k/tests/testData/ast/anonymousBlock/oneStaticAnonBlock.ide.kt b/j2k/tests/testData/ast/anonymousBlock/oneStaticAnonBlock.ide.kt index 59f41c38354..a60f634522f 100644 --- a/j2k/tests/testData/ast/anonymousBlock/oneStaticAnonBlock.ide.kt +++ b/j2k/tests/testData/ast/anonymousBlock/oneStaticAnonBlock.ide.kt @@ -1,4 +1,4 @@ -open class Test() { +class Test() { var str : String = 0 class object { { diff --git a/j2k/tests/testData/ast/assignmentExpression/nullability.ide.kt b/j2k/tests/testData/ast/assignmentExpression/nullability.ide.kt index b5842b10aa0..e81129ba3d4 100644 --- a/j2k/tests/testData/ast/assignmentExpression/nullability.ide.kt +++ b/j2k/tests/testData/ast/assignmentExpression/nullability.ide.kt @@ -1,5 +1,5 @@ import java.util.BitSet -open class Foo() { +class Foo() { open fun foo(o : BitSet) { val o2 = o val foo = 0 diff --git a/j2k/tests/testData/ast/boxedType/Boxing.ide.kt b/j2k/tests/testData/ast/boxedType/Boxing.ide.kt index 9c028beb905..eda815d2b36 100644 --- a/j2k/tests/testData/ast/boxedType/Boxing.ide.kt +++ b/j2k/tests/testData/ast/boxedType/Boxing.ide.kt @@ -1,5 +1,5 @@ import java.util.ArrayList -open class Boxing() { +class Boxing() { open fun test() { val i = 0 val n = 0.0.toFloat() diff --git a/j2k/tests/testData/ast/boxedType/kt-671.ide.kt b/j2k/tests/testData/ast/boxedType/kt-671.ide.kt index 4d635df78fc..8262a056813 100644 --- a/j2k/tests/testData/ast/boxedType/kt-671.ide.kt +++ b/j2k/tests/testData/ast/boxedType/kt-671.ide.kt @@ -1,5 +1,5 @@ package demo -open class Test() { +class Test() { open fun test() { val i = Integer.valueOf(100) val s = 3 diff --git a/j2k/tests/testData/ast/callChainExpression/libraryFieldCall.ide.kt b/j2k/tests/testData/ast/callChainExpression/libraryFieldCall.ide.kt index 834d14e9766..5aae1bab85c 100644 --- a/j2k/tests/testData/ast/callChainExpression/libraryFieldCall.ide.kt +++ b/j2k/tests/testData/ast/callChainExpression/libraryFieldCall.ide.kt @@ -1,9 +1,9 @@ -open class Library() { +class Library() { class object { val ourOut : java.io.PrintStream = 0 } } -open class User() { +class User() { open fun main() { Library.ourOut.print() } diff --git a/j2k/tests/testData/ast/callChainExpression/libraryMethodCall.ide.kt b/j2k/tests/testData/ast/callChainExpression/libraryMethodCall.ide.kt index 09228a77865..b8889c2de94 100644 --- a/j2k/tests/testData/ast/callChainExpression/libraryMethodCall.ide.kt +++ b/j2k/tests/testData/ast/callChainExpression/libraryMethodCall.ide.kt @@ -1,4 +1,4 @@ -open class Library() { +class Library() { class object { open fun call() { } @@ -7,7 +7,7 @@ return "" } } } -open class User() { +class User() { open fun main() { Library.call() Library.getString().isEmpty() diff --git a/j2k/tests/testData/ast/callChainExpression/libraryMethodCallFromInstance.ide.kt b/j2k/tests/testData/ast/callChainExpression/libraryMethodCallFromInstance.ide.kt index 2ff5c4cf4d4..2b4a9e676bf 100644 --- a/j2k/tests/testData/ast/callChainExpression/libraryMethodCallFromInstance.ide.kt +++ b/j2k/tests/testData/ast/callChainExpression/libraryMethodCallFromInstance.ide.kt @@ -1,11 +1,11 @@ -open class Library() { +class Library() { open fun call() { } open fun getString() : String { return "" } } -open class User() { +class User() { open fun main() { val lib = Library() lib.call() diff --git a/j2k/tests/testData/ast/callChainExpression/libraryStringFieldCall.ide.kt b/j2k/tests/testData/ast/callChainExpression/libraryStringFieldCall.ide.kt index 7293c784819..94660cf0089 100644 --- a/j2k/tests/testData/ast/callChainExpression/libraryStringFieldCall.ide.kt +++ b/j2k/tests/testData/ast/callChainExpression/libraryStringFieldCall.ide.kt @@ -1,7 +1,7 @@ -open class Library() { +class Library() { public val myString : String = 0 } -open class User() { +class User() { open fun main() { Library.myString.isEmpty() } diff --git a/j2k/tests/testData/ast/class/ClassShadowing.ide.kt b/j2k/tests/testData/ast/class/ClassShadowing.ide.kt index 033499c3a4e..46f17cb1fc4 100644 --- a/j2k/tests/testData/ast/class/ClassShadowing.ide.kt +++ b/j2k/tests/testData/ast/class/ClassShadowing.ide.kt @@ -1,12 +1,12 @@ package test -public open class Short() { +public class Short() { class object { public open fun valueOf(value : String) : Short { return Short() } } } -open class Test() { +class Test() { class object { public open fun test() { test.Short.valueOf("1") diff --git a/j2k/tests/testData/ast/class/class.ide.kt b/j2k/tests/testData/ast/class/class.ide.kt index bc29d4b27a1..98c16b37053 100644 --- a/j2k/tests/testData/ast/class/class.ide.kt +++ b/j2k/tests/testData/ast/class/class.ide.kt @@ -1,2 +1,2 @@ -open class Test() { +class Test() { } \ No newline at end of file diff --git a/j2k/tests/testData/ast/class/innerStaticClass.ide.kt b/j2k/tests/testData/ast/class/innerStaticClass.ide.kt index dc0ae41dff2..e88cebad2d3 100644 --- a/j2k/tests/testData/ast/class/innerStaticClass.ide.kt +++ b/j2k/tests/testData/ast/class/innerStaticClass.ide.kt @@ -1,6 +1,6 @@ class S() { class object { -open class Inner() { +class Inner() { } } } \ No newline at end of file diff --git a/j2k/tests/testData/ast/class/internalClass.ide.kt b/j2k/tests/testData/ast/class/internalClass.ide.kt index bc29d4b27a1..98c16b37053 100644 --- a/j2k/tests/testData/ast/class/internalClass.ide.kt +++ b/j2k/tests/testData/ast/class/internalClass.ide.kt @@ -1,2 +1,2 @@ -open class Test() { +class Test() { } \ No newline at end of file diff --git a/j2k/tests/testData/ast/class/kt-639.ide.kt b/j2k/tests/testData/ast/class/kt-639.ide.kt index 3207549697b..d92cd028188 100644 --- a/j2k/tests/testData/ast/class/kt-639.ide.kt +++ b/j2k/tests/testData/ast/class/kt-639.ide.kt @@ -1,6 +1,6 @@ package demo import java.util.HashMap -open class Test() { +class Test() { class object { open fun init() : Test { val __ = Test() @@ -12,7 +12,7 @@ return __ } } } -open class User() { +class User() { open fun main() { val m = HashMap(1) val m2 = HashMap(10) diff --git a/j2k/tests/testData/ast/class/pivateClass.ide.kt b/j2k/tests/testData/ast/class/pivateClass.ide.kt index 96001c69f28..0cb88d1d7d3 100644 --- a/j2k/tests/testData/ast/class/pivateClass.ide.kt +++ b/j2k/tests/testData/ast/class/pivateClass.ide.kt @@ -1,2 +1,2 @@ -private open class Test() { +private class Test() { } \ No newline at end of file diff --git a/j2k/tests/testData/ast/class/privateInit.ide.kt b/j2k/tests/testData/ast/class/privateInit.ide.kt index 84940a2fd16..e3cb3fc1e00 100644 --- a/j2k/tests/testData/ast/class/privateInit.ide.kt +++ b/j2k/tests/testData/ast/class/privateInit.ide.kt @@ -1,4 +1,4 @@ -public open class MyClass() { +public class MyClass() { private fun init(arg1 : Int, arg2 : Int, arg3 : Int) { } } \ No newline at end of file diff --git a/j2k/tests/testData/ast/class/protectedClass.ide.kt b/j2k/tests/testData/ast/class/protectedClass.ide.kt index e82caa26cd0..1eceac9e138 100644 --- a/j2k/tests/testData/ast/class/protectedClass.ide.kt +++ b/j2k/tests/testData/ast/class/protectedClass.ide.kt @@ -1,2 +1,2 @@ -protected open class Test() { +protected class Test() { } \ No newline at end of file diff --git a/j2k/tests/testData/ast/class/publicClass.ide.kt b/j2k/tests/testData/ast/class/publicClass.ide.kt index 98e32f1aca0..a3e0691f699 100644 --- a/j2k/tests/testData/ast/class/publicClass.ide.kt +++ b/j2k/tests/testData/ast/class/publicClass.ide.kt @@ -1,2 +1,2 @@ -public open class Test() { +public class Test() { } \ No newline at end of file diff --git a/j2k/tests/testData/ast/constructors/allCallsPrimary.ide.kt b/j2k/tests/testData/ast/constructors/allCallsPrimary.ide.kt index 9e140b781d6..0102ceba7b2 100644 --- a/j2k/tests/testData/ast/constructors/allCallsPrimary.ide.kt +++ b/j2k/tests/testData/ast/constructors/allCallsPrimary.ide.kt @@ -1,4 +1,4 @@ -open class C(arg1 : Int, arg2 : Int, arg3 : Int) { +class C(arg1 : Int, arg2 : Int, arg3 : Int) { class object { open fun init(arg1 : Int, arg2 : Int) : C { val __ = C(arg1, arg2, 0) @@ -10,7 +10,7 @@ return __ } } } -public open class User() { +public class User() { class object { public open fun main() { val c1 = C(100, 100, 100) diff --git a/j2k/tests/testData/ast/constructors/allCallsPrimary2.ide.kt b/j2k/tests/testData/ast/constructors/allCallsPrimary2.ide.kt index ca2810565ff..bca0a907c59 100644 --- a/j2k/tests/testData/ast/constructors/allCallsPrimary2.ide.kt +++ b/j2k/tests/testData/ast/constructors/allCallsPrimary2.ide.kt @@ -1,4 +1,4 @@ -open class C(arg1 : Int) { +class C(arg1 : Int) { val myArg1 : Int var myArg2 : Int = 0 var myArg3 : Int = 0 @@ -22,7 +22,7 @@ return __ } } } -public open class User() { +public class User() { class object { public open fun main() { val c1 = C.init(100, 100, 100) diff --git a/j2k/tests/testData/ast/constructors/customerBuilder.ide.kt b/j2k/tests/testData/ast/constructors/customerBuilder.ide.kt index d0251558b65..903763def90 100644 --- a/j2k/tests/testData/ast/constructors/customerBuilder.ide.kt +++ b/j2k/tests/testData/ast/constructors/customerBuilder.ide.kt @@ -1,5 +1,5 @@ package org.test.customer -open class Customer(first : String, last : String) { +class Customer(first : String, last : String) { public val _firstName : String public val _lastName : String public open fun getFirstName() : String { @@ -19,7 +19,7 @@ _lastName = last doSmthAfter() } } -open class CustomerBuilder() { +class CustomerBuilder() { public var _firstName : String = "Homer" public var _lastName : String = "Simpson" public open fun WithFirstName(firstName : String) : CustomerBuilder { @@ -34,7 +34,7 @@ public open fun Build() : Customer { return Customer(_firstName, _lastName) } } -public open class User() { +public class User() { class object { public open fun main() { val customer = CustomerBuilder().WithFirstName("Homer").WithLastName("Simpson").Build() diff --git a/j2k/tests/testData/ast/constructors/genericIdentifier.ide.kt b/j2k/tests/testData/ast/constructors/genericIdentifier.ide.kt index 9b65a4c1f9e..519189d160c 100644 --- a/j2k/tests/testData/ast/constructors/genericIdentifier.ide.kt +++ b/j2k/tests/testData/ast/constructors/genericIdentifier.ide.kt @@ -1,4 +1,4 @@ -public open class Identifier(_myName : T, _myHasDollar : Boolean) { +public class Identifier(_myName : T, _myHasDollar : Boolean) { private val myName : T private var myHasDollar : Boolean = false private var myNullable : Boolean = true @@ -26,7 +26,7 @@ return __ } } } -public open class User() { +public class User() { class object { public open fun main() { val i1 = Identifier.init("name", false, true) diff --git a/j2k/tests/testData/ast/constructors/identifier.ide.kt b/j2k/tests/testData/ast/constructors/identifier.ide.kt index abe7525ad2b..d54e18064d2 100644 --- a/j2k/tests/testData/ast/constructors/identifier.ide.kt +++ b/j2k/tests/testData/ast/constructors/identifier.ide.kt @@ -1,4 +1,4 @@ -public open class Identifier(_myName : String, _myHasDollar : Boolean) { +public class Identifier(_myName : String, _myHasDollar : Boolean) { private val myName : String private var myHasDollar : Boolean = false private var myNullable : Boolean = true @@ -26,7 +26,7 @@ return __ } } } -public open class User() { +public class User() { class object { public open fun main() { val i1 = Identifier.init("name", false, true) diff --git a/j2k/tests/testData/ast/constructors/withManyDefaultParams.ide.kt b/j2k/tests/testData/ast/constructors/withManyDefaultParams.ide.kt index d6bb6e61fb7..8bd7479650d 100644 --- a/j2k/tests/testData/ast/constructors/withManyDefaultParams.ide.kt +++ b/j2k/tests/testData/ast/constructors/withManyDefaultParams.ide.kt @@ -1,4 +1,4 @@ -public open class Test(_myName : String, _a : Boolean, _b : Double, _c : Float, _d : Long, _e : Int, _f : Short, _g : Char) { +public class Test(_myName : String, _a : Boolean, _b : Double, _c : Float, _d : Long, _e : Int, _f : Short, _g : Char) { private val myName : String private var a : Boolean = false private var b : Double = 0.toDouble() @@ -31,7 +31,7 @@ return "" } } } -public open class User() { +public class User() { class object { public open fun main() { val t = Test.init("name") diff --git a/j2k/tests/testData/ast/field/classChildExtendsBase.ide.kt b/j2k/tests/testData/ast/field/classChildExtendsBase.ide.kt index 12b68798cd5..4c408004189 100644 --- a/j2k/tests/testData/ast/field/classChildExtendsBase.ide.kt +++ b/j2k/tests/testData/ast/field/classChildExtendsBase.ide.kt @@ -1,6 +1,6 @@ -open class Base() { +class Base() { private var myFirst : String = 0 } -open class Child() : Base() { +class Child() : Base() { private var mySecond : String = 0 } \ No newline at end of file diff --git a/j2k/tests/testData/ast/field/internalField.ide.kt b/j2k/tests/testData/ast/field/internalField.ide.kt index 352557fd844..315f2cc44e3 100644 --- a/j2k/tests/testData/ast/field/internalField.ide.kt +++ b/j2k/tests/testData/ast/field/internalField.ide.kt @@ -1,3 +1,3 @@ -open class C() { +class C() { var f : Foo = 0 } \ No newline at end of file diff --git a/j2k/tests/testData/ast/field/privateField.ide.kt b/j2k/tests/testData/ast/field/privateField.ide.kt index e8e87a73c35..f917fda955b 100644 --- a/j2k/tests/testData/ast/field/privateField.ide.kt +++ b/j2k/tests/testData/ast/field/privateField.ide.kt @@ -1,3 +1,3 @@ -open class C() { +class C() { private var f : Foo = 0 } \ No newline at end of file diff --git a/j2k/tests/testData/ast/field/protectedField.ide.kt b/j2k/tests/testData/ast/field/protectedField.ide.kt index 0b36c5eb07f..df96011b431 100644 --- a/j2k/tests/testData/ast/field/protectedField.ide.kt +++ b/j2k/tests/testData/ast/field/protectedField.ide.kt @@ -1,3 +1,3 @@ -open class C() { +class C() { protected var f : Foo = 0 } \ No newline at end of file diff --git a/j2k/tests/testData/ast/field/publicField.ide.kt b/j2k/tests/testData/ast/field/publicField.ide.kt index 54420112d7f..ec03f42e0c7 100644 --- a/j2k/tests/testData/ast/field/publicField.ide.kt +++ b/j2k/tests/testData/ast/field/publicField.ide.kt @@ -1,3 +1,3 @@ -open class C() { +class C() { public var f : Foo = 0 } \ No newline at end of file diff --git a/j2k/tests/testData/ast/field/valWithInit.ide.kt b/j2k/tests/testData/ast/field/valWithInit.ide.kt index b311ebb6784..07ad534da53 100644 --- a/j2k/tests/testData/ast/field/valWithInit.ide.kt +++ b/j2k/tests/testData/ast/field/valWithInit.ide.kt @@ -1,3 +1,3 @@ -open class C() { +class C() { val f : Foo = Foo(1, 2) } \ No newline at end of file diff --git a/j2k/tests/testData/ast/field/varWithInit.ide.kt b/j2k/tests/testData/ast/field/varWithInit.ide.kt index aaf4d5003e3..698acd63479 100644 --- a/j2k/tests/testData/ast/field/varWithInit.ide.kt +++ b/j2k/tests/testData/ast/field/varWithInit.ide.kt @@ -1,3 +1,3 @@ -open class C() { +class C() { var f : Foo = Foo(1, 2) } \ No newline at end of file diff --git a/j2k/tests/testData/ast/field/varWithoutInit.ide.kt b/j2k/tests/testData/ast/field/varWithoutInit.ide.kt index 352557fd844..315f2cc44e3 100644 --- a/j2k/tests/testData/ast/field/varWithoutInit.ide.kt +++ b/j2k/tests/testData/ast/field/varWithoutInit.ide.kt @@ -1,3 +1,3 @@ -open class C() { +class C() { var f : Foo = 0 } \ No newline at end of file diff --git a/j2k/tests/testData/ast/function/extendsBaseWhichExtendsObject.ide.kt b/j2k/tests/testData/ast/function/extendsBaseWhichExtendsObject.ide.kt index 0c4da343b33..ba825317b49 100644 --- a/j2k/tests/testData/ast/function/extendsBaseWhichExtendsObject.ide.kt +++ b/j2k/tests/testData/ast/function/extendsBaseWhichExtendsObject.ide.kt @@ -1,5 +1,5 @@ package test -open class Test() : Base() { +class Test() : Base() { public override fun hashCode() : Int { return super.hashCode() } @@ -16,7 +16,7 @@ protected override fun finalize() { super.finalize() } } -open class Base() { +class Base() { public open fun hashCode() : Int { return System.identityHashCode(this) } diff --git a/j2k/tests/testData/ast/function/override.ide.kt b/j2k/tests/testData/ast/function/override.ide.kt index da82b33f766..771c4d6e5af 100644 --- a/j2k/tests/testData/ast/function/override.ide.kt +++ b/j2k/tests/testData/ast/function/override.ide.kt @@ -1,4 +1,4 @@ -open class A() { +class A() { open fun a() { } } diff --git a/j2k/tests/testData/ast/function/overrideAndOpen.ide.kt b/j2k/tests/testData/ast/function/overrideAndOpen.ide.kt index 706fbe26f27..5ab854c32cd 100644 --- a/j2k/tests/testData/ast/function/overrideAndOpen.ide.kt +++ b/j2k/tests/testData/ast/function/overrideAndOpen.ide.kt @@ -1,12 +1,12 @@ -open class A() { +class A() { open fun foo() { } } -open class B() : A() { +class B() : A() { override fun foo() { } } -open class C() : B() { +class C() : B() { override fun foo() { } } \ No newline at end of file diff --git a/j2k/tests/testData/ast/function/overrideObject.ide.kt b/j2k/tests/testData/ast/function/overrideObject.ide.kt index 8d0ff58b2d3..e3668613e8b 100644 --- a/j2k/tests/testData/ast/function/overrideObject.ide.kt +++ b/j2k/tests/testData/ast/function/overrideObject.ide.kt @@ -1,5 +1,5 @@ package test -open class Test() { +class Test() { public open fun hashCode() : Int { return System.identityHashCode(this) } diff --git a/j2k/tests/testData/ast/function/varVararg.ide.kt b/j2k/tests/testData/ast/function/varVararg.ide.kt index a1f5435a867..8461608b76a 100644 --- a/j2k/tests/testData/ast/function/varVararg.ide.kt +++ b/j2k/tests/testData/ast/function/varVararg.ide.kt @@ -1,5 +1,5 @@ package demo -open class Test() { +class Test() { open fun test(vararg var args : Any) { args = array(1, 2, 3) } diff --git a/j2k/tests/testData/ast/function/writableParameter.ide.kt b/j2k/tests/testData/ast/function/writableParameter.ide.kt index b098e657066..9c212535429 100644 --- a/j2k/tests/testData/ast/function/writableParameter.ide.kt +++ b/j2k/tests/testData/ast/function/writableParameter.ide.kt @@ -1,5 +1,5 @@ package demo -open class Test() { +class Test() { open fun test(var i : Int) : Int { i = 10 return i + 20 diff --git a/j2k/tests/testData/ast/identifier/finalFieldReference.ide.kt b/j2k/tests/testData/ast/identifier/finalFieldReference.ide.kt index eaa77087c55..b0d522cfd1b 100644 --- a/j2k/tests/testData/ast/identifier/finalFieldReference.ide.kt +++ b/j2k/tests/testData/ast/identifier/finalFieldReference.ide.kt @@ -1,8 +1,8 @@ -open class `$$$$$`() { +class `$$$$$`() { } -open class `$`() { +class `$`() { } -open class `$$`(`$$$$` : `$$$$$`) : `$`() { +class `$$`(`$$$$` : `$$$$$`) : `$`() { val `$$$` : `$$$$$` public open fun `$$$$$$`() : `$$$$$` { return `$$$` diff --git a/j2k/tests/testData/ast/importStatement/importWithKeywords.ide.kt b/j2k/tests/testData/ast/importStatement/importWithKeywords.ide.kt index 63b5935201f..a3323a31bbc 100644 --- a/j2k/tests/testData/ast/importStatement/importWithKeywords.ide.kt +++ b/j2k/tests/testData/ast/importStatement/importWithKeywords.ide.kt @@ -1,4 +1,4 @@ package test import `as`.`type`.`val`.`var`.`fun`.`is`.`in`.`object`.`when`.`trait`.`This` -open class Test() { +class Test() { } \ No newline at end of file diff --git a/j2k/tests/testData/ast/importStatement/importWithStar.ide.kt b/j2k/tests/testData/ast/importStatement/importWithStar.ide.kt index c390c539acc..3539bfa815c 100644 --- a/j2k/tests/testData/ast/importStatement/importWithStar.ide.kt +++ b/j2k/tests/testData/ast/importStatement/importWithStar.ide.kt @@ -1,4 +1,4 @@ package org.jetbrains.jet.j2k import org.jetbrains.annotations.* -public open class Converter() { +public class Converter() { } \ No newline at end of file diff --git a/j2k/tests/testData/ast/importStatement/simpleImport.ide.kt b/j2k/tests/testData/ast/importStatement/simpleImport.ide.kt index c35720004e5..39fdc3dbb56 100644 --- a/j2k/tests/testData/ast/importStatement/simpleImport.ide.kt +++ b/j2k/tests/testData/ast/importStatement/simpleImport.ide.kt @@ -1,3 +1,3 @@ package org.jetbrains.jet.j2k -public open class Converter() { +public class Converter() { } \ No newline at end of file diff --git a/j2k/tests/testData/ast/inheritance/classOneExtendsBaseGeneric.ide.kt b/j2k/tests/testData/ast/inheritance/classOneExtendsBaseGeneric.ide.kt index 1808e38ae78..b9010dcd7f3 100644 --- a/j2k/tests/testData/ast/inheritance/classOneExtendsBaseGeneric.ide.kt +++ b/j2k/tests/testData/ast/inheritance/classOneExtendsBaseGeneric.ide.kt @@ -1,6 +1,6 @@ -open class Base(name : T) { +class Base(name : T) { } -open class One(name : T, second : K) : Base(name) { +class One(name : T, second : K) : Base(name) { private var mySecond : K = 0 { mySecond = second diff --git a/j2k/tests/testData/ast/inheritance/classOneExtendsBaseWithOneParam.ide.kt b/j2k/tests/testData/ast/inheritance/classOneExtendsBaseWithOneParam.ide.kt index c219bb292a7..266245b9495 100644 --- a/j2k/tests/testData/ast/inheritance/classOneExtendsBaseWithOneParam.ide.kt +++ b/j2k/tests/testData/ast/inheritance/classOneExtendsBaseWithOneParam.ide.kt @@ -1,4 +1,4 @@ -open class Base(name : String) { +class Base(name : String) { } -open class One(name : String, second : String) : Base(name) { +class One(name : String, second : String) : Base(name) { } \ No newline at end of file diff --git a/j2k/tests/testData/ast/inheritance/classOneExtendsBaseWithZeroParams.ide.kt b/j2k/tests/testData/ast/inheritance/classOneExtendsBaseWithZeroParams.ide.kt index 94f907016db..ce93d19cfe5 100644 --- a/j2k/tests/testData/ast/inheritance/classOneExtendsBaseWithZeroParams.ide.kt +++ b/j2k/tests/testData/ast/inheritance/classOneExtendsBaseWithZeroParams.ide.kt @@ -1,4 +1,4 @@ -open class Base() { +class Base() { } -open class One() : Base() { +class One() : Base() { } \ No newline at end of file diff --git a/j2k/tests/testData/ast/inheritance/classOneExtendsBaseWithZeroParamsNonEmptyConstructor.ide.kt b/j2k/tests/testData/ast/inheritance/classOneExtendsBaseWithZeroParamsNonEmptyConstructor.ide.kt index 2a152e2f826..2f7587496cb 100644 --- a/j2k/tests/testData/ast/inheritance/classOneExtendsBaseWithZeroParamsNonEmptyConstructor.ide.kt +++ b/j2k/tests/testData/ast/inheritance/classOneExtendsBaseWithZeroParamsNonEmptyConstructor.ide.kt @@ -1,6 +1,6 @@ -open class Base(name : String) { +class Base(name : String) { } -open class One(name : String, second : String) : Base(name) { +class One(name : String, second : String) : Base(name) { private var mySecond : String = 0 { mySecond = second diff --git a/j2k/tests/testData/ast/issues/arrayLength.ide.kt b/j2k/tests/testData/ast/issues/arrayLength.ide.kt index cbe0fe83b77..8eb3cc0e126 100644 --- a/j2k/tests/testData/ast/issues/arrayLength.ide.kt +++ b/j2k/tests/testData/ast/issues/arrayLength.ide.kt @@ -1,4 +1,4 @@ -open class Test() { +class Test() { class object { public open fun foo(args : Array) : Int { return args.size diff --git a/j2k/tests/testData/ast/issues/comments.ide.kt b/j2k/tests/testData/ast/issues/comments.ide.kt index 4841220b571..3adf7bc1efb 100644 --- a/j2k/tests/testData/ast/issues/comments.ide.kt +++ b/j2k/tests/testData/ast/issues/comments.ide.kt @@ -2,7 +2,7 @@ /* This is a block comment */ -open class C() { +class C() { // This is a class comment /** * This is a field doc comment. diff --git a/j2k/tests/testData/ast/issues/kt-1016.ide.kt b/j2k/tests/testData/ast/issues/kt-1016.ide.kt index 801abcf6e5a..93b6c42788a 100644 --- a/j2k/tests/testData/ast/issues/kt-1016.ide.kt +++ b/j2k/tests/testData/ast/issues/kt-1016.ide.kt @@ -1,5 +1,5 @@ package demo -open class C(i : Int) { +class C(i : Int) { private val i : Int { this.i = i diff --git a/j2k/tests/testData/ast/issues/kt-1048.ide.kt b/j2k/tests/testData/ast/issues/kt-1048.ide.kt index 3b187133500..d56e93fd0e4 100644 --- a/j2k/tests/testData/ast/issues/kt-1048.ide.kt +++ b/j2k/tests/testData/ast/issues/kt-1048.ide.kt @@ -1,7 +1,7 @@ import java.util.HashMap -open class G(t : T) { +class G(t : T) { } -public open class Java() { +public class Java() { open fun test() { val m = HashMap() m.put(1, 1) diff --git a/j2k/tests/testData/ast/issues/kt-1074.ide.kt b/j2k/tests/testData/ast/issues/kt-1074.ide.kt index 3b20d29c847..f3ab137b41c 100644 --- a/j2k/tests/testData/ast/issues/kt-1074.ide.kt +++ b/j2k/tests/testData/ast/issues/kt-1074.ide.kt @@ -1,5 +1,5 @@ package demo -open class Test() { +class Test() { class object { open fun subListRangeCheck(fromIndex : Int, toIndex : Int, size : Int) { if (fromIndex < 0) diff --git a/j2k/tests/testData/ast/issues/kt-543-boxed.ide.kt b/j2k/tests/testData/ast/issues/kt-543-boxed.ide.kt index f35a31d1b3e..6ff44d4cac2 100644 --- a/j2k/tests/testData/ast/issues/kt-543-boxed.ide.kt +++ b/j2k/tests/testData/ast/issues/kt-543-boxed.ide.kt @@ -1,5 +1,5 @@ package demo -open class Test() { +class Test() { open fun putInt(i : Int) { } open fun test() { diff --git a/j2k/tests/testData/ast/issues/kt-543-mixed.ide.kt b/j2k/tests/testData/ast/issues/kt-543-mixed.ide.kt index 434b8826087..6b15ecc6e8e 100644 --- a/j2k/tests/testData/ast/issues/kt-543-mixed.ide.kt +++ b/j2k/tests/testData/ast/issues/kt-543-mixed.ide.kt @@ -1,5 +1,5 @@ package demo -open class Test() { +class Test() { open fun putInt(i : Int) { } open fun test() { diff --git a/j2k/tests/testData/ast/issues/kt-543.ide.kt b/j2k/tests/testData/ast/issues/kt-543.ide.kt index 0f59e57b7f2..2a2d2c990d5 100644 --- a/j2k/tests/testData/ast/issues/kt-543.ide.kt +++ b/j2k/tests/testData/ast/issues/kt-543.ide.kt @@ -1,5 +1,5 @@ package demo -open class Test() { +class Test() { open fun putInt(i : Int) { } open fun test() { diff --git a/j2k/tests/testData/ast/issues/kt-638.ide.kt b/j2k/tests/testData/ast/issues/kt-638.ide.kt index ecb96166b82..8969cdb3da5 100644 --- a/j2k/tests/testData/ast/issues/kt-638.ide.kt +++ b/j2k/tests/testData/ast/issues/kt-638.ide.kt @@ -1,4 +1,4 @@ -public open class Identifier(_myName : T, _myHasDollar : Boolean) { +public class Identifier(_myName : T, _myHasDollar : Boolean) { private val myName : T private var myHasDollar : Boolean = false private var myNullable : Boolean = true @@ -26,7 +26,7 @@ return __ } } } -public open class User() { +public class User() { class object { public open fun main(args : Array) { val i1 = Identifier.init("name", false, true) diff --git a/j2k/tests/testData/ast/issues/kt-696.ide.kt b/j2k/tests/testData/ast/issues/kt-696.ide.kt index 746e2628d75..7acb4e75b27 100644 --- a/j2k/tests/testData/ast/issues/kt-696.ide.kt +++ b/j2k/tests/testData/ast/issues/kt-696.ide.kt @@ -1,5 +1,5 @@ package test -open class Base() { +class Base() { public open fun hashCode() : Int { return System.identityHashCode(this) } @@ -10,7 +10,7 @@ public open fun toString() : String { return getJavaClass.getName() + '@' + Integer.toHexString(hashCode()) } } -open class Child() : Base() { +class Child() : Base() { public override fun hashCode() : Int { return super.hashCode() } diff --git a/j2k/tests/testData/ast/issues/kt-792-mixed.ide.kt b/j2k/tests/testData/ast/issues/kt-792-mixed.ide.kt index 2152aba1fa7..9e199940ebc 100644 --- a/j2k/tests/testData/ast/issues/kt-792-mixed.ide.kt +++ b/j2k/tests/testData/ast/issues/kt-792-mixed.ide.kt @@ -1,5 +1,5 @@ package demo -open class Test(i : Int) { +class Test(i : Int) { open fun test() { val i = 10 Test(i) diff --git a/j2k/tests/testData/ast/issues/kt-792.ide.kt b/j2k/tests/testData/ast/issues/kt-792.ide.kt index f6286df5c55..1e3b67720dc 100644 --- a/j2k/tests/testData/ast/issues/kt-792.ide.kt +++ b/j2k/tests/testData/ast/issues/kt-792.ide.kt @@ -1,5 +1,5 @@ package demo -open class Test(i : Int) { +class Test(i : Int) { open fun test() { val b = 10 Test(b.toInt()) diff --git a/j2k/tests/testData/ast/issues/kt-794-mixed.ide.kt b/j2k/tests/testData/ast/issues/kt-794-mixed.ide.kt index 0b40cac7e07..a77d9cfb00a 100644 --- a/j2k/tests/testData/ast/issues/kt-794-mixed.ide.kt +++ b/j2k/tests/testData/ast/issues/kt-794-mixed.ide.kt @@ -1,5 +1,5 @@ package demo -open class Test() { +class Test() { open fun getInteger(i : Int) : Int { return i } diff --git a/j2k/tests/testData/ast/issues/kt-794.ide.kt b/j2k/tests/testData/ast/issues/kt-794.ide.kt index 621f7c77988..b06790c38d4 100644 --- a/j2k/tests/testData/ast/issues/kt-794.ide.kt +++ b/j2k/tests/testData/ast/issues/kt-794.ide.kt @@ -1,4 +1,4 @@ -open class Test() { +class Test() { open fun getInt() : Int { val b = 10 return b.toInt() diff --git a/j2k/tests/testData/ast/issues/kt-809-string.ide.kt b/j2k/tests/testData/ast/issues/kt-809-string.ide.kt index ceebf10e978..2cd82c1f13f 100644 --- a/j2k/tests/testData/ast/issues/kt-809-string.ide.kt +++ b/j2k/tests/testData/ast/issues/kt-809-string.ide.kt @@ -1,15 +1,15 @@ package demo -open class Container() { +class Container() { var myString : String = "1" } -open class One() { +class One() { class object { var myContainer : Container = Container() } } -open class StringContainer(s : String) { +class StringContainer(s : String) { } -open class Test() { +class Test() { open fun putString(s : String) { } open fun test() { diff --git a/j2k/tests/testData/ast/issues/kt-809.ide.kt b/j2k/tests/testData/ast/issues/kt-809.ide.kt index 806e6b2b30c..30b3df27140 100644 --- a/j2k/tests/testData/ast/issues/kt-809.ide.kt +++ b/j2k/tests/testData/ast/issues/kt-809.ide.kt @@ -1,15 +1,15 @@ package demo -open class Container() { +class Container() { var myInt : Int = 1 } -open class One() { +class One() { class object { var myContainer : Container = Container() } } -open class IntContainer(i : Int) { +class IntContainer(i : Int) { } -open class Test() { +class Test() { open fun putInt(i : Int) { } open fun test() { diff --git a/j2k/tests/testData/ast/issues/kt-820-field.ide.kt b/j2k/tests/testData/ast/issues/kt-820-field.ide.kt index 51515fb72a7..69b7fc6c6f6 100644 --- a/j2k/tests/testData/ast/issues/kt-820-field.ide.kt +++ b/j2k/tests/testData/ast/issues/kt-820-field.ide.kt @@ -1,12 +1,12 @@ package demo -open class Container() { +class Container() { var myInt : Int = 1 } -open class One() { +class One() { class object { var myContainer : Container = Container() } } -open class Test() { +class Test() { var b : Byte = One.myContainer.myInt.toByte() } \ No newline at end of file diff --git a/j2k/tests/testData/ast/issues/kt-820-string.ide.kt b/j2k/tests/testData/ast/issues/kt-820-string.ide.kt index c46310e511d..26db6222dff 100644 --- a/j2k/tests/testData/ast/issues/kt-820-string.ide.kt +++ b/j2k/tests/testData/ast/issues/kt-820-string.ide.kt @@ -1,4 +1,4 @@ -open class Test() { +class Test() { class object { public open fun toFileSystemSafeName(name : String) : String { val size = name.length() diff --git a/j2k/tests/testData/ast/issues/kt-820.ide.kt b/j2k/tests/testData/ast/issues/kt-820.ide.kt index 6c8b4648d1e..be4a36eb95e 100644 --- a/j2k/tests/testData/ast/issues/kt-820.ide.kt +++ b/j2k/tests/testData/ast/issues/kt-820.ide.kt @@ -1,13 +1,13 @@ package demo -open class Container() { +class Container() { var myInt : Int = 1 } -open class One() { +class One() { class object { var myContainer : Container = Container() } } -open class Test() { +class Test() { open fun test() { val b = One.myContainer.myInt.toByte() } diff --git a/j2k/tests/testData/ast/issues/kt-824-isDir.ide.kt b/j2k/tests/testData/ast/issues/kt-824-isDir.ide.kt index a3b96c5b4aa..6c698bd1d68 100644 --- a/j2k/tests/testData/ast/issues/kt-824-isDir.ide.kt +++ b/j2k/tests/testData/ast/issues/kt-824-isDir.ide.kt @@ -3,7 +3,7 @@ import java.io.File /** * User: ignatov */ -public open class Test() { +public class Test() { class object { public open fun isDir(parent : File) : Boolean { if (parent == null || !parent.exists()) diff --git a/j2k/tests/testData/ast/issues/kt-824.ide.kt b/j2k/tests/testData/ast/issues/kt-824.ide.kt index 8274b36f7fa..4f8c7500cff 100644 --- a/j2k/tests/testData/ast/issues/kt-824.ide.kt +++ b/j2k/tests/testData/ast/issues/kt-824.ide.kt @@ -1,13 +1,13 @@ package demo -open class Container() { +class Container() { var myBoolean : Boolean = true } -open class One() { +class One() { class object { var myContainer : Container = Container() } } -open class Test() { +class Test() { open fun test() { if (One.myContainer.myBoolean) System.out.println("Ok") diff --git a/j2k/tests/testData/ast/issues/kt-828.ide.kt b/j2k/tests/testData/ast/issues/kt-828.ide.kt index d6b72fd246d..58676533600 100644 --- a/j2k/tests/testData/ast/issues/kt-828.ide.kt +++ b/j2k/tests/testData/ast/issues/kt-828.ide.kt @@ -1,4 +1,4 @@ -open class Test() { +class Test() { open fun test() { val res = true res = res and false diff --git a/j2k/tests/testData/ast/issues/kt-836.ide.kt b/j2k/tests/testData/ast/issues/kt-836.ide.kt index 8138d29b09e..f8bad2f8aa7 100644 --- a/j2k/tests/testData/ast/issues/kt-836.ide.kt +++ b/j2k/tests/testData/ast/issues/kt-836.ide.kt @@ -1,6 +1,6 @@ package com.voltvoodoo.saplo4j.model import java.io.Serializable -public open class Language(code : String) : Serializable { +public class Language(code : String) : Serializable { protected var code : String = 0 public override fun toString() : String { return this.code @@ -9,14 +9,14 @@ return this.code this.code = code } } -open class Base() { +class Base() { open fun test() { } open fun toString() : String { return "BASE" } } -open class Child() : Base() { +class Child() : Base() { override fun test() { } override fun toString() : String { diff --git a/j2k/tests/testData/ast/issues/kt-837.ide.kt b/j2k/tests/testData/ast/issues/kt-837.ide.kt index f049c0eb7e6..05d4421d8db 100644 --- a/j2k/tests/testData/ast/issues/kt-837.ide.kt +++ b/j2k/tests/testData/ast/issues/kt-837.ide.kt @@ -1,6 +1,6 @@ package com.voltvoodoo.saplo4j.model import java.io.Serializable -public open class Language(code : String) : Serializable { +public class Language(code : String) : Serializable { protected var code : String = 0 public open fun equals(other : Language) : Boolean { return other.toString().equals(this.toString()) diff --git a/j2k/tests/testData/ast/issues/kt-852.ide.kt b/j2k/tests/testData/ast/issues/kt-852.ide.kt index 7d296cbff20..26995e60674 100644 --- a/j2k/tests/testData/ast/issues/kt-852.ide.kt +++ b/j2k/tests/testData/ast/issues/kt-852.ide.kt @@ -1,5 +1,5 @@ package demo -open class Test() { +class Test() { open fun test() : String { val s1 = "" val s2 = "" diff --git a/j2k/tests/testData/ast/issues/kt-871.ide.kt b/j2k/tests/testData/ast/issues/kt-871.ide.kt index 800bcbd9716..c42467e8e13 100644 --- a/j2k/tests/testData/ast/issues/kt-871.ide.kt +++ b/j2k/tests/testData/ast/issues/kt-871.ide.kt @@ -1,5 +1,5 @@ package demo -open class Program() { +class Program() { class object { public open fun main(args : Array) { System.out.println("Halo!") diff --git a/j2k/tests/testData/ast/issues/kt-879.ide.kt b/j2k/tests/testData/ast/issues/kt-879.ide.kt index b52d1403a85..8f738d5b1da 100644 --- a/j2k/tests/testData/ast/issues/kt-879.ide.kt +++ b/j2k/tests/testData/ast/issues/kt-879.ide.kt @@ -1,4 +1,4 @@ -open class Test() { +class Test() { class object { public open fun getInt(i : Int) : Int { when (i) { diff --git a/j2k/tests/testData/ast/issues/kt-893.ide.kt b/j2k/tests/testData/ast/issues/kt-893.ide.kt index 42836be2eca..32dea9885e7 100644 --- a/j2k/tests/testData/ast/issues/kt-893.ide.kt +++ b/j2k/tests/testData/ast/issues/kt-893.ide.kt @@ -1,5 +1,5 @@ package demo -open class Test() { +class Test() { open fun test() { for (i in 0..10 - 1) { System.out.println(i) diff --git a/j2k/tests/testData/ast/issues/kt-963.ide.kt b/j2k/tests/testData/ast/issues/kt-963.ide.kt index 2e024295a77..2bedcb5055d 100644 --- a/j2k/tests/testData/ast/issues/kt-963.ide.kt +++ b/j2k/tests/testData/ast/issues/kt-963.ide.kt @@ -1,5 +1,5 @@ package demo -open class C(a : Int) { +class C(a : Int) { var abc : Int = 0 { abc = a * 2 diff --git a/j2k/tests/testData/ast/kotlinExclusion/kt-656.ide.kt b/j2k/tests/testData/ast/kotlinExclusion/kt-656.ide.kt index 5d03d470b2a..8b28f03ef86 100644 --- a/j2k/tests/testData/ast/kotlinExclusion/kt-656.ide.kt +++ b/j2k/tests/testData/ast/kotlinExclusion/kt-656.ide.kt @@ -1,5 +1,5 @@ package demo -open class Test() : java.lang.Iterable { +class Test() : java.lang.Iterable { public override fun iterator() : java.util.Iterator { return null } @@ -8,7 +8,7 @@ val j = i return j } } -open class FullTest() : java.lang.Iterable { +class FullTest() : java.lang.Iterable { public override fun iterator() : java.util.Iterator { return null } diff --git a/j2k/tests/testData/ast/list/ForEach.ide.kt b/j2k/tests/testData/ast/list/ForEach.ide.kt index 204b03acc06..0bbde8ecd55 100644 --- a/j2k/tests/testData/ast/list/ForEach.ide.kt +++ b/j2k/tests/testData/ast/list/ForEach.ide.kt @@ -1,5 +1,5 @@ import java.util.* -public open class ForEach() { +public class ForEach() { public open fun test() { val xs = ArrayList() val ys = LinkedList() diff --git a/j2k/tests/testData/ast/list/Lists.ide.kt b/j2k/tests/testData/ast/list/Lists.ide.kt index 4a655b03e2d..3c7070fed2f 100644 --- a/j2k/tests/testData/ast/list/Lists.ide.kt +++ b/j2k/tests/testData/ast/list/Lists.ide.kt @@ -1,5 +1,5 @@ import java.util.* -public open class Lists() { +public class Lists() { public open fun test() { val xs = ArrayList() val ys = LinkedList() diff --git a/j2k/tests/testData/ast/literalExpression/char.ide.kt b/j2k/tests/testData/ast/literalExpression/char.ide.kt index 8611024cb6f..25dc61fb8ee 100644 --- a/j2k/tests/testData/ast/literalExpression/char.ide.kt +++ b/j2k/tests/testData/ast/literalExpression/char.ide.kt @@ -1,4 +1,4 @@ -open class Test() { +class Test() { open fun test() { val c1 = 'c' val c2 = 'C' diff --git a/j2k/tests/testData/ast/literalExpression/dollarInsideString.ide.kt b/j2k/tests/testData/ast/literalExpression/dollarInsideString.ide.kt index 3013e939133..9ba84c8e406 100644 --- a/j2k/tests/testData/ast/literalExpression/dollarInsideString.ide.kt +++ b/j2k/tests/testData/ast/literalExpression/dollarInsideString.ide.kt @@ -1,5 +1,5 @@ package demo -open class Test() { +class Test() { open fun test() { val name = "$$$$" name = name.replaceAll("\\$[0-9]+", "\\$") diff --git a/j2k/tests/testData/ast/literalExpression/endsWithDFL.ide.kt b/j2k/tests/testData/ast/literalExpression/endsWithDFL.ide.kt index ae9c41aaeb9..f1e2e458056 100644 --- a/j2k/tests/testData/ast/literalExpression/endsWithDFL.ide.kt +++ b/j2k/tests/testData/ast/literalExpression/endsWithDFL.ide.kt @@ -1,4 +1,4 @@ -open class Test() { +class Test() { open fun test() { val l1 = 10 val d1 = 10.0 diff --git a/j2k/tests/testData/ast/literalExpression/hex.ide.kt b/j2k/tests/testData/ast/literalExpression/hex.ide.kt index d4f7d830813..ea4c5ff42df 100644 --- a/j2k/tests/testData/ast/literalExpression/hex.ide.kt +++ b/j2k/tests/testData/ast/literalExpression/hex.ide.kt @@ -1,4 +1,4 @@ -open class Test() { +class Test() { open fun test() { val i1 = 33 val i2 = 51 diff --git a/j2k/tests/testData/ast/literalExpression/octal.ide.kt b/j2k/tests/testData/ast/literalExpression/octal.ide.kt index 74df3813576..6fe27f16feb 100644 --- a/j2k/tests/testData/ast/literalExpression/octal.ide.kt +++ b/j2k/tests/testData/ast/literalExpression/octal.ide.kt @@ -1,4 +1,4 @@ -open class Test() { +class Test() { open fun test() { val i1 = 37 val i2 = 26 diff --git a/j2k/tests/testData/ast/literalExpression/trueOrFalse.ide.kt b/j2k/tests/testData/ast/literalExpression/trueOrFalse.ide.kt index 677793dab98..d7e1917f2f5 100644 --- a/j2k/tests/testData/ast/literalExpression/trueOrFalse.ide.kt +++ b/j2k/tests/testData/ast/literalExpression/trueOrFalse.ide.kt @@ -1,4 +1,4 @@ -open class Test() { +class Test() { open fun test() { val t1 = true val t2 = true diff --git a/j2k/tests/testData/ast/methodCallExpression/genericMethod.ide.kt b/j2k/tests/testData/ast/methodCallExpression/genericMethod.ide.kt index 77c0aa8bcfa..4f3008e5ec0 100644 --- a/j2k/tests/testData/ast/methodCallExpression/genericMethod.ide.kt +++ b/j2k/tests/testData/ast/methodCallExpression/genericMethod.ide.kt @@ -1,9 +1,9 @@ package demo -open class Map() { +class Map() { open fun put(k : K, v : V) { } } -open class U() { +class U() { open fun test() { val m = Map() m.put("10", 10) diff --git a/j2k/tests/testData/ast/misc/packageWithOpenClass.ide.kt b/j2k/tests/testData/ast/misc/packageWithOpenClass.ide.kt index d4336ffcc51..3f205654c0b 100644 --- a/j2k/tests/testData/ast/misc/packageWithOpenClass.ide.kt +++ b/j2k/tests/testData/ast/misc/packageWithOpenClass.ide.kt @@ -1,3 +1,3 @@ package test -open class C() { +class C() { } \ No newline at end of file diff --git a/j2k/tests/testData/ast/newClassExpression/fullQualifiedName.ide.kt b/j2k/tests/testData/ast/newClassExpression/fullQualifiedName.ide.kt index 51ea7fef84b..21d55d1a2d5 100644 --- a/j2k/tests/testData/ast/newClassExpression/fullQualifiedName.ide.kt +++ b/j2k/tests/testData/ast/newClassExpression/fullQualifiedName.ide.kt @@ -1,5 +1,5 @@ package test -open class User() { +class User() { open fun main() { val list = java.util.LinkedList() } diff --git a/j2k/tests/testData/ast/newClassExpression/fullQualifiedName2.ide.kt b/j2k/tests/testData/ast/newClassExpression/fullQualifiedName2.ide.kt index 51ea7fef84b..21d55d1a2d5 100644 --- a/j2k/tests/testData/ast/newClassExpression/fullQualifiedName2.ide.kt +++ b/j2k/tests/testData/ast/newClassExpression/fullQualifiedName2.ide.kt @@ -1,5 +1,5 @@ package test -open class User() { +class User() { open fun main() { val list = java.util.LinkedList() } diff --git a/j2k/tests/testData/ast/newClassExpression/genericClassInvocation.ide.kt b/j2k/tests/testData/ast/newClassExpression/genericClassInvocation.ide.kt index 926c48703af..e24f3332565 100644 --- a/j2k/tests/testData/ast/newClassExpression/genericClassInvocation.ide.kt +++ b/j2k/tests/testData/ast/newClassExpression/genericClassInvocation.ide.kt @@ -1,5 +1,5 @@ import java.util.LinkedList -open class User() { +class User() { open fun main() { val list = LinkedList() } diff --git a/j2k/tests/testData/ast/newClassExpression/newClassByFullName.ide.kt b/j2k/tests/testData/ast/newClassExpression/newClassByFullName.ide.kt index eb8c96bf90c..e0e479ee4da 100644 --- a/j2k/tests/testData/ast/newClassExpression/newClassByFullName.ide.kt +++ b/j2k/tests/testData/ast/newClassExpression/newClassByFullName.ide.kt @@ -1,7 +1,7 @@ package org.test -open class Library() { +class Library() { } -open class User() { +class User() { open fun main() { val lib = Library() } diff --git a/j2k/tests/testData/ast/newClassExpression/newInnerClass.ide.kt b/j2k/tests/testData/ast/newClassExpression/newInnerClass.ide.kt index 260c078ca41..eae6dc83521 100644 --- a/j2k/tests/testData/ast/newClassExpression/newInnerClass.ide.kt +++ b/j2k/tests/testData/ast/newClassExpression/newInnerClass.ide.kt @@ -1,9 +1,9 @@ package org.test -open class OuterClass() { -open class InnerClass() { +class OuterClass() { +class InnerClass() { } } -open class User() { +class User() { open fun main() { val outerObject = OuterClass() val innerObject = outerObject.InnerClass() diff --git a/j2k/tests/testData/ast/newClassExpression/newListAndNewMember.ide.kt b/j2k/tests/testData/ast/newClassExpression/newListAndNewMember.ide.kt index 0634233ce58..22f4fb0b7bc 100644 --- a/j2k/tests/testData/ast/newClassExpression/newListAndNewMember.ide.kt +++ b/j2k/tests/testData/ast/newClassExpression/newListAndNewMember.ide.kt @@ -1,8 +1,8 @@ package org.test import java.util.LinkedList -open class Member() { +class Member() { } -open class User() { +class User() { open fun main() { val members = LinkedList() members.add(Member()) diff --git a/j2k/tests/testData/ast/newClassExpression/newStaticInnerClass.ide.kt b/j2k/tests/testData/ast/newClassExpression/newStaticInnerClass.ide.kt index b641ed682af..f05941dfc19 100644 --- a/j2k/tests/testData/ast/newClassExpression/newStaticInnerClass.ide.kt +++ b/j2k/tests/testData/ast/newClassExpression/newStaticInnerClass.ide.kt @@ -1,11 +1,11 @@ package demo -open class Foo() { +class Foo() { class object { -open class Bar() { +class Bar() { } } } -open class User() { +class User() { open fun main() { val boo = Foo.Bar() } diff --git a/j2k/tests/testData/ast/objectLiteral/MyFrame.ide.kt b/j2k/tests/testData/ast/objectLiteral/MyFrame.ide.kt index 6cca6e8ef4e..9737e7e9500 100644 --- a/j2k/tests/testData/ast/objectLiteral/MyFrame.ide.kt +++ b/j2k/tests/testData/ast/objectLiteral/MyFrame.ide.kt @@ -1,5 +1,5 @@ package demo -open class WindowAdapter() { +class WindowAdapter() { public open fun windowClosing() { } } diff --git a/j2k/tests/testData/ast/packageStatement/orgJetbrainsJetJ2kIn.ide.kt b/j2k/tests/testData/ast/packageStatement/orgJetbrainsJetJ2kIn.ide.kt index a673d540277..4a8c534eb73 100644 --- a/j2k/tests/testData/ast/packageStatement/orgJetbrainsJetJ2kIn.ide.kt +++ b/j2k/tests/testData/ast/packageStatement/orgJetbrainsJetJ2kIn.ide.kt @@ -1,4 +1,4 @@ package org.jetbrains.jet.j2k.`in` import org.jetbrains.annotations.Nullable -public open class Converter() { +public class Converter() { } \ No newline at end of file diff --git a/j2k/tests/testData/ast/rawGenerics/kt-540-map.ide.kt b/j2k/tests/testData/ast/rawGenerics/kt-540-map.ide.kt index b5287e68ed9..8b3abf2189b 100644 --- a/j2k/tests/testData/ast/rawGenerics/kt-540-map.ide.kt +++ b/j2k/tests/testData/ast/rawGenerics/kt-540-map.ide.kt @@ -1,6 +1,6 @@ package demo import java.util.HashMap -open class Test() { +class Test() { open fun main() { val commonMap = HashMap() val rawMap = HashMap() diff --git a/j2k/tests/testData/ast/rawGenerics/kt-540-rawGenericClass.ide.kt b/j2k/tests/testData/ast/rawGenerics/kt-540-rawGenericClass.ide.kt index 238bfbc78b7..e5214ecbf19 100644 --- a/j2k/tests/testData/ast/rawGenerics/kt-540-rawGenericClass.ide.kt +++ b/j2k/tests/testData/ast/rawGenerics/kt-540-rawGenericClass.ide.kt @@ -1,10 +1,10 @@ package demo -open class Collection(e : E) { +class Collection(e : E) { { System.out.println(e) } } -open class Test() { +class Test() { open fun main() { val raw1 = Collection(1) val raw2 = Collection(1) diff --git a/j2k/tests/testData/ast/rawGenerics/kt-540.ide.kt b/j2k/tests/testData/ast/rawGenerics/kt-540.ide.kt index ba894c82b4b..f649033411e 100644 --- a/j2k/tests/testData/ast/rawGenerics/kt-540.ide.kt +++ b/j2k/tests/testData/ast/rawGenerics/kt-540.ide.kt @@ -1,6 +1,6 @@ package demo import java.util.LinkedList -open class Test() { +class Test() { open fun main() { val common = LinkedList() val raw = LinkedList() diff --git a/j2k/tests/testData/ast/rawGenerics/rawGenericMethod.ide.kt b/j2k/tests/testData/ast/rawGenerics/rawGenericMethod.ide.kt index 331c86e31fa..04083b7ba36 100644 --- a/j2k/tests/testData/ast/rawGenerics/rawGenericMethod.ide.kt +++ b/j2k/tests/testData/ast/rawGenerics/rawGenericMethod.ide.kt @@ -1,9 +1,9 @@ package demo -open class TestT() { +class TestT() { open fun getT() { } } -open class U() { +class U() { open fun main() { val t = TestT() t.getT() diff --git a/j2k/tests/testData/ast/superExpression/classAdotSuperFoo.ide.kt b/j2k/tests/testData/ast/superExpression/classAdotSuperFoo.ide.kt index 2fe44fa3554..8182885d826 100644 --- a/j2k/tests/testData/ast/superExpression/classAdotSuperFoo.ide.kt +++ b/j2k/tests/testData/ast/superExpression/classAdotSuperFoo.ide.kt @@ -1,8 +1,8 @@ -open class Base() { +class Base() { open fun foo() } -open class A() : Base() { -open class C() { +class A() : Base() { +class C() { open fun test() { super@A.foo() } diff --git a/j2k/tests/testData/ast/superExpression/classAextendsB.ide.kt b/j2k/tests/testData/ast/superExpression/classAextendsB.ide.kt index b9c5e29b288..442b90d2961 100644 --- a/j2k/tests/testData/ast/superExpression/classAextendsB.ide.kt +++ b/j2k/tests/testData/ast/superExpression/classAextendsB.ide.kt @@ -1,9 +1,9 @@ -open class B(i : Int) { +class B(i : Int) { open fun call() : Int { return 1 } } -open class A() : B(10) { +class A() : B(10) { override fun call() : Int { return super.call() } diff --git a/j2k/tests/testData/ast/switch/comlicatedFallDown.ide.kt b/j2k/tests/testData/ast/switch/comlicatedFallDown.ide.kt index 48342299369..7d4bd99cd64 100644 --- a/j2k/tests/testData/ast/switch/comlicatedFallDown.ide.kt +++ b/j2k/tests/testData/ast/switch/comlicatedFallDown.ide.kt @@ -1,5 +1,5 @@ package demo -public open class SwitchDemo() { +public class SwitchDemo() { class object { public open fun print(o : Any) { System.out.println(o) diff --git a/j2k/tests/testData/ast/switch/emptySwitch.ide.kt b/j2k/tests/testData/ast/switch/emptySwitch.ide.kt index e71e76ae6b2..ea425b49c23 100644 --- a/j2k/tests/testData/ast/switch/emptySwitch.ide.kt +++ b/j2k/tests/testData/ast/switch/emptySwitch.ide.kt @@ -1,4 +1,4 @@ -public open class NonDefault() { +public class NonDefault() { class object { public open fun main(args : Array) { val value = 3 diff --git a/j2k/tests/testData/ast/switch/fallDown.ide.kt b/j2k/tests/testData/ast/switch/fallDown.ide.kt index 8898cf6f48b..8bcd045f2a8 100644 --- a/j2k/tests/testData/ast/switch/fallDown.ide.kt +++ b/j2k/tests/testData/ast/switch/fallDown.ide.kt @@ -1,5 +1,5 @@ package switch_demo -public open class SwitchDemo() { +public class SwitchDemo() { class object { public open fun main(args : Array) { val month = 8 diff --git a/j2k/tests/testData/ast/switch/kt-539.ide.kt b/j2k/tests/testData/ast/switch/kt-539.ide.kt index 350e0bebe37..3bde3e6fd7c 100644 --- a/j2k/tests/testData/ast/switch/kt-539.ide.kt +++ b/j2k/tests/testData/ast/switch/kt-539.ide.kt @@ -1,5 +1,5 @@ package switch_demo -public open class SwitchDemo() { +public class SwitchDemo() { class object { public open fun main(args : Array) { val month = 8 diff --git a/j2k/tests/testData/ast/switch/nondefault.ide.kt b/j2k/tests/testData/ast/switch/nondefault.ide.kt index 385f564442e..596a3ac9a1a 100644 --- a/j2k/tests/testData/ast/switch/nondefault.ide.kt +++ b/j2k/tests/testData/ast/switch/nondefault.ide.kt @@ -1,4 +1,4 @@ -public open class NonDefault() { +public class NonDefault() { class object { public open fun main(args : Array) { val value = 3 diff --git a/j2k/tests/testData/ast/thisExpression/classAdotThisFoo.ide.kt b/j2k/tests/testData/ast/thisExpression/classAdotThisFoo.ide.kt index 4bb52748296..9934e2648ae 100644 --- a/j2k/tests/testData/ast/thisExpression/classAdotThisFoo.ide.kt +++ b/j2k/tests/testData/ast/thisExpression/classAdotThisFoo.ide.kt @@ -1,9 +1,9 @@ -open class Base() { +class Base() { open fun foo() { } } -open class A() : Base() { -open class C() { +class A() : Base() { +class C() { open fun test() { this@A.foo() }