From 8b45b2678517a02366799b33bc29bc248a4afb88 Mon Sep 17 00:00:00 2001 From: Svetlana Isakova Date: Fri, 30 Mar 2012 14:37:15 +0400 Subject: [PATCH] reordered modifiers order: visibility first in j2k converter --- j2k/src/org/jetbrains/jet/j2k/ast/Class.java | 6 +++--- .../org/jetbrains/jet/j2k/ast/Function.java | 12 +++++------ .../ast/annotations/file/jetbrainsNotNull.kt | 6 +++--- .../testData/ast/class/class/abstractClass.kt | 4 ++-- .../ast/class/class/abstractClassShape.jav | 2 +- .../ast/class/class/abstractClassShape.kt | 8 ++++---- .../testData/ast/class/file/privateInit.kt | 2 +- .../ast/constructors/file/allCallsPrimary.kt | 2 +- .../ast/constructors/file/allCallsPrimary2.kt | 2 +- .../ast/constructors/file/customerBuilder.kt | 16 +++++++-------- .../constructors/file/genericIdentifier.kt | 10 +++++----- .../ast/constructors/file/identifier.kt | 10 +++++----- .../file/withManyDefaultParams.kt | 6 +++--- .../ast/enum/class/runnableImplementation.kt | 2 +- .../file/extendsBaseWhichExtendsObject.kt | 20 +++++++++---------- .../ast/function/file/overrideObject.kt | 10 +++++----- .../identifier/file/finalFieldReference.kt | 2 +- j2k/tests/testData/ast/issues/file/kt-638.kt | 10 +++++----- j2k/tests/testData/ast/issues/file/kt-696.kt | 12 +++++------ .../testData/ast/issues/file/kt-820-string.kt | 2 +- .../testData/ast/issues/file/kt-824-isDir.kt | 2 +- j2k/tests/testData/ast/issues/file/kt-836.kt | 2 +- j2k/tests/testData/ast/issues/file/kt-837.kt | 2 +- j2k/tests/testData/ast/issues/file/kt-871.kt | 2 +- j2k/tests/testData/ast/issues/file/kt-879.kt | 2 +- .../ast/kotlinExclusion/file/kt-656.kt | 8 ++++---- .../expression/newClassWithAnonymousScope.kt | 2 +- .../ast/objectLiteral/file/MyFrame.kt | 6 +++--- .../ast/switch/file/comlicatedFallDown.kt | 6 +++--- .../testData/ast/switch/file/fallDown.kt | 2 +- j2k/tests/testData/ast/switch/file/kt-539.kt | 2 +- 31 files changed, 90 insertions(+), 90 deletions(-) diff --git a/j2k/src/org/jetbrains/jet/j2k/ast/Class.java b/j2k/src/org/jetbrains/jet/j2k/ast/Class.java index 87fffb14724..dc8b9101527 100644 --- a/j2k/src/org/jetbrains/jet/j2k/ast/Class.java +++ b/j2k/src/org/jetbrains/jet/j2k/ast/Class.java @@ -192,12 +192,12 @@ public class Class extends Member { String modifiersToKotlin() { List modifierList = new LinkedList(); + modifierList.add(accessModifier()); + if (needAbstractModifier()) { modifierList.add(Modifier.ABSTRACT); } - modifierList.add(accessModifier()); - if (needOpenModifier()) { modifierList.add(Modifier.OPEN); } @@ -210,7 +210,7 @@ public class Class extends Member { } boolean needOpenModifier() { - return !myModifiers.contains(Modifier.FINAL); + return !myModifiers.contains(Modifier.FINAL) && !myModifiers.contains(Modifier.ABSTRACT); } boolean needAbstractModifier() { diff --git a/j2k/src/org/jetbrains/jet/j2k/ast/Function.java b/j2k/src/org/jetbrains/jet/j2k/ast/Function.java index d79be748f95..bffaf057b8f 100644 --- a/j2k/src/org/jetbrains/jet/j2k/ast/Function.java +++ b/j2k/src/org/jetbrains/jet/j2k/ast/Function.java @@ -88,6 +88,11 @@ public class Function extends Member { String modifiersToKotlin() { List modifierList = new LinkedList(); + String accessModifier = accessModifier(); + if (!accessModifier.isEmpty()) { + modifierList.add(accessModifier); + } + if (isAbstract()) { modifierList.add(Modifier.ABSTRACT); } @@ -96,7 +101,7 @@ public class Function extends Member { modifierList.add(Modifier.OVERRIDE); } - if (!myModifiers.contains(Modifier.OVERRIDE) && !myModifiers.contains(Modifier.FINAL)) { + if (!myModifiers.contains(Modifier.ABSTRACT) && !myModifiers.contains(Modifier.OVERRIDE) && !myModifiers.contains(Modifier.FINAL)) { modifierList.add(Modifier.OPEN); } @@ -104,11 +109,6 @@ public class Function extends Member { modifierList.remove(Modifier.OPEN); } - String accessModifier = accessModifier(); - if (!accessModifier.isEmpty()) { - modifierList.add(accessModifier); - } - if (modifierList.size() > 0) { return AstUtil.join(modifierList, SPACE) + SPACE; } diff --git a/j2k/tests/testData/ast/annotations/file/jetbrainsNotNull.kt b/j2k/tests/testData/ast/annotations/file/jetbrainsNotNull.kt index 0e30c303511..376befca75c 100644 --- a/j2k/tests/testData/ast/annotations/file/jetbrainsNotNull.kt +++ b/j2k/tests/testData/ast/annotations/file/jetbrainsNotNull.kt @@ -1,13 +1,13 @@ package test public open class Test(str : String) { var myStr : String? = "String2" -open public fun sout(str : String) : Unit { +public open fun sout(str : String) : Unit { System.out?.println(str) } -open public fun dummy(str : String) : String { +public open fun dummy(str : String) : String { return str } -open public fun test() : Unit { +public open fun test() : Unit { sout("String") var test : String = "String2" sout(test) diff --git a/j2k/tests/testData/ast/class/class/abstractClass.kt b/j2k/tests/testData/ast/class/class/abstractClass.kt index 7f1ee42ef6f..e7fb293e5af 100644 --- a/j2k/tests/testData/ast/class/class/abstractClass.kt +++ b/j2k/tests/testData/ast/class/class/abstractClass.kt @@ -1,5 +1,5 @@ -abstract open class A() { -abstract open fun callme() : Unit +abstract class A() { +abstract fun callme() : Unit open fun callmetoo() : Unit { print("This is a concrete method.") } diff --git a/j2k/tests/testData/ast/class/class/abstractClassShape.jav b/j2k/tests/testData/ast/class/class/abstractClassShape.jav index 9cf102a0c6b..a6b01569bbb 100644 --- a/j2k/tests/testData/ast/class/class/abstractClassShape.jav +++ b/j2k/tests/testData/ast/class/class/abstractClassShape.jav @@ -8,5 +8,5 @@ abstract class Shape { public String getColor() { return color; } - abstract public double area(); + public abstract double area(); } \ No newline at end of file diff --git a/j2k/tests/testData/ast/class/class/abstractClassShape.kt b/j2k/tests/testData/ast/class/class/abstractClassShape.kt index d04de778464..8525a28f1b8 100644 --- a/j2k/tests/testData/ast/class/class/abstractClassShape.kt +++ b/j2k/tests/testData/ast/class/class/abstractClassShape.kt @@ -1,10 +1,10 @@ -abstract open class Shape() { +abstract class Shape() { public var color : String? = null -open public fun setColor(c : String?) : Unit { +public open fun setColor(c : String?) : Unit { color = c } -open public fun getColor() : String? { +public open fun getColor() : String? { return color } -abstract open public fun area() : Double +public abstract fun area() : Double } \ No newline at end of file diff --git a/j2k/tests/testData/ast/class/file/privateInit.kt b/j2k/tests/testData/ast/class/file/privateInit.kt index 30b43c541d0..dc753237186 100644 --- a/j2k/tests/testData/ast/class/file/privateInit.kt +++ b/j2k/tests/testData/ast/class/file/privateInit.kt @@ -1,4 +1,4 @@ public open class MyClass() { -open private fun init(arg1 : Int, arg2 : Int, arg3 : Int) : Unit { +private open fun init(arg1 : Int, arg2 : Int, arg3 : Int) : Unit { } } \ No newline at end of file diff --git a/j2k/tests/testData/ast/constructors/file/allCallsPrimary.kt b/j2k/tests/testData/ast/constructors/file/allCallsPrimary.kt index 1ba1404eccd..38a7eb1ddee 100644 --- a/j2k/tests/testData/ast/constructors/file/allCallsPrimary.kt +++ b/j2k/tests/testData/ast/constructors/file/allCallsPrimary.kt @@ -12,7 +12,7 @@ return __ } public open class User() { class object { -open public fun main() : Unit { +public open fun main() : Unit { var c1 : C? = C(100, 100, 100) var c2 : C? = C.init(100, 100) var c3 : C? = C.init(100) diff --git a/j2k/tests/testData/ast/constructors/file/allCallsPrimary2.kt b/j2k/tests/testData/ast/constructors/file/allCallsPrimary2.kt index 312f31d82f6..e6f383fa362 100644 --- a/j2k/tests/testData/ast/constructors/file/allCallsPrimary2.kt +++ b/j2k/tests/testData/ast/constructors/file/allCallsPrimary2.kt @@ -24,7 +24,7 @@ return __ } public open class User() { class object { -open public fun main() : Unit { +public open fun main() : Unit { var c1 : C? = C.init(100, 100, 100) var c2 : C? = C.init(100, 100) var c3 : C? = C(100) diff --git a/j2k/tests/testData/ast/constructors/file/customerBuilder.kt b/j2k/tests/testData/ast/constructors/file/customerBuilder.kt index 1c0cd6a13e4..f733dd050f4 100644 --- a/j2k/tests/testData/ast/constructors/file/customerBuilder.kt +++ b/j2k/tests/testData/ast/constructors/file/customerBuilder.kt @@ -2,15 +2,15 @@ package org.test.customer open class Customer(first : String?, last : String?) { public val _firstName : String? public val _lastName : String? -open public fun getFirstName() : String? { +public open fun getFirstName() : String? { return _firstName } -open public fun getLastName() : String? { +public open fun getLastName() : String? { return _lastName } -open private fun doSmthBefore() : Unit { +private open fun doSmthBefore() : Unit { } -open private fun doSmthAfter() : Unit { +private open fun doSmthAfter() : Unit { } { doSmthBefore() @@ -22,21 +22,21 @@ doSmthAfter() open class CustomerBuilder() { public var _firstName : String? = "Homer" public var _lastName : String? = "Simpson" -open public fun WithFirstName(firstName : String?) : CustomerBuilder? { +public open fun WithFirstName(firstName : String?) : CustomerBuilder? { _firstName = firstName return this } -open public fun WithLastName(lastName : String?) : CustomerBuilder? { +public open fun WithLastName(lastName : String?) : CustomerBuilder? { _lastName = lastName return this } -open public fun Build() : Customer? { +public open fun Build() : Customer? { return Customer(_firstName, _lastName) } } public open class User() { class object { -open public fun main() : Unit { +public open fun main() : Unit { var customer : 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/file/genericIdentifier.kt b/j2k/tests/testData/ast/constructors/file/genericIdentifier.kt index 56c0cebadac..d049a45adce 100644 --- a/j2k/tests/testData/ast/constructors/file/genericIdentifier.kt +++ b/j2k/tests/testData/ast/constructors/file/genericIdentifier.kt @@ -2,7 +2,7 @@ public open class Identifier(_myName : T?, _myHasDollar : Boolean) { private val myName : T? = null private var myHasDollar : Boolean = false private var myNullable : Boolean = true -open public fun getName() : T? { +public open fun getName() : T? { return myName } { @@ -10,16 +10,16 @@ myName = _myName myHasDollar = _myHasDollar } class object { -open public fun init(name : T?) : Identifier { +public open fun init(name : T?) : Identifier { val __ = Identifier(name, false) return __ } -open public fun init(name : T?, isNullable : Boolean) : Identifier { +public open fun init(name : T?, isNullable : Boolean) : Identifier { val __ = Identifier(name, false) __.myNullable = isNullable return __ } -open public fun init(name : T?, hasDollar : Boolean, isNullable : Boolean) : Identifier { +public open fun init(name : T?, hasDollar : Boolean, isNullable : Boolean) : Identifier { val __ = Identifier(name, hasDollar) __.myNullable = isNullable return __ @@ -28,7 +28,7 @@ return __ } public open class User() { class object { -open public fun main() : Unit { +public open fun main() : Unit { var i1 : Identifier<*>? = Identifier.init("name", false, true) var i2 : Identifier? = Identifier.init("name", false) var i3 : Identifier? = Identifier.init("name") diff --git a/j2k/tests/testData/ast/constructors/file/identifier.kt b/j2k/tests/testData/ast/constructors/file/identifier.kt index ba304bedf86..3ede387654c 100644 --- a/j2k/tests/testData/ast/constructors/file/identifier.kt +++ b/j2k/tests/testData/ast/constructors/file/identifier.kt @@ -2,7 +2,7 @@ public open class Identifier(_myName : String?, _myHasDollar : Boolean) { private val myName : String? = null private var myHasDollar : Boolean = false private var myNullable : Boolean = true -open public fun getName() : String? { +public open fun getName() : String? { return myName } { @@ -10,16 +10,16 @@ myName = _myName myHasDollar = _myHasDollar } class object { -open public fun init(name : String?) : Identifier { +public open fun init(name : String?) : Identifier { val __ = Identifier(name, false) return __ } -open public fun init(name : String?, isNullable : Boolean) : Identifier { +public open fun init(name : String?, isNullable : Boolean) : Identifier { val __ = Identifier(name, false) __.myNullable = isNullable return __ } -open public fun init(name : String?, hasDollar : Boolean, isNullable : Boolean) : Identifier { +public open fun init(name : String?, hasDollar : Boolean, isNullable : Boolean) : Identifier { val __ = Identifier(name, hasDollar) __.myNullable = isNullable return __ @@ -28,7 +28,7 @@ return __ } public open class User() { class object { -open public fun main() : Unit { +public open fun main() : Unit { var i1 : Identifier? = Identifier.init("name", false, true) var i2 : Identifier? = Identifier.init("name", false) var i3 : Identifier? = Identifier.init("name") diff --git a/j2k/tests/testData/ast/constructors/file/withManyDefaultParams.kt b/j2k/tests/testData/ast/constructors/file/withManyDefaultParams.kt index dcff00bf0c0..434c34a10b2 100644 --- a/j2k/tests/testData/ast/constructors/file/withManyDefaultParams.kt +++ b/j2k/tests/testData/ast/constructors/file/withManyDefaultParams.kt @@ -18,11 +18,11 @@ f = _f g = _g } class object { -open public fun init() : Test { +public open fun init() : Test { val __ = Test(null, false, 0.toDouble(), 0.toFloat(), 0, 0, 0, ' ') return __ } -open public fun init(name : String?) : Test { +public open fun init(name : String?) : Test { val __ = Test(foo(name), false, 0.toDouble(), 0.toFloat(), 0, 0, 0, ' ') return __ } @@ -33,7 +33,7 @@ return "" } public open class User() { class object { -open public fun main() : Unit { +public open fun main() : Unit { var t : Test? = Test.init("name") } } diff --git a/j2k/tests/testData/ast/enum/class/runnableImplementation.kt b/j2k/tests/testData/ast/enum/class/runnableImplementation.kt index dad0edf7366..e3bce19be72 100644 --- a/j2k/tests/testData/ast/enum/class/runnableImplementation.kt +++ b/j2k/tests/testData/ast/enum/class/runnableImplementation.kt @@ -4,7 +4,7 @@ BLACK RED YELLOW BLUE -override public fun run() : Unit { +public override fun run() : Unit { System.out?.println("name()=" + name() + ", toString()=" + toString()) } public fun name() : String { return "" } diff --git a/j2k/tests/testData/ast/function/file/extendsBaseWhichExtendsObject.kt b/j2k/tests/testData/ast/function/file/extendsBaseWhichExtendsObject.kt index eea76d734e4..491c63b601e 100644 --- a/j2k/tests/testData/ast/function/file/extendsBaseWhichExtendsObject.kt +++ b/j2k/tests/testData/ast/function/file/extendsBaseWhichExtendsObject.kt @@ -1,35 +1,35 @@ package test open class Test() : Base() { -override public fun hashCode() : Int { +public override fun hashCode() : Int { return super.hashCode() } -override public fun equals(o : Any?) : Boolean { +public override fun equals(o : Any?) : Boolean { return super.equals(o) } -override protected fun clone() : Any? { +protected override fun clone() : Any? { return super.clone() } -override public fun toString() : String? { +public override fun toString() : String? { return super.toString() } -override protected fun finalize() : Unit { +protected override fun finalize() : Unit { super.finalize() } } open class Base() { -open public fun hashCode() : Int { +public open fun hashCode() : Int { return System.identityHashCode(this) } -open public fun equals(o : Any?) : Boolean { +public open fun equals(o : Any?) : Boolean { return this.identityEquals(o) } -open protected fun clone() : Any? { +protected open fun clone() : Any? { return super.clone() } -open public fun toString() : String? { +public open fun toString() : String? { return getJavaClass.getName() + '@' + Integer.toHexString(hashCode()) } -open protected fun finalize() : Unit { +protected open fun finalize() : Unit { super.finalize() } } \ No newline at end of file diff --git a/j2k/tests/testData/ast/function/file/overrideObject.kt b/j2k/tests/testData/ast/function/file/overrideObject.kt index cdbb7783005..55f017c4656 100644 --- a/j2k/tests/testData/ast/function/file/overrideObject.kt +++ b/j2k/tests/testData/ast/function/file/overrideObject.kt @@ -1,18 +1,18 @@ package test open class Test() { -open public fun hashCode() : Int { +public open fun hashCode() : Int { return System.identityHashCode(this) } -open public fun equals(o : Any?) : Boolean { +public open fun equals(o : Any?) : Boolean { return this.identityEquals(o) } -open protected fun clone() : Any? { +protected open fun clone() : Any? { return super.clone() } -open public fun toString() : String? { +public open fun toString() : String? { return getJavaClass.getName() + '@' + Integer.toHexString(hashCode()) } -open protected fun finalize() : Unit { +protected open fun finalize() : Unit { super.finalize() } } \ No newline at end of file diff --git a/j2k/tests/testData/ast/identifier/file/finalFieldReference.kt b/j2k/tests/testData/ast/identifier/file/finalFieldReference.kt index 9eca4f6c449..3e5423839fb 100644 --- a/j2k/tests/testData/ast/identifier/file/finalFieldReference.kt +++ b/j2k/tests/testData/ast/identifier/file/finalFieldReference.kt @@ -4,7 +4,7 @@ open class `$`() { } open class `$$`(`$$$$` : `$$$$$`?) : `$`() { val `$$$` : `$$$$$`? -open public fun `$$$$$$`() : `$$$$$`? { +public open fun `$$$$$$`() : `$$$$$`? { return `$$$` } { diff --git a/j2k/tests/testData/ast/issues/file/kt-638.kt b/j2k/tests/testData/ast/issues/file/kt-638.kt index 3176bdd81f3..2bdbed1b2d5 100644 --- a/j2k/tests/testData/ast/issues/file/kt-638.kt +++ b/j2k/tests/testData/ast/issues/file/kt-638.kt @@ -2,7 +2,7 @@ public open class Identifier(_myName : T?, _myHasDollar : Boolean) { private val myName : T? = null private var myHasDollar : Boolean = false private var myNullable : Boolean = true -open public fun getName() : T? { +public open fun getName() : T? { return myName } { @@ -10,16 +10,16 @@ myName = _myName myHasDollar = _myHasDollar } class object { -open public fun init(name : T?) : Identifier { +public open fun init(name : T?) : Identifier { val __ = Identifier(name, false) return __ } -open public fun init(name : T?, isNullable : Boolean) : Identifier { +public open fun init(name : T?, isNullable : Boolean) : Identifier { val __ = Identifier(name, false) __.myNullable = isNullable return __ } -open public fun init(name : T?, hasDollar : Boolean, isNullable : Boolean) : Identifier { +public open fun init(name : T?, hasDollar : Boolean, isNullable : Boolean) : Identifier { val __ = Identifier(name, hasDollar) __.myNullable = isNullable return __ @@ -28,7 +28,7 @@ return __ } public open class User() { class object { -open public fun main(args : Array?) : Unit { +public open fun main(args : Array?) : Unit { var i1 : Identifier<*>? = Identifier.init("name", false, true) var i2 : Identifier? = Identifier.init("name", false) var i3 : Identifier? = Identifier.init("name") diff --git a/j2k/tests/testData/ast/issues/file/kt-696.kt b/j2k/tests/testData/ast/issues/file/kt-696.kt index 9369e8ec092..173b4205ee4 100644 --- a/j2k/tests/testData/ast/issues/file/kt-696.kt +++ b/j2k/tests/testData/ast/issues/file/kt-696.kt @@ -1,23 +1,23 @@ package test open class Base() { -open public fun hashCode() : Int { +public open fun hashCode() : Int { return System.identityHashCode(this) } -open public fun equals(o : Any?) : Boolean { +public open fun equals(o : Any?) : Boolean { return this.identityEquals(o) } -open public fun toString() : String? { +public open fun toString() : String? { return getJavaClass.getName() + '@' + Integer.toHexString(hashCode()) } } open class Child() : Base() { -override public fun hashCode() : Int { +public override fun hashCode() : Int { return super.hashCode() } -override public fun equals(o : Any?) : Boolean { +public override fun equals(o : Any?) : Boolean { return super.equals(o) } -override public fun toString() : String? { +public override fun toString() : String? { return super.toString() } } \ No newline at end of file diff --git a/j2k/tests/testData/ast/issues/file/kt-820-string.kt b/j2k/tests/testData/ast/issues/file/kt-820-string.kt index 53c1ae343e2..4e57eeda5ec 100644 --- a/j2k/tests/testData/ast/issues/file/kt-820-string.kt +++ b/j2k/tests/testData/ast/issues/file/kt-820-string.kt @@ -1,6 +1,6 @@ open class Test() { class object { -open public fun toFileSystemSafeName(name : String?) : String? { +public open fun toFileSystemSafeName(name : String?) : String? { var size : Int = name?.length().sure() return name } diff --git a/j2k/tests/testData/ast/issues/file/kt-824-isDir.kt b/j2k/tests/testData/ast/issues/file/kt-824-isDir.kt index 8e899910fd4..3ed40c7ecc3 100644 --- a/j2k/tests/testData/ast/issues/file/kt-824-isDir.kt +++ b/j2k/tests/testData/ast/issues/file/kt-824-isDir.kt @@ -2,7 +2,7 @@ package test import java.io.File public open class Test() { class object { -open public fun isDir(parent : File?) : Boolean { +public open fun isDir(parent : File?) : Boolean { if (parent == null || !parent?.exists()) { return false diff --git a/j2k/tests/testData/ast/issues/file/kt-836.kt b/j2k/tests/testData/ast/issues/file/kt-836.kt index d7ab78c24fd..938269632b7 100644 --- a/j2k/tests/testData/ast/issues/file/kt-836.kt +++ b/j2k/tests/testData/ast/issues/file/kt-836.kt @@ -2,7 +2,7 @@ package com.voltvoodoo.saplo4j.model import java.io.Serializable public open class Language(code : String?) : Serializable { protected var code : String? = null -override public fun toString() : String? { +public override fun toString() : String? { return this.code } { diff --git a/j2k/tests/testData/ast/issues/file/kt-837.kt b/j2k/tests/testData/ast/issues/file/kt-837.kt index 79d431e87c6..07834c5c81e 100644 --- a/j2k/tests/testData/ast/issues/file/kt-837.kt +++ b/j2k/tests/testData/ast/issues/file/kt-837.kt @@ -2,7 +2,7 @@ package com.voltvoodoo.saplo4j.model import java.io.Serializable public open class Language(code : String?) : Serializable { protected var code : String? = null -open public fun equals(other : Language?) : Boolean { +public open fun equals(other : Language?) : Boolean { return other?.toString()?.equals(this.toString()).sure() } { diff --git a/j2k/tests/testData/ast/issues/file/kt-871.kt b/j2k/tests/testData/ast/issues/file/kt-871.kt index 84fd489ca76..69d9bdeef56 100644 --- a/j2k/tests/testData/ast/issues/file/kt-871.kt +++ b/j2k/tests/testData/ast/issues/file/kt-871.kt @@ -1,7 +1,7 @@ package demo open class Program() { class object { -open public fun main(args : Array?) : Unit { +public open fun main(args : Array?) : Unit { System.out?.println("Halo!") } } diff --git a/j2k/tests/testData/ast/issues/file/kt-879.kt b/j2k/tests/testData/ast/issues/file/kt-879.kt index 94d7f7761fb..b52d1403a85 100644 --- a/j2k/tests/testData/ast/issues/file/kt-879.kt +++ b/j2k/tests/testData/ast/issues/file/kt-879.kt @@ -1,6 +1,6 @@ open class Test() { class object { -open public fun getInt(i : Int) : Int { +public open fun getInt(i : Int) : Int { when (i) { 0 -> { return 0 diff --git a/j2k/tests/testData/ast/kotlinExclusion/file/kt-656.kt b/j2k/tests/testData/ast/kotlinExclusion/file/kt-656.kt index 4d8d3ac6e19..244ae7f4495 100644 --- a/j2k/tests/testData/ast/kotlinExclusion/file/kt-656.kt +++ b/j2k/tests/testData/ast/kotlinExclusion/file/kt-656.kt @@ -1,19 +1,19 @@ package demo import java.util.Iterator open class Test() : java.lang.Iterable { -override public fun iterator() : java.util.Iterator? { +public override fun iterator() : java.util.Iterator? { return null } -open public fun push(i : java.util.Iterator?) : java.util.Iterator? { +public open fun push(i : java.util.Iterator?) : java.util.Iterator? { var j : java.util.Iterator? = i return j } } open class FullTest() : java.lang.Iterable { -override public fun iterator() : java.util.Iterator? { +public override fun iterator() : java.util.Iterator? { return null } -open public fun push(i : java.util.Iterator?) : java.util.Iterator? { +public open fun push(i : java.util.Iterator?) : java.util.Iterator? { var j : java.util.Iterator? = i return j } diff --git a/j2k/tests/testData/ast/newClassExpression/expression/newClassWithAnonymousScope.kt b/j2k/tests/testData/ast/newClassExpression/expression/newClassWithAnonymousScope.kt index bfee0514886..29038a298dc 100644 --- a/j2k/tests/testData/ast/newClassExpression/expression/newClassWithAnonymousScope.kt +++ b/j2k/tests/testData/ast/newClassExpression/expression/newClassWithAnonymousScope.kt @@ -1,5 +1,5 @@ object : Runnable() { -override public fun run() : Unit { +public override fun run() : Unit { System.out?.println("Run") } } \ No newline at end of file diff --git a/j2k/tests/testData/ast/objectLiteral/file/MyFrame.kt b/j2k/tests/testData/ast/objectLiteral/file/MyFrame.kt index bb49c2e14d5..270a5e9625f 100644 --- a/j2k/tests/testData/ast/objectLiteral/file/MyFrame.kt +++ b/j2k/tests/testData/ast/objectLiteral/file/MyFrame.kt @@ -1,17 +1,17 @@ package demo open class WindowAdapter() { -open public fun windowClosing() : Unit { +public open fun windowClosing() : Unit { } } public class Client() : Frame() { { var a : WindowAdapter? = object : WindowAdapter() { -override public fun windowClosing() : Unit { +public override fun windowClosing() : Unit { } } addWindowListener(a) addWindowListener(object : WindowAdapter() { -override public fun windowClosing() : Unit { +public override fun windowClosing() : Unit { } }) } diff --git a/j2k/tests/testData/ast/switch/file/comlicatedFallDown.kt b/j2k/tests/testData/ast/switch/file/comlicatedFallDown.kt index 27edb9beab0..60f4dd0466e 100644 --- a/j2k/tests/testData/ast/switch/file/comlicatedFallDown.kt +++ b/j2k/tests/testData/ast/switch/file/comlicatedFallDown.kt @@ -1,10 +1,10 @@ package demo public open class SwitchDemo() { class object { -open public fun print(o : Any?) : Unit { +public open fun print(o : Any?) : Unit { System.out?.println(o) } -open public fun test(i : Int) : Unit { +public open fun test(i : Int) : Unit { var monthString : String? = "" when (i) { 1 -> { @@ -80,7 +80,7 @@ monthString = "Invalid month" } System.out?.println(monthString) } -open public fun main(args : Array?) : Unit { +public open fun main(args : Array?) : Unit { for (i in 1..12) test(i) } } diff --git a/j2k/tests/testData/ast/switch/file/fallDown.kt b/j2k/tests/testData/ast/switch/file/fallDown.kt index 29bc8f10c2b..e27df742d64 100644 --- a/j2k/tests/testData/ast/switch/file/fallDown.kt +++ b/j2k/tests/testData/ast/switch/file/fallDown.kt @@ -1,7 +1,7 @@ package switch_demo public open class SwitchDemo() { class object { -open public fun main(args : Array?) : Unit { +public open fun main(args : Array?) : Unit { var month : Int = 8 var monthString : String? when (month) { diff --git a/j2k/tests/testData/ast/switch/file/kt-539.kt b/j2k/tests/testData/ast/switch/file/kt-539.kt index db23ffbaf04..aa9105769d8 100644 --- a/j2k/tests/testData/ast/switch/file/kt-539.kt +++ b/j2k/tests/testData/ast/switch/file/kt-539.kt @@ -1,7 +1,7 @@ package switch_demo public open class SwitchDemo() { class object { -open public fun main(args : Array?) : Unit { +public open fun main(args : Array?) : Unit { var month : Int = 8 var monthString : String? when (month) {