Converter:

Fix converting import list
Add tests for imports problem
Add 'element' test type

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

@@ -69,13 +69,11 @@ public class Converter(val project: Project, val settings: ConverterSettings) {
         is PsiStatement -> statementToStatement(element)
         is PsiExpression -> expressionToExpression(element)
         is PsiComment -> Comment(element.getText()!!)
+        is PsiImportList -> importsToImportList(element)
         else -> null
     }
 
     public fun fileToFile(javaFile: PsiJavaFile): File {
-        val psiImportList = javaFile.getImportList()
-        val importList = if (psiImportList != null) importsToImportList(psiImportList) else null
-
         val body = ArrayList<Node>()
         for (element in javaFile.getChildren()) {
             if (element !is PsiImportStatementBase) {
@@ -85,7 +83,7 @@ public class Converter(val project: Project, val settings: ConverterSettings) {
                 }
             }
         }
-        return File(quoteKeywords(javaFile.getPackageName()), importList, body, createMainFunction(javaFile))
+        return File(quoteKeywords(javaFile.getPackageName()), body, createMainFunction(javaFile))
     }
 
     public fun anonymousClassToAnonymousClass(anonymousClass: PsiAnonymousClass): AnonymousClass {

j2k/src/org/jetbrains/jet/j2k/ast/File.kt

@@ -17,12 +17,11 @@
 package org.jetbrains.jet.j2k.ast
 
 public open class File(val packageName: String,
-                       val imports: ImportList?,
                        val body: MutableList<Node>,
                        val mainFunction: String) : Node {
 
     public override fun toKotlin(): String {
-        val common = (imports?.toKotlin() ?: "") + "\n\n" + body.toKotlin("\n") + "\n" + mainFunction
+        val common = body.toKotlin("\n") + "\n" + mainFunction
         if (packageName.isEmpty()) {
             return common
         }

j2k/tests/test/org/jetbrains/jet/j2k/test/AbstractJavaToKotlinConverterTest.kt

@@ -37,7 +37,7 @@ public abstract class AbstractJavaToKotlinConverterBasicTest() : AbstractJavaToK
 public abstract class AbstractJavaToKotlinConverterTest(val kotlinFileExtension: String,
                                                         val settings: ConverterSettings) : UsefulTestCase() {
 
-    val testHeaderPattern = Pattern.compile("//(expression|statement|method|class|file|comp)\n")
+    val testHeaderPattern = Pattern.compile("//(element|expression|statement|method|class|file|comp)\n")
 
     protected fun doTest(javaPath: String) {
         val jetCoreEnvironment = createEnvironmentWithMockJdkAndIdeaAnnotations(getTestRootDisposable(), ConfigurationKind.JDK_ONLY)
@@ -56,6 +56,7 @@ public abstract class AbstractJavaToKotlinConverterTest(val kotlinFileExtension:
         val prefix = matcher.group().trim().substring(2)
         val javaCode = matcher.replaceFirst("")
         val actual = when (prefix) {
+            "element" -> elementToKotlin(converter, javaCode)
             "expression" -> expressionToKotlin(converter, javaCode)
             "statement" -> statementToKotlin(converter, javaCode)
             "method" -> methodToKotlin(converter, javaCode)
@@ -77,6 +78,12 @@ public abstract class AbstractJavaToKotlinConverterTest(val kotlinFileExtension:
         Assert.assertEquals(expected, actual)
     }
 
+    private fun elementToKotlin(converter: Converter, text: String): String {
+        val fileWithText = JavaToKotlinTranslator.createFile(converter.project, text)!!
+        val element = fileWithText.getFirstChild()!!
+        return prettify(converter.elementToKotlin(element))
+    }
+
     private fun fileToKotlin(converter: Converter, text: String): String {
         return generateKotlinCode(converter, JavaToKotlinTranslator.createFile(converter.project, text))
     }

j2k/tests/test/org/jetbrains/jet/j2k/test/JavaToKotlinConverterBasicTestGenerated.java

@@ -1233,6 +1233,16 @@ public class JavaToKotlinConverterBasicTestGenerated extends AbstractJavaToKotli
             doTest("j2k/tests/testData/ast/importStatement/importWithStar.jav");
         }
         
+        @TestMetadata("oneImport.jav")
+        public void testOneImport() throws Exception {
+            doTest("j2k/tests/testData/ast/importStatement/oneImport.jav");
+        }
+        
+        @TestMetadata("onlyImports.jav")
+        public void testOnlyImports() throws Exception {
+            doTest("j2k/tests/testData/ast/importStatement/onlyImports.jav");
+        }
+        
         @TestMetadata("simpleImport.jav")
         public void testSimpleImport() throws Exception {
             doTest("j2k/tests/testData/ast/importStatement/simpleImport.jav");

j2k/tests/test/org/jetbrains/jet/j2k/test/JavaToKotlinConverterPluginTestGenerated.java

@@ -1233,6 +1233,16 @@ public class JavaToKotlinConverterPluginTestGenerated extends AbstractJavaToKotl
             doTest("j2k/tests/testData/ast/importStatement/importWithStar.jav");
         }
         
+        @TestMetadata("oneImport.jav")
+        public void testOneImport() throws Exception {
+            doTest("j2k/tests/testData/ast/importStatement/oneImport.jav");
+        }
+        
+        @TestMetadata("onlyImports.jav")
+        public void testOnlyImports() throws Exception {
+            doTest("j2k/tests/testData/ast/importStatement/onlyImports.jav");
+        }
+        
         @TestMetadata("simpleImport.jav")
         public void testSimpleImport() throws Exception {
             doTest("j2k/tests/testData/ast/importStatement/simpleImport.jav");

j2k/tests/testData/ast/importStatement/oneImport.ide.kt

@@ -0,0 +1 @@
+import java.util.Arrays

j2k/tests/testData/ast/importStatement/oneImport.jav

@@ -0,0 +1,2 @@
+//element
+import java.util.Arrays;

j2k/tests/testData/ast/importStatement/oneImport.kt

@@ -0,0 +1 @@
+import java.util.Arrays

j2k/tests/testData/ast/importStatement/onlyImports.ide.kt

@@ -0,0 +1,2 @@
+import java.util.Arrays
+import java.util.concurrent.ArrayBlockingQueue

j2k/tests/testData/ast/importStatement/onlyImports.jav

@@ -0,0 +1,3 @@
+//element
+import java.util.Arrays;
+import java.util.concurrent.ArrayBlockingQueue;

j2k/tests/testData/ast/importStatement/onlyImports.kt

@@ -0,0 +1,2 @@
+import java.util.Arrays
+import java.util.concurrent.ArrayBlockingQueue