example with customer builder added,

initial support for constructors added

Makefile

@@ -8,4 +8,4 @@ disable-sandbox:
 	cd ~/.IdeaIC11/system/ &&	mv plugins-sandbox plugins-sandbox.tmp
 
 enable-sandbox:
-	cd ~/.IdeaIC11/system/ && mv plugins-sandbox.tmp ./plugins-sandbox
+	cd ~/.IdeaIC11/system/ && rm -rf plugins-sandbox && mv plugins-sandbox.tmp ./plugins-sandbox

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

@@ -135,15 +135,22 @@ public class Converter {
     if (method.getParent() instanceof PsiClass && ((PsiClass) method.getParent()).isInterface())
       modifiers.remove(Modifier.ABSTRACT);
 
-    if (method.isConstructor())
+
+    if (method.isConstructor()) {
+      boolean isPrimary = false;
+      if (method.getParent() instanceof PsiClass && ((PsiClass) method.getParent()).getConstructors().length == 1)
+        isPrimary = true;
+
       return new Constructor(
         identifier,
         modifiers,
         type,
         typeParameters,
         params,
-        body
+        body,
+        isPrimary
       );
+    }
     return new Function(
       identifier,
       modifiers,

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

@@ -1,6 +1,7 @@
 package org.jetbrains.jet.j2k.ast;
 
 import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
 import org.jetbrains.jet.j2k.util.AstUtil;
 
 import java.util.LinkedList;
@@ -32,6 +33,29 @@ public class Class extends Member {
     myFields = fields;
   }
 
+  @Nullable
+  private Constructor getPrimaryConstructor() {
+    for (Function m : myMethods)
+      if (m.getKind() == Kind.CONSTRUCTOR)
+        if (((Constructor) m).isPrimary())
+          return (Constructor) m;
+    return null;
+  }
+
+  String primaryConstructorSignatureToKotlin() {
+    Constructor maybeConstructor = getPrimaryConstructor();
+    if (maybeConstructor != null)
+      return maybeConstructor.primarySignatureToKotlin();
+    return "(" + ")";
+  }
+
+  String primaryConstructorBodyToKotlin() {
+    Constructor maybeConstructor = getPrimaryConstructor();
+    if (maybeConstructor != null)
+      return maybeConstructor.primaryBodyToKotlin();
+    return EMPTY;
+  }
+
   private boolean hasWhere() {
     for (Element t : myTypeParameters)
       if (t instanceof TypeParameter && ((TypeParameter) t).hasWhere())
@@ -99,8 +123,10 @@ public class Class extends Member {
   }
 
   String bodyToKotlin() {
-    return SPACE + "{" + N + classObjectToKotlin() + N +
+    return SPACE + "{" + N +
+      classObjectToKotlin() + N +
       AstUtil.joinNodes(getNonStatic(myFields), N) + N +
+      primaryConstructorBodyToKotlin() + N +
       AstUtil.joinNodes(getNonStatic(methodsExceptConstructors()), N) + N +
       AstUtil.joinNodes(getNonStatic(myInnerClasses), N) + N +
       "}";
@@ -139,9 +165,9 @@ public class Class extends Member {
   @NotNull
   @Override
   public String toKotlin() {
-    return modifiersToKotlin() + TYPE + SPACE + myName.toKotlin() + typeParametersToKotlin() +
+    return modifiersToKotlin() + TYPE + SPACE + myName.toKotlin() + typeParametersToKotlin() + primaryConstructorSignatureToKotlin() +
       implementTypesToKotlin() +
       typeParameterWhereToKotlin() +
       bodyToKotlin();
   }
-}
+}

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

@@ -9,11 +9,26 @@ import java.util.Set;
  * @author ignatov
  */
 public class Constructor extends Function {
-  public Constructor(Identifier identifier, Set<String> modifiers, Type type, List<Element> typeParameters, Element params, Block block) {
+  private boolean myIsPrimary;
+
+  public Constructor(Identifier identifier, Set<String> modifiers, Type type, List<Element> typeParameters, Element params, Block block, boolean isPrimary) {
     super(identifier, modifiers, type, typeParameters, params, block);
+    myIsPrimary = isPrimary;
   }
 
-  public String primary() {
+  public String primarySignatureToKotlin() {
+    return "(" + myParams.toKotlin() + ")";
+  }
+
+  public String primaryBodyToKotlin() {
+    return myBlock.toKotlin();
+  }
+
+  public boolean isPrimary() {
+    return myIsPrimary;
+  }
+
+  public String privatePrimaryToKotlin() {
     return modifiersToKotlin() + "(" + myParams.toKotlin() + ")" + SPACE + myBlock.toKotlin();
   }
 

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

@@ -26,7 +26,7 @@ public class Enum extends Class {
   private String primaryConstructorToKotlin() {
     Constructor maybeConstructor = getPrimaryConstructor();
     if (maybeConstructor != null)
-      return maybeConstructor.primary();
+      return maybeConstructor.privatePrimaryToKotlin();
     return EMPTY;
   }
 
@@ -45,4 +45,4 @@ public class Enum extends Class {
       AstUtil.joinNodes(myInnerClasses, N) + N +
       "}";
   }
-}
+}

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

@@ -14,6 +14,11 @@ public class Trait extends Class {
     TYPE = "trait";
   }
 
+  @Override
+  String primaryConstructorSignatureToKotlin() {
+    return EMPTY;
+  }
+
   boolean needOpenModifier() {
     return false;
   }

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

@@ -229,10 +229,33 @@ public class ExpressionVisitor extends StatementVisitor implements Visitor {
   @Override
   public void visitReferenceExpression(PsiReferenceExpression expression) {
     super.visitReferenceExpression(expression);
+
+    boolean hasDollar = false;
+    final PsiReference reference = expression.getReference();
+    if (reference != null) {
+      final PsiElement resolvedReference = reference.resolve();
+      if (resolvedReference != null) {
+        if (resolvedReference instanceof PsiField) {
+          final PsiModifierList modifierList = ((PsiField) resolvedReference).getModifierList();
+          if (modifierList != null && modifierList.hasExplicitModifier(PsiModifier.FINAL)) {
+            PsiElement context = expression.getContext();
+            while (context != null) {
+              if (context instanceof PsiMethod && ((PsiMethod) context).isConstructor()) {
+                hasDollar = true;
+                break;
+              }
+              context = context.getContext();
+            }
+          }
+        }
+      }
+    }
+
     boolean isNullable = typeToType(expression.getType()).isNullable();
+    final IdentifierImpl identifier = hasDollar ? new IdentifierImpl("$" + expression.getReferenceName(), isNullable) : new IdentifierImpl(expression.getReferenceName(), isNullable);
     myResult = new CallChainExpression(
       expressionToExpression(expression.getQualifierExpression()),
-      new IdentifierImpl(expression.getReferenceName(), isNullable) // TODO: if type exists so id is nullable
+      identifier // TODO: if type exists so id is nullable
     );
   }
 

test/org/jetbrains/jet/j2k/JavaToKotlinConverterTest.java

@@ -47,15 +47,20 @@ public class JavaToKotlinConverterTest extends LightDaemonAnalyzerTestCase {
     else if (javaFile.getParent().endsWith("/class")) actual = classToKotlin(javaCode);
     else if (javaFile.getParent().endsWith("/file")) actual = fileToKotlin(javaCode);
 
-    assert !actual.equals("");
+    assert !actual.equals("") : "Specify what is it: file, class, method, statement or expression";
+
     final File tmp = new File(kotlinPath + ".tmp");
-    if (!expected.equals(actual))
+    if (!expected.equals(actual)) writeStringToFile(tmp, actual);
-      writeStringToFile(tmp, actual);
+    if (expected.equals(actual) && tmp.exists()) tmp.delete();
-    if (expected.equals(actual) && tmp.exists())
+
-      tmp.delete();
     Assert.assertEquals(expected, actual);
   }
 
+  @Override
+  protected void setUp() throws Exception {
+    super.setUp();
+  }
+
   @NotNull
   protected String getTestFilePath() {
     return myDataPath + File.separator + myName + ".jav";
@@ -114,7 +119,7 @@ public class JavaToKotlinConverterTest extends LightDaemonAnalyzerTestCase {
   @NotNull
   protected String methodToKotlin(String text) throws IOException {
     String result = classToKotlin("final class C {" + text + "}")
-      .replaceAll("class C \\{", "");
+      .replaceAll("class C\\(\\) \\{", "");
     result = result.substring(0, result.lastIndexOf("}"));
     return prettify(result);
   }

testData/ast/callChainExpression/file/libraryFieldCall.kt

@@ -1,10 +1,10 @@
 namespace {
-open class Library {
+open class Library() {
 class object {
 val ourOut : PrintStream?
 }
 }
-open class User {
+open class User() {
 open fun main() : Unit {
 Library.ourOut?.print()
 }

testData/ast/callChainExpression/file/libraryMethodCall.kt

@@ -1,5 +1,5 @@
 namespace {
-open class Library {
+open class Library() {
 class object {
 open fun call() : Unit {
 }
@@ -8,7 +8,7 @@ return ""
 }
 }
 }
-open class User {
+open class User() {
 open fun main() : Unit {
 Library.call()
 Library.getString()?.isEmpty()

testData/ast/callChainExpression/file/libraryMethodCallFromInstance.kt

@@ -1,12 +1,12 @@
 namespace {
-open class Library {
+open class Library() {
 open fun call() : Unit {
 }
 open fun getString() : String? {
 return ""
 }
 }
-open class User {
+open class User() {
 open fun main() : Unit {
 var lib : Library? = Library()
 lib?.call()

testData/ast/callChainExpression/file/libraryStringFieldCall.kt

@@ -1,8 +1,8 @@
 namespace {
-open class Library {
+open class Library() {
 public val myString : String?
 }
-open class User {
+open class User() {
 open fun main() : Unit {
 Library.myString?.isEmpty()
 }

testData/ast/class/class/abstractClass.kt

@@ -1,4 +1,4 @@
-abstract open class A {
+abstract open class A() {
 abstract open fun callme() : Unit
 open fun callmetoo() : Unit {
 print("This is a concrete method.")

testData/ast/class/class/abstractClassShape.kt

@@ -1,5 +1,7 @@
-abstract open class Shape {
+abstract open class Shape() {
 public var color : String?
+{
+}
 open public fun setColor(c : String?) : Unit {
 color = c
 }

testData/ast/class/class/class.kt

@@ -1,2 +1,2 @@
-open class Test {
+open class Test() {
 }

testData/ast/class/class/classWithEmptyMethods.kt

@@ -1,4 +1,4 @@
-class T {
+class T() {
 open fun main() : Unit {
 }
 open fun i() : Int {

testData/ast/class/class/classWithFields.kt

@@ -1,4 +1,4 @@
-class T {
+class T() {
 var a : String? = "abc"
 var b : Int = 10
 }

testData/ast/class/class/classWithMultiplyFields.kt

@@ -1,4 +1,4 @@
-class T {
+class T() {
 var a : String?
 var b : String?
 var c : String? = "abc"

testData/ast/class/class/emptyClass.kt

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

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/finalClass.kt

@@ -1,2 +1,2 @@
-class Test {
+class Test() {
 }

testData/ast/class/class/genericClass.kt

@@ -1,2 +1,2 @@
-class Entry<K, V> {
+class Entry<K, V>() {
 }

testData/ast/class/class/innerEmptyClass.kt

@@ -1,4 +1,4 @@
-class A {
+class A() {
-class B {
+class B() {
 }
 }

testData/ast/class/class/innerStaticClass.kt

@@ -1,6 +1,6 @@
-class S {
+class S() {
 class object {
-open class Inner {
+open class Inner() {
 }
 }
 }

testData/ast/class/class/internalClass.kt

@@ -1,2 +1,2 @@
-open class Test {
+open class Test() {
 }

testData/ast/class/class/oneStaticFieldOneNonStatic.kt

@@ -1,4 +1,4 @@
-class S {
+class S() {
 class object {
 var myI : Int = 10
 }

testData/ast/class/class/oneStaticMethod.kt

@@ -1,4 +1,4 @@
-class S {
+class S() {
 class object {
 open fun staticF() : Boolean {
 return true

testData/ast/class/class/oneStaticMethodOneNonStatic.kt

@@ -1,4 +1,4 @@
-class S {
+class S() {
 class object {
 open fun sI() : Int {
 return 1

testData/ast/class/class/pivateClass.kt

@@ -1,2 +1,2 @@
-private open class Test {
+private open class Test() {
 }

testData/ast/class/class/protectedClass.kt

@@ -1,2 +1,2 @@
-protected open class Test {
+protected open class Test() {
 }

testData/ast/class/class/publicClass.kt

@@ -1,2 +1,2 @@
-public open class Test {
+public open class Test() {
 }

testData/ast/class/class/simpleInheritance.kt

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

testData/ast/class/class/twoStaticMethod.kt

@@ -1,4 +1,4 @@
-class S {
+class S() {
 class object {
 open fun sB() : Boolean {
 return true

testData/ast/class/file/privateInit.kt

@@ -1,5 +1,5 @@
 namespace {
-public open class MyClass {
+public open class MyClass() {
 open private fun init(arg1 : Int, arg2 : Int, arg3 : Int) : Unit {
 }
 }

testData/ast/constructors/file/customerBuilder.jav

@@ -0,0 +1,54 @@
+package org.test.customer
+
+class Customer {
+  public final String _firstName;
+  public final String _lastName;
+
+  Customer(String first, String last) {
+    doSmthBefore();
+    _firstName = first;
+    _lastName = last;
+    doSmthAfter();
+  }
+
+  public String getFirstName() {
+    return _firstName;
+  }
+
+  public String getLastName() {
+    return _lastName;
+  }
+
+  private void doSmthBefore() {}
+  private void doSmthAfter() {}
+}
+
+class CustomerBuilder {
+  public String _firstName = "Homer";
+  public String _lastName = "Simpson";
+
+  public CustomerBuilder WithFirstName(String firstName) {
+    _firstName = firstName;
+    return this;
+  }
+
+  public CustomerBuilder WithLastName(String lastName) {
+    _lastName = lastName;
+    return this;
+  }
+
+  public Customer Build() {
+    return new Customer(_firstName, _lastName);
+  }
+}
+
+public class User {
+  public static void main(Array[String] args) {
+     Customer customer = new CustomerBuilder()
+       .WithFirstName("Homer")
+       .WithLastName("Simpson")
+       .Build();
+     System.out.println(customer.getFirstName());
+     System.out.println(customer.getLastName());
+  }
+}

testData/ast/constructors/file/customerBuilder.kt

@@ -0,0 +1,46 @@
+namespace org.test.customer {
+open class Customer(first : String?, last : String?) {
+public val _firstName : String?
+public val _lastName : String?
+{
+doSmthBefore()
+$_firstName = first
+$_lastName = last
+doSmthAfter()
+}
+open public fun getFirstName() : String? {
+return _firstName
+}
+open public fun getLastName() : String? {
+return _lastName
+}
+open private fun doSmthBefore() : Unit {
+}
+open private fun doSmthAfter() : Unit {
+}
+}
+open class CustomerBuilder() {
+public var _firstName : String? = "Homer"
+public var _lastName : String? = "Simpson"
+open public fun WithFirstName(firstName : String?) : CustomerBuilder? {
+_firstName = firstName
+return this
+}
+open public fun WithLastName(lastName : String?) : CustomerBuilder? {
+_lastName = lastName
+return this
+}
+open public fun Build() : Customer? {
+return org.test.customer.Customer(_firstName, _lastName)
+}
+}
+public open class User() {
+class object {
+open public fun main() : Unit {
+var customer : Customer? = org.test.customer.CustomerBuilder().WithFirstName("Homer")?.WithLastName("Simpson")?.Build()
+System.`out`?.println(customer?.getFirstName())
+System.`out`?.println(customer?.getLastName())
+}
+}
+}
+}

testData/ast/file/file/packageWithClass.kt

@@ -1,4 +1,4 @@
 namespace test {
-class C {
+class C() {
 }
 }

testData/ast/file/file/packageWithClasses.kt

@@ -1,6 +1,6 @@
 namespace {
-class A {
+class A() {
 }
-class B {
+class B() {
 }
 }

testData/ast/file/file/packageWithOpenClass.kt

@@ -1,4 +1,4 @@
 namespace test {
-open class C {
+open class C() {
 }
 }

testData/ast/function/file/override.kt

@@ -1,9 +1,9 @@
 namespace {
-open class A {
+open class A() {
 open fun a() : Unit {
 }
 }
-class B : A {
+class B() : A {
 override fun a() : Unit {
 }
 }

testData/ast/function/file/overrideAndOpen.kt

@@ -1,13 +1,13 @@
 namespace {
-open class A {
+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/newClassExpression/file/newClassByFullName.kt

@@ -1,7 +1,7 @@
 namespace org.test {
-open class Library {
+open class Library() {
 }
-open class User {
+open class User() {
 open fun main() : Unit {
 var lib : Library? = org.test.Library()
 }

testData/ast/superExpression/class/classAextendsB.kt

@@ -1,8 +1,11 @@
-open class B {
+open class B() {
 open fun call() : Unit {
 }
 }
-open class A : B {
+open class A() : B {
+{
+super()
+}
 override fun call() : Unit {
 return super.call()
 }

testData/ast/superExpression/file/classAdotSuperFoo.kt

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

testData/ast/thisExpression/file/classAdotThisFoo.kt

@@ -1,10 +1,10 @@
 namespace {
-open class Base {
+open class Base() {
 open fun foo() : Unit {
 }
 }
-open class A : Base {
+open class A() : Base {
-open class C {
+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/classParametrizationWithTwoBounds.kt

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

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?>? {
 }

testData/ast/typeParameters/class/genericClass.kt

@@ -1,2 +1,2 @@
-class Comparable<T> {
+class Comparable<T>() {
 }