Converter:

Omit Unit return type
Refactor handling of Unit type: extract separate object UnitType

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<Node>,
@@ -45,7 +46,7 @@ public open class Function(val name: Identifier,
         return ""
     }
 
-    open fun modifiersToKotlin(): String {
+    private fun modifiersToKotlin(): String {
         val modifierList = ArrayList<Modifier>()
         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() +
+            modifiersToKotlin() +
-        "fun " + name.toKotlin() +
+            "fun ${name.toKotlin()}${typeParametersToKotlin()}" +
-        typeParametersToKotlin() +
+            "(${params.toKotlin()})" +
-        "(" + params.toKotlin() + ") : " +
+            returnTypeToKotlin() +
-        `type`.toKotlin() + " " + typeParameterWhereToKotlin() +
+            typeParameterWhereToKotlin() +
-        block?.toKotlin()
+            block?.toKotlin()
     }
 }

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

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)))

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)
     }
 

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)

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)

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()

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()

j2k/tests/testData/ast/arrayType/methodArrayArgs.ide.kt

@@ -1,2 +1,2 @@
-fun fromArrayToCollection(a : Array<Foo>) : Unit {
+fun fromArrayToCollection(a : Array<Foo>) {
 }

j2k/tests/testData/ast/arrayType/methodArrayArgs.kt

@@ -1,2 +1,2 @@
-fun fromArrayToCollection(a : Array<Foo?>?) : Unit {
+fun fromArrayToCollection(a : Array<Foo?>?) {
 }

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()

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()!!

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

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

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)

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)

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()
 }
 }

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()
 }
 }

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()
 }

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()
 }

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()

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()

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()
 }
 }

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()
 }
 }

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")

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")

j2k/tests/testData/ast/class/abstractClass.ide.kt

@@ -1,6 +1,6 @@
 abstract class A() {
-abstract fun callme() : Unit
+abstract fun callme()
-open fun callmetoo() : Unit {
+open fun callmetoo() {
 print("This is a concrete method.")
 }
 }

j2k/tests/testData/ast/class/abstractClass.kt

@@ -1,6 +1,6 @@
 abstract class A() {
-abstract fun callme() : Unit
+abstract fun callme()
-open fun callmetoo() : Unit {
+open fun callmetoo() {
 print("This is a concrete method.")
 }
 }

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 {

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? {

j2k/tests/testData/ast/class/classWithEmptyMethods.ide.kt

@@ -1,5 +1,5 @@
 class T() {
-fun main() : Unit {
+fun main() {
 }
 fun i() : Int {
 }

j2k/tests/testData/ast/class/classWithEmptyMethods.kt

@@ -1,5 +1,5 @@
 class T() {
-fun main() : Unit {
+fun main() {
 }
 fun i() : Int {
 }

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()

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<Any?, Any?>? = HashMap(1)
 var m2 : HashMap<Any?, Any?>? = HashMap(10)
 var t1 : Test? = Test.init()

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) {
 }
 }

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) {
 }
 }

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)

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)

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)

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)

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())

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())

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<String>("name", false, true)
 val i2 = Identifier.init<String>("name", false)
 val i3 = Identifier.init<String>("name")

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<String?>("name", false, true)
 var i2 : Identifier<*>? = Identifier.init<String?>("name", false)
 var i3 : Identifier<*>? = Identifier.init<String?>("name")

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")

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")

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")
 }
 }

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")
 }
 }

j2k/tests/testData/ast/enum/enumConstantIsNotNull.ide.kt

@@ -1,6 +1,6 @@
 enum class E {
 FOO
-fun foo() : Unit {
+fun foo() {
 FOO.toString()
 }
 }

j2k/tests/testData/ast/enum/enumConstantIsNotNull.kt

@@ -1,6 +1,6 @@
 enum class E {
 FOO
-fun foo() : Unit {
+fun foo() {
 FOO.toString()
 }
 }

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())
 }
 }

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())
 }
 }

j2k/tests/testData/ast/function/emptyVoidMethod.ide.kt

@@ -1,2 +1,2 @@
-fun main() : Unit {
+fun main() {
 }

j2k/tests/testData/ast/function/emptyVoidMethod.kt

@@ -1,2 +1,2 @@
-fun main() : Unit {
+fun main() {
 }

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<Base>.getName() + '@' + Integer.toHexString(hashCode())
 }
-protected open fun finalize() : Unit {
+protected open fun finalize() {
 super.finalize()
 }
 }

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<Base>.getName() + '@' + Integer.toHexString(hashCode())
 }
-protected open fun finalize() : Unit {
+protected open fun finalize() {
 super.finalize()
 }
 }

j2k/tests/testData/ast/function/functionInFinalClass.ide.kt

