From 48bd6cf0177d36b1b3c2933ad73aab5163c90cd2 Mon Sep 17 00:00:00 2001
From: Sergey Ignatov <sergey.ignatov@jetbrains.com>
Date: Mon, 31 Oct 2011 20:31:03 +0400
Subject: [PATCH] first implementation for new classes creation

---
 .../jet/j2k/ast/NewClassExpression.java       | 22 ++++++++++++++++
 .../jet/j2k/visitors/ElementVisitor.java      | 11 +++++---
 .../jet/j2k/visitors/ExpressionVisitor.java   |  9 ++++++-
 .../jet/j2k/ast/NewClassExpressionTest.java   | 25 +++++++++++++++++++
 4 files changed, 62 insertions(+), 5 deletions(-)
 create mode 100644 src/org/jetbrains/jet/j2k/ast/NewClassExpression.java
 create mode 100644 test/org/jetbrains/jet/j2k/ast/NewClassExpressionTest.java

diff --git a/src/org/jetbrains/jet/j2k/ast/NewClassExpression.java b/src/org/jetbrains/jet/j2k/ast/NewClassExpression.java
new file mode 100644
index 00000000000..e55cd7cdb55
--- /dev/null
+++ b/src/org/jetbrains/jet/j2k/ast/NewClassExpression.java
@@ -0,0 +1,22 @@
+package org.jetbrains.jet.j2k.ast;
+
+import org.jetbrains.annotations.NotNull;
+
+/**
+ * @author ignatov
+ */
+public class NewClassExpression extends Expression {
+  private final Element myName;
+  private final Element myArguments;
+
+  public NewClassExpression(Element name, Element arguments) {
+    myName = name;
+    myArguments = arguments;
+  }
+
+  @NotNull
+  @Override
+  public String toKotlin() {
+    return myName.toKotlin() + "(" + myArguments.toKotlin() + ")";
+  }
+}
\ No newline at end of file
diff --git a/src/org/jetbrains/jet/j2k/visitors/ElementVisitor.java b/src/org/jetbrains/jet/j2k/visitors/ElementVisitor.java
index 25feabfa00b..634696bc6a6 100644
--- a/src/org/jetbrains/jet/j2k/visitors/ElementVisitor.java
+++ b/src/org/jetbrains/jet/j2k/visitors/ElementVisitor.java
@@ -1,9 +1,6 @@
 package org.jetbrains.jet.j2k.visitors;
 
-import com.intellij.psi.JavaElementVisitor;
-import com.intellij.psi.PsiExpressionList;
-import com.intellij.psi.PsiLocalVariable;
-import com.intellij.psi.PsiParameterList;
+import com.intellij.psi.*;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.jet.j2k.Converter;
 import org.jetbrains.jet.j2k.ast.*;
@@ -41,6 +38,12 @@ public class ElementVisitor extends JavaElementVisitor implements Visitor {
     );
   }
 
+  @Override
+  public void visitReferenceElement(PsiJavaCodeReferenceElement reference) {
+    super.visitReferenceElement(reference);
+    myResult = new IdentifierImpl(reference.getQualifiedName()); // TODO
+  }
+
   @Override
   public void visitParameterList(PsiParameterList list) {
     super.visitParameterList(list);
diff --git a/src/org/jetbrains/jet/j2k/visitors/ExpressionVisitor.java b/src/org/jetbrains/jet/j2k/visitors/ExpressionVisitor.java
index 53ed864d091..5262efacdc8 100644
--- a/src/org/jetbrains/jet/j2k/visitors/ExpressionVisitor.java
+++ b/src/org/jetbrains/jet/j2k/visitors/ExpressionVisitor.java
@@ -169,8 +169,15 @@ public class ExpressionVisitor extends StatementVisitor implements Visitor {
   public void visitNewExpression(PsiNewExpression expression) {
     super.visitNewExpression(expression);
 
-    if (expression.getArrayInitializer() !=  null) // new Foo[] {}
+    if (expression.getArrayInitializer() != null) // new Foo[] {}
       myResult = expressionToExpression(expression.getArrayInitializer());
+    else {
+      myResult = new NewClassExpression(
+        elementToElement(expression.getClassOrAnonymousClassReference()),
+        elementToElement(expression.getArgumentList())
+      );
+    }
+
   }
 
   @Override
diff --git a/test/org/jetbrains/jet/j2k/ast/NewClassExpressionTest.java b/test/org/jetbrains/jet/j2k/ast/NewClassExpressionTest.java
new file mode 100644
index 00000000000..78df5a362ef
--- /dev/null
+++ b/test/org/jetbrains/jet/j2k/ast/NewClassExpressionTest.java
@@ -0,0 +1,25 @@
+package org.jetbrains.jet.j2k.ast;
+
+import junit.framework.Assert;
+import org.jetbrains.jet.j2k.JetTestCaseBase;
+
+/**
+ * @author ignatov
+ */
+public class NewClassExpressionTest extends JetTestCaseBase {
+  public void testClassWithoutBody() throws Exception {
+    Assert.assertEquals(expressionToSingleLineKotlin("new Foo();"), "Foo()");
+  }
+
+  public void testClassWithoutBody2() throws Exception {
+    Assert.assertEquals(expressionToSingleLineKotlin("new myApp.Foo();"), "myApp.Foo()");
+  }
+
+  public void testClassWithParam() throws Exception {
+    Assert.assertEquals(expressionToSingleLineKotlin("new Foo(param);"), "Foo(param)");
+  }
+
+  public void testClassWithParams() throws Exception {
+    Assert.assertEquals(expressionToSingleLineKotlin("new Foo(param1, param2);"), "Foo(param1, param2)");
+  }
+}