From 1fe978e216930c92694c6f71d28180e4b9d73d13 Mon Sep 17 00:00:00 2001 From: Aleksi Majander Date: Tue, 5 Feb 2013 16:55:11 +0200 Subject: [PATCH] Fixed issue with final variables and overloading --- src/org/jetbrains/jet/j2k/ast/Field.kt | 2 +- tests/testData/ast/constructors/file/genericIdentifier.kt | 2 +- tests/testData/ast/constructors/file/identifier.kt | 2 +- tests/testData/ast/issues/file/kt-638.kt | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/org/jetbrains/jet/j2k/ast/Field.kt b/src/org/jetbrains/jet/j2k/ast/Field.kt index eeddca3c190..45520b2a11e 100644 --- a/src/org/jetbrains/jet/j2k/ast/Field.kt +++ b/src/org/jetbrains/jet/j2k/ast/Field.kt @@ -33,7 +33,7 @@ public open class Field(val identifier : Identifier, val declaration : String = docComments.toKotlin("\n", "", "\n") + modifiersToKotlin() + identifier.toKotlin() + " : " + `type`.toKotlin() if (initializer.isEmpty()) { - return declaration + ((if (isVal() && !isStatic() && writingAccesses == 1) + return declaration + ((if (isVal() && !isStatic() && writingAccesses != 0) "" else " = " + Converter.getDefaultInitializer(this))) diff --git a/tests/testData/ast/constructors/file/genericIdentifier.kt b/tests/testData/ast/constructors/file/genericIdentifier.kt index d049a45adce..5646289bdfd 100644 --- a/tests/testData/ast/constructors/file/genericIdentifier.kt +++ b/tests/testData/ast/constructors/file/genericIdentifier.kt @@ -1,5 +1,5 @@ public open class Identifier(_myName : T?, _myHasDollar : Boolean) { -private val myName : T? = null +private val myName : T? private var myHasDollar : Boolean = false private var myNullable : Boolean = true public open fun getName() : T? { diff --git a/tests/testData/ast/constructors/file/identifier.kt b/tests/testData/ast/constructors/file/identifier.kt index 3ede387654c..c627d0821be 100644 --- a/tests/testData/ast/constructors/file/identifier.kt +++ b/tests/testData/ast/constructors/file/identifier.kt @@ -1,5 +1,5 @@ public open class Identifier(_myName : String?, _myHasDollar : Boolean) { -private val myName : String? = null +private val myName : String? private var myHasDollar : Boolean = false private var myNullable : Boolean = true public open fun getName() : String? { diff --git a/tests/testData/ast/issues/file/kt-638.kt b/tests/testData/ast/issues/file/kt-638.kt index d5a6a0ad7e1..a59d69c7f08 100644 --- a/tests/testData/ast/issues/file/kt-638.kt +++ b/tests/testData/ast/issues/file/kt-638.kt @@ -1,5 +1,5 @@ public open class Identifier(_myName : T?, _myHasDollar : Boolean) { -private val myName : T? = null +private val myName : T? private var myHasDollar : Boolean = false private var myNullable : Boolean = true public open fun getName() : T? {