From d98d8cfa7fa39cbd48d6e58373d3372eb8c65766 Mon Sep 17 00:00:00 2001 From: "Pavel V. Talanov" Date: Tue, 19 Nov 2013 16:52:57 +0400 Subject: [PATCH] Converter: Functions are final by default in plugin mode --- j2k/src/org/jetbrains/jet/j2k/Converter.kt | 12 ++++++------ j2k/src/org/jetbrains/jet/j2k/ast/Class.kt | 2 +- j2k/src/org/jetbrains/jet/j2k/ast/Constructor.kt | 11 +++++++---- j2k/src/org/jetbrains/jet/j2k/ast/Function.kt | 13 ++++++++----- .../ast/annotations/jetbrainsNotNull.ide.kt | 6 +++--- .../annotations/jetbrainsNotNullChainExpr.ide.kt | 4 ++-- .../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 | 2 +- .../callChainExpression/libraryMethodCall.ide.kt | 6 +++--- .../libraryMethodCallFromInstance.ide.kt | 6 +++--- .../libraryStringFieldCall.ide.kt | 2 +- j2k/tests/testData/ast/class/ClassShadowing.ide.kt | 4 ++-- j2k/tests/testData/ast/class/abstractClass.ide.kt | 2 +- .../testData/ast/class/abstractClassShape.ide.kt | 4 ++-- j2k/tests/testData/ast/class/kt-639.ide.kt | 6 +++--- .../ast/constructors/allCallsPrimary.ide.kt | 6 +++--- .../ast/constructors/allCallsPrimary2.ide.kt | 6 +++--- .../ast/constructors/customerBuilder.ide.kt | 12 ++++++------ .../ast/constructors/genericIdentifier.ide.kt | 10 +++++----- .../testData/ast/constructors/identifier.ide.kt | 10 +++++----- .../ast/constructors/withManyDefaultParams.ide.kt | 8 ++++---- .../function/extendsBaseWhichExtendsObject.ide.kt | 10 +++++----- j2k/tests/testData/ast/function/override.ide.kt | 2 +- .../testData/ast/function/overrideAndOpen.ide.kt | 2 +- .../testData/ast/function/overrideObject.ide.kt | 10 +++++----- j2k/tests/testData/ast/function/varVararg.ide.kt | 2 +- .../testData/ast/function/writableParameter.ide.kt | 2 +- .../ast/identifier/finalFieldReference.ide.kt | 2 +- j2k/tests/testData/ast/issues/arrayLength.ide.kt | 2 +- j2k/tests/testData/ast/issues/comments.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 | 4 ++-- j2k/tests/testData/ast/issues/kt-543-mixed.ide.kt | 4 ++-- j2k/tests/testData/ast/issues/kt-543.ide.kt | 4 ++-- j2k/tests/testData/ast/issues/kt-638.ide.kt | 10 +++++----- j2k/tests/testData/ast/issues/kt-696.ide.kt | 6 +++--- 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 | 4 ++-- j2k/tests/testData/ast/issues/kt-794.ide.kt | 2 +- j2k/tests/testData/ast/issues/kt-809-string.ide.kt | 4 ++-- j2k/tests/testData/ast/issues/kt-809.ide.kt | 4 ++-- j2k/tests/testData/ast/issues/kt-820-string.ide.kt | 2 +- j2k/tests/testData/ast/issues/kt-820.ide.kt | 2 +- j2k/tests/testData/ast/issues/kt-824-isDir.ide.kt | 2 +- j2k/tests/testData/ast/issues/kt-824.ide.kt | 2 +- j2k/tests/testData/ast/issues/kt-828.ide.kt | 2 +- j2k/tests/testData/ast/issues/kt-836.ide.kt | 4 ++-- 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/qualifyStatic.ide.kt | 2 +- .../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 +- .../testData/ast/literalExpression/char.ide.kt | 2 +- .../ast/literalExpression/dollarInsideString.ide.kt | 2 +- .../ast/literalExpression/endsWithDFL.ide.kt | 4 ++-- j2k/tests/testData/ast/literalExpression/hex.ide.kt | 2 +- .../testData/ast/literalExpression/octal.ide.kt | 2 +- .../ast/literalExpression/trueOrFalse.ide.kt | 2 +- .../ast/methodCallExpression/genericMethod.ide.kt | 4 ++-- .../ast/newClassExpression/fullQualifiedName.ide.kt | 2 +- .../newClassExpression/fullQualifiedName2.ide.kt | 2 +- .../genericClassInvocation.ide.kt | 2 +- .../newClassExpression/newClassByFullName.ide.kt | 2 +- .../ast/newClassExpression/newInnerClass.ide.kt | 2 +- .../newClassExpression/newListAndNewMember.ide.kt | 2 +- .../newClassExpression/newStaticInnerClass.ide.kt | 2 +- j2k/tests/testData/ast/objectLiteral/MyFrame.ide.kt | 2 +- .../testData/ast/rawGenerics/kt-540-map.ide.kt | 2 +- .../ast/rawGenerics/kt-540-rawGenericClass.ide.kt | 2 +- j2k/tests/testData/ast/rawGenerics/kt-540.ide.kt | 2 +- .../ast/rawGenerics/rawGenericMethod.ide.kt | 4 ++-- .../ast/superExpression/classAdotSuperFoo.ide.kt | 4 ++-- .../ast/superExpression/classAextendsB.ide.kt | 2 +- .../testData/ast/switch/comlicatedFallDown.ide.kt | 6 +++--- 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 | 4 ++-- .../ast/trait/interfaceWithMethodDeclaration.ide.kt | 4 ++-- 88 files changed, 168 insertions(+), 162 deletions(-) diff --git a/j2k/src/org/jetbrains/jet/j2k/Converter.kt b/j2k/src/org/jetbrains/jet/j2k/Converter.kt index 6cf09735eaf..4be56a7c206 100644 --- a/j2k/src/org/jetbrains/jet/j2k/Converter.kt +++ b/j2k/src/org/jetbrains/jet/j2k/Converter.kt @@ -207,7 +207,7 @@ public class Converter(val project: Project, val settings: ConverterSettings) { } } } - members.add(Constructor(Identifier.EMPTY_IDENTIFIER, arrayListOf(), Collections.emptySet(), + members.add(Constructor(this, Identifier.EMPTY_IDENTIFIER, arrayListOf(), Collections.emptySet(), ClassType(name, Collections.emptyList(), false, this), Collections.emptyList(), ParameterList(createParametersFromFields(finalOrWithEmptyInitializer)), @@ -295,12 +295,11 @@ public class Converter(val project: Project, val settings: ConverterSettings) { } if (method.isConstructor()) { - val isPrimary: Boolean = isConstructorPrimary(method) - return Constructor(identifier, docComments, modifiers, returnType, typeParameters, params, - Block(removeEmpty(body.statements), false), isPrimary) + return Constructor(this, identifier, docComments, modifiers, returnType, typeParameters, params, + Block(removeEmpty(body.statements), false), isConstructorPrimary(method)) } - return Function(identifier, docComments, modifiers, returnType, typeParameters, params, body) + return Function(this, identifier, docComments, modifiers, returnType, typeParameters, params, body) } private fun createFunctionParameters(method: PsiMethod): ParameterList { @@ -342,6 +341,7 @@ public class Converter(val project: Project, val settings: ConverterSettings) { return false } + public fun blockToBlock(block: PsiCodeBlock?, notEmpty: Boolean): Block { if (block == null) return Block.EMPTY_BLOCK @@ -611,7 +611,7 @@ public class Converter(val project: Project, val settings: ConverterSettings) { private fun isNotOpenMethod(method: PsiMethod): Boolean { val parent = method.getParent() if (parent is PsiClass) { - val parentModifierList: PsiModifierList? = parent.getModifierList() + val parentModifierList = parent.getModifierList() if ((parentModifierList != null && parentModifierList.hasExplicitModifier(PsiModifier.FINAL)) || parent.isEnum()) { return true } diff --git a/j2k/src/org/jetbrains/jet/j2k/ast/Class.kt b/j2k/src/org/jetbrains/jet/j2k/ast/Class.kt index 55b88afdb74..f4a56c78a8f 100644 --- a/j2k/src/org/jetbrains/jet/j2k/ast/Class.kt +++ b/j2k/src/org/jetbrains/jet/j2k/ast/Class.kt @@ -80,7 +80,7 @@ public open class Class(val converter: Converter, val constructorTypeParameters = ArrayList() constructorTypeParameters.addAll(typeParameters) constructorTypeParameters.addAll(f.typeParameters) - return Function(Identifier("init"), arrayList(), modifiers, + return Function(converter, Identifier("init"), arrayList(), modifiers, ClassType(name, constructorTypeParameters, false, converter), constructorTypeParameters, f.params, block) } diff --git a/j2k/src/org/jetbrains/jet/j2k/ast/Constructor.kt b/j2k/src/org/jetbrains/jet/j2k/ast/Constructor.kt index 7319b58de1e..1b294a7703b 100644 --- a/j2k/src/org/jetbrains/jet/j2k/ast/Constructor.kt +++ b/j2k/src/org/jetbrains/jet/j2k/ast/Constructor.kt @@ -17,21 +17,24 @@ package org.jetbrains.jet.j2k.ast import org.jetbrains.jet.j2k.ast.types.Type +import org.jetbrains.jet.j2k.Converter -public open class Constructor(identifier: Identifier, +public class Constructor(converter: Converter, + identifier: Identifier, docComments: List, modifiers: Set, `type`: Type, typeParameters: List, params: Element, block: Block, - val isPrimary: Boolean) : Function(identifier, docComments, modifiers, `type`, typeParameters, params, block) { + val isPrimary: Boolean) : Function(converter, identifier, docComments, modifiers, + `type`, typeParameters, params, block) { - public open fun primarySignatureToKotlin(): String { + public fun primarySignatureToKotlin(): String { return "(" + params.toKotlin() + ")" } - public open fun primaryBodyToKotlin(): String { + public fun primaryBodyToKotlin(): String { return block!!.toKotlin() } } diff --git a/j2k/src/org/jetbrains/jet/j2k/ast/Function.kt b/j2k/src/org/jetbrains/jet/j2k/ast/Function.kt index a29866491b1..9febe8d4508 100644 --- a/j2k/src/org/jetbrains/jet/j2k/ast/Function.kt +++ b/j2k/src/org/jetbrains/jet/j2k/ast/Function.kt @@ -19,8 +19,10 @@ package org.jetbrains.jet.j2k.ast import org.jetbrains.jet.j2k.ast.types.Type import java.util.ArrayList import org.jetbrains.jet.j2k.ast.types.isUnit +import org.jetbrains.jet.j2k.Converter -public open class Function(val name: Identifier, +public open class Function(val converter: Converter, + val name: Identifier, val docComments: List, modifiers: Set, val `type`: Type, @@ -61,10 +63,11 @@ public open class Function(val name: Identifier, modifierList.add(Modifier.OVERRIDE) } - if (!modifiers.contains(Modifier.ABSTRACT) && - !modifiers.contains(Modifier.OVERRIDE) && - !modifiers.contains(Modifier.FINAL) && - !modifiers.contains(Modifier.PRIVATE)) { + if (converter.settings.openByDefault && + !modifiers.contains(Modifier.ABSTRACT) && + !modifiers.contains(Modifier.OVERRIDE) && + !modifiers.contains(Modifier.FINAL) && + !modifiers.contains(Modifier.PRIVATE)) { modifierList.add(Modifier.OPEN) } diff --git a/j2k/tests/testData/ast/annotations/jetbrainsNotNull.ide.kt b/j2k/tests/testData/ast/annotations/jetbrainsNotNull.ide.kt index 7009d01f4ea..c52688ffbc9 100644 --- a/j2k/tests/testData/ast/annotations/jetbrainsNotNull.ide.kt +++ b/j2k/tests/testData/ast/annotations/jetbrainsNotNull.ide.kt @@ -1,13 +1,13 @@ package test public class Test(str : String) { var myStr : String = "String2" -public open fun sout(str : String) { +public fun sout(str : String) { System.out.println(str) } -public open fun dummy(str : String) : String { +public fun dummy(str : String) : String { return str } -public open fun test() { +public fun test() { sout("String") val test = "String2" sout(test) diff --git a/j2k/tests/testData/ast/annotations/jetbrainsNotNullChainExpr.ide.kt b/j2k/tests/testData/ast/annotations/jetbrainsNotNullChainExpr.ide.kt index 73a458cbd23..19ae91be185 100644 --- a/j2k/tests/testData/ast/annotations/jetbrainsNotNullChainExpr.ide.kt +++ b/j2k/tests/testData/ast/annotations/jetbrainsNotNullChainExpr.ide.kt @@ -1,6 +1,6 @@ package test class Foo() { -open fun execute() { +fun execute() { } } class Bar() { @@ -8,7 +8,7 @@ var fooNotNull : Foo = Foo() var fooNullable : Foo = null } class Test() { -public open fun test(barNotNull : Bar, barNullable : Bar) { +public fun test(barNotNull : Bar, barNullable : Bar) { barNotNull.fooNotNull.execute() barNotNull.fooNullable.execute() barNullable.fooNotNull.execute() diff --git a/j2k/tests/testData/ast/assignmentExpression/nullability.ide.kt b/j2k/tests/testData/ast/assignmentExpression/nullability.ide.kt index e81129ba3d4..be9c88711a3 100644 --- a/j2k/tests/testData/ast/assignmentExpression/nullability.ide.kt +++ b/j2k/tests/testData/ast/assignmentExpression/nullability.ide.kt @@ -1,6 +1,6 @@ import java.util.BitSet class Foo() { -open fun foo(o : BitSet) { +fun foo(o : BitSet) { val o2 = o val foo = 0 foo = o2.size() diff --git a/j2k/tests/testData/ast/boxedType/Boxing.ide.kt b/j2k/tests/testData/ast/boxedType/Boxing.ide.kt index eda815d2b36..6872f4a7ff5 100644 --- a/j2k/tests/testData/ast/boxedType/Boxing.ide.kt +++ b/j2k/tests/testData/ast/boxedType/Boxing.ide.kt @@ -1,6 +1,6 @@ import java.util.ArrayList class Boxing() { -open fun test() { +fun test() { val i = 0 val n = 0.0.toFloat() i = 1 diff --git a/j2k/tests/testData/ast/boxedType/kt-671.ide.kt b/j2k/tests/testData/ast/boxedType/kt-671.ide.kt index 8262a056813..4cb2b68c2a9 100644 --- a/j2k/tests/testData/ast/boxedType/kt-671.ide.kt +++ b/j2k/tests/testData/ast/boxedType/kt-671.ide.kt @@ -1,6 +1,6 @@ package demo class Test() { -open fun test() { +fun test() { val i = Integer.valueOf(100) val s = 3 val ss = java.lang.Short.valueOf(s) diff --git a/j2k/tests/testData/ast/callChainExpression/libraryFieldCall.ide.kt b/j2k/tests/testData/ast/callChainExpression/libraryFieldCall.ide.kt index 5aae1bab85c..8d0504a0289 100644 --- a/j2k/tests/testData/ast/callChainExpression/libraryFieldCall.ide.kt +++ b/j2k/tests/testData/ast/callChainExpression/libraryFieldCall.ide.kt @@ -4,7 +4,7 @@ val ourOut : java.io.PrintStream = 0 } } class User() { -open fun main() { +fun main() { Library.ourOut.print() } } \ No newline at end of file diff --git a/j2k/tests/testData/ast/callChainExpression/libraryMethodCall.ide.kt b/j2k/tests/testData/ast/callChainExpression/libraryMethodCall.ide.kt index b8889c2de94..2b6b105c950 100644 --- a/j2k/tests/testData/ast/callChainExpression/libraryMethodCall.ide.kt +++ b/j2k/tests/testData/ast/callChainExpression/libraryMethodCall.ide.kt @@ -1,14 +1,14 @@ class Library() { class object { -open fun call() { +fun call() { } -open fun getString() : String { +fun getString() : String { return "" } } } class User() { -open fun main() { +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 2b4a9e676bf..3a1cce2149b 100644 --- a/j2k/tests/testData/ast/callChainExpression/libraryMethodCallFromInstance.ide.kt +++ b/j2k/tests/testData/ast/callChainExpression/libraryMethodCallFromInstance.ide.kt @@ -1,12 +1,12 @@ class Library() { -open fun call() { +fun call() { } -open fun getString() : String { +fun getString() : String { return "" } } class User() { -open fun main() { +fun main() { val lib = Library() lib.call() lib.getString().isEmpty() diff --git a/j2k/tests/testData/ast/callChainExpression/libraryStringFieldCall.ide.kt b/j2k/tests/testData/ast/callChainExpression/libraryStringFieldCall.ide.kt index 94660cf0089..88c0e39be8d 100644 --- a/j2k/tests/testData/ast/callChainExpression/libraryStringFieldCall.ide.kt +++ b/j2k/tests/testData/ast/callChainExpression/libraryStringFieldCall.ide.kt @@ -2,7 +2,7 @@ class Library() { public val myString : String = 0 } class User() { -open fun main() { +fun main() { Library.myString.isEmpty() } } \ No newline at end of file diff --git a/j2k/tests/testData/ast/class/ClassShadowing.ide.kt b/j2k/tests/testData/ast/class/ClassShadowing.ide.kt index 46f17cb1fc4..8639820dea3 100644 --- a/j2k/tests/testData/ast/class/ClassShadowing.ide.kt +++ b/j2k/tests/testData/ast/class/ClassShadowing.ide.kt @@ -1,14 +1,14 @@ package test public class Short() { class object { -public open fun valueOf(value : String) : Short { +public fun valueOf(value : String) : Short { return Short() } } } class Test() { class object { -public open fun test() { +public fun test() { test.Short.valueOf("1") test.Short.valueOf("1") java.lang.Short.valueOf("1") diff --git a/j2k/tests/testData/ast/class/abstractClass.ide.kt b/j2k/tests/testData/ast/class/abstractClass.ide.kt index f0513d57cf0..ca2f54970f9 100644 --- a/j2k/tests/testData/ast/class/abstractClass.ide.kt +++ b/j2k/tests/testData/ast/class/abstractClass.ide.kt @@ -1,6 +1,6 @@ abstract class A() { abstract fun callme() -open fun callmetoo() { +fun callmetoo() { print("This is a concrete method.") } } \ No newline at end of file diff --git a/j2k/tests/testData/ast/class/abstractClassShape.ide.kt b/j2k/tests/testData/ast/class/abstractClassShape.ide.kt index f8aa1f32a13..8a1d91023d0 100644 --- a/j2k/tests/testData/ast/class/abstractClassShape.ide.kt +++ b/j2k/tests/testData/ast/class/abstractClassShape.ide.kt @@ -1,9 +1,9 @@ abstract class Shape() { public var color : String = 0 -public open fun setColor(c : String) { +public fun setColor(c : String) { color = c } -public open fun getColor() : String { +public fun getColor() : String { return color } public abstract fun area() : Double diff --git a/j2k/tests/testData/ast/class/kt-639.ide.kt b/j2k/tests/testData/ast/class/kt-639.ide.kt index d92cd028188..a7860adbf3b 100644 --- a/j2k/tests/testData/ast/class/kt-639.ide.kt +++ b/j2k/tests/testData/ast/class/kt-639.ide.kt @@ -2,18 +2,18 @@ package demo import java.util.HashMap class Test() { class object { -open fun init() : Test { +fun init() : Test { val __ = Test() return __ } -open fun init(s : String) : Test { +fun init(s : String) : Test { val __ = Test() return __ } } } class User() { -open fun main() { +fun main() { val m = HashMap(1) val m2 = HashMap(10) val t1 = Test.init() diff --git a/j2k/tests/testData/ast/constructors/allCallsPrimary.ide.kt b/j2k/tests/testData/ast/constructors/allCallsPrimary.ide.kt index 0102ceba7b2..e8c83501d55 100644 --- a/j2k/tests/testData/ast/constructors/allCallsPrimary.ide.kt +++ b/j2k/tests/testData/ast/constructors/allCallsPrimary.ide.kt @@ -1,10 +1,10 @@ class C(arg1 : Int, arg2 : Int, arg3 : Int) { class object { -open fun init(arg1 : Int, arg2 : Int) : C { +fun init(arg1 : Int, arg2 : Int) : C { val __ = C(arg1, arg2, 0) return __ } -open fun init(arg1 : Int) : C { +fun init(arg1 : Int) : C { val __ = C(arg1, 0, 0) return __ } @@ -12,7 +12,7 @@ return __ } public class User() { class object { -public open fun main() { +public fun main() { val c1 = C(100, 100, 100) val c2 = C.init(100, 100) val c3 = C.init(100) diff --git a/j2k/tests/testData/ast/constructors/allCallsPrimary2.ide.kt b/j2k/tests/testData/ast/constructors/allCallsPrimary2.ide.kt index bca0a907c59..7697921e0e7 100644 --- a/j2k/tests/testData/ast/constructors/allCallsPrimary2.ide.kt +++ b/j2k/tests/testData/ast/constructors/allCallsPrimary2.ide.kt @@ -8,13 +8,13 @@ myArg2 = 0 myArg3 = 0 } class object { -open fun init(arg1 : Int, arg2 : Int, arg3 : Int) : C { +fun init(arg1 : Int, arg2 : Int, arg3 : Int) : C { val __ = C(arg1) __.myArg2 = arg2 __.myArg3 = arg3 return __ } -open fun init(arg1 : Int, arg2 : Int) : C { +fun init(arg1 : Int, arg2 : Int) : C { val __ = C(arg1) __.myArg2 = arg2 __.myArg3 = 0 @@ -24,7 +24,7 @@ return __ } public class User() { class object { -public open fun main() { +public fun main() { val c1 = C.init(100, 100, 100) val c2 = C.init(100, 100) val c3 = C(100) diff --git a/j2k/tests/testData/ast/constructors/customerBuilder.ide.kt b/j2k/tests/testData/ast/constructors/customerBuilder.ide.kt index 903763def90..35aa1813fa5 100644 --- a/j2k/tests/testData/ast/constructors/customerBuilder.ide.kt +++ b/j2k/tests/testData/ast/constructors/customerBuilder.ide.kt @@ -2,10 +2,10 @@ package org.test.customer class Customer(first : String, last : String) { public val _firstName : String public val _lastName : String -public open fun getFirstName() : String { +public fun getFirstName() : String { return _firstName } -public open fun getLastName() : String { +public fun getLastName() : String { return _lastName } private fun doSmthBefore() { @@ -22,21 +22,21 @@ doSmthAfter() class CustomerBuilder() { public var _firstName : String = "Homer" public var _lastName : String = "Simpson" -public open fun WithFirstName(firstName : String) : CustomerBuilder { +public fun WithFirstName(firstName : String) : CustomerBuilder { _firstName = firstName return this } -public open fun WithLastName(lastName : String) : CustomerBuilder { +public fun WithLastName(lastName : String) : CustomerBuilder { _lastName = lastName return this } -public open fun Build() : Customer { +public fun Build() : Customer { return Customer(_firstName, _lastName) } } public class User() { class object { -public open fun main() { +public fun main() { val customer = CustomerBuilder().WithFirstName("Homer").WithLastName("Simpson").Build() System.out.println(customer.getFirstName()) System.out.println(customer.getLastName()) diff --git a/j2k/tests/testData/ast/constructors/genericIdentifier.ide.kt b/j2k/tests/testData/ast/constructors/genericIdentifier.ide.kt index 519189d160c..d1210b5f690 100644 --- a/j2k/tests/testData/ast/constructors/genericIdentifier.ide.kt +++ b/j2k/tests/testData/ast/constructors/genericIdentifier.ide.kt @@ -2,7 +2,7 @@ public class Identifier(_myName : T, _myHasDollar : Boolean) { private val myName : T private var myHasDollar : Boolean = false private var myNullable : Boolean = true -public open fun getName() : T { +public fun getName() : T { return myName } { @@ -10,16 +10,16 @@ myName = _myName myHasDollar = _myHasDollar } class object { -public open fun init(name : T) : Identifier { +public fun init(name : T) : Identifier { val __ = Identifier(name, false) return __ } -public open fun init(name : T, isNullable : Boolean) : Identifier { +public fun init(name : T, isNullable : Boolean) : Identifier { val __ = Identifier(name, false) __.myNullable = isNullable return __ } -public open fun init(name : T, hasDollar : Boolean, isNullable : Boolean) : Identifier { +public fun init(name : T, hasDollar : Boolean, isNullable : Boolean) : Identifier { val __ = Identifier(name, hasDollar) __.myNullable = isNullable return __ @@ -28,7 +28,7 @@ return __ } public class User() { class object { -public open fun main() { +public fun main() { val i1 = Identifier.init("name", false, true) val i2 = Identifier.init("name", false) val i3 = Identifier.init("name") diff --git a/j2k/tests/testData/ast/constructors/identifier.ide.kt b/j2k/tests/testData/ast/constructors/identifier.ide.kt index d54e18064d2..93ff15adcb0 100644 --- a/j2k/tests/testData/ast/constructors/identifier.ide.kt +++ b/j2k/tests/testData/ast/constructors/identifier.ide.kt @@ -2,7 +2,7 @@ public class Identifier(_myName : String, _myHasDollar : Boolean) { private val myName : String private var myHasDollar : Boolean = false private var myNullable : Boolean = true -public open fun getName() : String { +public fun getName() : String { return myName } { @@ -10,16 +10,16 @@ myName = _myName myHasDollar = _myHasDollar } class object { -public open fun init(name : String) : Identifier { +public fun init(name : String) : Identifier { val __ = Identifier(name, false) return __ } -public open fun init(name : String, isNullable : Boolean) : Identifier { +public fun init(name : String, isNullable : Boolean) : Identifier { val __ = Identifier(name, false) __.myNullable = isNullable return __ } -public open fun init(name : String, hasDollar : Boolean, isNullable : Boolean) : Identifier { +public fun init(name : String, hasDollar : Boolean, isNullable : Boolean) : Identifier { val __ = Identifier(name, hasDollar) __.myNullable = isNullable return __ @@ -28,7 +28,7 @@ return __ } public class User() { class object { -public open fun main() { +public fun main() { val i1 = Identifier.init("name", false, true) val i2 = Identifier.init("name", false) val i3 = Identifier.init("name") diff --git a/j2k/tests/testData/ast/constructors/withManyDefaultParams.ide.kt b/j2k/tests/testData/ast/constructors/withManyDefaultParams.ide.kt index 8bd7479650d..260def584f3 100644 --- a/j2k/tests/testData/ast/constructors/withManyDefaultParams.ide.kt +++ b/j2k/tests/testData/ast/constructors/withManyDefaultParams.ide.kt @@ -18,22 +18,22 @@ f = _f g = _g } class object { -public open fun init() : Test { +public fun init() : Test { val __ = Test(0, false, 0.toDouble(), 0.toFloat(), 0, 0, 0, ' ') return __ } -public open fun init(name : String) : Test { +public fun init(name : String) : Test { val __ = Test(foo(name), false, 0.toDouble(), 0.toFloat(), 0, 0, 0, ' ') return __ } -open fun foo(n : String) : String { +fun foo(n : String) : String { return "" } } } public class User() { class object { -public open fun main() { +public fun main() { val t = Test.init("name") } } diff --git a/j2k/tests/testData/ast/function/extendsBaseWhichExtendsObject.ide.kt b/j2k/tests/testData/ast/function/extendsBaseWhichExtendsObject.ide.kt index ba825317b49..bdcdbe7d8e0 100644 --- a/j2k/tests/testData/ast/function/extendsBaseWhichExtendsObject.ide.kt +++ b/j2k/tests/testData/ast/function/extendsBaseWhichExtendsObject.ide.kt @@ -17,19 +17,19 @@ super.finalize() } } class Base() { -public open fun hashCode() : Int { +public fun hashCode() : Int { return System.identityHashCode(this) } -public open fun equals(o : Any) : Boolean { +public fun equals(o : Any) : Boolean { return this.identityEquals(o) } -protected open fun clone() : Any { +protected fun clone() : Any { return super.clone() } -public open fun toString() : String { +public fun toString() : String { return getJavaClass.getName() + '@' + Integer.toHexString(hashCode()) } -protected open fun finalize() { +protected fun finalize() { super.finalize() } } \ No newline at end of file diff --git a/j2k/tests/testData/ast/function/override.ide.kt b/j2k/tests/testData/ast/function/override.ide.kt index 771c4d6e5af..0357d73604f 100644 --- a/j2k/tests/testData/ast/function/override.ide.kt +++ b/j2k/tests/testData/ast/function/override.ide.kt @@ -1,5 +1,5 @@ class A() { -open fun a() { +fun a() { } } class B() : A() { diff --git a/j2k/tests/testData/ast/function/overrideAndOpen.ide.kt b/j2k/tests/testData/ast/function/overrideAndOpen.ide.kt index 5ab854c32cd..8d051af874c 100644 --- a/j2k/tests/testData/ast/function/overrideAndOpen.ide.kt +++ b/j2k/tests/testData/ast/function/overrideAndOpen.ide.kt @@ -1,5 +1,5 @@ class A() { -open fun foo() { +fun foo() { } } class B() : A() { diff --git a/j2k/tests/testData/ast/function/overrideObject.ide.kt b/j2k/tests/testData/ast/function/overrideObject.ide.kt index e3668613e8b..d1095a6ca9c 100644 --- a/j2k/tests/testData/ast/function/overrideObject.ide.kt +++ b/j2k/tests/testData/ast/function/overrideObject.ide.kt @@ -1,18 +1,18 @@ package test class Test() { -public open fun hashCode() : Int { +public fun hashCode() : Int { return System.identityHashCode(this) } -public open fun equals(o : Any) : Boolean { +public fun equals(o : Any) : Boolean { return this.identityEquals(o) } -protected open fun clone() : Any { +protected fun clone() : Any { return super.clone() } -public open fun toString() : String { +public fun toString() : String { return getJavaClass.getName() + '@' + Integer.toHexString(hashCode()) } -protected open fun finalize() { +protected fun finalize() { super.finalize() } } \ No newline at end of file diff --git a/j2k/tests/testData/ast/function/varVararg.ide.kt b/j2k/tests/testData/ast/function/varVararg.ide.kt index 8461608b76a..58c98923519 100644 --- a/j2k/tests/testData/ast/function/varVararg.ide.kt +++ b/j2k/tests/testData/ast/function/varVararg.ide.kt @@ -1,6 +1,6 @@ package demo class Test() { -open fun test(vararg var args : Any) { +fun test(vararg var args : Any) { args = array(1, 2, 3) } } \ No newline at end of file diff --git a/j2k/tests/testData/ast/function/writableParameter.ide.kt b/j2k/tests/testData/ast/function/writableParameter.ide.kt index 9c212535429..2afd03d146a 100644 --- a/j2k/tests/testData/ast/function/writableParameter.ide.kt +++ b/j2k/tests/testData/ast/function/writableParameter.ide.kt @@ -1,6 +1,6 @@ package demo class Test() { -open fun test(var i : Int) : Int { +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 b0d522cfd1b..4b0bca2277f 100644 --- a/j2k/tests/testData/ast/identifier/finalFieldReference.ide.kt +++ b/j2k/tests/testData/ast/identifier/finalFieldReference.ide.kt @@ -4,7 +4,7 @@ class `$`() { } class `$$`(`$$$$` : `$$$$$`) : `$`() { val `$$$` : `$$$$$` -public open fun `$$$$$$`() : `$$$$$` { +public fun `$$$$$$`() : `$$$$$` { return `$$$` } { diff --git a/j2k/tests/testData/ast/issues/arrayLength.ide.kt b/j2k/tests/testData/ast/issues/arrayLength.ide.kt index 8eb3cc0e126..2e7349c1c5d 100644 --- a/j2k/tests/testData/ast/issues/arrayLength.ide.kt +++ b/j2k/tests/testData/ast/issues/arrayLength.ide.kt @@ -1,6 +1,6 @@ class Test() { class object { -public open fun foo(args : Array) : Int { +public 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 3adf7bc1efb..c85a32cbedf 100644 --- a/j2k/tests/testData/ast/issues/comments.ide.kt +++ b/j2k/tests/testData/ast/issues/comments.ide.kt @@ -11,7 +11,7 @@ private var i : Int = 0 /** * This is a function doc comment. */ -public open fun foo() { +public fun foo() { /* This is a function comment */ } } \ No newline at end of file diff --git a/j2k/tests/testData/ast/issues/kt-1048.ide.kt b/j2k/tests/testData/ast/issues/kt-1048.ide.kt index d56e93fd0e4..6a08d106ad7 100644 --- a/j2k/tests/testData/ast/issues/kt-1048.ide.kt +++ b/j2k/tests/testData/ast/issues/kt-1048.ide.kt @@ -2,11 +2,11 @@ import java.util.HashMap class G(t : T) { } public class Java() { -open fun test() { +fun test() { val m = HashMap() m.put(1, 1) } -open fun test2() { +fun test2() { val m = HashMap() val g = G("") val g2 = G("") diff --git a/j2k/tests/testData/ast/issues/kt-1074.ide.kt b/j2k/tests/testData/ast/issues/kt-1074.ide.kt index f3ab137b41c..193a67b19fe 100644 --- a/j2k/tests/testData/ast/issues/kt-1074.ide.kt +++ b/j2k/tests/testData/ast/issues/kt-1074.ide.kt @@ -1,7 +1,7 @@ package demo class Test() { class object { -open fun subListRangeCheck(fromIndex : Int, toIndex : Int, size : Int) { +fun subListRangeCheck(fromIndex : Int, toIndex : Int, size : Int) { if (fromIndex < 0) throw IndexOutOfBoundsException("fromIndex = " + fromIndex) if (toIndex > size) 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 6ff44d4cac2..6263a8e5335 100644 --- a/j2k/tests/testData/ast/issues/kt-543-boxed.ide.kt +++ b/j2k/tests/testData/ast/issues/kt-543-boxed.ide.kt @@ -1,8 +1,8 @@ package demo class Test() { -open fun putInt(i : Int) { +fun putInt(i : Int) { } -open fun test() { +fun test() { val b = 10 putInt(b.toInt()) val b2 = 10 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 6b15ecc6e8e..7ca01a76547 100644 --- a/j2k/tests/testData/ast/issues/kt-543-mixed.ide.kt +++ b/j2k/tests/testData/ast/issues/kt-543-mixed.ide.kt @@ -1,8 +1,8 @@ package demo class Test() { -open fun putInt(i : Int) { +fun putInt(i : Int) { } -open fun test() { +fun test() { val i = 10 putInt(i) } diff --git a/j2k/tests/testData/ast/issues/kt-543.ide.kt b/j2k/tests/testData/ast/issues/kt-543.ide.kt index 2a2d2c990d5..4bec2bddb9e 100644 --- a/j2k/tests/testData/ast/issues/kt-543.ide.kt +++ b/j2k/tests/testData/ast/issues/kt-543.ide.kt @@ -1,8 +1,8 @@ package demo class Test() { -open fun putInt(i : Int) { +fun putInt(i : Int) { } -open fun test() { +fun test() { val b = 10 putInt(b.toInt()) } diff --git a/j2k/tests/testData/ast/issues/kt-638.ide.kt b/j2k/tests/testData/ast/issues/kt-638.ide.kt index 8969cdb3da5..79ac5f76424 100644 --- a/j2k/tests/testData/ast/issues/kt-638.ide.kt +++ b/j2k/tests/testData/ast/issues/kt-638.ide.kt @@ -2,7 +2,7 @@ public class Identifier(_myName : T, _myHasDollar : Boolean) { private val myName : T private var myHasDollar : Boolean = false private var myNullable : Boolean = true -public open fun getName() : T { +public fun getName() : T { return myName } { @@ -10,16 +10,16 @@ myName = _myName myHasDollar = _myHasDollar } class object { -public open fun init(name : T) : Identifier { +public fun init(name : T) : Identifier { val __ = Identifier(name, false) return __ } -public open fun init(name : T, isNullable : Boolean) : Identifier { +public fun init(name : T, isNullable : Boolean) : Identifier { val __ = Identifier(name, false) __.myNullable = isNullable return __ } -public open fun init(name : T, hasDollar : Boolean, isNullable : Boolean) : Identifier { +public fun init(name : T, hasDollar : Boolean, isNullable : Boolean) : Identifier { val __ = Identifier(name, hasDollar) __.myNullable = isNullable return __ @@ -28,7 +28,7 @@ return __ } public class User() { class object { -public open fun main(args : Array) { +public fun main(args : Array) { val i1 = Identifier.init("name", false, true) val i2 = Identifier.init("name", false) val i3 = Identifier.init("name") diff --git a/j2k/tests/testData/ast/issues/kt-696.ide.kt b/j2k/tests/testData/ast/issues/kt-696.ide.kt index 7acb4e75b27..c2a006b66f4 100644 --- a/j2k/tests/testData/ast/issues/kt-696.ide.kt +++ b/j2k/tests/testData/ast/issues/kt-696.ide.kt @@ -1,12 +1,12 @@ package test class Base() { -public open fun hashCode() : Int { +public fun hashCode() : Int { return System.identityHashCode(this) } -public open fun equals(o : Any) : Boolean { +public fun equals(o : Any) : Boolean { return this.identityEquals(o) } -public open fun toString() : String { +public fun toString() : String { return getJavaClass.getName() + '@' + Integer.toHexString(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 9e199940ebc..7c74d13cb0a 100644 --- a/j2k/tests/testData/ast/issues/kt-792-mixed.ide.kt +++ b/j2k/tests/testData/ast/issues/kt-792-mixed.ide.kt @@ -1,6 +1,6 @@ package demo class Test(i : Int) { -open fun test() { +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 1e3b67720dc..c4378be5213 100644 --- a/j2k/tests/testData/ast/issues/kt-792.ide.kt +++ b/j2k/tests/testData/ast/issues/kt-792.ide.kt @@ -1,6 +1,6 @@ package demo class Test(i : Int) { -open fun test() { +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 a77d9cfb00a..d985d167d7a 100644 --- a/j2k/tests/testData/ast/issues/kt-794-mixed.ide.kt +++ b/j2k/tests/testData/ast/issues/kt-794-mixed.ide.kt @@ -1,9 +1,9 @@ package demo class Test() { -open fun getInteger(i : Int) : Int { +fun getInteger(i : Int) : Int { return i } -open fun test() { +fun test() { val i = getInteger(10)!! } } \ No newline at end of file diff --git a/j2k/tests/testData/ast/issues/kt-794.ide.kt b/j2k/tests/testData/ast/issues/kt-794.ide.kt index b06790c38d4..b7067e73b22 100644 --- a/j2k/tests/testData/ast/issues/kt-794.ide.kt +++ b/j2k/tests/testData/ast/issues/kt-794.ide.kt @@ -1,5 +1,5 @@ class Test() { -open fun getInt() : Int { +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 2cd82c1f13f..a50c85da690 100644 --- a/j2k/tests/testData/ast/issues/kt-809-string.ide.kt +++ b/j2k/tests/testData/ast/issues/kt-809-string.ide.kt @@ -10,9 +10,9 @@ var myContainer : Container = Container() class StringContainer(s : String) { } class Test() { -open fun putString(s : String) { +fun putString(s : String) { } -open fun test() { +fun test() { putString(One.myContainer.myString) StringContainer(One.myContainer.myString) } diff --git a/j2k/tests/testData/ast/issues/kt-809.ide.kt b/j2k/tests/testData/ast/issues/kt-809.ide.kt index 30b3df27140..03bc44ea02d 100644 --- a/j2k/tests/testData/ast/issues/kt-809.ide.kt +++ b/j2k/tests/testData/ast/issues/kt-809.ide.kt @@ -10,9 +10,9 @@ var myContainer : Container = Container() class IntContainer(i : Int) { } class Test() { -open fun putInt(i : Int) { +fun putInt(i : Int) { } -open fun test() { +fun test() { putInt(One.myContainer.myInt) IntContainer(One.myContainer.myInt) } 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 26db6222dff..0d71b4c5309 100644 --- a/j2k/tests/testData/ast/issues/kt-820-string.ide.kt +++ b/j2k/tests/testData/ast/issues/kt-820-string.ide.kt @@ -1,6 +1,6 @@ class Test() { class object { -public open fun toFileSystemSafeName(name : String) : String { +public fun toFileSystemSafeName(name : String) : String { val size = name.length() return name } diff --git a/j2k/tests/testData/ast/issues/kt-820.ide.kt b/j2k/tests/testData/ast/issues/kt-820.ide.kt index be4a36eb95e..cc29672c4b3 100644 --- a/j2k/tests/testData/ast/issues/kt-820.ide.kt +++ b/j2k/tests/testData/ast/issues/kt-820.ide.kt @@ -8,7 +8,7 @@ var myContainer : Container = Container() } } class Test() { -open fun test() { +fun test() { val b = One.myContainer.myInt.toByte() } } \ No newline at end of file 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 6c698bd1d68..6cef6156624 100644 --- a/j2k/tests/testData/ast/issues/kt-824-isDir.ide.kt +++ b/j2k/tests/testData/ast/issues/kt-824-isDir.ide.kt @@ -5,7 +5,7 @@ import java.io.File */ public class Test() { class object { -public open fun isDir(parent : File) : Boolean { +public fun isDir(parent : File) : Boolean { if (parent == null || !parent.exists()) { return false diff --git a/j2k/tests/testData/ast/issues/kt-824.ide.kt b/j2k/tests/testData/ast/issues/kt-824.ide.kt index 4f8c7500cff..2148721145f 100644 --- a/j2k/tests/testData/ast/issues/kt-824.ide.kt +++ b/j2k/tests/testData/ast/issues/kt-824.ide.kt @@ -8,7 +8,7 @@ var myContainer : Container = Container() } } class Test() { -open fun test() { +fun test() { if (One.myContainer.myBoolean) System.out.println("Ok") val s = (if (One.myContainer.myBoolean) diff --git a/j2k/tests/testData/ast/issues/kt-828.ide.kt b/j2k/tests/testData/ast/issues/kt-828.ide.kt index 58676533600..4309c3fb376 100644 --- a/j2k/tests/testData/ast/issues/kt-828.ide.kt +++ b/j2k/tests/testData/ast/issues/kt-828.ide.kt @@ -1,5 +1,5 @@ class Test() { -open fun test() { +fun test() { val res = true res = res and false res = res or false diff --git a/j2k/tests/testData/ast/issues/kt-836.ide.kt b/j2k/tests/testData/ast/issues/kt-836.ide.kt index f8bad2f8aa7..81d7931deff 100644 --- a/j2k/tests/testData/ast/issues/kt-836.ide.kt +++ b/j2k/tests/testData/ast/issues/kt-836.ide.kt @@ -10,9 +10,9 @@ this.code = code } } class Base() { -open fun test() { +fun test() { } -open fun toString() : String { +fun toString() : String { return "BASE" } } diff --git a/j2k/tests/testData/ast/issues/kt-837.ide.kt b/j2k/tests/testData/ast/issues/kt-837.ide.kt index 05d4421d8db..4850b2319c2 100644 --- a/j2k/tests/testData/ast/issues/kt-837.ide.kt +++ b/j2k/tests/testData/ast/issues/kt-837.ide.kt @@ -2,7 +2,7 @@ package com.voltvoodoo.saplo4j.model import java.io.Serializable public class Language(code : String) : Serializable { protected var code : String = 0 -public open fun equals(other : Language) : Boolean { +public 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 26995e60674..4fe4a91dad9 100644 --- a/j2k/tests/testData/ast/issues/kt-852.ide.kt +++ b/j2k/tests/testData/ast/issues/kt-852.ide.kt @@ -1,6 +1,6 @@ package demo class Test() { -open fun test() : String { +fun test() : String { val s1 = "" val s2 = "" val s3 = "" diff --git a/j2k/tests/testData/ast/issues/kt-871.ide.kt b/j2k/tests/testData/ast/issues/kt-871.ide.kt index c42467e8e13..803065ebe16 100644 --- a/j2k/tests/testData/ast/issues/kt-871.ide.kt +++ b/j2k/tests/testData/ast/issues/kt-871.ide.kt @@ -1,7 +1,7 @@ package demo class Program() { class object { -public open fun main(args : Array) { +public 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 8f738d5b1da..d776d77d5e0 100644 --- a/j2k/tests/testData/ast/issues/kt-879.ide.kt +++ b/j2k/tests/testData/ast/issues/kt-879.ide.kt @@ -1,6 +1,6 @@ class Test() { class object { -public open fun getInt(i : Int) : Int { +public fun getInt(i : Int) : Int { when (i) { 0 -> { return 0 diff --git a/j2k/tests/testData/ast/issues/kt-893.ide.kt b/j2k/tests/testData/ast/issues/kt-893.ide.kt index 32dea9885e7..afc74707030 100644 --- a/j2k/tests/testData/ast/issues/kt-893.ide.kt +++ b/j2k/tests/testData/ast/issues/kt-893.ide.kt @@ -1,6 +1,6 @@ package demo class Test() { -open fun test() { +fun test() { for (i in 0..10 - 1) { System.out.println(i) } diff --git a/j2k/tests/testData/ast/issues/qualifyStatic.ide.kt b/j2k/tests/testData/ast/issues/qualifyStatic.ide.kt index dd5e31bb5ff..020c9f1f9cb 100644 --- a/j2k/tests/testData/ast/issues/qualifyStatic.ide.kt +++ b/j2k/tests/testData/ast/issues/qualifyStatic.ide.kt @@ -1,6 +1,6 @@ import java.util.Calendar abstract class MyCalendar() : Calendar() { -public open fun foo() { +public fun foo() { val i = Calendar.ALL_STYLES } } \ No newline at end of file diff --git a/j2k/tests/testData/ast/kotlinExclusion/kt-656.ide.kt b/j2k/tests/testData/ast/kotlinExclusion/kt-656.ide.kt index 8b28f03ef86..23d60e397eb 100644 --- a/j2k/tests/testData/ast/kotlinExclusion/kt-656.ide.kt +++ b/j2k/tests/testData/ast/kotlinExclusion/kt-656.ide.kt @@ -3,7 +3,7 @@ class Test() : java.lang.Iterable { public override fun iterator() : java.util.Iterator { return null } -public open fun push(i : java.util.Iterator) : java.util.Iterator { +public fun push(i : java.util.Iterator) : java.util.Iterator { val j = i return j } @@ -12,7 +12,7 @@ class FullTest() : java.lang.Iterable { public override fun iterator() : java.util.Iterator { return null } -public open fun push(i : java.util.Iterator) : java.util.Iterator { +public fun push(i : java.util.Iterator) : java.util.Iterator { val j = i return j } diff --git a/j2k/tests/testData/ast/list/ForEach.ide.kt b/j2k/tests/testData/ast/list/ForEach.ide.kt index 0bbde8ecd55..004e4fee5e0 100644 --- a/j2k/tests/testData/ast/list/ForEach.ide.kt +++ b/j2k/tests/testData/ast/list/ForEach.ide.kt @@ -1,6 +1,6 @@ import java.util.* public class ForEach() { -public open fun test() { +public fun test() { val xs = ArrayList() val ys = LinkedList() for (x in xs) diff --git a/j2k/tests/testData/ast/list/Lists.ide.kt b/j2k/tests/testData/ast/list/Lists.ide.kt index 3c7070fed2f..e4d83caca07 100644 --- a/j2k/tests/testData/ast/list/Lists.ide.kt +++ b/j2k/tests/testData/ast/list/Lists.ide.kt @@ -1,6 +1,6 @@ import java.util.* public class Lists() { -public open fun test() { +public fun test() { val xs = ArrayList() val ys = LinkedList() val zs = ArrayList() diff --git a/j2k/tests/testData/ast/literalExpression/char.ide.kt b/j2k/tests/testData/ast/literalExpression/char.ide.kt index 25dc61fb8ee..de4e7f46fb7 100644 --- a/j2k/tests/testData/ast/literalExpression/char.ide.kt +++ b/j2k/tests/testData/ast/literalExpression/char.ide.kt @@ -1,5 +1,5 @@ class Test() { -open fun test() { +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 9ba84c8e406..1e12af56d36 100644 --- a/j2k/tests/testData/ast/literalExpression/dollarInsideString.ide.kt +++ b/j2k/tests/testData/ast/literalExpression/dollarInsideString.ide.kt @@ -1,6 +1,6 @@ package demo class Test() { -open fun test() { +fun test() { val name = "$$$$" name = name.replaceAll("\\$[0-9]+", "\\$") val c = '$' diff --git a/j2k/tests/testData/ast/literalExpression/endsWithDFL.ide.kt b/j2k/tests/testData/ast/literalExpression/endsWithDFL.ide.kt index f1e2e458056..6067dc39886 100644 --- a/j2k/tests/testData/ast/literalExpression/endsWithDFL.ide.kt +++ b/j2k/tests/testData/ast/literalExpression/endsWithDFL.ide.kt @@ -1,5 +1,5 @@ class Test() { -open fun test() { +fun test() { val l1 = 10 val d1 = 10.0 val f1 = 10.0.toFloat() @@ -7,7 +7,7 @@ val l2 = 10 val d2 = 10.0 val f2 = 10.0.toFloat() } -open fun testBoxed() { +fun testBoxed() { val l1 = 10 val d1 = 10.0 val f1 = 10.0.toFloat() diff --git a/j2k/tests/testData/ast/literalExpression/hex.ide.kt b/j2k/tests/testData/ast/literalExpression/hex.ide.kt index ea4c5ff42df..4950575dd93 100644 --- a/j2k/tests/testData/ast/literalExpression/hex.ide.kt +++ b/j2k/tests/testData/ast/literalExpression/hex.ide.kt @@ -1,5 +1,5 @@ class Test() { -open fun test() { +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 6fe27f16feb..6be3ac79dc9 100644 --- a/j2k/tests/testData/ast/literalExpression/octal.ide.kt +++ b/j2k/tests/testData/ast/literalExpression/octal.ide.kt @@ -1,5 +1,5 @@ class Test() { -open fun test() { +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 d7e1917f2f5..d8a6a5ad6a0 100644 --- a/j2k/tests/testData/ast/literalExpression/trueOrFalse.ide.kt +++ b/j2k/tests/testData/ast/literalExpression/trueOrFalse.ide.kt @@ -1,5 +1,5 @@ class Test() { -open fun test() { +fun test() { val t1 = true val t2 = true val f1 = false diff --git a/j2k/tests/testData/ast/methodCallExpression/genericMethod.ide.kt b/j2k/tests/testData/ast/methodCallExpression/genericMethod.ide.kt index 4f3008e5ec0..ee3e2d7708e 100644 --- a/j2k/tests/testData/ast/methodCallExpression/genericMethod.ide.kt +++ b/j2k/tests/testData/ast/methodCallExpression/genericMethod.ide.kt @@ -1,10 +1,10 @@ package demo class Map() { -open fun put(k : K, v : V) { +fun put(k : K, v : V) { } } class U() { -open fun test() { +fun test() { val m = Map() m.put("10", 10) } diff --git a/j2k/tests/testData/ast/newClassExpression/fullQualifiedName.ide.kt b/j2k/tests/testData/ast/newClassExpression/fullQualifiedName.ide.kt index 21d55d1a2d5..5c8756e96ad 100644 --- a/j2k/tests/testData/ast/newClassExpression/fullQualifiedName.ide.kt +++ b/j2k/tests/testData/ast/newClassExpression/fullQualifiedName.ide.kt @@ -1,6 +1,6 @@ package test class User() { -open fun main() { +fun main() { val list = java.util.LinkedList() } } \ No newline at end of file diff --git a/j2k/tests/testData/ast/newClassExpression/fullQualifiedName2.ide.kt b/j2k/tests/testData/ast/newClassExpression/fullQualifiedName2.ide.kt index 21d55d1a2d5..5c8756e96ad 100644 --- a/j2k/tests/testData/ast/newClassExpression/fullQualifiedName2.ide.kt +++ b/j2k/tests/testData/ast/newClassExpression/fullQualifiedName2.ide.kt @@ -1,6 +1,6 @@ package test class User() { -open fun main() { +fun main() { val list = java.util.LinkedList() } } \ No newline at end of file diff --git a/j2k/tests/testData/ast/newClassExpression/genericClassInvocation.ide.kt b/j2k/tests/testData/ast/newClassExpression/genericClassInvocation.ide.kt index e24f3332565..dc67e78dfd2 100644 --- a/j2k/tests/testData/ast/newClassExpression/genericClassInvocation.ide.kt +++ b/j2k/tests/testData/ast/newClassExpression/genericClassInvocation.ide.kt @@ -1,6 +1,6 @@ import java.util.LinkedList class User() { -open fun main() { +fun main() { val list = LinkedList() } } \ No newline at end of file diff --git a/j2k/tests/testData/ast/newClassExpression/newClassByFullName.ide.kt b/j2k/tests/testData/ast/newClassExpression/newClassByFullName.ide.kt index e0e479ee4da..bb123408a03 100644 --- a/j2k/tests/testData/ast/newClassExpression/newClassByFullName.ide.kt +++ b/j2k/tests/testData/ast/newClassExpression/newClassByFullName.ide.kt @@ -2,7 +2,7 @@ package org.test class Library() { } class User() { -open fun main() { +fun main() { val lib = Library() } } \ No newline at end of file diff --git a/j2k/tests/testData/ast/newClassExpression/newInnerClass.ide.kt b/j2k/tests/testData/ast/newClassExpression/newInnerClass.ide.kt index eae6dc83521..2037cb68f9f 100644 --- a/j2k/tests/testData/ast/newClassExpression/newInnerClass.ide.kt +++ b/j2k/tests/testData/ast/newClassExpression/newInnerClass.ide.kt @@ -4,7 +4,7 @@ class InnerClass() { } } class User() { -open fun main() { +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 22f4fb0b7bc..be88a6c8b13 100644 --- a/j2k/tests/testData/ast/newClassExpression/newListAndNewMember.ide.kt +++ b/j2k/tests/testData/ast/newClassExpression/newListAndNewMember.ide.kt @@ -3,7 +3,7 @@ import java.util.LinkedList class Member() { } class User() { -open fun main() { +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 f05941dfc19..10226c6e2f6 100644 --- a/j2k/tests/testData/ast/newClassExpression/newStaticInnerClass.ide.kt +++ b/j2k/tests/testData/ast/newClassExpression/newStaticInnerClass.ide.kt @@ -6,7 +6,7 @@ class Bar() { } } class User() { -open fun main() { +fun main() { val boo = Foo.Bar() } } \ No newline at end of file diff --git a/j2k/tests/testData/ast/objectLiteral/MyFrame.ide.kt b/j2k/tests/testData/ast/objectLiteral/MyFrame.ide.kt index 9737e7e9500..e2f34d9f251 100644 --- a/j2k/tests/testData/ast/objectLiteral/MyFrame.ide.kt +++ b/j2k/tests/testData/ast/objectLiteral/MyFrame.ide.kt @@ -1,6 +1,6 @@ package demo class WindowAdapter() { -public open fun windowClosing() { +public fun windowClosing() { } } public class Client() : Frame() { 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 8b3abf2189b..64246fef913 100644 --- a/j2k/tests/testData/ast/rawGenerics/kt-540-map.ide.kt +++ b/j2k/tests/testData/ast/rawGenerics/kt-540-map.ide.kt @@ -1,7 +1,7 @@ package demo import java.util.HashMap class Test() { -open fun main() { +fun main() { val commonMap = HashMap() val rawMap = HashMap() val superRawMap = 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 e5214ecbf19..d09cfefbca3 100644 --- a/j2k/tests/testData/ast/rawGenerics/kt-540-rawGenericClass.ide.kt +++ b/j2k/tests/testData/ast/rawGenerics/kt-540-rawGenericClass.ide.kt @@ -5,7 +5,7 @@ System.out.println(e) } } class Test() { -open fun main() { +fun main() { val raw1 = Collection(1) val raw2 = Collection(1) val raw3 = 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 f649033411e..27b9adf3219 100644 --- a/j2k/tests/testData/ast/rawGenerics/kt-540.ide.kt +++ b/j2k/tests/testData/ast/rawGenerics/kt-540.ide.kt @@ -1,7 +1,7 @@ package demo import java.util.LinkedList class Test() { -open fun main() { +fun main() { val common = LinkedList() val raw = LinkedList() val superRaw = LinkedList() diff --git a/j2k/tests/testData/ast/rawGenerics/rawGenericMethod.ide.kt b/j2k/tests/testData/ast/rawGenerics/rawGenericMethod.ide.kt index 04083b7ba36..e9de9a9b2c1 100644 --- a/j2k/tests/testData/ast/rawGenerics/rawGenericMethod.ide.kt +++ b/j2k/tests/testData/ast/rawGenerics/rawGenericMethod.ide.kt @@ -1,10 +1,10 @@ package demo class TestT() { -open fun getT() { +fun getT() { } } class U() { -open fun main() { +fun main() { val t = TestT() t.getT() t.getT() diff --git a/j2k/tests/testData/ast/superExpression/classAdotSuperFoo.ide.kt b/j2k/tests/testData/ast/superExpression/classAdotSuperFoo.ide.kt index 8182885d826..146d212af09 100644 --- a/j2k/tests/testData/ast/superExpression/classAdotSuperFoo.ide.kt +++ b/j2k/tests/testData/ast/superExpression/classAdotSuperFoo.ide.kt @@ -1,9 +1,9 @@ class Base() { -open fun foo() +fun foo() } class A() : Base() { class C() { -open fun test() { +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 442b90d2961..7457890f3a0 100644 --- a/j2k/tests/testData/ast/superExpression/classAextendsB.ide.kt +++ b/j2k/tests/testData/ast/superExpression/classAextendsB.ide.kt @@ -1,5 +1,5 @@ class B(i : Int) { -open fun call() : Int { +fun call() : Int { return 1 } } diff --git a/j2k/tests/testData/ast/switch/comlicatedFallDown.ide.kt b/j2k/tests/testData/ast/switch/comlicatedFallDown.ide.kt index 7d4bd99cd64..be25895bc24 100644 --- a/j2k/tests/testData/ast/switch/comlicatedFallDown.ide.kt +++ b/j2k/tests/testData/ast/switch/comlicatedFallDown.ide.kt @@ -1,10 +1,10 @@ package demo public class SwitchDemo() { class object { -public open fun print(o : Any) { +public fun print(o : Any) { System.out.println(o) } -public open fun test(i : Int) { +public fun test(i : Int) { val monthString = "" when (i) { 1 -> { @@ -80,7 +80,7 @@ monthString = "Invalid month" } System.out.println(monthString) } -public open fun main(args : Array) { +public fun main(args : Array) { for (i in 1..12) test(i) } } diff --git a/j2k/tests/testData/ast/switch/emptySwitch.ide.kt b/j2k/tests/testData/ast/switch/emptySwitch.ide.kt index ea425b49c23..b3d95387ea0 100644 --- a/j2k/tests/testData/ast/switch/emptySwitch.ide.kt +++ b/j2k/tests/testData/ast/switch/emptySwitch.ide.kt @@ -1,6 +1,6 @@ public class NonDefault() { class object { -public open fun main(args : Array) { +public fun main(args : Array) { val value = 3 val valueString = "" when (value) { diff --git a/j2k/tests/testData/ast/switch/fallDown.ide.kt b/j2k/tests/testData/ast/switch/fallDown.ide.kt index 8bcd045f2a8..aa9585ea90e 100644 --- a/j2k/tests/testData/ast/switch/fallDown.ide.kt +++ b/j2k/tests/testData/ast/switch/fallDown.ide.kt @@ -1,7 +1,7 @@ package switch_demo public class SwitchDemo() { class object { -public open fun main(args : Array) { +public fun main(args : Array) { val month = 8 val monthString : String when (month) { diff --git a/j2k/tests/testData/ast/switch/kt-539.ide.kt b/j2k/tests/testData/ast/switch/kt-539.ide.kt index 3bde3e6fd7c..6d80ac75d76 100644 --- a/j2k/tests/testData/ast/switch/kt-539.ide.kt +++ b/j2k/tests/testData/ast/switch/kt-539.ide.kt @@ -1,7 +1,7 @@ package switch_demo public class SwitchDemo() { class object { -public open fun main(args : Array) { +public fun main(args : Array) { val month = 8 val monthString : String when (month) { diff --git a/j2k/tests/testData/ast/switch/nondefault.ide.kt b/j2k/tests/testData/ast/switch/nondefault.ide.kt index 596a3ac9a1a..60f3a4bc558 100644 --- a/j2k/tests/testData/ast/switch/nondefault.ide.kt +++ b/j2k/tests/testData/ast/switch/nondefault.ide.kt @@ -1,6 +1,6 @@ public class NonDefault() { class object { -public open fun main(args : Array) { +public fun main(args : Array) { val value = 3 val valueString = "" when (value) { diff --git a/j2k/tests/testData/ast/thisExpression/classAdotThisFoo.ide.kt b/j2k/tests/testData/ast/thisExpression/classAdotThisFoo.ide.kt index 9934e2648ae..511b9c1f28e 100644 --- a/j2k/tests/testData/ast/thisExpression/classAdotThisFoo.ide.kt +++ b/j2k/tests/testData/ast/thisExpression/classAdotThisFoo.ide.kt @@ -1,10 +1,10 @@ class Base() { -open fun foo() { +fun foo() { } } class A() : Base() { class C() { -open fun test() { +fun test() { this@A.foo() } } diff --git a/j2k/tests/testData/ast/trait/interfaceWithMethodDeclaration.ide.kt b/j2k/tests/testData/ast/trait/interfaceWithMethodDeclaration.ide.kt index 0a901456e3d..2536f3f7190 100644 --- a/j2k/tests/testData/ast/trait/interfaceWithMethodDeclaration.ide.kt +++ b/j2k/tests/testData/ast/trait/interfaceWithMethodDeclaration.ide.kt @@ -1,4 +1,4 @@ trait INode { -open fun getTag() : Tag -open fun toKotlin() : String +fun getTag() : Tag +fun toKotlin() : String } \ No newline at end of file