diff --git a/src/org/jetbrains/jet/j2k/Converter.java b/src/org/jetbrains/jet/j2k/Converter.java index b995b66a0d7..0b8c079de5f 100644 --- a/src/org/jetbrains/jet/j2k/Converter.java +++ b/src/org/jetbrains/jet/j2k/Converter.java @@ -101,7 +101,7 @@ public class Converter { ); // we create primary constructor from all non final fields and fields without initializers - if (!psiClass.isEnum() && !psiClass.isInterface() && getPrimaryConstructorForThisCase(psiClass) == null) { + if (!psiClass.isEnum() && !psiClass.isInterface() && psiClass.getConstructors().length > 1 && getPrimaryConstructorForThisCase(psiClass) == null) { final List finalOrWithEmptyInitializer = getFinalOrWithEmptyInitializer(fields); final Map initializers = new HashMap(); diff --git a/testData/ast/callChainExpression/file/libraryFieldCall.kt b/testData/ast/callChainExpression/file/libraryFieldCall.kt index e73fec3b331..868d83f109a 100644 --- a/testData/ast/callChainExpression/file/libraryFieldCall.kt +++ b/testData/ast/callChainExpression/file/libraryFieldCall.kt @@ -1,10 +1,7 @@ -open class Library(ourOut : PrintStream?) { +open class Library() { class object { val ourOut : PrintStream? } -{ -$ourOut = ourOut -} } open class User() { open fun main() : Unit { diff --git a/testData/ast/callChainExpression/file/libraryStringFieldCall.kt b/testData/ast/callChainExpression/file/libraryStringFieldCall.kt index f0b4a755514..bced464f750 100644 --- a/testData/ast/callChainExpression/file/libraryStringFieldCall.kt +++ b/testData/ast/callChainExpression/file/libraryStringFieldCall.kt @@ -1,8 +1,5 @@ -open class Library(myString : String?) { +open class Library() { public val myString : String? -{ -$myString = myString -} } open class User() { open fun main() : Unit { diff --git a/testData/ast/class/class/classWithMultiplyFields.kt b/testData/ast/class/class/classWithMultiplyFields.kt index 284615f1d67..03b2647a157 100644 --- a/testData/ast/class/class/classWithMultiplyFields.kt +++ b/testData/ast/class/class/classWithMultiplyFields.kt @@ -1,9 +1,5 @@ -class T(a : String?, b : String?) { +class T() { var a : String? var b : String? var c : String? = "abc" -{ -$a = a -$b = b -} } \ No newline at end of file diff --git a/testData/ast/field/file/classChildExtendsBase.kt b/testData/ast/field/file/classChildExtendsBase.kt index bbfb7fb7fb8..c262641b4ba 100644 --- a/testData/ast/field/file/classChildExtendsBase.kt +++ b/testData/ast/field/file/classChildExtendsBase.kt @@ -1,12 +1,6 @@ -open class Base(myFirst : String?) { +open class Base() { private var myFirst : String? -{ -$myFirst = myFirst } -} -open class Child(mySecond : String?) : Base() { +open class Child() : Base() { private var mySecond : String? -{ -$mySecond = mySecond -} } \ No newline at end of file diff --git a/testData/ast/field/file/internalField.kt b/testData/ast/field/file/internalField.kt index e1619fe519b..e09da17755a 100644 --- a/testData/ast/field/file/internalField.kt +++ b/testData/ast/field/file/internalField.kt @@ -1,6 +1,3 @@ -open class C(f : Foo?) { +open class C() { var f : Foo? -{ -$f = f -} } \ No newline at end of file diff --git a/testData/ast/field/file/privateField.kt b/testData/ast/field/file/privateField.kt index d86a453cada..2c742aff9e0 100644 --- a/testData/ast/field/file/privateField.kt +++ b/testData/ast/field/file/privateField.kt @@ -1,6 +1,3 @@ -open class C(f : Foo?) { +open class C() { private var f : Foo? -{ -$f = f -} } \ No newline at end of file diff --git a/testData/ast/field/file/protectedField.kt b/testData/ast/field/file/protectedField.kt index e874bfa3195..0e856b631cf 100644 --- a/testData/ast/field/file/protectedField.kt +++ b/testData/ast/field/file/protectedField.kt @@ -1,6 +1,3 @@ -open class C(f : Foo?) { +open class C() { protected var f : Foo? -{ -$f = f -} } \ No newline at end of file diff --git a/testData/ast/field/file/publicField.kt b/testData/ast/field/file/publicField.kt index 610d873990b..5767d6362dd 100644 --- a/testData/ast/field/file/publicField.kt +++ b/testData/ast/field/file/publicField.kt @@ -1,6 +1,3 @@ -open class C(f : Foo?) { +open class C() { public var f : Foo? -{ -$f = f -} } \ No newline at end of file diff --git a/testData/ast/field/file/valWithInit.kt b/testData/ast/field/file/valWithInit.kt index 94b58759762..f3c93b7ce6d 100644 --- a/testData/ast/field/file/valWithInit.kt +++ b/testData/ast/field/file/valWithInit.kt @@ -1,6 +1,3 @@ -open class C(f : Foo?) { +open class C() { val f : Foo? = Foo(1, 2) -{ -$f = f -} } \ No newline at end of file diff --git a/testData/ast/field/file/varWithoutInit.kt b/testData/ast/field/file/varWithoutInit.kt index e1619fe519b..e09da17755a 100644 --- a/testData/ast/field/file/varWithoutInit.kt +++ b/testData/ast/field/file/varWithoutInit.kt @@ -1,6 +1,3 @@ -open class C(f : Foo?) { +open class C() { var f : Foo? -{ -$f = f -} } \ No newline at end of file