diff --git a/src/org/jetbrains/jet/j2k/Converter.java b/src/org/jetbrains/jet/j2k/Converter.java index 2898e4ce555..3e59e0f47df 100644 --- a/src/org/jetbrains/jet/j2k/Converter.java +++ b/src/org/jetbrains/jet/j2k/Converter.java @@ -111,7 +111,7 @@ public class Converter { private static List getFinalOrWithEmptyInitializer(@NotNull List fields) { List result = new LinkedList(); for (Field f : fields) - if (f.isFinal() || f.getInitializer().toKotlin().isEmpty()) + if (f.isVal() || f.getInitializer().toKotlin().isEmpty()) result.add(f); return result; } diff --git a/src/org/jetbrains/jet/j2k/ast/Class.java b/src/org/jetbrains/jet/j2k/ast/Class.java index e1db54e456d..141a12699f0 100644 --- a/src/org/jetbrains/jet/j2k/ast/Class.java +++ b/src/org/jetbrains/jet/j2k/ast/Class.java @@ -174,8 +174,8 @@ public class Class extends Member { @NotNull String bodyToKotlin() { return SPACE + "{" + N + - primaryConstructorBodyToKotlin() + N + AstUtil.joinNodes(getNonStatic(membersExceptConstructors()), N) + N + + primaryConstructorBodyToKotlin() + N + classObjectToKotlin() + N + "}"; } diff --git a/src/org/jetbrains/jet/j2k/ast/Enum.java b/src/org/jetbrains/jet/j2k/ast/Enum.java index 7ac18cf480a..2fd28501176 100644 --- a/src/org/jetbrains/jet/j2k/ast/Enum.java +++ b/src/org/jetbrains/jet/j2k/ast/Enum.java @@ -30,8 +30,8 @@ public class Enum extends Class { public String toKotlin() { return modifiersToKotlin() + "enum class" + SPACE + myName.toKotlin() + primaryConstructorSignatureToKotlin() + typeParametersToKotlin() + implementTypesToKotlin() + SPACE + "{" + N + - primaryConstructorBodyToKotlin() + N + AstUtil.joinNodes(membersExceptConstructors(), N) + N + + primaryConstructorBodyToKotlin() + N + "public fun name() : String { return \"\" }" + N + // TODO : remove hack "public fun order() : Int { return 0 }" + N + "}"; diff --git a/testData/ast/issues/file/kt-963.jav b/testData/ast/issues/file/kt-963.jav new file mode 100644 index 00000000000..9e2cbb3e114 --- /dev/null +++ b/testData/ast/issues/file/kt-963.jav @@ -0,0 +1,8 @@ +package demo; + +class C { + public C(int a) { + abc = a * 2; + } + int abc = 0; +} \ No newline at end of file diff --git a/testData/ast/issues/file/kt-963.kt b/testData/ast/issues/file/kt-963.kt new file mode 100644 index 00000000000..e69de29bb2d