base class params added to the class declaration

src/org/jetbrains/jet/j2k/Converter.java

@@ -85,9 +85,26 @@ public class Converter {
     final List<Type> implementsTypes = typesToNotNullableTypeList(psiClass.getImplementsListTypes());
     final List<Type> extendsTypes = typesToNotNullableTypeList(psiClass.getExtendsListTypes());
     final IdentifierImpl name = new IdentifierImpl(psiClass.getName());
+    final List<Expression> baseClassParams = new LinkedList<Expression>();
+
+//    for (PsiType t : psiClass.getExtendsListTypes())
+//      if (t != null && t instanceof PsiClassType) {
+//        final PsiClass resolve = ((PsiClassType) t).resolve();
+//        if (resolve != null) {
+    final SuperVisitor visitor = new SuperVisitor();
+    psiClass.accept(visitor);
+    final HashSet<PsiExpressionList> resolvedSuperCallParameters = visitor.getResolvedSuperCallParameters();
+    if (resolvedSuperCallParameters.size() == 1)
+      baseClassParams.addAll(
+        expressionsToExpressionList(
+          resolvedSuperCallParameters.toArray(new PsiExpressionList[1])[0].getExpressions()
+        )
+      );
+//        }
+//      }
 
     // we create primary constructor
-    if (!psiClass.isEnum() && !psiClass.isInterface() && getPrimaryConstructor(psiClass) == null) {
+    if (!psiClass.isEnum() && !psiClass.isInterface() && getPrimaryConstructorForThisCase(psiClass) == null) {
       final List<Field> finalOrWithEmptyInitializer = getFinalOrWithEmptyInitializer(fields);
       final Map<String, String> initializers = new HashMap<String, String>();
 
@@ -147,11 +164,11 @@ public class Converter {
     }
 
     if (psiClass.isInterface())
-      return new Trait(name, modifiers, typeParameters, extendsTypes, implementsTypes, innerClasses, methods, fields);
+      return new Trait(name, modifiers, typeParameters, extendsTypes, Collections.<Expression>emptyList(), implementsTypes, innerClasses, methods, fields);
     if (psiClass.isEnum())
-      return new Enum(name, modifiers, typeParameters, Collections.<Type>emptyList(), implementsTypes,
+      return new Enum(name, modifiers, typeParameters, Collections.<Type>emptyList(), Collections.<Expression>emptyList(), implementsTypes,
         innerClasses, methods, fieldsToFieldListForEnums(psiClass.getAllFields()));
-    return new Class(name, modifiers, typeParameters, extendsTypes, implementsTypes, innerClasses, methods, fields);
+    return new Class(name, modifiers, typeParameters, extendsTypes, baseClassParams, implementsTypes, innerClasses, methods, fields);
   }
 
   private static String getDefaultInitializer(Field f) {
@@ -219,7 +236,7 @@ public class Converter {
   }
 
   @Nullable
-  public static PsiMethod getPrimaryConstructor(PsiClass psiClass) {
+  public static PsiMethod getPrimaryConstructorForThisCase(PsiClass psiClass) {
     ThisVisitor tv = new ThisVisitor();
     psiClass.accept(tv);
     return tv.getPrimaryConstructor();
@@ -233,7 +250,7 @@ public class Converter {
       if (parent.getConstructors().length == 1)
         return true;
       else {
-        PsiMethod c = getPrimaryConstructor(parent); // TODO: move up to classToClass() method
+        PsiMethod c = getPrimaryConstructorForThisCase(parent); // TODO: move up to classToClass() method
         if (c != null && c.hashCode() == constructor.hashCode())
           return true;
       }
@@ -241,6 +258,22 @@ public class Converter {
     return false;
   }
 
+  @Nullable
+  public static PsiMethod getPrimaryConstructor(@NotNull PsiClass psiClass) { // TODO
+    for (PsiMethod c : psiClass.getConstructors())
+      if (isConstructorPrimary(c))
+        return c;
+    return null;
+  }
+
+  private static List<Statement> removeEmpty(List<Statement> statements) {
+    List<Statement> result = new LinkedList<Statement>();
+    for (Statement s : statements)
+      if (s != Statement.EMPTY_STATEMENT && s != Expression.EMPTY_EXPRESSION)
+        result.add(s);
+    return result;
+  }
+
   @NotNull
   private static Function methodToFunction(PsiMethod method, boolean notEmpty) {
     final IdentifierImpl identifier = new IdentifierImpl(method.getName());
@@ -257,14 +290,13 @@ public class Converter {
 
     if (method.isConstructor()) { // TODO: simplify
       boolean isPrimary = isConstructorPrimary(method);
-
       return new Constructor(
         identifier,
         modifiers,
         type,
         typeParameters,
         params,
-        body,
+        new Block(removeEmpty(body.getStatements()), false),
         isPrimary
       );
     }

src/org/jetbrains/jet/j2k/ast/AnonymousClass.java

@@ -14,6 +14,7 @@ public class AnonymousClass extends Class {
       Collections.<String>emptySet(),
       Collections.<Element>emptyList(),
       Collections.<Type>emptyList(),
+      Collections.<Expression>emptyList(),
       Collections.<Type>emptyList(),
       innerClasses,
       methods,

src/org/jetbrains/jet/j2k/ast/Class.java

@@ -9,12 +9,15 @@ import java.util.LinkedList;
 import java.util.List;
 import java.util.Set;
 
+import static org.jetbrains.jet.j2k.util.AstUtil.*;
+
 /**
  * @author ignatov
  */
 public class Class extends Member {
   String TYPE = "class";
   final Identifier myName;
+  private final List<Expression> myBaseClassParams;
   private final List<Element> myTypeParameters;
   private final List<Type> myExtendsTypes;
   private final List<Type> myImplementsTypes;
@@ -23,8 +26,9 @@ public class Class extends Member {
   final List<Field> myFields;
 
   public Class(Identifier name, Set<String> modifiers, List<Element> typeParameters, List<Type> extendsTypes,
-               List<Type> implementsTypes, List<Class> innerClasses, List<Function> methods, List<Field> fields) {
+               List<Expression> baseClassParams, List<Type> implementsTypes, List<Class> innerClasses, List<Function> methods, List<Field> fields) {
     myName = name;
+    myBaseClassParams = baseClassParams;
     myModifiers = modifiers;
     myTypeParameters = typeParameters;
     myExtendsTypes = extendsTypes;
@@ -70,7 +74,7 @@ public class Class extends Member {
       for (Element t : myTypeParameters)
         if (t instanceof TypeParameter)
           wheres.add(((TypeParameter) t).getWhereToKotlin());
-      return SPACE + "where" + SPACE + AstUtil.join(wheres, COMMA_WITH_SPACE) + SPACE;
+      return SPACE + "where" + SPACE + join(wheres, COMMA_WITH_SPACE) + SPACE;
     }
     return EMPTY;
   }
@@ -112,14 +116,23 @@ public class Class extends Member {
     return myTypeParameters.size() > 0 ? "<" + AstUtil.joinNodes(myTypeParameters, COMMA_WITH_SPACE) + ">" : EMPTY;
   }
 
+  List<String> baseClassSignatureWithParams() {
+    if (TYPE.equals("class") && myExtendsTypes.size() == 1) {
+      LinkedList<String> result = new LinkedList<String>();
+      result.add(myExtendsTypes.get(0).toKotlin() + "(" + joinNodes(myBaseClassParams, COMMA_WITH_SPACE) + ")");
+      return result;
+    } else
+      return nodesToKotlin(myExtendsTypes);
+  }
+
   String implementTypesToKotlin() {
-    List<Type> allTypes = new LinkedList<Type>() {
+    List<String> allTypes = new LinkedList<String>() {
       {
-        addAll(myExtendsTypes);
-        addAll(myImplementsTypes);
+        addAll(baseClassSignatureWithParams());
+        addAll(nodesToKotlin(myImplementsTypes));
       }
     };
-    return allTypes.size() == 0 ? EMPTY : SPACE + COLON + SPACE + AstUtil.joinNodes(allTypes, COMMA_WITH_SPACE);
+    return allTypes.size() == 0 ? EMPTY : SPACE + COLON + SPACE + join(allTypes, COMMA_WITH_SPACE);
   }
 
   String modifiersToKotlin() {
@@ -134,7 +147,7 @@ public class Class extends Member {
       modifierList.add(Modifier.OPEN);
 
     if (modifierList.size() > 0)
-      return AstUtil.join(modifierList, SPACE) + SPACE;
+      return join(modifierList, SPACE) + SPACE;
 
     return EMPTY;
   }

src/org/jetbrains/jet/j2k/ast/Enum.java

@@ -11,8 +11,8 @@ import java.util.Set;
  * @author ignatov
  */
 public class Enum extends Class {
-  public Enum(Identifier name, Set<String> modifiers, List<Element> typeParameters, List<Type> extendsTypes, List<Type> implementsTypes, List<Class> innerClasses, List<Function> methods, List<Field> fields) {
-    super(name, modifiers, typeParameters, extendsTypes, implementsTypes, innerClasses, methods, fields);
+  public Enum(Identifier name, Set<String> modifiers, List<Element> typeParameters, List<Type> extendsTypes, List<Expression> baseClassParams, List<Type> implementsTypes, List<Class> innerClasses, List<Function> methods, List<Field> fields) {
+    super(name, modifiers, typeParameters, extendsTypes, baseClassParams, implementsTypes, innerClasses, methods, fields);
   }
 
   @Nullable

src/org/jetbrains/jet/j2k/ast/Trait.java

@@ -7,8 +7,8 @@ import java.util.Set;
  * @author ignatov
  */
 public class Trait extends Class {
-  public Trait(Identifier name, Set<String> modifiers, List<Element> typeParameters, List<Type> extendsTypes, List<Type> implementsTypes, List<Class> innerClasses, List<Function> methods, List<Field> fields) {
-    super(name, modifiers, typeParameters, extendsTypes, implementsTypes, innerClasses, methods, fields);
+  public Trait(Identifier name, Set<String> modifiers, List<Element> typeParameters, List<Type> extendsTypes, List<Expression> baseClassParams, List<Type> implementsTypes, List<Class> innerClasses, List<Function> methods, List<Field> fields) {
+    super(name, modifiers, typeParameters, extendsTypes, baseClassParams, implementsTypes, innerClasses, methods, fields);
     TYPE = "trait";
   }
 

src/org/jetbrains/jet/j2k/util/AstUtil.java

@@ -31,7 +31,7 @@ public class AstUtil {
     return join(array.toArray(new String[array.size()]), delimiter);
   }
 
-  private static List<String> nodesToKotlin(List<? extends INode> nodes) {
+  public static List<String> nodesToKotlin(List<? extends INode> nodes) {
     List<String> result = new LinkedList<String>();
     for (INode n : nodes)
       result.add(n.toKotlin());

src/org/jetbrains/jet/j2k/visitors/ExpressionVisitor.java

@@ -164,12 +164,13 @@ public class ExpressionVisitor extends StatementVisitor implements Visitor {
   @Override
   public void visitMethodCallExpression(PsiMethodCallExpression expression) {
     super.visitMethodCallExpression(expression);
-    myResult = // TODO: not resolved
-      new MethodCallExpression(
-        expressionToExpression(expression.getMethodExpression()),
-        elementToElement(expression.getArgumentList()),
-        typeToType(expression.getType()).isNullable()
-      );
+    if (!SuperVisitor.isSuper(expression.getMethodExpression()) || !isInsidePrimaryConstructor(expression))
+      myResult = // TODO: not resolved
+        new MethodCallExpression(
+          expressionToExpression(expression.getMethodExpression()),
+          elementToElement(expression.getArgumentList()),
+          typeToType(expression.getType()).isNullable()
+        );
   }
 
   @Override
@@ -305,7 +306,7 @@ public class ExpressionVisitor extends StatementVisitor implements Visitor {
     return false;
   }
 
-  private boolean isInsidePrimaryConstructor(PsiReferenceExpression expression) {
+  private boolean isInsidePrimaryConstructor(PsiExpression expression) {
     PsiElement context = expression.getContext();
     while (context != null) {
       if (context instanceof PsiMethod && ((PsiMethod) context).isConstructor())

src/org/jetbrains/jet/j2k/visitors/SuperVisitor.java

@@ -0,0 +1,38 @@
+package org.jetbrains.jet.j2k.visitors;
+
+import com.intellij.psi.*;
+
+import java.util.HashSet;
+
+
+/**
+ * @author ignatov
+ */
+public class SuperVisitor extends JavaRecursiveElementVisitor {
+  private HashSet<PsiExpressionList> myResolvedSuperCallParameters;
+
+  public SuperVisitor() {
+    myResolvedSuperCallParameters = new HashSet<PsiExpressionList>();
+  }
+
+  public HashSet<PsiExpressionList> getResolvedSuperCallParameters() {
+    return myResolvedSuperCallParameters;
+  }
+
+  @Override
+  public void visitMethodCallExpression(PsiMethodCallExpression expression) {
+    super.visitMethodCallExpression(expression);
+    if (isSuper(expression.getMethodExpression()))
+      myResolvedSuperCallParameters.add(expression.getArgumentList());
+  }
+
+  static boolean isSuper(PsiReference r) {
+    if (r.getCanonicalText().equals("super")) {
+      final PsiElement baseConstructor = r.resolve();
+      if (baseConstructor != null && baseConstructor instanceof PsiMethod && ((PsiMethod) baseConstructor).isConstructor()) {
+        return true;
+      }
+    }
+    return false;
+  }
+}

src/org/jetbrains/jet/j2k/visitors/ThisVisitor.java

@@ -14,10 +14,6 @@ import java.util.HashSet;
 public class ThisVisitor extends JavaRecursiveElementVisitor {
   HashSet<PsiMethod> myResolvedConstructors = new HashSet<PsiMethod>();
 
-  public HashSet<PsiMethod> getResult() {
-    return myResolvedConstructors;
-  }
-
   @Override
   public void visitReferenceExpression(PsiReferenceExpression expression) {
     for (PsiReference r : expression.getReferences())

testData/ast/class/class/abstractClassShape.kt

@@ -7,6 +7,4 @@ open public fun getColor() : String? {
 return color
 }
 abstract open public fun area() : Double
-{
-}
 }

testData/ast/class/class/extendsOneClassAndImplementsOneInterface.kt

@@ -1,2 +1,2 @@
-class A() : Base, I {
+class A() : Base(), I {
 }

testData/ast/class/class/extendsOneClassAndImplementsSeveralInterfaces.kt

@@ -1,2 +1,2 @@
-class A() : Base, I0, I1, I2 {
+class A() : Base(), I0, I1, I2 {
 }

testData/ast/class/class/simpleInheritance.kt

@@ -1,2 +1,2 @@
-class A() : Base {
+class A() : Base() {
 }

testData/ast/constructors/file/allCallsPrimary.kt

@@ -9,8 +9,6 @@ val __ = C(arg1, 0, 0)
 return __
 }
 }
-{
-}
 }
 public open class User() {
 class object {

testData/ast/function/file/override.kt

@@ -2,7 +2,7 @@ open class A() {
 open fun a() : Unit {
 }
 }
-class B() : A {
+class B() : A() {
 override fun a() : Unit {
 }
 }

testData/ast/function/file/overrideAndOpen.kt

@@ -2,11 +2,11 @@ open class A() {
 open fun foo() : Unit {
 }
 }
-open class B() : A {
+open class B() : A() {
 override fun foo() : Unit {
 }
 }
-open class C() : B {
+open class C() : B() {
 override fun foo() : Unit {
 }
 }

testData/ast/identifier/file/finalFieldReference.kt

@@ -2,7 +2,7 @@ open class `$$$$$`() {
 }
 open class `$`() {
 }
-open class `$$`(`$$$$` : `$$$$$`?) : `$` {
+open class `$$`(`$$$$` : `$$$$$`?) : `$`() {
 val `$$$` : `$$$$$`?
 open public fun `$$$$$$`() : `$$$$$`? {
 return `$$$`

testData/ast/superExpression/class/classAextendsB.jav

@@ -1,11 +1,12 @@
 class B {
-  void call() {}
+  B(int i) {}
+  int call() {return 1;}
 }
 
 class A extends B {
   A() {
-    super();
+    super(10);
   }
 
-  void call() { return super.call(); }
+  int call() { return super.call(); }
 }

testData/ast/superExpression/class/classAextendsB.kt

@@ -1,12 +1,10 @@
-open class B() {
-open fun call() : Unit {
+open class B(i : Int) {
+open fun call() : Int {
+return 1
 }
 }
-open class A() : B {
-override fun call() : Unit {
+open class A() : B(10) {
+override fun call() : Int {
 return super.call()
 }
-{
-super()
-}
 }

testData/ast/superExpression/file/classAdotSuperFoo.kt

@@ -1,7 +1,7 @@
 open class Base() {
 open fun foo() : Unit
 }
-open class A() : Base {
+open class A() : Base() {
 open class C() {
 open fun test() : Unit {
 super@A.foo()

testData/ast/thisExpression/file/classAdotThisFoo.kt

@@ -2,7 +2,7 @@ open class Base() {
 open fun foo() : Unit {
 }
 }
-open class A() : Base {
+open class A() : Base() {
 open class C() {
 open fun test() : Unit {
 this@A.foo()

testData/ast/typeParameters/class/classDoubleParametrizationWithTwoBoundsWithExtending.kt

@@ -1,2 +1,2 @@
-class CC<T : INode?, K : Node?>() : A where T : Comparable<in T?>?, K : Collection<in K?>? {
+class CC<T : INode?, K : Node?>() : A() where T : Comparable<in T?>?, K : Collection<in K?>? {
 }

testData/ast/typeParameters/class/classParametrizationWithTwoBoundsWithExtending.kt

@@ -1,2 +1,2 @@
-class C<T : INode?>() : A where T : Comparable<in T?>? {
+class C<T : INode?>() : A() where T : Comparable<in T?>? {
 }