From 74230b70e505404ec2efa49a726bff18f63196ab Mon Sep 17 00:00:00 2001
From: Sergey Ignatov <sergey.ignatov@jetbrains.com>
Date: Fri, 4 Nov 2011 15:03:08 +0400
Subject: [PATCH] java.lang.Object converted to Any?

---
 src/org/jetbrains/jet/j2k/visitors/TypeVisitor.java    | 1 +
 test/org/jetbrains/jet/j2k/JetTestCaseBase.java        | 2 +-
 test/org/jetbrains/jet/j2k/ast/BoxedTypeTest.java      | 4 ++++
 test/org/jetbrains/jet/j2k/ast/TypeParametersTest.java | 4 ++--
 test/org/jetbrains/jet/j2k/ast/VarArgTest.java         | 4 ++--
 5 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/src/org/jetbrains/jet/j2k/visitors/TypeVisitor.java b/src/org/jetbrains/jet/j2k/visitors/TypeVisitor.java
index 7264882b581..b7878e33629 100644
--- a/src/org/jetbrains/jet/j2k/visitors/TypeVisitor.java
+++ b/src/org/jetbrains/jet/j2k/visitors/TypeVisitor.java
@@ -57,6 +57,7 @@ public class TypeVisitor extends PsiTypeVisitor<Type> implements Visitor {
   @NotNull
   private String getClassTypeName(@NotNull PsiClassType classType) {
     String canonicalTypeStr = classType.getCanonicalText();
+    if (canonicalTypeStr.equals("java.lang.Object")) return "Any";
     if (canonicalTypeStr.equals("java.lang.Byte")) return "Byte";
     if (canonicalTypeStr.equals("java.lang.Character")) return "Char";
     if (canonicalTypeStr.equals("java.lang.Double")) return "Double";
diff --git a/test/org/jetbrains/jet/j2k/JetTestCaseBase.java b/test/org/jetbrains/jet/j2k/JetTestCaseBase.java
index 55fbcc93e91..71aa8696bc1 100644
--- a/test/org/jetbrains/jet/j2k/JetTestCaseBase.java
+++ b/test/org/jetbrains/jet/j2k/JetTestCaseBase.java
@@ -133,7 +133,7 @@ public abstract class JetTestCaseBase extends LightDaemonAnalyzerTestCase {
 
   protected String expressionToKotlin(String code) throws Exception {
     String result = statementToKotlin("Object o =" + code + "}");
-    result = result.replaceFirst("var o : Object\\? =", "");
+    result = result.replaceFirst("var o : Any\\? =", "");
     return prettify(result);
   }
 
diff --git a/test/org/jetbrains/jet/j2k/ast/BoxedTypeTest.java b/test/org/jetbrains/jet/j2k/ast/BoxedTypeTest.java
index 3afaa44806e..f9c58660380 100644
--- a/test/org/jetbrains/jet/j2k/ast/BoxedTypeTest.java
+++ b/test/org/jetbrains/jet/j2k/ast/BoxedTypeTest.java
@@ -7,6 +7,10 @@ import org.jetbrains.jet.j2k.JetTestCaseBase;
  * @author ignatov
  */
 public class BoxedTypeTest extends JetTestCaseBase {
+  public void testObject() throws Exception {
+    Assert.assertEquals(statementToKotlin("Object i = 10;"), "var i : Any? = 10");
+  }
+
   public void testBoolean() throws Exception {
     Assert.assertEquals(statementToKotlin("Boolean i = 10;"), "var i : Boolean? = 10");
   }
diff --git a/test/org/jetbrains/jet/j2k/ast/TypeParametersTest.java b/test/org/jetbrains/jet/j2k/ast/TypeParametersTest.java
index 1473dd6213e..62ff6346b73 100644
--- a/test/org/jetbrains/jet/j2k/ast/TypeParametersTest.java
+++ b/test/org/jetbrains/jet/j2k/ast/TypeParametersTest.java
@@ -25,7 +25,7 @@ public class TypeParametersTest extends JetTestCaseBase {
     Assert.assertEquals(
       methodToSingleLineKotlin(
         "<T extends Object & Comparable<? super T>> T max(Collection<? extends T> coll) {}"),
-      "fun max<T : Object?>(coll : Collection<out T?>?) : T? where T : Comparable<in T?>? { }"
+      "fun max<T : Any?>(coll : Collection<out T?>?) : T? where T : Comparable<in T?>? { }"
     );
   }
 
@@ -33,7 +33,7 @@ public class TypeParametersTest extends JetTestCaseBase {
     Assert.assertEquals(
       methodToSingleLineKotlin(
         "<T extends Object & Comparable<? super T>, K extends Node & Collection<? super K>> T max(Collection<? extends T> coll) {}"),
-      "fun max<T : Object?, K : Node?>(coll : Collection<out T?>?) : T? where T : Comparable<in T?>?, K : Collection<in K?>? { }"
+      "fun max<T : Any?, K : Node?>(coll : Collection<out T?>?) : T? where T : Comparable<in T?>?, K : Collection<in K?>? { }"
     );
   }
 
diff --git a/test/org/jetbrains/jet/j2k/ast/VarArgTest.java b/test/org/jetbrains/jet/j2k/ast/VarArgTest.java
index a54c4a78abf..fc3d43f1053 100644
--- a/test/org/jetbrains/jet/j2k/ast/VarArgTest.java
+++ b/test/org/jetbrains/jet/j2k/ast/VarArgTest.java
@@ -10,14 +10,14 @@ public class VarArgTest extends JetTestCaseBase {
   public void testEllipsisTypeSingleParams() throws Exception {
     Assert.assertEquals(
       methodToSingleLineKotlin("void pushAll(Object... objs) {}"),
-      "fun pushAll(vararg objs : Object?) : Unit { }"
+      "fun pushAll(vararg objs : Any?) : Unit { }"
     );
   }
 
   public void testEllipsisTypeSeveralParams() throws Exception {
     Assert.assertEquals(
       methodToSingleLineKotlin("String format(String pattern, Object... arguments);"),
-      "fun format(pattern : String?, vararg arguments : Object?) : String?"
+      "fun format(pattern : String?, vararg arguments : Any?) : String?"
     );
   }
 }