diff --git a/src/org/jetbrains/jet/j2k/ast/Constructor.java b/src/org/jetbrains/jet/j2k/ast/Constructor.java index 8e4c257ad5a..3e97cadd26f 100644 --- a/src/org/jetbrains/jet/j2k/ast/Constructor.java +++ b/src/org/jetbrains/jet/j2k/ast/Constructor.java @@ -14,7 +14,7 @@ public class Constructor extends Function { } public String primary() { - return "(" + myParams.toKotlin() + ")"; + return modifiersToKotlin() + "(" + myParams.toKotlin() + ")" + SPACE + myBlock.toKotlin(); } @NotNull diff --git a/src/org/jetbrains/jet/j2k/ast/Enum.java b/src/org/jetbrains/jet/j2k/ast/Enum.java index 6a0fd5a3524..f16a7393718 100644 --- a/src/org/jetbrains/jet/j2k/ast/Enum.java +++ b/src/org/jetbrains/jet/j2k/ast/Enum.java @@ -33,8 +33,9 @@ public class Enum extends Class { @NotNull @Override public String toKotlin() { - return modifiersToKotlin() + "enum" + SPACE + myName.toKotlin() + typeParametersToKotlin() + primaryConstructorToKotlin() + implementTypesToKotlin() + SPACE + "{" + N + + return modifiersToKotlin() + "enum" + SPACE + myName.toKotlin() + typeParametersToKotlin() + implementTypesToKotlin() + SPACE + "{" + N + AstUtil.joinNodes(myFields, N) + N + + primaryConstructorToKotlin() + N + AstUtil.joinNodes(methodsExceptConstructors(), N) + N + AstUtil.joinNodes(myInnerClasses, N) + N + "}"; diff --git a/src/org/jetbrains/jet/j2k/ast/Function.java b/src/org/jetbrains/jet/j2k/ast/Function.java index e8e8ed0433b..cd9d435cf71 100644 --- a/src/org/jetbrains/jet/j2k/ast/Function.java +++ b/src/org/jetbrains/jet/j2k/ast/Function.java @@ -15,7 +15,7 @@ public class Function extends Member { private final Type myType; private final List myTypeParameters; final Element myParams; - private final Block myBlock; + final Block myBlock; public Function(Identifier name, Set modifiers, Type type, List typeParameters, Element params, Block block) { myName = name; @@ -48,7 +48,7 @@ public class Function extends Member { return EMPTY; } - private String modifiersToKotlin() { + String modifiersToKotlin() { List modifierList = new LinkedList(); if (myModifiers.contains(Modifier.OVERRIDE))