@@ -1,5 +1,5 @@
 package demo
 class Final() {
-fun test() : Unit {
+fun test() {
 }
 }

j2k/tests/testData/ast/function/functionInFinalClass.kt

@@ -1,5 +1,5 @@
 package demo
 class Final() {
-fun test() : Unit {
+fun test() {
 }
 }

j2k/tests/testData/ast/function/internal.ide.kt

@@ -1,2 +1,2 @@
-fun test() : Unit {
+fun test() {
 }

j2k/tests/testData/ast/function/internal.kt

@@ -1,2 +1,2 @@
-fun test() : Unit {
+fun test() {
 }

j2k/tests/testData/ast/function/main.ide.kt

@@ -1,4 +1,4 @@
 class object {
-public fun main(args : Array<String>) : Unit {
+public fun main(args : Array<String>) {
 }
 }

j2k/tests/testData/ast/function/main.kt

@@ -1,4 +1,4 @@
 class object {
-public fun main(args : Array<String?>?) : Unit {
+public fun main(args : Array<String?>?) {
 }
 }

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() {
 }
 }

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() {
 }
 }

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() {
 }
 }

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() {
 }
 }

j2k/tests/testData/ast/function/overrideObject.ide.kt

@@ -12,7 +12,7 @@ return super.clone()
 public open fun toString() : String {
 return getJavaClass<Test>.getName() + '@' + Integer.toHexString(hashCode())
 }
-protected open fun finalize() : Unit {
+protected open fun finalize() {
 super.finalize()
 }
 }

j2k/tests/testData/ast/function/overrideObject.kt

@@ -12,7 +12,7 @@ return super.clone()
 public open fun toString() : String? {
 return getJavaClass<Test>.getName() + '@' + Integer.toHexString(hashCode())
 }
-protected open fun finalize() : Unit {
+protected open fun finalize() {
 super.finalize()
 }
 }

j2k/tests/testData/ast/function/ownGenericParam.ide.kt

@@ -1,2 +1,2 @@
-fun putU<U>(u : U) : Unit {
+fun putU<U>(u : U) {
 }

j2k/tests/testData/ast/function/ownGenericParam.kt

@@ -1,2 +1,2 @@
-fun putU<U>(u : U?) : Unit {
+fun putU<U>(u : U?) {
 }

j2k/tests/testData/ast/function/ownSeveralGenericParams.ide.kt

@@ -1,2 +1,2 @@
-fun putUVW<U, V, W>(u : U, v : V, w : W) : Unit {
+fun putUVW<U, V, W>(u : U, v : V, w : W) {
 }

j2k/tests/testData/ast/function/ownSeveralGenericParams.kt

@@ -1,2 +1,2 @@
-fun putUVW<U, V, W>(u : U?, v : V?, w : W?) : Unit {
+fun putUVW<U, V, W>(u : U?, v : V?, w : W?) {
 }

j2k/tests/testData/ast/function/private.ide.kt

@@ -1,2 +1,2 @@
-private fun test() : Unit {
+private fun test() {
 }

j2k/tests/testData/ast/function/private.kt

@@ -1,2 +1,2 @@
-private fun test() : Unit {
+private fun test() {
 }

j2k/tests/testData/ast/function/protected.ide.kt

@@ -1,2 +1,2 @@
-protected fun test() : Unit {
+protected fun test() {
 }

j2k/tests/testData/ast/function/protected.kt

@@ -1,2 +1,2 @@
-protected fun test() : Unit {
+protected fun test() {
 }

j2k/tests/testData/ast/function/public.ide.kt

@@ -1,2 +1,2 @@
-public fun test() : Unit {
+public fun test() {
 }

j2k/tests/testData/ast/function/public.kt

@@ -1,2 +1,2 @@
-public fun test() : Unit {
+public fun test() {
 }

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<Int>(1, 2, 3)
 }
 }

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<Int?>(1, 2, 3)
 }
 }

j2k/tests/testData/ast/inProjectionType/methodParams.ide.kt

@@ -1,2 +1,2 @@
-fun popAll(dst : Collection<in E>) : Unit {
+fun popAll(dst : Collection<in E>) {
 }

j2k/tests/testData/ast/inProjectionType/methodParams.kt

@@ -1,2 +1,2 @@
-fun popAll(dst : Collection<in E?>?) : Unit {
+fun popAll(dst : Collection<in E?>?) {
 }

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 */
 }
 }

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 */
 }
 }

j2k/tests/testData/ast/issues/kt-1048.ide.kt

@@ -2,11 +2,11 @@ import java.util.HashMap
 open class G<T : String>(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<String>("")

j2k/tests/testData/ast/issues/kt-1048.kt

@@ -2,11 +2,11 @@ import java.util.HashMap
 open class G<T : String?>(t : T?) {
 }
 public open class Java() {
-open fun test() : Unit {
+open fun test() {
 var m : HashMap<Any?, Any?>? = HashMap()
 m?.put(1, 1)
 }
-open fun test2() : Unit {
+open fun test2() {
 var m : HashMap<*, *>? = HashMap()
 var g : G<String?>? = G("")
 var g2 : G<String?>? = G<String?>("")

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)

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)

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

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

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)
 }

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)
 }

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())
 }

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())
 }

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<String>) : Unit {
+public open fun main(args : Array<String>) {
 val i1 = Identifier.init<String>("name", false, true)
 val i2 = Identifier.init<String>("name", false)
 val i3 = Identifier.init<String>("name")

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<String?>?) : Unit {
+public open fun main(args : Array<String?>?) {
 var i1 : Identifier<*>? = Identifier.init<String?>("name", false, true)
 var i2 : Identifier<*>? = Identifier.init<String?>("name", false)
 var i3 : Identifier<*>? = Identifier.init<String?>("name")

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)
 }

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)
 }

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())
 }

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())
 }