From 21bc2887d2ab54c73f72a9fb63c5d60b07124e38 Mon Sep 17 00:00:00 2001 From: "Pavel V. Talanov" Date: Tue, 19 Nov 2013 13:50:03 +0400 Subject: [PATCH] Converter: Omit Unit return type Refactor handling of Unit type: extract separate object UnitType --- j2k/src/org/jetbrains/jet/j2k/ast/Function.kt | 17 ++++++++++------- j2k/src/org/jetbrains/jet/j2k/ast/types/Type.kt | 5 +++++ .../jetbrains/jet/j2k/visitors/TypeVisitor.kt | 2 +- .../test/AbstractJavaToKotlinConverterTest.kt | 2 +- .../ast/annotations/jetbrainsNotNull.ide.kt | 4 ++-- .../ast/annotations/jetbrainsNotNull.kt | 4 ++-- .../jetbrainsNotNullChainExpr.ide.kt | 4 ++-- .../annotations/jetbrainsNotNullChainExpr.kt | 4 ++-- .../ast/arrayType/methodArrayArgs.ide.kt | 2 +- .../testData/ast/arrayType/methodArrayArgs.kt | 2 +- .../ast/assignmentExpression/nullability.ide.kt | 2 +- .../ast/assignmentExpression/nullability.kt | 2 +- j2k/tests/testData/ast/boxedType/Boxing.ide.kt | 2 +- j2k/tests/testData/ast/boxedType/Boxing.kt | 2 +- j2k/tests/testData/ast/boxedType/kt-671.ide.kt | 2 +- j2k/tests/testData/ast/boxedType/kt-671.kt | 2 +- .../callChainExpression/libraryFieldCall.ide.kt | 2 +- .../ast/callChainExpression/libraryFieldCall.kt | 2 +- .../libraryMethodCall.ide.kt | 4 ++-- .../callChainExpression/libraryMethodCall.kt | 4 ++-- .../libraryMethodCallFromInstance.ide.kt | 4 ++-- .../libraryMethodCallFromInstance.kt | 4 ++-- .../libraryStringFieldCall.ide.kt | 2 +- .../libraryStringFieldCall.kt | 2 +- .../testData/ast/class/ClassShadowing.ide.kt | 2 +- j2k/tests/testData/ast/class/ClassShadowing.kt | 2 +- .../testData/ast/class/abstractClass.ide.kt | 4 ++-- j2k/tests/testData/ast/class/abstractClass.kt | 4 ++-- .../ast/class/abstractClassShape.ide.kt | 2 +- .../testData/ast/class/abstractClassShape.kt | 2 +- .../ast/class/classWithEmptyMethods.ide.kt | 2 +- .../testData/ast/class/classWithEmptyMethods.kt | 2 +- j2k/tests/testData/ast/class/kt-639.ide.kt | 2 +- j2k/tests/testData/ast/class/kt-639.kt | 2 +- j2k/tests/testData/ast/class/privateInit.ide.kt | 2 +- j2k/tests/testData/ast/class/privateInit.kt | 2 +- .../ast/constructors/allCallsPrimary.ide.kt | 2 +- .../ast/constructors/allCallsPrimary.kt | 2 +- .../ast/constructors/allCallsPrimary2.ide.kt | 2 +- .../ast/constructors/allCallsPrimary2.kt | 2 +- .../ast/constructors/customerBuilder.ide.kt | 6 +++--- .../ast/constructors/customerBuilder.kt | 6 +++--- .../ast/constructors/genericIdentifier.ide.kt | 2 +- .../ast/constructors/genericIdentifier.kt | 2 +- .../testData/ast/constructors/identifier.ide.kt | 2 +- .../testData/ast/constructors/identifier.kt | 2 +- .../constructors/withManyDefaultParams.ide.kt | 2 +- .../ast/constructors/withManyDefaultParams.kt | 2 +- .../ast/enum/enumConstantIsNotNull.ide.kt | 2 +- .../testData/ast/enum/enumConstantIsNotNull.kt | 2 +- .../ast/enum/runnableImplementation.ide.kt | 2 +- .../testData/ast/enum/runnableImplementation.kt | 2 +- .../ast/function/emptyVoidMethod.ide.kt | 2 +- .../testData/ast/function/emptyVoidMethod.kt | 2 +- .../extendsBaseWhichExtendsObject.ide.kt | 4 ++-- .../function/extendsBaseWhichExtendsObject.kt | 4 ++-- .../ast/function/functionInFinalClass.ide.kt | 2 +- .../ast/function/functionInFinalClass.kt | 2 +- j2k/tests/testData/ast/function/internal.ide.kt | 2 +- j2k/tests/testData/ast/function/internal.kt | 2 +- j2k/tests/testData/ast/function/main.ide.kt | 2 +- j2k/tests/testData/ast/function/main.kt | 2 +- j2k/tests/testData/ast/function/override.ide.kt | 4 ++-- j2k/tests/testData/ast/function/override.kt | 4 ++-- .../ast/function/overrideAndOpen.ide.kt | 6 +++--- .../testData/ast/function/overrideAndOpen.kt | 6 +++--- .../testData/ast/function/overrideObject.ide.kt | 2 +- .../testData/ast/function/overrideObject.kt | 2 +- .../ast/function/ownGenericParam.ide.kt | 2 +- .../testData/ast/function/ownGenericParam.kt | 2 +- .../ast/function/ownSeveralGenericParams.ide.kt | 2 +- .../ast/function/ownSeveralGenericParams.kt | 2 +- j2k/tests/testData/ast/function/private.ide.kt | 2 +- j2k/tests/testData/ast/function/private.kt | 2 +- .../testData/ast/function/protected.ide.kt | 2 +- j2k/tests/testData/ast/function/protected.kt | 2 +- j2k/tests/testData/ast/function/public.ide.kt | 2 +- j2k/tests/testData/ast/function/public.kt | 2 +- .../testData/ast/function/varVararg.ide.kt | 2 +- j2k/tests/testData/ast/function/varVararg.kt | 2 +- .../ast/inProjectionType/methodParams.ide.kt | 2 +- .../ast/inProjectionType/methodParams.kt | 2 +- j2k/tests/testData/ast/issues/comments.ide.kt | 2 +- j2k/tests/testData/ast/issues/comments.kt | 2 +- j2k/tests/testData/ast/issues/kt-1048.ide.kt | 4 ++-- j2k/tests/testData/ast/issues/kt-1048.kt | 4 ++-- j2k/tests/testData/ast/issues/kt-1074.ide.kt | 2 +- j2k/tests/testData/ast/issues/kt-1074.kt | 2 +- .../testData/ast/issues/kt-543-boxed.ide.kt | 4 ++-- j2k/tests/testData/ast/issues/kt-543-boxed.kt | 4 ++-- .../testData/ast/issues/kt-543-mixed.ide.kt | 4 ++-- j2k/tests/testData/ast/issues/kt-543-mixed.kt | 4 ++-- j2k/tests/testData/ast/issues/kt-543.ide.kt | 4 ++-- j2k/tests/testData/ast/issues/kt-543.kt | 4 ++-- j2k/tests/testData/ast/issues/kt-638.ide.kt | 2 +- j2k/tests/testData/ast/issues/kt-638.kt | 2 +- .../testData/ast/issues/kt-792-mixed.ide.kt | 2 +- j2k/tests/testData/ast/issues/kt-792-mixed.kt | 2 +- j2k/tests/testData/ast/issues/kt-792.ide.kt | 2 +- j2k/tests/testData/ast/issues/kt-792.kt | 2 +- .../testData/ast/issues/kt-794-mixed.ide.kt | 2 +- j2k/tests/testData/ast/issues/kt-794-mixed.kt | 2 +- .../testData/ast/issues/kt-809-string.ide.kt | 4 ++-- j2k/tests/testData/ast/issues/kt-809-string.kt | 4 ++-- j2k/tests/testData/ast/issues/kt-809.ide.kt | 4 ++-- j2k/tests/testData/ast/issues/kt-809.kt | 4 ++-- j2k/tests/testData/ast/issues/kt-820.ide.kt | 2 +- j2k/tests/testData/ast/issues/kt-820.kt | 2 +- j2k/tests/testData/ast/issues/kt-824.ide.kt | 2 +- j2k/tests/testData/ast/issues/kt-824.kt | 2 +- j2k/tests/testData/ast/issues/kt-828.ide.kt | 2 +- j2k/tests/testData/ast/issues/kt-828.kt | 2 +- j2k/tests/testData/ast/issues/kt-836.ide.kt | 4 ++-- j2k/tests/testData/ast/issues/kt-836.kt | 4 ++-- j2k/tests/testData/ast/issues/kt-871.ide.kt | 2 +- j2k/tests/testData/ast/issues/kt-871.kt | 2 +- j2k/tests/testData/ast/issues/kt-893.ide.kt | 2 +- j2k/tests/testData/ast/issues/kt-893.kt | 2 +- .../testData/ast/issues/qualifyStatic.ide.kt | 2 +- j2k/tests/testData/ast/issues/qualifyStatic.kt | 2 +- j2k/tests/testData/ast/list/ForEach.ide.kt | 2 +- j2k/tests/testData/ast/list/ForEach.kt | 2 +- j2k/tests/testData/ast/list/Lists.ide.kt | 2 +- j2k/tests/testData/ast/list/Lists.kt | 2 +- .../testData/ast/literalExpression/char.ide.kt | 2 +- .../testData/ast/literalExpression/char.kt | 2 +- .../literalExpression/dollarInsideString.ide.kt | 2 +- .../ast/literalExpression/dollarInsideString.kt | 2 +- .../ast/literalExpression/endsWithDFL.ide.kt | 4 ++-- .../ast/literalExpression/endsWithDFL.kt | 4 ++-- .../testData/ast/literalExpression/hex.ide.kt | 2 +- j2k/tests/testData/ast/literalExpression/hex.kt | 2 +- .../testData/ast/literalExpression/octal.ide.kt | 2 +- .../testData/ast/literalExpression/octal.kt | 2 +- .../ast/literalExpression/trueOrFalse.ide.kt | 2 +- .../ast/literalExpression/trueOrFalse.kt | 2 +- .../methodCallExpression/genericMethod.ide.kt | 4 ++-- .../ast/methodCallExpression/genericMethod.kt | 4 ++-- .../testData/ast/misc/intNullability.ide.kt | 2 +- j2k/tests/testData/ast/misc/intNullability.kt | 2 +- .../newClassExpression/fullQualifiedName.ide.kt | 2 +- .../ast/newClassExpression/fullQualifiedName.kt | 2 +- .../fullQualifiedName2.ide.kt | 2 +- .../newClassExpression/fullQualifiedName2.kt | 2 +- .../genericClassInvocation.ide.kt | 2 +- .../genericClassInvocation.kt | 2 +- .../newClassByFullName.ide.kt | 2 +- .../newClassExpression/newClassByFullName.kt | 2 +- .../newClassWithAnonymousScope.ide.kt | 2 +- .../newClassWithAnonymousScope.kt | 2 +- .../ast/newClassExpression/newInnerClass.ide.kt | 2 +- .../ast/newClassExpression/newInnerClass.kt | 2 +- .../newListAndNewMember.ide.kt | 2 +- .../newClassExpression/newListAndNewMember.kt | 2 +- .../newStaticInnerClass.ide.kt | 2 +- .../newClassExpression/newStaticInnerClass.kt | 2 +- .../testData/ast/objectLiteral/MyFrame.ide.kt | 6 +++--- j2k/tests/testData/ast/objectLiteral/MyFrame.kt | 6 +++--- .../ast/outProjectionType/methodParams.ide.kt | 2 +- .../ast/outProjectionType/methodParams.kt | 2 +- .../testData/ast/rawGenerics/kt-540-map.ide.kt | 2 +- .../testData/ast/rawGenerics/kt-540-map.kt | 2 +- .../rawGenerics/kt-540-rawGenericClass.ide.kt | 2 +- .../ast/rawGenerics/kt-540-rawGenericClass.kt | 2 +- .../testData/ast/rawGenerics/kt-540.ide.kt | 2 +- j2k/tests/testData/ast/rawGenerics/kt-540.kt | 2 +- .../ast/rawGenerics/rawGenericMethod.ide.kt | 4 ++-- .../ast/rawGenerics/rawGenericMethod.kt | 4 ++-- .../ast/starProjectionType/methodParams.ide.kt | 2 +- .../ast/starProjectionType/methodParams.kt | 2 +- .../superExpression/classAdotSuperFoo.ide.kt | 4 ++-- .../ast/superExpression/classAdotSuperFoo.kt | 4 ++-- .../ast/switch/comlicatedFallDown.ide.kt | 6 +++--- .../testData/ast/switch/comlicatedFallDown.kt | 6 +++--- .../testData/ast/switch/emptySwitch.ide.kt | 2 +- j2k/tests/testData/ast/switch/emptySwitch.kt | 2 +- j2k/tests/testData/ast/switch/fallDown.ide.kt | 2 +- j2k/tests/testData/ast/switch/fallDown.kt | 2 +- j2k/tests/testData/ast/switch/kt-539.ide.kt | 2 +- j2k/tests/testData/ast/switch/kt-539.kt | 2 +- j2k/tests/testData/ast/switch/nondefault.ide.kt | 2 +- j2k/tests/testData/ast/switch/nondefault.kt | 2 +- .../ast/thisExpression/classAdotThisFoo.ide.kt | 4 ++-- .../ast/thisExpression/classAdotThisFoo.kt | 4 ++-- .../ast/varArg/ellipsisTypeSingleParams.ide.kt | 2 +- .../ast/varArg/ellipsisTypeSingleParams.kt | 2 +- 186 files changed, 253 insertions(+), 245 deletions(-) diff --git a/j2k/src/org/jetbrains/jet/j2k/ast/Function.kt b/j2k/src/org/jetbrains/jet/j2k/ast/Function.kt index 00082c1ea1d..a29866491b1 100644 --- a/j2k/src/org/jetbrains/jet/j2k/ast/Function.kt +++ b/j2k/src/org/jetbrains/jet/j2k/ast/Function.kt @@ -18,6 +18,7 @@ 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 public open class Function(val name: Identifier, val docComments: List, @@ -45,7 +46,7 @@ public open class Function(val name: Identifier, return "" } - open fun modifiersToKotlin(): String { + private fun modifiersToKotlin(): String { val modifierList = ArrayList() val accessModifier = accessModifier() if (accessModifier != null) { @@ -74,13 +75,15 @@ public open class Function(val name: Identifier, return modifierList.toKotlin() } + private fun returnTypeToKotlin() = if (!`type`.isUnit()) " : " + `type`.toKotlin() + " " else " " + public override fun toKotlin(): String { return docComments.toKotlin("\n", "", "\n") + - modifiersToKotlin() + - "fun " + name.toKotlin() + - typeParametersToKotlin() + - "(" + params.toKotlin() + ") : " + - `type`.toKotlin() + " " + typeParameterWhereToKotlin() + - block?.toKotlin() + modifiersToKotlin() + + "fun ${name.toKotlin()}${typeParametersToKotlin()}" + + "(${params.toKotlin()})" + + returnTypeToKotlin() + + typeParameterWhereToKotlin() + + block?.toKotlin() } } diff --git a/j2k/src/org/jetbrains/jet/j2k/ast/types/Type.kt b/j2k/src/org/jetbrains/jet/j2k/ast/types/Type.kt index 7ea56872546..e819632d192 100644 --- a/j2k/src/org/jetbrains/jet/j2k/ast/types/Type.kt +++ b/j2k/src/org/jetbrains/jet/j2k/ast/types/Type.kt @@ -20,6 +20,7 @@ import org.jetbrains.jet.j2k.ast.Element import org.jetbrains.jet.j2k.Converter public fun Type.isPrimitive(): Boolean = this is PrimitiveType +public fun Type.isUnit(): Boolean = this == UnitType public abstract class MayBeNullableType(nullable: Boolean, val converter: Converter): Type { override public val nullable: Boolean = !converter.settings.forceNotNullTypes && nullable @@ -30,6 +31,10 @@ public trait NotNullType : Type { get() = false } +public object UnitType: NotNullType { + override fun toKotlin() = "Unit" +} + public trait Type : Element { public val nullable: Boolean diff --git a/j2k/src/org/jetbrains/jet/j2k/visitors/TypeVisitor.kt b/j2k/src/org/jetbrains/jet/j2k/visitors/TypeVisitor.kt index 0272eda6e36..31b4ea10e2b 100644 --- a/j2k/src/org/jetbrains/jet/j2k/visitors/TypeVisitor.kt +++ b/j2k/src/org/jetbrains/jet/j2k/visitors/TypeVisitor.kt @@ -38,7 +38,7 @@ public open class TypeVisitor(private val myConverter: Converter) : PsiTypeVisit public override fun visitPrimitiveType(primitiveType: PsiPrimitiveType?): Type { val name: String = primitiveType?.getCanonicalText()!! if (name == "void") { - myResult = PrimitiveType(Identifier("Unit")) + myResult = UnitType } else if (PRIMITIVE_TYPES_NAMES.contains(name)) { myResult = PrimitiveType(Identifier(StringUtil.capitalize(name))) diff --git a/j2k/tests/test/org/jetbrains/jet/j2k/test/AbstractJavaToKotlinConverterTest.kt b/j2k/tests/test/org/jetbrains/jet/j2k/test/AbstractJavaToKotlinConverterTest.kt index 7da823e2ffc..9ddd7cb873c 100644 --- a/j2k/tests/test/org/jetbrains/jet/j2k/test/AbstractJavaToKotlinConverterTest.kt +++ b/j2k/tests/test/org/jetbrains/jet/j2k/test/AbstractJavaToKotlinConverterTest.kt @@ -91,7 +91,7 @@ public abstract class AbstractJavaToKotlinConverterTest(val kotlinFileExtension: private fun statementToKotlin(converter: Converter, text: String?): String { var result = methodToKotlin(converter, "void main() {" + text + "}") val pos = result.lastIndexOf("}") - result = result.substring(0, pos).replaceFirst("fun main\\(\\) : Unit \\{", "") + result = result.substring(0, pos).replaceFirst("fun main\\(\\) \\{", "") return prettify(result) } diff --git a/j2k/tests/testData/ast/annotations/jetbrainsNotNull.ide.kt b/j2k/tests/testData/ast/annotations/jetbrainsNotNull.ide.kt index 1222ec13ce0..862da16372f 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 open class Test(str : String) { var myStr : String = "String2" -public open fun sout(str : String) : Unit { +public open fun sout(str : String) { System.out.println(str) } public open fun dummy(str : String) : String { return str } -public open fun test() : Unit { +public open fun test() { sout("String") val test = "String2" sout(test) diff --git a/j2k/tests/testData/ast/annotations/jetbrainsNotNull.kt b/j2k/tests/testData/ast/annotations/jetbrainsNotNull.kt index 1639842a602..95a3ab53310 100644 --- a/j2k/tests/testData/ast/annotations/jetbrainsNotNull.kt +++ b/j2k/tests/testData/ast/annotations/jetbrainsNotNull.kt @@ -1,13 +1,13 @@ package test public open class Test(str : String) { var myStr : String = "String2" -public open fun sout(str : String) : Unit { +public open fun sout(str : String) { System.out?.println(str) } public open fun dummy(str : String) : String { return str } -public open fun test() : Unit { +public open fun test() { sout("String") var test : String = "String2" sout(test) diff --git a/j2k/tests/testData/ast/annotations/jetbrainsNotNullChainExpr.ide.kt b/j2k/tests/testData/ast/annotations/jetbrainsNotNullChainExpr.ide.kt index e219cdccfd7..a8157b37a38 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 open class Foo() { -open fun execute() : Unit { +open fun execute() { } } open class Bar() { @@ -8,7 +8,7 @@ var fooNotNull : Foo = Foo() var fooNullable : Foo = null } open class Test() { -public open fun test(barNotNull : Bar, barNullable : Bar) : Unit { +public open fun test(barNotNull : Bar, barNullable : Bar) { barNotNull.fooNotNull.execute() barNotNull.fooNullable.execute() barNullable.fooNotNull.execute() diff --git a/j2k/tests/testData/ast/annotations/jetbrainsNotNullChainExpr.kt b/j2k/tests/testData/ast/annotations/jetbrainsNotNullChainExpr.kt index 8f43666f096..d0711dba0c2 100644 --- a/j2k/tests/testData/ast/annotations/jetbrainsNotNullChainExpr.kt +++ b/j2k/tests/testData/ast/annotations/jetbrainsNotNullChainExpr.kt @@ -1,6 +1,6 @@ package test open class Foo() { -open fun execute() : Unit { +open fun execute() { } } open class Bar() { @@ -8,7 +8,7 @@ var fooNotNull : Foo = Foo() var fooNullable : Foo? = null } open class Test() { -public open fun test(barNotNull : Bar, barNullable : Bar?) : Unit { +public open fun test(barNotNull : Bar, barNullable : Bar?) { barNotNull.fooNotNull.execute() barNotNull.fooNullable?.execute() barNullable?.fooNotNull?.execute() diff --git a/j2k/tests/testData/ast/arrayType/methodArrayArgs.ide.kt b/j2k/tests/testData/ast/arrayType/methodArrayArgs.ide.kt index b111f9219a9..378e20f7bae 100644 --- a/j2k/tests/testData/ast/arrayType/methodArrayArgs.ide.kt +++ b/j2k/tests/testData/ast/arrayType/methodArrayArgs.ide.kt @@ -1,2 +1,2 @@ -fun fromArrayToCollection(a : Array) : Unit { +fun fromArrayToCollection(a : Array) { } \ No newline at end of file diff --git a/j2k/tests/testData/ast/arrayType/methodArrayArgs.kt b/j2k/tests/testData/ast/arrayType/methodArrayArgs.kt index b095e2dd099..6e3043e220d 100644 --- a/j2k/tests/testData/ast/arrayType/methodArrayArgs.kt +++ b/j2k/tests/testData/ast/arrayType/methodArrayArgs.kt @@ -1,2 +1,2 @@ -fun fromArrayToCollection(a : Array?) : Unit { +fun fromArrayToCollection(a : Array?) { } \ No newline at end of file diff --git a/j2k/tests/testData/ast/assignmentExpression/nullability.ide.kt b/j2k/tests/testData/ast/assignmentExpression/nullability.ide.kt index b3308b2ebad..b5842b10aa0 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 open class Foo() { -open fun foo(o : BitSet) : Unit { +open fun foo(o : BitSet) { val o2 = o val foo = 0 foo = o2.size() diff --git a/j2k/tests/testData/ast/assignmentExpression/nullability.kt b/j2k/tests/testData/ast/assignmentExpression/nullability.kt index f54e56b0b80..97a0856def2 100644 --- a/j2k/tests/testData/ast/assignmentExpression/nullability.kt +++ b/j2k/tests/testData/ast/assignmentExpression/nullability.kt @@ -1,6 +1,6 @@ import java.util.BitSet open class Foo() { -open fun foo(o : BitSet?) : Unit { +open fun foo(o : BitSet?) { var o2 : BitSet? = o var foo : Int = 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 ea407cbe835..9c028beb905 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 open class Boxing() { -open fun test() : Unit { +open fun test() { val i = 0 val n = 0.0.toFloat() i = 1 diff --git a/j2k/tests/testData/ast/boxedType/Boxing.kt b/j2k/tests/testData/ast/boxedType/Boxing.kt index 55612e18a7b..6084d021a30 100644 --- a/j2k/tests/testData/ast/boxedType/Boxing.kt +++ b/j2k/tests/testData/ast/boxedType/Boxing.kt @@ -1,6 +1,6 @@ import java.util.ArrayList open class Boxing() { -open fun test() : Unit { +open fun test() { var i : Int? = 0 var n : Number? = 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 35dabbcaebf..4d635df78fc 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 open class Test() { -open fun test() : Unit { +open fun test() { val i = Integer.valueOf(100) val s = 3 val ss = java.lang.Short.valueOf(s) diff --git a/j2k/tests/testData/ast/boxedType/kt-671.kt b/j2k/tests/testData/ast/boxedType/kt-671.kt index bb5c163ee24..111d4ed2437 100644 --- a/j2k/tests/testData/ast/boxedType/kt-671.kt +++ b/j2k/tests/testData/ast/boxedType/kt-671.kt @@ -1,6 +1,6 @@ package demo open class Test() { -open fun test() : Unit { +open fun test() { var i : Int? = Integer.valueOf(100) var s : Short = 3 var ss : Short? = 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 ea0692f134d..834d14e9766 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 } } open class User() { -open fun main() : Unit { +open fun main() { Library.ourOut.print() } } \ No newline at end of file diff --git a/j2k/tests/testData/ast/callChainExpression/libraryFieldCall.kt b/j2k/tests/testData/ast/callChainExpression/libraryFieldCall.kt index 48516916f25..ffac70016b3 100644 --- a/j2k/tests/testData/ast/callChainExpression/libraryFieldCall.kt +++ b/j2k/tests/testData/ast/callChainExpression/libraryFieldCall.kt @@ -4,7 +4,7 @@ val ourOut : java.io.PrintStream? = null } } open class User() { -open fun main() : Unit { +open 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 59eb308bf6e..09228a77865 100644 --- a/j2k/tests/testData/ast/callChainExpression/libraryMethodCall.ide.kt +++ b/j2k/tests/testData/ast/callChainExpression/libraryMethodCall.ide.kt @@ -1,6 +1,6 @@ open class Library() { class object { -open fun call() : Unit { +open fun call() { } open fun getString() : String { return "" @@ -8,7 +8,7 @@ return "" } } open class User() { -open fun main() : Unit { +open fun main() { Library.call() Library.getString().isEmpty() } diff --git a/j2k/tests/testData/ast/callChainExpression/libraryMethodCall.kt b/j2k/tests/testData/ast/callChainExpression/libraryMethodCall.kt index 3c0ee4c68a4..200cf33c69b 100644 --- a/j2k/tests/testData/ast/callChainExpression/libraryMethodCall.kt +++ b/j2k/tests/testData/ast/callChainExpression/libraryMethodCall.kt @@ -1,6 +1,6 @@ open class Library() { class object { -open fun call() : Unit { +open fun call() { } open fun getString() : String? { return "" @@ -8,7 +8,7 @@ return "" } } open class User() { -open fun main() : Unit { +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 2704eb95a00..2ff5c4cf4d4 100644 --- a/j2k/tests/testData/ast/callChainExpression/libraryMethodCallFromInstance.ide.kt +++ b/j2k/tests/testData/ast/callChainExpression/libraryMethodCallFromInstance.ide.kt @@ -1,12 +1,12 @@ open class Library() { -open fun call() : Unit { +open fun call() { } open fun getString() : String { return "" } } open class User() { -open fun main() : Unit { +open fun main() { val lib = Library() lib.call() lib.getString().isEmpty() diff --git a/j2k/tests/testData/ast/callChainExpression/libraryMethodCallFromInstance.kt b/j2k/tests/testData/ast/callChainExpression/libraryMethodCallFromInstance.kt index b8a02f01152..2615cc44f80 100644 --- a/j2k/tests/testData/ast/callChainExpression/libraryMethodCallFromInstance.kt +++ b/j2k/tests/testData/ast/callChainExpression/libraryMethodCallFromInstance.kt @@ -1,12 +1,12 @@ open class Library() { -open fun call() : Unit { +open fun call() { } open fun getString() : String? { return "" } } open class User() { -open fun main() : Unit { +open fun main() { var lib : Library? = 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 fe3c12aee65..7293c784819 100644 --- a/j2k/tests/testData/ast/callChainExpression/libraryStringFieldCall.ide.kt +++ b/j2k/tests/testData/ast/callChainExpression/libraryStringFieldCall.ide.kt @@ -2,7 +2,7 @@ open class Library() { public val myString : String = 0 } open class User() { -open fun main() : Unit { +open fun main() { Library.myString.isEmpty() } } \ No newline at end of file diff --git a/j2k/tests/testData/ast/callChainExpression/libraryStringFieldCall.kt b/j2k/tests/testData/ast/callChainExpression/libraryStringFieldCall.kt index 9e0de14ec3c..06d3d5b012d 100644 --- a/j2k/tests/testData/ast/callChainExpression/libraryStringFieldCall.kt +++ b/j2k/tests/testData/ast/callChainExpression/libraryStringFieldCall.kt @@ -2,7 +2,7 @@ open class Library() { public val myString : String? = null } open class User() { -open fun main() : Unit { +open 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 cf46ffc1809..033499c3a4e 100644 --- a/j2k/tests/testData/ast/class/ClassShadowing.ide.kt +++ b/j2k/tests/testData/ast/class/ClassShadowing.ide.kt @@ -8,7 +8,7 @@ return Short() } open class Test() { class object { -public open fun test() : Unit { +public open fun test() { test.Short.valueOf("1") test.Short.valueOf("1") java.lang.Short.valueOf("1") diff --git a/j2k/tests/testData/ast/class/ClassShadowing.kt b/j2k/tests/testData/ast/class/ClassShadowing.kt index e237408d1a5..6be500e4bf5 100644 --- a/j2k/tests/testData/ast/class/ClassShadowing.kt +++ b/j2k/tests/testData/ast/class/ClassShadowing.kt @@ -8,7 +8,7 @@ return Short() } open class Test() { class object { -public open fun test() : Unit { +public open 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 e7fb293e5af..f0513d57cf0 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() : Unit -open fun callmetoo() : Unit { +abstract fun callme() +open fun callmetoo() { print("This is a concrete method.") } } \ No newline at end of file diff --git a/j2k/tests/testData/ast/class/abstractClass.kt b/j2k/tests/testData/ast/class/abstractClass.kt index e7fb293e5af..f0513d57cf0 100644 --- a/j2k/tests/testData/ast/class/abstractClass.kt +++ b/j2k/tests/testData/ast/class/abstractClass.kt @@ -1,6 +1,6 @@ abstract class A() { -abstract fun callme() : Unit -open fun callmetoo() : Unit { +abstract fun callme() +open 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 33a191ed8d8..f8aa1f32a13 100644 --- a/j2k/tests/testData/ast/class/abstractClassShape.ide.kt +++ b/j2k/tests/testData/ast/class/abstractClassShape.ide.kt @@ -1,6 +1,6 @@ abstract class Shape() { public var color : String = 0 -public open fun setColor(c : String) : Unit { +public open fun setColor(c : String) { color = c } public open fun getColor() : String { diff --git a/j2k/tests/testData/ast/class/abstractClassShape.kt b/j2k/tests/testData/ast/class/abstractClassShape.kt index 8525a28f1b8..2ccef051dd4 100644 --- a/j2k/tests/testData/ast/class/abstractClassShape.kt +++ b/j2k/tests/testData/ast/class/abstractClassShape.kt @@ -1,6 +1,6 @@ abstract class Shape() { public var color : String? = null -public open fun setColor(c : String?) : Unit { +public open fun setColor(c : String?) { color = c } public open fun getColor() : String? { diff --git a/j2k/tests/testData/ast/class/classWithEmptyMethods.ide.kt b/j2k/tests/testData/ast/class/classWithEmptyMethods.ide.kt index 362017eef2c..005650d2e55 100644 --- a/j2k/tests/testData/ast/class/classWithEmptyMethods.ide.kt +++ b/j2k/tests/testData/ast/class/classWithEmptyMethods.ide.kt @@ -1,5 +1,5 @@ class T() { -fun main() : Unit { +fun main() { } fun i() : Int { } diff --git a/j2k/tests/testData/ast/class/classWithEmptyMethods.kt b/j2k/tests/testData/ast/class/classWithEmptyMethods.kt index 18ced74776d..7795bc57065 100644 --- a/j2k/tests/testData/ast/class/classWithEmptyMethods.kt +++ b/j2k/tests/testData/ast/class/classWithEmptyMethods.kt @@ -1,5 +1,5 @@ class T() { -fun main() : Unit { +fun main() { } fun i() : Int { } diff --git a/j2k/tests/testData/ast/class/kt-639.ide.kt b/j2k/tests/testData/ast/class/kt-639.ide.kt index cb89edb78ab..3207549697b 100644 --- a/j2k/tests/testData/ast/class/kt-639.ide.kt +++ b/j2k/tests/testData/ast/class/kt-639.ide.kt @@ -13,7 +13,7 @@ return __ } } open class User() { -open fun main() : Unit { +open fun main() { val m = HashMap(1) val m2 = HashMap(10) val t1 = Test.init() diff --git a/j2k/tests/testData/ast/class/kt-639.kt b/j2k/tests/testData/ast/class/kt-639.kt index fe438a103ec..bf354eb0974 100644 --- a/j2k/tests/testData/ast/class/kt-639.kt +++ b/j2k/tests/testData/ast/class/kt-639.kt @@ -13,7 +13,7 @@ return __ } } open class User() { -open fun main() : Unit { +open fun main() { var m : HashMap? = HashMap(1) var m2 : HashMap? = HashMap(10) var t1 : Test? = Test.init() diff --git a/j2k/tests/testData/ast/class/privateInit.ide.kt b/j2k/tests/testData/ast/class/privateInit.ide.kt index 4f86265d153..84940a2fd16 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() { -private fun init(arg1 : Int, arg2 : Int, arg3 : Int) : Unit { +private fun init(arg1 : Int, arg2 : Int, arg3 : Int) { } } \ No newline at end of file diff --git a/j2k/tests/testData/ast/class/privateInit.kt b/j2k/tests/testData/ast/class/privateInit.kt index 4f86265d153..84940a2fd16 100644 --- a/j2k/tests/testData/ast/class/privateInit.kt +++ b/j2k/tests/testData/ast/class/privateInit.kt @@ -1,4 +1,4 @@ public open class MyClass() { -private fun init(arg1 : Int, arg2 : Int, arg3 : Int) : Unit { +private fun init(arg1 : Int, arg2 : Int, arg3 : Int) { } } \ 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 3e84ffc7127..9e140b781d6 100644 --- a/j2k/tests/testData/ast/constructors/allCallsPrimary.ide.kt +++ b/j2k/tests/testData/ast/constructors/allCallsPrimary.ide.kt @@ -12,7 +12,7 @@ return __ } public open class User() { class object { -public open fun main() : Unit { +public open 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/allCallsPrimary.kt b/j2k/tests/testData/ast/constructors/allCallsPrimary.kt index 38a7eb1ddee..0deff4ad62d 100644 --- a/j2k/tests/testData/ast/constructors/allCallsPrimary.kt +++ b/j2k/tests/testData/ast/constructors/allCallsPrimary.kt @@ -12,7 +12,7 @@ return __ } public open class User() { class object { -public open fun main() : Unit { +public open fun main() { 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/allCallsPrimary2.ide.kt b/j2k/tests/testData/ast/constructors/allCallsPrimary2.ide.kt index 746405d4c12..ca2810565ff 100644 --- a/j2k/tests/testData/ast/constructors/allCallsPrimary2.ide.kt +++ b/j2k/tests/testData/ast/constructors/allCallsPrimary2.ide.kt @@ -24,7 +24,7 @@ return __ } public open class User() { class object { -public open fun main() : Unit { +public open 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/allCallsPrimary2.kt b/j2k/tests/testData/ast/constructors/allCallsPrimary2.kt index e6f383fa362..32fe6a6e021 100644 --- a/j2k/tests/testData/ast/constructors/allCallsPrimary2.kt +++ b/j2k/tests/testData/ast/constructors/allCallsPrimary2.kt @@ -24,7 +24,7 @@ return __ } public open class User() { class object { -public open fun main() : Unit { +public open fun main() { 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/customerBuilder.ide.kt b/j2k/tests/testData/ast/constructors/customerBuilder.ide.kt index 74491704f13..d0251558b65 100644 --- a/j2k/tests/testData/ast/constructors/customerBuilder.ide.kt +++ b/j2k/tests/testData/ast/constructors/customerBuilder.ide.kt @@ -8,9 +8,9 @@ return _firstName public open fun getLastName() : String { return _lastName } -private fun doSmthBefore() : Unit { +private fun doSmthBefore() { } -private fun doSmthAfter() : Unit { +private fun doSmthAfter() { } { doSmthBefore() @@ -36,7 +36,7 @@ return Customer(_firstName, _lastName) } public open class User() { class object { -public open fun main() : Unit { +public open 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/customerBuilder.kt b/j2k/tests/testData/ast/constructors/customerBuilder.kt index b2573d9b469..c546ee6d667 100644 --- a/j2k/tests/testData/ast/constructors/customerBuilder.kt +++ b/j2k/tests/testData/ast/constructors/customerBuilder.kt @@ -8,9 +8,9 @@ return _firstName public open fun getLastName() : String? { return _lastName } -private fun doSmthBefore() : Unit { +private fun doSmthBefore() { } -private fun doSmthAfter() : Unit { +private fun doSmthAfter() { } { doSmthBefore() @@ -36,7 +36,7 @@ return Customer(_firstName, _lastName) } public open class User() { class object { -public open fun main() : Unit { +public open fun main() { 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/genericIdentifier.ide.kt b/j2k/tests/testData/ast/constructors/genericIdentifier.ide.kt index 6bfc7dbf009..9b65a4c1f9e 100644 --- a/j2k/tests/testData/ast/constructors/genericIdentifier.ide.kt +++ b/j2k/tests/testData/ast/constructors/genericIdentifier.ide.kt @@ -28,7 +28,7 @@ return __ } public open class User() { class object { -public open fun main() : Unit { +public open 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/genericIdentifier.kt b/j2k/tests/testData/ast/constructors/genericIdentifier.kt index e237eeee52d..fee6f7c2fe4 100644 --- a/j2k/tests/testData/ast/constructors/genericIdentifier.kt +++ b/j2k/tests/testData/ast/constructors/genericIdentifier.kt @@ -28,7 +28,7 @@ return __ } public open class User() { class object { -public open fun main() : Unit { +public open fun main() { 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/identifier.ide.kt b/j2k/tests/testData/ast/constructors/identifier.ide.kt index b5e85883a2a..abe7525ad2b 100644 --- a/j2k/tests/testData/ast/constructors/identifier.ide.kt +++ b/j2k/tests/testData/ast/constructors/identifier.ide.kt @@ -28,7 +28,7 @@ return __ } public open class User() { class object { -public open fun main() : Unit { +public open 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.kt b/j2k/tests/testData/ast/constructors/identifier.kt index c627d0821be..2a424e3d939 100644 --- a/j2k/tests/testData/ast/constructors/identifier.kt +++ b/j2k/tests/testData/ast/constructors/identifier.kt @@ -28,7 +28,7 @@ return __ } public open class User() { class object { -public open fun main() : Unit { +public open fun main() { 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/withManyDefaultParams.ide.kt b/j2k/tests/testData/ast/constructors/withManyDefaultParams.ide.kt index b2d68ed3e5f..d6bb6e61fb7 100644 --- a/j2k/tests/testData/ast/constructors/withManyDefaultParams.ide.kt +++ b/j2k/tests/testData/ast/constructors/withManyDefaultParams.ide.kt @@ -33,7 +33,7 @@ return "" } public open class User() { class object { -public open fun main() : Unit { +public open fun main() { val t = Test.init("name") } } diff --git a/j2k/tests/testData/ast/constructors/withManyDefaultParams.kt b/j2k/tests/testData/ast/constructors/withManyDefaultParams.kt index 434c34a10b2..801bdecb9e7 100644 --- a/j2k/tests/testData/ast/constructors/withManyDefaultParams.kt +++ b/j2k/tests/testData/ast/constructors/withManyDefaultParams.kt @@ -33,7 +33,7 @@ return "" } public open class User() { class object { -public open fun main() : Unit { +public open fun main() { var t : Test? = Test.init("name") } } diff --git a/j2k/tests/testData/ast/enum/enumConstantIsNotNull.ide.kt b/j2k/tests/testData/ast/enum/enumConstantIsNotNull.ide.kt index 62a8e2019a2..c46b6f58d20 100644 --- a/j2k/tests/testData/ast/enum/enumConstantIsNotNull.ide.kt +++ b/j2k/tests/testData/ast/enum/enumConstantIsNotNull.ide.kt @@ -1,6 +1,6 @@ enum class E { FOO -fun foo() : Unit { +fun foo() { FOO.toString() } } \ No newline at end of file diff --git a/j2k/tests/testData/ast/enum/enumConstantIsNotNull.kt b/j2k/tests/testData/ast/enum/enumConstantIsNotNull.kt index 62a8e2019a2..c46b6f58d20 100644 --- a/j2k/tests/testData/ast/enum/enumConstantIsNotNull.kt +++ b/j2k/tests/testData/ast/enum/enumConstantIsNotNull.kt @@ -1,6 +1,6 @@ enum class E { FOO -fun foo() : Unit { +fun foo() { FOO.toString() } } \ No newline at end of file diff --git a/j2k/tests/testData/ast/enum/runnableImplementation.ide.kt b/j2k/tests/testData/ast/enum/runnableImplementation.ide.kt index c1f1bee9e30..fc94882b3c6 100644 --- a/j2k/tests/testData/ast/enum/runnableImplementation.ide.kt +++ b/j2k/tests/testData/ast/enum/runnableImplementation.ide.kt @@ -4,7 +4,7 @@ BLACK RED YELLOW BLUE -public override fun run() : Unit { +public override fun run() { System.out.println("name()=" + name() + ", toString()=" + toString()) } } \ No newline at end of file diff --git a/j2k/tests/testData/ast/enum/runnableImplementation.kt b/j2k/tests/testData/ast/enum/runnableImplementation.kt index dbcd73d4440..caec2f9cd4f 100644 --- a/j2k/tests/testData/ast/enum/runnableImplementation.kt +++ b/j2k/tests/testData/ast/enum/runnableImplementation.kt @@ -4,7 +4,7 @@ BLACK RED YELLOW BLUE -public override fun run() : Unit { +public override fun run() { System.out?.println("name()=" + name() + ", toString()=" + toString()) } } \ No newline at end of file diff --git a/j2k/tests/testData/ast/function/emptyVoidMethod.ide.kt b/j2k/tests/testData/ast/function/emptyVoidMethod.ide.kt index ae299eb173a..e97bc7ec751 100644 --- a/j2k/tests/testData/ast/function/emptyVoidMethod.ide.kt +++ b/j2k/tests/testData/ast/function/emptyVoidMethod.ide.kt @@ -1,2 +1,2 @@ -fun main() : Unit { +fun main() { } \ No newline at end of file diff --git a/j2k/tests/testData/ast/function/emptyVoidMethod.kt b/j2k/tests/testData/ast/function/emptyVoidMethod.kt index ae299eb173a..e97bc7ec751 100644 --- a/j2k/tests/testData/ast/function/emptyVoidMethod.kt +++ b/j2k/tests/testData/ast/function/emptyVoidMethod.kt @@ -1,2 +1,2 @@ -fun main() : Unit { +fun main() { } \ 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 9f25dd62141..0c4da343b33 100644 --- a/j2k/tests/testData/ast/function/extendsBaseWhichExtendsObject.ide.kt +++ b/j2k/tests/testData/ast/function/extendsBaseWhichExtendsObject.ide.kt @@ -12,7 +12,7 @@ return super.clone() public override fun toString() : String { return super.toString() } -protected override fun finalize() : Unit { +protected override fun finalize() { super.finalize() } } @@ -29,7 +29,7 @@ return super.clone() public open fun toString() : String { return getJavaClass.getName() + '@' + Integer.toHexString(hashCode()) } -protected open fun finalize() : Unit { +protected open fun finalize() { super.finalize() } } \ No newline at end of file diff --git a/j2k/tests/testData/ast/function/extendsBaseWhichExtendsObject.kt b/j2k/tests/testData/ast/function/extendsBaseWhichExtendsObject.kt index 491c63b601e..49fd1e9a776 100644 --- a/j2k/tests/testData/ast/function/extendsBaseWhichExtendsObject.kt +++ b/j2k/tests/testData/ast/function/extendsBaseWhichExtendsObject.kt @@ -12,7 +12,7 @@ return super.clone() public override fun toString() : String? { return super.toString() } -protected override fun finalize() : Unit { +protected override fun finalize() { super.finalize() } } @@ -29,7 +29,7 @@ return super.clone() public open fun toString() : String? { return getJavaClass.getName() + '@' + Integer.toHexString(hashCode()) } -protected open fun finalize() : Unit { +protected open fun finalize() { super.finalize() } } \ No newline at end of file diff --git a/j2k/tests/testData/ast/function/functionInFinalClass.ide.kt b/j2k/tests/testData/ast/function/functionInFinalClass.ide.kt index def36e1f8de..e818c914915 100644 --- a/j2k/tests/testData/ast/function/functionInFinalClass.ide.kt +++ b/j2k/tests/testData/ast/function/functionInFinalClass.ide.kt @@ -1,5 +1,5 @@ package demo class Final() { -fun test() : Unit { +fun test() { } } \ No newline at end of file diff --git a/j2k/tests/testData/ast/function/functionInFinalClass.kt b/j2k/tests/testData/ast/function/functionInFinalClass.kt index def36e1f8de..e818c914915 100644 --- a/j2k/tests/testData/ast/function/functionInFinalClass.kt +++ b/j2k/tests/testData/ast/function/functionInFinalClass.kt @@ -1,5 +1,5 @@ package demo class Final() { -fun test() : Unit { +fun test() { } } \ No newline at end of file diff --git a/j2k/tests/testData/ast/function/internal.ide.kt b/j2k/tests/testData/ast/function/internal.ide.kt index 5b3e9634f3f..a7a0a149d8b 100644 --- a/j2k/tests/testData/ast/function/internal.ide.kt +++ b/j2k/tests/testData/ast/function/internal.ide.kt @@ -1,2 +1,2 @@ -fun test() : Unit { +fun test() { } \ No newline at end of file diff --git a/j2k/tests/testData/ast/function/internal.kt b/j2k/tests/testData/ast/function/internal.kt index 5b3e9634f3f..a7a0a149d8b 100644 --- a/j2k/tests/testData/ast/function/internal.kt +++ b/j2k/tests/testData/ast/function/internal.kt @@ -1,2 +1,2 @@ -fun test() : Unit { +fun test() { } \ No newline at end of file diff --git a/j2k/tests/testData/ast/function/main.ide.kt b/j2k/tests/testData/ast/function/main.ide.kt index 5301c489a62..71d18852399 100644 --- a/j2k/tests/testData/ast/function/main.ide.kt +++ b/j2k/tests/testData/ast/function/main.ide.kt @@ -1,4 +1,4 @@ class object { -public fun main(args : Array) : Unit { +public fun main(args : Array) { } } \ No newline at end of file diff --git a/j2k/tests/testData/ast/function/main.kt b/j2k/tests/testData/ast/function/main.kt index 164c099f986..8af2386b4e6 100644 --- a/j2k/tests/testData/ast/function/main.kt +++ b/j2k/tests/testData/ast/function/main.kt @@ -1,4 +1,4 @@ class object { -public fun main(args : Array?) : Unit { +public fun main(args : Array?) { } } \ 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 d895be5bb27..da82b33f766 100644 --- a/j2k/tests/testData/ast/function/override.ide.kt +++ b/j2k/tests/testData/ast/function/override.ide.kt @@ -1,8 +1,8 @@ open class A() { -open fun a() : Unit { +open fun a() { } } class B() : A() { -override fun a() : Unit { +override fun a() { } } \ No newline at end of file diff --git a/j2k/tests/testData/ast/function/override.kt b/j2k/tests/testData/ast/function/override.kt index d895be5bb27..da82b33f766 100644 --- a/j2k/tests/testData/ast/function/override.kt +++ b/j2k/tests/testData/ast/function/override.kt @@ -1,8 +1,8 @@ open class A() { -open fun a() : Unit { +open fun a() { } } class B() : A() { -override fun a() : Unit { +override fun a() { } } \ No newline at end of file diff --git a/j2k/tests/testData/ast/function/overrideAndOpen.ide.kt b/j2k/tests/testData/ast/function/overrideAndOpen.ide.kt index 678a37a4a70..706fbe26f27 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() { -open fun foo() : Unit { +open fun foo() { } } open class B() : A() { -override fun foo() : Unit { +override fun foo() { } } open class C() : B() { -override fun foo() : Unit { +override fun foo() { } } \ No newline at end of file diff --git a/j2k/tests/testData/ast/function/overrideAndOpen.kt b/j2k/tests/testData/ast/function/overrideAndOpen.kt index 678a37a4a70..706fbe26f27 100644 --- a/j2k/tests/testData/ast/function/overrideAndOpen.kt +++ b/j2k/tests/testData/ast/function/overrideAndOpen.kt @@ -1,12 +1,12 @@ open class A() { -open fun foo() : Unit { +open fun foo() { } } open class B() : A() { -override fun foo() : Unit { +override fun foo() { } } open class C() : B() { -override fun foo() : Unit { +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 bd26c7ce938..8d0ff58b2d3 100644 --- a/j2k/tests/testData/ast/function/overrideObject.ide.kt +++ b/j2k/tests/testData/ast/function/overrideObject.ide.kt @@ -12,7 +12,7 @@ return super.clone() public open fun toString() : String { return getJavaClass.getName() + '@' + Integer.toHexString(hashCode()) } -protected open fun finalize() : Unit { +protected open fun finalize() { super.finalize() } } \ No newline at end of file diff --git a/j2k/tests/testData/ast/function/overrideObject.kt b/j2k/tests/testData/ast/function/overrideObject.kt index 55f017c4656..3d11e4c80cf 100644 --- a/j2k/tests/testData/ast/function/overrideObject.kt +++ b/j2k/tests/testData/ast/function/overrideObject.kt @@ -12,7 +12,7 @@ return super.clone() public open fun toString() : String? { return getJavaClass.getName() + '@' + Integer.toHexString(hashCode()) } -protected open fun finalize() : Unit { +protected open fun finalize() { super.finalize() } } \ No newline at end of file diff --git a/j2k/tests/testData/ast/function/ownGenericParam.ide.kt b/j2k/tests/testData/ast/function/ownGenericParam.ide.kt index ac57365e9fd..d8fb29bf7ed 100644 --- a/j2k/tests/testData/ast/function/ownGenericParam.ide.kt +++ b/j2k/tests/testData/ast/function/ownGenericParam.ide.kt @@ -1,2 +1,2 @@ -fun putU(u : U) : Unit { +fun putU(u : U) { } \ No newline at end of file diff --git a/j2k/tests/testData/ast/function/ownGenericParam.kt b/j2k/tests/testData/ast/function/ownGenericParam.kt index e5533fdcb5f..08d80f7aece 100644 --- a/j2k/tests/testData/ast/function/ownGenericParam.kt +++ b/j2k/tests/testData/ast/function/ownGenericParam.kt @@ -1,2 +1,2 @@ -fun putU(u : U?) : Unit { +fun putU(u : U?) { } \ No newline at end of file diff --git a/j2k/tests/testData/ast/function/ownSeveralGenericParams.ide.kt b/j2k/tests/testData/ast/function/ownSeveralGenericParams.ide.kt index eb9fce3065f..42ebbc67b38 100644 --- a/j2k/tests/testData/ast/function/ownSeveralGenericParams.ide.kt +++ b/j2k/tests/testData/ast/function/ownSeveralGenericParams.ide.kt @@ -1,2 +1,2 @@ -fun putUVW(u : U, v : V, w : W) : Unit { +fun putUVW(u : U, v : V, w : W) { } \ No newline at end of file diff --git a/j2k/tests/testData/ast/function/ownSeveralGenericParams.kt b/j2k/tests/testData/ast/function/ownSeveralGenericParams.kt index 19fb6188681..d8420656669 100644 --- a/j2k/tests/testData/ast/function/ownSeveralGenericParams.kt +++ b/j2k/tests/testData/ast/function/ownSeveralGenericParams.kt @@ -1,2 +1,2 @@ -fun putUVW(u : U?, v : V?, w : W?) : Unit { +fun putUVW(u : U?, v : V?, w : W?) { } \ No newline at end of file diff --git a/j2k/tests/testData/ast/function/private.ide.kt b/j2k/tests/testData/ast/function/private.ide.kt index 45e5e8bab00..dd4bde284eb 100644 --- a/j2k/tests/testData/ast/function/private.ide.kt +++ b/j2k/tests/testData/ast/function/private.ide.kt @@ -1,2 +1,2 @@ -private fun test() : Unit { +private fun test() { } \ No newline at end of file diff --git a/j2k/tests/testData/ast/function/private.kt b/j2k/tests/testData/ast/function/private.kt index 45e5e8bab00..dd4bde284eb 100644 --- a/j2k/tests/testData/ast/function/private.kt +++ b/j2k/tests/testData/ast/function/private.kt @@ -1,2 +1,2 @@ -private fun test() : Unit { +private fun test() { } \ No newline at end of file diff --git a/j2k/tests/testData/ast/function/protected.ide.kt b/j2k/tests/testData/ast/function/protected.ide.kt index dbbc30b447b..992d26c14fe 100644 --- a/j2k/tests/testData/ast/function/protected.ide.kt +++ b/j2k/tests/testData/ast/function/protected.ide.kt @@ -1,2 +1,2 @@ -protected fun test() : Unit { +protected fun test() { } \ No newline at end of file diff --git a/j2k/tests/testData/ast/function/protected.kt b/j2k/tests/testData/ast/function/protected.kt index dbbc30b447b..992d26c14fe 100644 --- a/j2k/tests/testData/ast/function/protected.kt +++ b/j2k/tests/testData/ast/function/protected.kt @@ -1,2 +1,2 @@ -protected fun test() : Unit { +protected fun test() { } \ No newline at end of file diff --git a/j2k/tests/testData/ast/function/public.ide.kt b/j2k/tests/testData/ast/function/public.ide.kt index d835330ec86..327abedcdb0 100644 --- a/j2k/tests/testData/ast/function/public.ide.kt +++ b/j2k/tests/testData/ast/function/public.ide.kt @@ -1,2 +1,2 @@ -public fun test() : Unit { +public fun test() { } \ No newline at end of file diff --git a/j2k/tests/testData/ast/function/public.kt b/j2k/tests/testData/ast/function/public.kt index d835330ec86..327abedcdb0 100644 --- a/j2k/tests/testData/ast/function/public.kt +++ b/j2k/tests/testData/ast/function/public.kt @@ -1,2 +1,2 @@ -public fun test() : Unit { +public fun test() { } \ 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 cb04b7d2f96..a1f5435a867 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 open class Test() { -open fun test(vararg var args : Any) : Unit { +open 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/varVararg.kt b/j2k/tests/testData/ast/function/varVararg.kt index 6d364141a95..2e90c70287f 100644 --- a/j2k/tests/testData/ast/function/varVararg.kt +++ b/j2k/tests/testData/ast/function/varVararg.kt @@ -1,6 +1,6 @@ package demo open class Test() { -open fun test(vararg var args : Any?) : Unit { +open fun test(vararg var args : Any?) { args = array(1, 2, 3) } } \ No newline at end of file diff --git a/j2k/tests/testData/ast/inProjectionType/methodParams.ide.kt b/j2k/tests/testData/ast/inProjectionType/methodParams.ide.kt index c5f37c03f4c..e2b9e873a85 100644 --- a/j2k/tests/testData/ast/inProjectionType/methodParams.ide.kt +++ b/j2k/tests/testData/ast/inProjectionType/methodParams.ide.kt @@ -1,2 +1,2 @@ -fun popAll(dst : Collection) : Unit { +fun popAll(dst : Collection) { } \ No newline at end of file diff --git a/j2k/tests/testData/ast/inProjectionType/methodParams.kt b/j2k/tests/testData/ast/inProjectionType/methodParams.kt index 6888dcd5c36..628f7adac85 100644 --- a/j2k/tests/testData/ast/inProjectionType/methodParams.kt +++ b/j2k/tests/testData/ast/inProjectionType/methodParams.kt @@ -1,2 +1,2 @@ -fun popAll(dst : Collection?) : Unit { +fun popAll(dst : Collection?) { } \ No newline at end of file diff --git a/j2k/tests/testData/ast/issues/comments.ide.kt b/j2k/tests/testData/ast/issues/comments.ide.kt index e98e6e431d5..4841220b571 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() : Unit { +public open fun foo() { /* This is a function comment */ } } \ No newline at end of file diff --git a/j2k/tests/testData/ast/issues/comments.kt b/j2k/tests/testData/ast/issues/comments.kt index e98e6e431d5..4841220b571 100644 --- a/j2k/tests/testData/ast/issues/comments.kt +++ b/j2k/tests/testData/ast/issues/comments.kt @@ -11,7 +11,7 @@ private var i : Int = 0 /** * This is a function doc comment. */ -public open fun foo() : Unit { +public open 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 f54664254b7..3b187133500 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 open class G(t : T) { } public open class Java() { -open fun test() : Unit { +open fun test() { val m = HashMap() m.put(1, 1) } -open fun test2() : Unit { +open fun test2() { val m = HashMap() val g = G("") val g2 = G("") diff --git a/j2k/tests/testData/ast/issues/kt-1048.kt b/j2k/tests/testData/ast/issues/kt-1048.kt index 69d30dfa1a3..2cdc1976e7c 100644 --- a/j2k/tests/testData/ast/issues/kt-1048.kt +++ b/j2k/tests/testData/ast/issues/kt-1048.kt @@ -2,11 +2,11 @@ import java.util.HashMap open class G(t : T?) { } public open class Java() { -open fun test() : Unit { +open fun test() { var m : HashMap? = HashMap() m?.put(1, 1) } -open fun test2() : Unit { +open fun test2() { var m : HashMap<*, *>? = HashMap() var g : G? = G("") var g2 : G? = G("") diff --git a/j2k/tests/testData/ast/issues/kt-1074.ide.kt b/j2k/tests/testData/ast/issues/kt-1074.ide.kt index 652697c03b5..3b20d29c847 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 open class Test() { class object { -open fun subListRangeCheck(fromIndex : Int, toIndex : Int, size : Int) : Unit { +open 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-1074.kt b/j2k/tests/testData/ast/issues/kt-1074.kt index 652697c03b5..3b20d29c847 100644 --- a/j2k/tests/testData/ast/issues/kt-1074.kt +++ b/j2k/tests/testData/ast/issues/kt-1074.kt @@ -1,7 +1,7 @@ package demo open class Test() { class object { -open fun subListRangeCheck(fromIndex : Int, toIndex : Int, size : Int) : Unit { +open 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 de2f22324ed..f35a31d1b3e 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 open class Test() { -open fun putInt(i : Int) : Unit { +open fun putInt(i : Int) { } -open fun test() : Unit { +open fun test() { val b = 10 putInt(b.toInt()) val b2 = 10 diff --git a/j2k/tests/testData/ast/issues/kt-543-boxed.kt b/j2k/tests/testData/ast/issues/kt-543-boxed.kt index 2465167cd1d..0b202ba6075 100644 --- a/j2k/tests/testData/ast/issues/kt-543-boxed.kt +++ b/j2k/tests/testData/ast/issues/kt-543-boxed.kt @@ -1,8 +1,8 @@ package demo open class Test() { -open fun putInt(i : Int?) : Unit { +open fun putInt(i : Int?) { } -open fun test() : Unit { +open fun test() { var b : Byte = 10 putInt(b.toInt()) var b2 : Byte? = 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 d42440ca277..434b8826087 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 open class Test() { -open fun putInt(i : Int) : Unit { +open fun putInt(i : Int) { } -open fun test() : Unit { +open fun test() { val i = 10 putInt(i) } diff --git a/j2k/tests/testData/ast/issues/kt-543-mixed.kt b/j2k/tests/testData/ast/issues/kt-543-mixed.kt index 566c7766284..191485b8b48 100644 --- a/j2k/tests/testData/ast/issues/kt-543-mixed.kt +++ b/j2k/tests/testData/ast/issues/kt-543-mixed.kt @@ -1,8 +1,8 @@ package demo open class Test() { -open fun putInt(i : Int?) : Unit { +open fun putInt(i : Int?) { } -open fun test() : Unit { +open fun test() { var i : Int = 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 b78e0c86415..0f59e57b7f2 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 open class Test() { -open fun putInt(i : Int) : Unit { +open fun putInt(i : Int) { } -open fun test() : Unit { +open fun test() { val b = 10 putInt(b.toInt()) } diff --git a/j2k/tests/testData/ast/issues/kt-543.kt b/j2k/tests/testData/ast/issues/kt-543.kt index dc9dcb3b7f7..4b77fc846c4 100644 --- a/j2k/tests/testData/ast/issues/kt-543.kt +++ b/j2k/tests/testData/ast/issues/kt-543.kt @@ -1,8 +1,8 @@ package demo open class Test() { -open fun putInt(i : Int) : Unit { +open fun putInt(i : Int) { } -open fun test() : Unit { +open fun test() { var b : Byte = 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 8ba587838e2..ecb96166b82 100644 --- a/j2k/tests/testData/ast/issues/kt-638.ide.kt +++ b/j2k/tests/testData/ast/issues/kt-638.ide.kt @@ -28,7 +28,7 @@ return __ } public open class User() { class object { -public open fun main(args : Array) : Unit { +public open 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-638.kt b/j2k/tests/testData/ast/issues/kt-638.kt index 6a38806f16a..3dbce402e30 100644 --- a/j2k/tests/testData/ast/issues/kt-638.kt +++ b/j2k/tests/testData/ast/issues/kt-638.kt @@ -28,7 +28,7 @@ return __ } public open class User() { class object { -public open fun main(args : Array?) : Unit { +public open fun main(args : Array?) { 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/kt-792-mixed.ide.kt b/j2k/tests/testData/ast/issues/kt-792-mixed.ide.kt index 1ef3d38bf15..2152aba1fa7 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 open class Test(i : Int) { -open fun test() : Unit { +open fun test() { val i = 10 Test(i) } diff --git a/j2k/tests/testData/ast/issues/kt-792-mixed.kt b/j2k/tests/testData/ast/issues/kt-792-mixed.kt index fa82740445e..a3ba1b47946 100644 --- a/j2k/tests/testData/ast/issues/kt-792-mixed.kt +++ b/j2k/tests/testData/ast/issues/kt-792-mixed.kt @@ -1,6 +1,6 @@ package demo open class Test(i : Int?) { -open fun test() : Unit { +open fun test() { var i : Int = 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 a90021b8ab5..f6286df5c55 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 open class Test(i : Int) { -open fun test() : Unit { +open fun test() { val b = 10 Test(b.toInt()) } diff --git a/j2k/tests/testData/ast/issues/kt-792.kt b/j2k/tests/testData/ast/issues/kt-792.kt index 2a6929f3456..5d3a34252f9 100644 --- a/j2k/tests/testData/ast/issues/kt-792.kt +++ b/j2k/tests/testData/ast/issues/kt-792.kt @@ -1,6 +1,6 @@ package demo open class Test(i : Int) { -open fun test() : Unit { +open fun test() { var b : Byte = 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 9eb2852ea37..0b40cac7e07 100644 --- a/j2k/tests/testData/ast/issues/kt-794-mixed.ide.kt +++ b/j2k/tests/testData/ast/issues/kt-794-mixed.ide.kt @@ -3,7 +3,7 @@ open class Test() { open fun getInteger(i : Int) : Int { return i } -open fun test() : Unit { +open fun test() { val i = getInteger(10)!! } } \ No newline at end of file diff --git a/j2k/tests/testData/ast/issues/kt-794-mixed.kt b/j2k/tests/testData/ast/issues/kt-794-mixed.kt index 769c7a2e2bf..aa937d2512f 100644 --- a/j2k/tests/testData/ast/issues/kt-794-mixed.kt +++ b/j2k/tests/testData/ast/issues/kt-794-mixed.kt @@ -3,7 +3,7 @@ open class Test() { open fun getInteger(i : Int?) : Int? { return i } -open fun test() : Unit { +open fun test() { var i : Int = getInteger(10)!! } } \ No newline at end of file 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 1e774047243..ceebf10e978 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() open class StringContainer(s : String) { } open class Test() { -open fun putString(s : String) : Unit { +open fun putString(s : String) { } -open fun test() : Unit { +open fun test() { putString(One.myContainer.myString) StringContainer(One.myContainer.myString) } diff --git a/j2k/tests/testData/ast/issues/kt-809-string.kt b/j2k/tests/testData/ast/issues/kt-809-string.kt index 9dea26fc2eb..8899df9f049 100644 --- a/j2k/tests/testData/ast/issues/kt-809-string.kt +++ b/j2k/tests/testData/ast/issues/kt-809-string.kt @@ -10,9 +10,9 @@ var myContainer : Container? = Container() open class StringContainer(s : String?) { } open class Test() { -open fun putString(s : String?) : Unit { +open fun putString(s : String?) { } -open fun test() : Unit { +open 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 39edc95786d..806e6b2b30c 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() open class IntContainer(i : Int) { } open class Test() { -open fun putInt(i : Int) : Unit { +open fun putInt(i : Int) { } -open fun test() : Unit { +open fun test() { putInt(One.myContainer.myInt) IntContainer(One.myContainer.myInt) } diff --git a/j2k/tests/testData/ast/issues/kt-809.kt b/j2k/tests/testData/ast/issues/kt-809.kt index 598912b4016..21274c4d138 100644 --- a/j2k/tests/testData/ast/issues/kt-809.kt +++ b/j2k/tests/testData/ast/issues/kt-809.kt @@ -10,9 +10,9 @@ var myContainer : Container? = Container() open class IntContainer(i : Int) { } open class Test() { -open fun putInt(i : Int) : Unit { +open fun putInt(i : Int) { } -open fun test() : Unit { +open fun test() { putInt(One.myContainer?.myInt!!) IntContainer(One.myContainer?.myInt!!) } diff --git a/j2k/tests/testData/ast/issues/kt-820.ide.kt b/j2k/tests/testData/ast/issues/kt-820.ide.kt index 88a596837fb..6c8b4648d1e 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() } } open class Test() { -open fun test() : Unit { +open fun test() { val b = One.myContainer.myInt.toByte() } } \ No newline at end of file diff --git a/j2k/tests/testData/ast/issues/kt-820.kt b/j2k/tests/testData/ast/issues/kt-820.kt index 77fbee788f3..41edf849b00 100644 --- a/j2k/tests/testData/ast/issues/kt-820.kt +++ b/j2k/tests/testData/ast/issues/kt-820.kt @@ -8,7 +8,7 @@ var myContainer : Container? = Container() } } open class Test() { -open fun test() : Unit { +open fun test() { var b : Byte = One.myContainer?.myInt!!.toByte() } } \ No newline at end of file diff --git a/j2k/tests/testData/ast/issues/kt-824.ide.kt b/j2k/tests/testData/ast/issues/kt-824.ide.kt index 30577dd0df4..8274b36f7fa 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() } } open class Test() { -open fun test() : Unit { +open 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-824.kt b/j2k/tests/testData/ast/issues/kt-824.kt index 065f372cb69..426738359a5 100644 --- a/j2k/tests/testData/ast/issues/kt-824.kt +++ b/j2k/tests/testData/ast/issues/kt-824.kt @@ -8,7 +8,7 @@ var myContainer : Container? = Container() } } open class Test() { -open fun test() : Unit { +open fun test() { if (One.myContainer?.myBoolean!!) System.out?.println("Ok") var s : String? = (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 21a2b6bb51d..d6b72fd246d 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 @@ open class Test() { -open fun test() : Unit { +open fun test() { val res = true res = res and false res = res or false diff --git a/j2k/tests/testData/ast/issues/kt-828.kt b/j2k/tests/testData/ast/issues/kt-828.kt index 3ed25233de4..03ed14b63e8 100644 --- a/j2k/tests/testData/ast/issues/kt-828.kt +++ b/j2k/tests/testData/ast/issues/kt-828.kt @@ -1,5 +1,5 @@ open class Test() { -open fun test() : Unit { +open fun test() { var res : Boolean = 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 26276c4091b..8138d29b09e 100644 --- a/j2k/tests/testData/ast/issues/kt-836.ide.kt +++ b/j2k/tests/testData/ast/issues/kt-836.ide.kt @@ -10,14 +10,14 @@ this.code = code } } open class Base() { -open fun test() : Unit { +open fun test() { } open fun toString() : String { return "BASE" } } open class Child() : Base() { -override fun test() : Unit { +override fun test() { } override fun toString() : String { return "Child" diff --git a/j2k/tests/testData/ast/issues/kt-836.kt b/j2k/tests/testData/ast/issues/kt-836.kt index 938269632b7..f3f8e836907 100644 --- a/j2k/tests/testData/ast/issues/kt-836.kt +++ b/j2k/tests/testData/ast/issues/kt-836.kt @@ -10,14 +10,14 @@ this.code = code } } open class Base() { -open fun test() : Unit { +open fun test() { } open fun toString() : String? { return "BASE" } } open class Child() : Base() { -override fun test() : Unit { +override fun test() { } override fun toString() : String? { return "Child" diff --git a/j2k/tests/testData/ast/issues/kt-871.ide.kt b/j2k/tests/testData/ast/issues/kt-871.ide.kt index e11d5c91c76..800bcbd9716 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 open class Program() { class object { -public open fun main(args : Array) : Unit { +public open fun main(args : Array) { System.out.println("Halo!") } } diff --git a/j2k/tests/testData/ast/issues/kt-871.kt b/j2k/tests/testData/ast/issues/kt-871.kt index 6f613625456..388ba5a33be 100644 --- a/j2k/tests/testData/ast/issues/kt-871.kt +++ b/j2k/tests/testData/ast/issues/kt-871.kt @@ -1,7 +1,7 @@ package demo open class Program() { class object { -public open fun main(args : Array?) : Unit { +public open fun main(args : Array?) { System.out?.println("Halo!") } } diff --git a/j2k/tests/testData/ast/issues/kt-893.ide.kt b/j2k/tests/testData/ast/issues/kt-893.ide.kt index 1caab4290f3..42836be2eca 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 open class Test() { -open fun test() : Unit { +open fun test() { for (i in 0..10 - 1) { System.out.println(i) } diff --git a/j2k/tests/testData/ast/issues/kt-893.kt b/j2k/tests/testData/ast/issues/kt-893.kt index 7e5d3bb6509..198ca0d9a7f 100644 --- a/j2k/tests/testData/ast/issues/kt-893.kt +++ b/j2k/tests/testData/ast/issues/kt-893.kt @@ -1,6 +1,6 @@ package demo open class Test() { -open fun test() : Unit { +open 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 7cfa3eea3f5..dd5e31bb5ff 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() : Unit { +public open fun foo() { val i = Calendar.ALL_STYLES } } \ No newline at end of file diff --git a/j2k/tests/testData/ast/issues/qualifyStatic.kt b/j2k/tests/testData/ast/issues/qualifyStatic.kt index 0a32e4017fd..ce8ed20125b 100644 --- a/j2k/tests/testData/ast/issues/qualifyStatic.kt +++ b/j2k/tests/testData/ast/issues/qualifyStatic.kt @@ -1,6 +1,6 @@ import java.util.Calendar abstract class MyCalendar() : Calendar() { -public open fun foo() : Unit { +public open fun foo() { var i : Int = Calendar.ALL_STYLES } } \ No newline at end of file diff --git a/j2k/tests/testData/ast/list/ForEach.ide.kt b/j2k/tests/testData/ast/list/ForEach.ide.kt index 0fd8d8309ef..204b03acc06 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 open class ForEach() { -public open fun test() : Unit { +public open fun test() { val xs = ArrayList() val ys = LinkedList() for (x in xs) diff --git a/j2k/tests/testData/ast/list/ForEach.kt b/j2k/tests/testData/ast/list/ForEach.kt index b0b3afe60f5..bc2f7eac112 100644 --- a/j2k/tests/testData/ast/list/ForEach.kt +++ b/j2k/tests/testData/ast/list/ForEach.kt @@ -1,6 +1,6 @@ import java.util.* public open class ForEach() { -public open fun test() : Unit { +public open fun test() { var xs : ArrayList? = ArrayList() var ys : MutableList? = 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 0304160b8cc..4a655b03e2d 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 open class Lists() { -public open fun test() : Unit { +public open fun test() { val xs = ArrayList() val ys = LinkedList() val zs = ArrayList() diff --git a/j2k/tests/testData/ast/list/Lists.kt b/j2k/tests/testData/ast/list/Lists.kt index 6958d3bea8b..21d212fe4e8 100644 --- a/j2k/tests/testData/ast/list/Lists.kt +++ b/j2k/tests/testData/ast/list/Lists.kt @@ -1,6 +1,6 @@ import java.util.* public open class Lists() { -public open fun test() : Unit { +public open fun test() { var xs : MutableList? = ArrayList() var ys : MutableList? = LinkedList() var zs : ArrayList? = ArrayList() diff --git a/j2k/tests/testData/ast/literalExpression/char.ide.kt b/j2k/tests/testData/ast/literalExpression/char.ide.kt index 84487813201..8611024cb6f 100644 --- a/j2k/tests/testData/ast/literalExpression/char.ide.kt +++ b/j2k/tests/testData/ast/literalExpression/char.ide.kt @@ -1,5 +1,5 @@ open class Test() { -open fun test() : Unit { +open fun test() { val c1 = 'c' val c2 = 'C' } diff --git a/j2k/tests/testData/ast/literalExpression/char.kt b/j2k/tests/testData/ast/literalExpression/char.kt index d8749cea99d..9214446774e 100644 --- a/j2k/tests/testData/ast/literalExpression/char.kt +++ b/j2k/tests/testData/ast/literalExpression/char.kt @@ -1,5 +1,5 @@ open class Test() { -open fun test() : Unit { +open fun test() { var c1 : Char = 'c' var c2 : Char? = 'C' } diff --git a/j2k/tests/testData/ast/literalExpression/dollarInsideString.ide.kt b/j2k/tests/testData/ast/literalExpression/dollarInsideString.ide.kt index cb502e8677b..3013e939133 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 open class Test() { -open fun test() : Unit { +open fun test() { val name = "$$$$" name = name.replaceAll("\\$[0-9]+", "\\$") val c = '$' diff --git a/j2k/tests/testData/ast/literalExpression/dollarInsideString.kt b/j2k/tests/testData/ast/literalExpression/dollarInsideString.kt index 6a42dcad2c9..27bc7069c7b 100644 --- a/j2k/tests/testData/ast/literalExpression/dollarInsideString.kt +++ b/j2k/tests/testData/ast/literalExpression/dollarInsideString.kt @@ -1,6 +1,6 @@ package demo open class Test() { -open fun test() : Unit { +open fun test() { var name : String? = "$$$$" name = name?.replaceAll("\\$[0-9]+", "\\$") var c : Char = '$' diff --git a/j2k/tests/testData/ast/literalExpression/endsWithDFL.ide.kt b/j2k/tests/testData/ast/literalExpression/endsWithDFL.ide.kt index 05b0e3f7fdf..ae9c41aaeb9 100644 --- a/j2k/tests/testData/ast/literalExpression/endsWithDFL.ide.kt +++ b/j2k/tests/testData/ast/literalExpression/endsWithDFL.ide.kt @@ -1,5 +1,5 @@ open class Test() { -open fun test() : Unit { +open 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() : Unit { +open fun testBoxed() { val l1 = 10 val d1 = 10.0 val f1 = 10.0.toFloat() diff --git a/j2k/tests/testData/ast/literalExpression/endsWithDFL.kt b/j2k/tests/testData/ast/literalExpression/endsWithDFL.kt index 00e8dd282f5..9f599f640a3 100644 --- a/j2k/tests/testData/ast/literalExpression/endsWithDFL.kt +++ b/j2k/tests/testData/ast/literalExpression/endsWithDFL.kt @@ -1,5 +1,5 @@ open class Test() { -open fun test() : Unit { +open fun test() { var l1 : Long = 10 var d1 : Double = 10.0 var f1 : Float = 10.0.toFloat() @@ -7,7 +7,7 @@ var l2 : Long = 10 var d2 : Double = 10.0 var f2 : Float = 10.0.toFloat() } -open fun testBoxed() : Unit { +open fun testBoxed() { var l1 : Long? = 10 var d1 : Double? = 10.0 var f1 : Float? = 10.0.toFloat() diff --git a/j2k/tests/testData/ast/literalExpression/hex.ide.kt b/j2k/tests/testData/ast/literalExpression/hex.ide.kt index b32ce811965..d4f7d830813 100644 --- a/j2k/tests/testData/ast/literalExpression/hex.ide.kt +++ b/j2k/tests/testData/ast/literalExpression/hex.ide.kt @@ -1,5 +1,5 @@ open class Test() { -open fun test() : Unit { +open fun test() { val i1 = 33 val i2 = 51 } diff --git a/j2k/tests/testData/ast/literalExpression/hex.kt b/j2k/tests/testData/ast/literalExpression/hex.kt index 0bd6b37ae40..513d64e695d 100644 --- a/j2k/tests/testData/ast/literalExpression/hex.kt +++ b/j2k/tests/testData/ast/literalExpression/hex.kt @@ -1,5 +1,5 @@ open class Test() { -open fun test() : Unit { +open fun test() { var i1 : Int = 33 var i2 : Int? = 51 } diff --git a/j2k/tests/testData/ast/literalExpression/octal.ide.kt b/j2k/tests/testData/ast/literalExpression/octal.ide.kt index e1e3c2d775b..74df3813576 100644 --- a/j2k/tests/testData/ast/literalExpression/octal.ide.kt +++ b/j2k/tests/testData/ast/literalExpression/octal.ide.kt @@ -1,5 +1,5 @@ open class Test() { -open fun test() : Unit { +open fun test() { val i1 = 37 val i2 = 26 } diff --git a/j2k/tests/testData/ast/literalExpression/octal.kt b/j2k/tests/testData/ast/literalExpression/octal.kt index 83165bcc6fc..ed0680edbde 100644 --- a/j2k/tests/testData/ast/literalExpression/octal.kt +++ b/j2k/tests/testData/ast/literalExpression/octal.kt @@ -1,5 +1,5 @@ open class Test() { -open fun test() : Unit { +open fun test() { var i1 : Int = 37 var i2 : Int? = 26 } diff --git a/j2k/tests/testData/ast/literalExpression/trueOrFalse.ide.kt b/j2k/tests/testData/ast/literalExpression/trueOrFalse.ide.kt index bc951e95c4f..677793dab98 100644 --- a/j2k/tests/testData/ast/literalExpression/trueOrFalse.ide.kt +++ b/j2k/tests/testData/ast/literalExpression/trueOrFalse.ide.kt @@ -1,5 +1,5 @@ open class Test() { -open fun test() : Unit { +open fun test() { val t1 = true val t2 = true val f1 = false diff --git a/j2k/tests/testData/ast/literalExpression/trueOrFalse.kt b/j2k/tests/testData/ast/literalExpression/trueOrFalse.kt index ad61883202e..dd9958976bc 100644 --- a/j2k/tests/testData/ast/literalExpression/trueOrFalse.kt +++ b/j2k/tests/testData/ast/literalExpression/trueOrFalse.kt @@ -1,5 +1,5 @@ open class Test() { -open fun test() : Unit { +open fun test() { var t1 : Boolean = true var t2 : Boolean? = true var f1 : Boolean = false diff --git a/j2k/tests/testData/ast/methodCallExpression/genericMethod.ide.kt b/j2k/tests/testData/ast/methodCallExpression/genericMethod.ide.kt index ec1665774ce..77c0aa8bcfa 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 open class Map() { -open fun put(k : K, v : V) : Unit { +open fun put(k : K, v : V) { } } open class U() { -open fun test() : Unit { +open fun test() { val m = Map() m.put("10", 10) } diff --git a/j2k/tests/testData/ast/methodCallExpression/genericMethod.kt b/j2k/tests/testData/ast/methodCallExpression/genericMethod.kt index b130cbc9376..043c1073a37 100644 --- a/j2k/tests/testData/ast/methodCallExpression/genericMethod.kt +++ b/j2k/tests/testData/ast/methodCallExpression/genericMethod.kt @@ -1,10 +1,10 @@ package demo open class Map() { -open fun put(k : K?, v : V?) : Unit { +open fun put(k : K?, v : V?) { } } open class U() { -open fun test() : Unit { +open fun test() { var m : Map? = Map() m?.put("10", 10) } diff --git a/j2k/tests/testData/ast/misc/intNullability.ide.kt b/j2k/tests/testData/ast/misc/intNullability.ide.kt index e3e6c4ca889..9891bb52eb9 100644 --- a/j2k/tests/testData/ast/misc/intNullability.ide.kt +++ b/j2k/tests/testData/ast/misc/intNullability.ide.kt @@ -1,7 +1,7 @@ package demo import kotlin.compatibility.* open class Test() { -open fun test() : Unit { +open fun test() { var i : Int? = 10 var j : Int? = 10 System.out?.println(i!! + j!!) diff --git a/j2k/tests/testData/ast/misc/intNullability.kt b/j2k/tests/testData/ast/misc/intNullability.kt index e3e6c4ca889..9891bb52eb9 100644 --- a/j2k/tests/testData/ast/misc/intNullability.kt +++ b/j2k/tests/testData/ast/misc/intNullability.kt @@ -1,7 +1,7 @@ package demo import kotlin.compatibility.* open class Test() { -open fun test() : Unit { +open fun test() { var i : Int? = 10 var j : Int? = 10 System.out?.println(i!! + j!!) diff --git a/j2k/tests/testData/ast/newClassExpression/fullQualifiedName.ide.kt b/j2k/tests/testData/ast/newClassExpression/fullQualifiedName.ide.kt index f540dfcdce3..51ea7fef84b 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 open class User() { -open fun main() : Unit { +open fun main() { val list = java.util.LinkedList() } } \ No newline at end of file diff --git a/j2k/tests/testData/ast/newClassExpression/fullQualifiedName.kt b/j2k/tests/testData/ast/newClassExpression/fullQualifiedName.kt index 808085fdf6f..83cb2cef93c 100644 --- a/j2k/tests/testData/ast/newClassExpression/fullQualifiedName.kt +++ b/j2k/tests/testData/ast/newClassExpression/fullQualifiedName.kt @@ -1,6 +1,6 @@ package test open class User() { -open fun main() : Unit { +open fun main() { var list : MutableList<*>? = 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 f540dfcdce3..51ea7fef84b 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 open class User() { -open fun main() : Unit { +open fun main() { val list = java.util.LinkedList() } } \ No newline at end of file diff --git a/j2k/tests/testData/ast/newClassExpression/fullQualifiedName2.kt b/j2k/tests/testData/ast/newClassExpression/fullQualifiedName2.kt index 808085fdf6f..83cb2cef93c 100644 --- a/j2k/tests/testData/ast/newClassExpression/fullQualifiedName2.kt +++ b/j2k/tests/testData/ast/newClassExpression/fullQualifiedName2.kt @@ -1,6 +1,6 @@ package test open class User() { -open fun main() : Unit { +open fun main() { var list : MutableList<*>? = 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 90255d5650d..926c48703af 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 open class User() { -open fun main() : Unit { +open fun main() { val list = LinkedList() } } \ No newline at end of file diff --git a/j2k/tests/testData/ast/newClassExpression/genericClassInvocation.kt b/j2k/tests/testData/ast/newClassExpression/genericClassInvocation.kt index d110bb30c16..db9941b7576 100644 --- a/j2k/tests/testData/ast/newClassExpression/genericClassInvocation.kt +++ b/j2k/tests/testData/ast/newClassExpression/genericClassInvocation.kt @@ -1,6 +1,6 @@ import java.util.LinkedList open class User() { -open fun main() : Unit { +open fun main() { var list : MutableList? = 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 2818ebccad3..eb8c96bf90c 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 open class Library() { } open class User() { -open fun main() : Unit { +open fun main() { val lib = Library() } } \ No newline at end of file diff --git a/j2k/tests/testData/ast/newClassExpression/newClassByFullName.kt b/j2k/tests/testData/ast/newClassExpression/newClassByFullName.kt index adb7fce935a..65868d3485a 100644 --- a/j2k/tests/testData/ast/newClassExpression/newClassByFullName.kt +++ b/j2k/tests/testData/ast/newClassExpression/newClassByFullName.kt @@ -2,7 +2,7 @@ package org.test open class Library() { } open class User() { -open fun main() : Unit { +open fun main() { var lib : Library? = Library() } } \ No newline at end of file diff --git a/j2k/tests/testData/ast/newClassExpression/newClassWithAnonymousScope.ide.kt b/j2k/tests/testData/ast/newClassExpression/newClassWithAnonymousScope.ide.kt index 01bbbbe3281..1d55c7127a2 100644 --- a/j2k/tests/testData/ast/newClassExpression/newClassWithAnonymousScope.ide.kt +++ b/j2k/tests/testData/ast/newClassExpression/newClassWithAnonymousScope.ide.kt @@ -1,5 +1,5 @@ object : Runnable() { -public override fun run() : Unit { +public override fun run() { System.out.println("Run") } } \ No newline at end of file diff --git a/j2k/tests/testData/ast/newClassExpression/newClassWithAnonymousScope.kt b/j2k/tests/testData/ast/newClassExpression/newClassWithAnonymousScope.kt index 29038a298dc..450032ead94 100644 --- a/j2k/tests/testData/ast/newClassExpression/newClassWithAnonymousScope.kt +++ b/j2k/tests/testData/ast/newClassExpression/newClassWithAnonymousScope.kt @@ -1,5 +1,5 @@ object : Runnable() { -public override fun run() : Unit { +public override fun run() { System.out?.println("Run") } } \ 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 77b610445c7..260c078ca41 100644 --- a/j2k/tests/testData/ast/newClassExpression/newInnerClass.ide.kt +++ b/j2k/tests/testData/ast/newClassExpression/newInnerClass.ide.kt @@ -4,7 +4,7 @@ open class InnerClass() { } } open class User() { -open fun main() : Unit { +open fun main() { val outerObject = OuterClass() val innerObject = outerObject.InnerClass() } diff --git a/j2k/tests/testData/ast/newClassExpression/newInnerClass.kt b/j2k/tests/testData/ast/newClassExpression/newInnerClass.kt index 93c7fec3411..1ce2c7ca119 100644 --- a/j2k/tests/testData/ast/newClassExpression/newInnerClass.kt +++ b/j2k/tests/testData/ast/newClassExpression/newInnerClass.kt @@ -4,7 +4,7 @@ open class InnerClass() { } } open class User() { -open fun main() : Unit { +open fun main() { var outerObject : OuterClass? = OuterClass() var innerObject : OuterClass.InnerClass? = outerObject?.InnerClass() } diff --git a/j2k/tests/testData/ast/newClassExpression/newListAndNewMember.ide.kt b/j2k/tests/testData/ast/newClassExpression/newListAndNewMember.ide.kt index ebfa0bb5af2..0634233ce58 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 open class Member() { } open class User() { -open fun main() : Unit { +open fun main() { val members = LinkedList() members.add(Member()) } diff --git a/j2k/tests/testData/ast/newClassExpression/newListAndNewMember.kt b/j2k/tests/testData/ast/newClassExpression/newListAndNewMember.kt index 1f5699c575d..3f8c8199874 100644 --- a/j2k/tests/testData/ast/newClassExpression/newListAndNewMember.kt +++ b/j2k/tests/testData/ast/newClassExpression/newListAndNewMember.kt @@ -3,7 +3,7 @@ import java.util.LinkedList open class Member() { } open class User() { -open fun main() : Unit { +open fun main() { var members : MutableList? = 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 1bc3562e941..b641ed682af 100644 --- a/j2k/tests/testData/ast/newClassExpression/newStaticInnerClass.ide.kt +++ b/j2k/tests/testData/ast/newClassExpression/newStaticInnerClass.ide.kt @@ -6,7 +6,7 @@ open class Bar() { } } open class User() { -open fun main() : Unit { +open fun main() { val boo = Foo.Bar() } } \ No newline at end of file diff --git a/j2k/tests/testData/ast/newClassExpression/newStaticInnerClass.kt b/j2k/tests/testData/ast/newClassExpression/newStaticInnerClass.kt index 3a6a440f397..690ffaa66bd 100644 --- a/j2k/tests/testData/ast/newClassExpression/newStaticInnerClass.kt +++ b/j2k/tests/testData/ast/newClassExpression/newStaticInnerClass.kt @@ -6,7 +6,7 @@ open class Bar() { } } open class User() { -open fun main() : Unit { +open fun main() { var boo : Foo.Bar? = 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 7ae2d9972b2..6cca6e8ef4e 100644 --- a/j2k/tests/testData/ast/objectLiteral/MyFrame.ide.kt +++ b/j2k/tests/testData/ast/objectLiteral/MyFrame.ide.kt @@ -1,17 +1,17 @@ package demo open class WindowAdapter() { -public open fun windowClosing() : Unit { +public open fun windowClosing() { } } public class Client() : Frame() { { val a = object : WindowAdapter() { -public override fun windowClosing() : Unit { +public override fun windowClosing() { } } addWindowListener(a) addWindowListener(object : WindowAdapter() { -public override fun windowClosing() : Unit { +public override fun windowClosing() { } }) } diff --git a/j2k/tests/testData/ast/objectLiteral/MyFrame.kt b/j2k/tests/testData/ast/objectLiteral/MyFrame.kt index 270a5e9625f..92383217435 100644 --- a/j2k/tests/testData/ast/objectLiteral/MyFrame.kt +++ b/j2k/tests/testData/ast/objectLiteral/MyFrame.kt @@ -1,17 +1,17 @@ package demo open class WindowAdapter() { -public open fun windowClosing() : Unit { +public open fun windowClosing() { } } public class Client() : Frame() { { var a : WindowAdapter? = object : WindowAdapter() { -public override fun windowClosing() : Unit { +public override fun windowClosing() { } } addWindowListener(a) addWindowListener(object : WindowAdapter() { -public override fun windowClosing() : Unit { +public override fun windowClosing() { } }) } diff --git a/j2k/tests/testData/ast/outProjectionType/methodParams.ide.kt b/j2k/tests/testData/ast/outProjectionType/methodParams.ide.kt index 7523758fd46..df98594dc7b 100644 --- a/j2k/tests/testData/ast/outProjectionType/methodParams.ide.kt +++ b/j2k/tests/testData/ast/outProjectionType/methodParams.ide.kt @@ -1,2 +1,2 @@ -fun pushAll(src : Collection) : Unit { +fun pushAll(src : Collection) { } \ No newline at end of file diff --git a/j2k/tests/testData/ast/outProjectionType/methodParams.kt b/j2k/tests/testData/ast/outProjectionType/methodParams.kt index 373c01e629f..61dcdc8dad3 100644 --- a/j2k/tests/testData/ast/outProjectionType/methodParams.kt +++ b/j2k/tests/testData/ast/outProjectionType/methodParams.kt @@ -1,2 +1,2 @@ -fun pushAll(src : Collection?) : Unit { +fun pushAll(src : Collection?) { } \ 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 fbc36b7a377..b5287e68ed9 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 open class Test() { -open fun main() : Unit { +open fun main() { val commonMap = HashMap() val rawMap = HashMap() val superRawMap = HashMap() diff --git a/j2k/tests/testData/ast/rawGenerics/kt-540-map.kt b/j2k/tests/testData/ast/rawGenerics/kt-540-map.kt index ce580f8680a..0410e23d9d3 100644 --- a/j2k/tests/testData/ast/rawGenerics/kt-540-map.kt +++ b/j2k/tests/testData/ast/rawGenerics/kt-540-map.kt @@ -1,7 +1,7 @@ package demo import java.util.HashMap open class Test() { -open fun main() : Unit { +open fun main() { var commonMap : HashMap? = HashMap() var rawMap : HashMap? = HashMap() var superRawMap : HashMap? = 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 a96fc96ecbd..238bfbc78b7 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) } } open class Test() { -open fun main() : Unit { +open fun main() { val raw1 = Collection(1) val raw2 = Collection(1) val raw3 = Collection("1") diff --git a/j2k/tests/testData/ast/rawGenerics/kt-540-rawGenericClass.kt b/j2k/tests/testData/ast/rawGenerics/kt-540-rawGenericClass.kt index 426b2190bc9..e3401238279 100644 --- a/j2k/tests/testData/ast/rawGenerics/kt-540-rawGenericClass.kt +++ b/j2k/tests/testData/ast/rawGenerics/kt-540-rawGenericClass.kt @@ -5,7 +5,7 @@ System.out?.println(e) } } open class Test() { -open fun main() : Unit { +open fun main() { var raw1 : Collection<*>? = Collection(1) var raw2 : Collection<*>? = Collection(1) var raw3 : Collection<*>? = 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 51c31b4015a..ba894c82b4b 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 open class Test() { -open fun main() : Unit { +open fun main() { val common = LinkedList() val raw = LinkedList() val superRaw = LinkedList() diff --git a/j2k/tests/testData/ast/rawGenerics/kt-540.kt b/j2k/tests/testData/ast/rawGenerics/kt-540.kt index 428297a628a..e5b202a9cac 100644 --- a/j2k/tests/testData/ast/rawGenerics/kt-540.kt +++ b/j2k/tests/testData/ast/rawGenerics/kt-540.kt @@ -1,7 +1,7 @@ package demo import java.util.LinkedList open class Test() { -open fun main() : Unit { +open fun main() { var common : MutableList? = LinkedList() var raw : MutableList<*>? = LinkedList() var superRaw : MutableList<*>? = LinkedList() diff --git a/j2k/tests/testData/ast/rawGenerics/rawGenericMethod.ide.kt b/j2k/tests/testData/ast/rawGenerics/rawGenericMethod.ide.kt index ce632182ab3..331c86e31fa 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 open class TestT() { -open fun getT() : Unit { +open fun getT() { } } open class U() { -open fun main() : Unit { +open fun main() { val t = TestT() t.getT() t.getT() diff --git a/j2k/tests/testData/ast/rawGenerics/rawGenericMethod.kt b/j2k/tests/testData/ast/rawGenerics/rawGenericMethod.kt index ea3e08d5bdb..a8fcebac3f7 100644 --- a/j2k/tests/testData/ast/rawGenerics/rawGenericMethod.kt +++ b/j2k/tests/testData/ast/rawGenerics/rawGenericMethod.kt @@ -1,10 +1,10 @@ package demo open class TestT() { -open fun getT() : Unit { +open fun getT() { } } open class U() { -open fun main() : Unit { +open fun main() { var t : TestT? = TestT() t?.getT() t?.getT() diff --git a/j2k/tests/testData/ast/starProjectionType/methodParams.ide.kt b/j2k/tests/testData/ast/starProjectionType/methodParams.ide.kt index 4d9524c085b..14625caf23f 100644 --- a/j2k/tests/testData/ast/starProjectionType/methodParams.ide.kt +++ b/j2k/tests/testData/ast/starProjectionType/methodParams.ide.kt @@ -1,2 +1,2 @@ -fun wtf(w : Collection<*>) : Unit { +fun wtf(w : Collection<*>) { } \ No newline at end of file diff --git a/j2k/tests/testData/ast/starProjectionType/methodParams.kt b/j2k/tests/testData/ast/starProjectionType/methodParams.kt index 01ea4c15302..6df4954e3b8 100644 --- a/j2k/tests/testData/ast/starProjectionType/methodParams.kt +++ b/j2k/tests/testData/ast/starProjectionType/methodParams.kt @@ -1,2 +1,2 @@ -fun wtf(w : Collection<*>?) : Unit { +fun wtf(w : Collection<*>?) { } \ No newline at end of file diff --git a/j2k/tests/testData/ast/superExpression/classAdotSuperFoo.ide.kt b/j2k/tests/testData/ast/superExpression/classAdotSuperFoo.ide.kt index a6495ce0571..2fe44fa3554 100644 --- a/j2k/tests/testData/ast/superExpression/classAdotSuperFoo.ide.kt +++ b/j2k/tests/testData/ast/superExpression/classAdotSuperFoo.ide.kt @@ -1,9 +1,9 @@ open class Base() { -open fun foo() : Unit +open fun foo() } open class A() : Base() { open class C() { -open fun test() : Unit { +open fun test() { super@A.foo() } } diff --git a/j2k/tests/testData/ast/superExpression/classAdotSuperFoo.kt b/j2k/tests/testData/ast/superExpression/classAdotSuperFoo.kt index a6495ce0571..2fe44fa3554 100644 --- a/j2k/tests/testData/ast/superExpression/classAdotSuperFoo.kt +++ b/j2k/tests/testData/ast/superExpression/classAdotSuperFoo.kt @@ -1,9 +1,9 @@ open class Base() { -open fun foo() : Unit +open fun foo() } open class A() : Base() { open class C() { -open fun test() : Unit { +open fun test() { super@A.foo() } } diff --git a/j2k/tests/testData/ast/switch/comlicatedFallDown.ide.kt b/j2k/tests/testData/ast/switch/comlicatedFallDown.ide.kt index 687bf185ee4..48342299369 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 open class SwitchDemo() { class object { -public open fun print(o : Any) : Unit { +public open fun print(o : Any) { System.out.println(o) } -public open fun test(i : Int) : Unit { +public open 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) : Unit { +public open fun main(args : Array) { for (i in 1..12) test(i) } } diff --git a/j2k/tests/testData/ast/switch/comlicatedFallDown.kt b/j2k/tests/testData/ast/switch/comlicatedFallDown.kt index ff998f92dc2..69da2a0bfd6 100644 --- a/j2k/tests/testData/ast/switch/comlicatedFallDown.kt +++ b/j2k/tests/testData/ast/switch/comlicatedFallDown.kt @@ -1,10 +1,10 @@ package demo public open class SwitchDemo() { class object { -public open fun print(o : Any?) : Unit { +public open fun print(o : Any?) { System.out?.println(o) } -public open fun test(i : Int) : Unit { +public open fun test(i : Int) { var monthString : String? = "" when (i) { 1 -> { @@ -80,7 +80,7 @@ monthString = "Invalid month" } System.out?.println(monthString) } -public open fun main(args : Array?) : Unit { +public open 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 1786c1b157a..e71e76ae6b2 100644 --- a/j2k/tests/testData/ast/switch/emptySwitch.ide.kt +++ b/j2k/tests/testData/ast/switch/emptySwitch.ide.kt @@ -1,6 +1,6 @@ public open class NonDefault() { class object { -public open fun main(args : Array) : Unit { +public open fun main(args : Array) { val value = 3 val valueString = "" when (value) { diff --git a/j2k/tests/testData/ast/switch/emptySwitch.kt b/j2k/tests/testData/ast/switch/emptySwitch.kt index afb01623bfe..05637f67902 100644 --- a/j2k/tests/testData/ast/switch/emptySwitch.kt +++ b/j2k/tests/testData/ast/switch/emptySwitch.kt @@ -1,6 +1,6 @@ public open class NonDefault() { class object { -public open fun main(args : Array?) : Unit { +public open fun main(args : Array?) { var value : Int = 3 var valueString : String? = "" when (value) { diff --git a/j2k/tests/testData/ast/switch/fallDown.ide.kt b/j2k/tests/testData/ast/switch/fallDown.ide.kt index f4b14b211a4..8898cf6f48b 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 open class SwitchDemo() { class object { -public open fun main(args : Array) : Unit { +public open fun main(args : Array) { val month = 8 val monthString : String when (month) { diff --git a/j2k/tests/testData/ast/switch/fallDown.kt b/j2k/tests/testData/ast/switch/fallDown.kt index 35bb7e7576d..dccfb215143 100644 --- a/j2k/tests/testData/ast/switch/fallDown.kt +++ b/j2k/tests/testData/ast/switch/fallDown.kt @@ -1,7 +1,7 @@ package switch_demo public open class SwitchDemo() { class object { -public open fun main(args : Array?) : Unit { +public open fun main(args : Array?) { var month : Int = 8 var 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 6ee522f5499..350e0bebe37 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 open class SwitchDemo() { class object { -public open fun main(args : Array) : Unit { +public open fun main(args : Array) { val month = 8 val monthString : String when (month) { diff --git a/j2k/tests/testData/ast/switch/kt-539.kt b/j2k/tests/testData/ast/switch/kt-539.kt index 4413070760e..6b6d5288e80 100644 --- a/j2k/tests/testData/ast/switch/kt-539.kt +++ b/j2k/tests/testData/ast/switch/kt-539.kt @@ -1,7 +1,7 @@ package switch_demo public open class SwitchDemo() { class object { -public open fun main(args : Array?) : Unit { +public open fun main(args : Array?) { var month : Int = 8 var 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 57debde90c0..385f564442e 100644 --- a/j2k/tests/testData/ast/switch/nondefault.ide.kt +++ b/j2k/tests/testData/ast/switch/nondefault.ide.kt @@ -1,6 +1,6 @@ public open class NonDefault() { class object { -public open fun main(args : Array) : Unit { +public open fun main(args : Array) { val value = 3 val valueString = "" when (value) { diff --git a/j2k/tests/testData/ast/switch/nondefault.kt b/j2k/tests/testData/ast/switch/nondefault.kt index de93f99ed00..facbbe8fa10 100644 --- a/j2k/tests/testData/ast/switch/nondefault.kt +++ b/j2k/tests/testData/ast/switch/nondefault.kt @@ -1,6 +1,6 @@ public open class NonDefault() { class object { -public open fun main(args : Array?) : Unit { +public open fun main(args : Array?) { var value : Int = 3 var valueString : String? = "" when (value) { diff --git a/j2k/tests/testData/ast/thisExpression/classAdotThisFoo.ide.kt b/j2k/tests/testData/ast/thisExpression/classAdotThisFoo.ide.kt index 615b3b5dc0a..4bb52748296 100644 --- a/j2k/tests/testData/ast/thisExpression/classAdotThisFoo.ide.kt +++ b/j2k/tests/testData/ast/thisExpression/classAdotThisFoo.ide.kt @@ -1,10 +1,10 @@ open class Base() { -open fun foo() : Unit { +open fun foo() { } } open class A() : Base() { open class C() { -open fun test() : Unit { +open fun test() { this@A.foo() } } diff --git a/j2k/tests/testData/ast/thisExpression/classAdotThisFoo.kt b/j2k/tests/testData/ast/thisExpression/classAdotThisFoo.kt index 615b3b5dc0a..4bb52748296 100644 --- a/j2k/tests/testData/ast/thisExpression/classAdotThisFoo.kt +++ b/j2k/tests/testData/ast/thisExpression/classAdotThisFoo.kt @@ -1,10 +1,10 @@ open class Base() { -open fun foo() : Unit { +open fun foo() { } } open class A() : Base() { open class C() { -open fun test() : Unit { +open fun test() { this@A.foo() } } diff --git a/j2k/tests/testData/ast/varArg/ellipsisTypeSingleParams.ide.kt b/j2k/tests/testData/ast/varArg/ellipsisTypeSingleParams.ide.kt index 715241ae78d..5a8349961bf 100644 --- a/j2k/tests/testData/ast/varArg/ellipsisTypeSingleParams.ide.kt +++ b/j2k/tests/testData/ast/varArg/ellipsisTypeSingleParams.ide.kt @@ -1,2 +1,2 @@ -fun pushAll(vararg objs : Any) : Unit { +fun pushAll(vararg objs : Any) { } \ No newline at end of file diff --git a/j2k/tests/testData/ast/varArg/ellipsisTypeSingleParams.kt b/j2k/tests/testData/ast/varArg/ellipsisTypeSingleParams.kt index 5219629e1e3..5e2076786e1 100644 --- a/j2k/tests/testData/ast/varArg/ellipsisTypeSingleParams.kt +++ b/j2k/tests/testData/ast/varArg/ellipsisTypeSingleParams.kt @@ -1,2 +1,2 @@ -fun pushAll(vararg objs : Any?) : Unit { +fun pushAll(vararg objs : Any?) { } \ No newline at end of file