New J2K: add copy-paste tests for new j2k

generators/tests/org/jetbrains/kotlin/generators/tests/GenerateTests.kt

@@ -154,6 +154,7 @@ import org.jetbrains.kotlin.kapt.cli.test.AbstractKaptToolIntegrationTest
 import org.jetbrains.kotlin.kapt3.test.AbstractClassFileToSourceStubConverterTest
 import org.jetbrains.kotlin.kapt3.test.AbstractKotlinKaptContextTest
 import org.jetbrains.kotlin.nj2k.AbstractNewJavaToKotlinConverterSingleFileTest
+import org.jetbrains.kotlin.nj2k.AbstractNewJavaToKotlinCopyPasteConversionTest
 import org.jetbrains.kotlin.nj2k.AbstractNullabilityAnalysisTest
 import org.jetbrains.kotlin.noarg.AbstractBlackBoxCodegenTestForNoArg
 import org.jetbrains.kotlin.noarg.AbstractBytecodeListingTestForNoArg
@@ -982,6 +983,9 @@ fun main(args: Array<String>) {
         testClass<AbstractNewJavaToKotlinConverterSingleFileTest> {
             model("newJ2k", extension = "java")
         }
+        testClass<AbstractNewJavaToKotlinCopyPasteConversionTest> {
+            model("copyPaste", pattern = """^([^\.]+)\.java$""")
+        }
         testClass<AbstractNullabilityAnalysisTest> {
             model("nullabilityAnalysis")
         }

generators/tests/org/jetbrains/kotlin/generators/tests/GenerateTests.kt.as35

@@ -142,6 +142,7 @@ import org.jetbrains.kotlin.kapt.cli.test.AbstractKaptToolIntegrationTest
 import org.jetbrains.kotlin.kapt3.test.AbstractClassFileToSourceStubConverterTest
 import org.jetbrains.kotlin.kapt3.test.AbstractKotlinKaptContextTest
 import org.jetbrains.kotlin.nj2k.AbstractNewJavaToKotlinConverterSingleFileTest
+import org.jetbrains.kotlin.nj2k.AbstractNewJavaToKotlinCopyPasteConversionTest
 import org.jetbrains.kotlin.nj2k.AbstractNullabilityAnalysisTest
 import org.jetbrains.kotlin.noarg.AbstractBlackBoxCodegenTestForNoArg
 import org.jetbrains.kotlin.noarg.AbstractBytecodeListingTestForNoArg
@@ -950,6 +951,9 @@ fun main(args: Array<String>) {
         testClass<AbstractNewJavaToKotlinConverterSingleFileTest> {
             model("newJ2k", extension = "java")
         }
+        testClass<AbstractNewJavaToKotlinCopyPasteConversionTest> {
+            model("copyPaste", pattern = """^([^\.]+)\.java$""")
+        }
         testClass<AbstractNullabilityAnalysisTest> {
             model("nullabilityAnalysis")
         }

idea/tests/org/jetbrains/kotlin/idea/conversion/copy/AbstractJavaToKotlinCopyPasteConversionTest.kt

@@ -6,6 +6,7 @@
 package org.jetbrains.kotlin.idea.conversion.copy
 
 import com.intellij.openapi.actionSystem.IdeActions
+import com.intellij.openapi.util.registry.Registry
 import org.jetbrains.kotlin.idea.AbstractCopyPasteTest
 import org.jetbrains.kotlin.idea.editor.KotlinEditorOptions
 import org.jetbrains.kotlin.idea.test.KotlinWithJdkAndRuntimeLightProjectDescriptor
@@ -22,10 +23,13 @@ abstract class AbstractJavaToKotlinCopyPasteConversionTest : AbstractCopyPasteTe
 
     override fun getTestDataPath() = BASE_PATH
 
+    protected open fun isNewJ2K(): Boolean = false
+
     override fun getProjectDescriptor() = KotlinWithJdkAndRuntimeLightProjectDescriptor.INSTANCE
 
     override fun setUp() {
         super.setUp()
+        Registry.get("kotlin.use.new.j2k").setValue(isNewJ2K())
         oldEditorOptions = KotlinEditorOptions.getInstance().state
         KotlinEditorOptions.getInstance().isEnableJavaToKotlinConversion = true
         KotlinEditorOptions.getInstance().isDonTShowConversionDialog = true

nj2k/build.gradle.kts

@@ -31,6 +31,7 @@ dependencies {
 
     testCompile(project(":idea"))
     testCompile(projectTests(":j2k"))
+    testCompile(projectTests(":idea"))
     testCompile(project(":nj2k:nj2k-services"))
     testCompile(projectTests(":idea:idea-test-framework"))
     testCompile(project(":compiler:light-classes"))

nj2k/testData/copyPaste/AddImports.expected.kt

@@ -0,0 +1,5 @@
+import java.io.File
+
+internal fun foo(file: File?): List<String> {
+    return emptyList()
+}

nj2k/testData/copyPaste/AddImports.java

@@ -0,0 +1,9 @@
+import java.io.File;
+import java.util.Collections;
+import java.util.List;
+
+class C {
+<selection>    List<String> foo(File file) {
+        return Collections.emptyList();
+    }
+</selection>}

nj2k/testData/copyPaste/AddImports.to.kt

@@ -0,0 +1 @@
+<caret>

nj2k/testData/copyPaste/AddImportsButNoConversion.expected.kt

@@ -0,0 +1,3 @@
+import java.io.File
+
+fun foo(): List<File>

nj2k/testData/copyPaste/AddImportsButNoConversion.java

@@ -0,0 +1,10 @@
+// NO_CONVERSION_EXPECTED
+import java.io.*;
+import java.util.Collections;
+import java.util.List;
+
+class C {
+    <selection>List<File></selection> foo() {
+        return Collections.emptyList();
+    }
+}

nj2k/testData/copyPaste/AddImportsButNoConversion.to.kt

@@ -0,0 +1 @@
+fun foo(): <caret>

nj2k/testData/copyPaste/AddImportsButNoConversion2.expected.kt

@@ -0,0 +1,5 @@
+import java.io.File
+
+fun foo() {
+    list.add(File.separatorChar)
+}

nj2k/testData/copyPaste/AddImportsClassInSamePackage.dependency.kt

@@ -0,0 +1,6 @@
+package ppp
+
+public object Dependency {
+    @JvmStatic
+    public val FIELD: Int = 1
+}

nj2k/testData/copyPaste/AddImportsClassInSamePackage.expected.kt

@@ -0,0 +1,5 @@
+import ppp.Dependency
+
+fun f() {
+    return Dependency.FIELD
+}

nj2k/testData/copyPaste/AddImportsClassInSamePackage.java

@@ -0,0 +1,7 @@
+package ppp
+
+class C {
+    char foo() {
+        <selection>return Dependency.FIELD;</selection>
+    }
+}

nj2k/testData/copyPaste/AddImportsClassInSamePackage.to.kt

@@ -0,0 +1,3 @@
+fun f() {
+    <caret>
+}

nj2k/testData/copyPaste/AddImportsDummyConflict.dependency.kt

@@ -0,0 +1,3 @@
+package ppp
+
+class dummy0

nj2k/testData/copyPaste/AddImportsDummyConflict.expected.kt

@@ -0,0 +1,5 @@
+import ppp.dummy0
+
+fun f() {
+    return dummy0()
+}

nj2k/testData/copyPaste/AddImportsDummyConflict.java

@@ -0,0 +1,7 @@
+import ppp.*
+
+class C {
+    dummy0 foo() {
+        <selection>return dummy0();</selection>
+    }
+}

nj2k/testData/copyPaste/AddImportsDummyConflict.to.kt

@@ -0,0 +1,3 @@
+fun f() {
+    <caret>
+}

nj2k/testData/copyPaste/AddImportsWithExplicitImports.expected.kt

@@ -0,0 +1,11 @@
+import java.io.File
+
+class C {
+    private fun memberFun(file: File?) {}
+
+    companion object {
+        @JvmStatic
+        fun main(args: Array<String>) {
+        }
+    }
+}

nj2k/testData/copyPaste/AddImportsWithExplicitImports.java

@@ -0,0 +1,6 @@
+import java.io.File;
+
+<selection>class C {
+    public static void main(String[] args) { }
+    private void memberFun(File file) {}
+}</selection>

nj2k/testData/copyPaste/AddImportsWithExplicitImports.to.kt

@@ -0,0 +1 @@
+<caret>

nj2k/testData/copyPaste/AddKClassImport.expected.kt

@@ -0,0 +1,5 @@
+package to
+
+import kotlin.reflect.KClass
+
+annotation class Ann(val value: KClass<*>)

nj2k/testData/copyPaste/AddKClassImport.java

@@ -0,0 +1,6 @@
+<selection>@interface Ann {
+    Class value();
+}</selection>
+
+class X {
+}

nj2k/testData/copyPaste/Arithmetic.expected.kt

@@ -0,0 +1 @@
+val v = b - c + d

nj2k/testData/copyPaste/Arithmetic.java

@@ -0,0 +1,4 @@
+// NO_CONVERSION_EXPECTED
+public static void main(String[]args){
+    a + <selection>b - c + d</selection> - e
+}

nj2k/testData/copyPaste/Arithmetic.to.kt

@@ -0,0 +1 @@
+val v = <caret>

nj2k/testData/copyPaste/ClassWithNoDocComment.expected.kt

@@ -0,0 +1,5 @@
+package to
+
+class JavaClass : Runnable {
+    override fun run() {}
+}

nj2k/testData/copyPaste/ClassWithNoDocComment.java

@@ -0,0 +1,10 @@
+/**
+ * Doc comment for JavaClass
+ */
+<selection>public class JavaClass implements Runnable{
+    @Override
+    public void run() {
+
+    }
+}
+</selection>

nj2k/testData/copyPaste/ClassWithOverrides.dependency.java

@@ -0,0 +1,8 @@
+package javaPack
+
+import org.jetbrains.annotations.NotNull;
+
+public interface I {
+    @NotNull
+    String foo();
+}

nj2k/testData/copyPaste/ClassWithOverrides.expected.kt

@@ -0,0 +1,9 @@
+package to
+
+import javaPack.I
+
+class C : I {
+    override fun foo(): String {
+        return ""
+    }
+}

nj2k/testData/copyPaste/ClassWithOverrides.java

@@ -0,0 +1,11 @@
+package javaPack
+
+import org.jetbrains.annotations.NotNull;
+
+<selection>public class C implements I {
+    @NotNull
+    @Override
+    public String foo() {
+        return "";
+    }
+}</selection>

nj2k/testData/copyPaste/Constructor.expected.kt

@@ -0,0 +1,3 @@
+fun main(args: Array<String>) {
+    A()
+}

nj2k/testData/copyPaste/Constructor.java

@@ -0,0 +1,5 @@
+class A {
+    public static void main(String[] args) {
+        <selection>new A()</selection>;
+    }
+}

nj2k/testData/copyPaste/Constructor.to.kt

@@ -0,0 +1,3 @@
+fun main(args: Array<String>) {
+    <caret>
+}

nj2k/testData/copyPaste/ConversionInCorrectContext.dependency.kt

@@ -0,0 +1,3 @@
+class Dependency {
+    fun getInt(): Int = 1
+}

nj2k/testData/copyPaste/ConversionInCorrectContext.expected.kt

@@ -0,0 +1,3 @@
+internal fun foo(p: Dependency): Double {
+    return p.getInt().toDouble() // explicit conversion to Double must be added on conversion (if type Dependency) is correctly resolved
+}

nj2k/testData/copyPaste/ConversionInCorrectContext.java

@@ -0,0 +1,5 @@
+class C {
+<selection>    double foo(Dependency p) {
+        return p.getInt(); // explicit conversion to Double must be added on conversion (if type Dependency) is correctly resolved
+    }
+</selection>}

nj2k/testData/copyPaste/ConversionInCorrectContext.to.kt

@@ -0,0 +1 @@
+<caret>

nj2k/testData/copyPaste/CopyAnnotation.expected.kt

@@ -0,0 +1,2 @@
+@Ann(String::class)
+class X

nj2k/testData/copyPaste/CopyAnnotation.java

@@ -0,0 +1,7 @@
+@interface Ann {
+    Class value();
+}
+
+<selection>@Ann(String.class)
+</selection>class C {
+}

nj2k/testData/copyPaste/CopyAnnotation.to.kt

@@ -0,0 +1 @@
+<caret>class X

nj2k/testData/copyPaste/ExtendsTypeRef.expected.kt

@@ -0,0 +1 @@
+class B : X<String, X<Int, Any>>

nj2k/testData/copyPaste/ExtendsTypeRef.java

@@ -0,0 +1,7 @@
+class X<T, U> {
+
+}
+
+class A extends <selection>X<String, X<Integer, Object>></selection> {
+
+}

nj2k/testData/copyPaste/ExtendsTypeRef.to.kt

@@ -0,0 +1 @@
+class B : <caret>

nj2k/testData/copyPaste/FieldWithNoEndComment.expected.kt

@@ -0,0 +1,3 @@
+package to
+
+private const val field = 1

nj2k/testData/copyPaste/FieldWithNoEndComment.java

@@ -0,0 +1,3 @@
+public class JavaClass {
+    <selection>private int field = 1;</selection> // comment for field
+}

nj2k/testData/copyPaste/FieldWithNoModifierAndNoSemicolon.expected.kt

@@ -0,0 +1,4 @@
+package to
+
+@Volatile
+internal var field = 1

nj2k/testData/copyPaste/FieldWithNoModifierAndNoSemicolon.java

@@ -0,0 +1,3 @@
+public class JavaClass {
+    public <selection>volatile int field = 1</selection>;
+}

nj2k/testData/copyPaste/FileWithNoPackageStatement.expected.kt

@@ -0,0 +1,8 @@
+package to
+
+object JavaClass {
+    @JvmStatic
+    fun main(args: Array<String>) {
+        println("Hello, world!")
+    }
+}

nj2k/testData/copyPaste/FileWithNoPackageStatement.java

@@ -0,0 +1,9 @@
+package helloWorld;
+
+// sample class
+<selection>public class JavaClass {
+    public static void main(String[] args) {
+        System.out.println("Hello, world!");
+    }
+}
+</selection>

nj2k/testData/copyPaste/HalfTheWhiteSpace.expected.kt

@@ -0,0 +1,10 @@
+class A {
+
+
+    internal fun foo() {}
+
+    internal fun bar() {}
+
+
+    fun f() {}
+}

nj2k/testData/copyPaste/HalfTheWhiteSpace.java

@@ -0,0 +1,10 @@
+class A {
+
+    <selection>
+    void foo() {}
+
+    void bar() {}
+
+    </selection>
+    void foobar() {}
+}

nj2k/testData/copyPaste/HalfTheWhiteSpace.to.kt

@@ -0,0 +1,6 @@
+class A {
+
+    <caret>
+
+    fun f() {}
+}

nj2k/testData/copyPaste/ImplementsTypeRef.expected.kt

@@ -0,0 +1 @@
+class B : X<String, X<Int, Any>>

nj2k/testData/copyPaste/ImplementsTypeRef.java

@@ -0,0 +1,7 @@
+interface X<T, U> {
+
+}
+
+class A implements <selection>X<String, X<Integer, Object>></selection> {
+
+}

nj2k/testData/copyPaste/ImplementsTypeRef.to.kt

@@ -0,0 +1 @@
+class B : <caret>

nj2k/testData/copyPaste/Imports1.expected.kt

@@ -0,0 +1,7 @@
+import a.b.c
+import g.e.v
+
+
+fun main(args: Array<String>) {
+
+}

nj2k/testData/copyPaste/Imports1.java

@@ -0,0 +1,4 @@
+<selection>import java.util.List;
+import a.b.c;
+import java.util.Set;
+import g.e.v;</selection>

nj2k/testData/copyPaste/Imports1.to.kt

@@ -0,0 +1,5 @@
+<caret>
+
+fun main(args: Array<String>) {
+
+}

nj2k/testData/copyPaste/Imports2.expected.kt

@@ -0,0 +1,3 @@
+fun main(args: Array<String>) {
+
+}

nj2k/testData/copyPaste/Imports2.java

@@ -0,0 +1,4 @@
+<selection>import java.util.List;</selection>
+import a.b.c;
+import java.util.Set;
+import g.e.v;

nj2k/testData/copyPaste/Imports2.to.kt

@@ -0,0 +1,5 @@
+<caret>
+
+fun main(args: Array<String>) {
+
+}

nj2k/testData/copyPaste/Imports3.expected.kt

@@ -0,0 +1,6 @@
+import g.e.v
+
+
+fun main(args: Array<String>) {
+
+}

nj2k/testData/copyPaste/Imports3.java

@@ -0,0 +1,4 @@
+import java.util.List;
+import a.b.c;
+import java.util.Set;
+<selection>import g.e.v;</selection>

nj2k/testData/copyPaste/Imports3.to.kt

@@ -0,0 +1,5 @@
+<caret>
+
+fun main(args: Array<String>) {
+
+}

nj2k/testData/copyPaste/Indentation.expected.kt

@@ -0,0 +1,3 @@
+fun main(args: Array<String>) {
+    if (x > 0) x = 2 else x = 3
+}

nj2k/testData/copyPaste/Indentation.java

@@ -0,0 +1,8 @@
+class A {
+public static void main(String[]args){
+<selection>if (x > 0)
+x = 2;
+else
+x = 3;</selection>
+}
+}

nj2k/testData/copyPaste/Indentation.to.kt

@@ -0,0 +1,2 @@
+fun main(args: Array<String>) { <caret>
+}

nj2k/testData/copyPaste/InsertIntoComment.expected.kt

@@ -0,0 +1 @@
+// String s = 1;

nj2k/testData/copyPaste/InsertIntoComment.java

@@ -0,0 +1,7 @@
+class A {
+    public static void main(String[] args) {
+        <selection>String s = 1;</selection>
+    }
+}
+
+// NO_CONVERSION_EXPECTED

nj2k/testData/copyPaste/InsertIntoComment.to.kt

@@ -0,0 +1 @@
+// <caret>

nj2k/testData/copyPaste/InsertIntoString.expected.kt

@@ -0,0 +1,3 @@
+fun main(args: Array<String>) {
+    println("String s = 1;")
+}

nj2k/testData/copyPaste/InsertIntoString.java

@@ -0,0 +1,7 @@
+class A {
+    public static void main(String[] args) {
+        <selection>String s = 1;</selection>
+    }
+}
+
+// NO_CONVERSION_EXPECTED

nj2k/testData/copyPaste/InsertIntoString.to.kt

@@ -0,0 +1,3 @@
+fun main(args: Array<String>) {
+    println("<caret>")
+}

nj2k/testData/copyPaste/MethodDeclarationWithNoBody.expected.kt

@@ -0,0 +1,3 @@
+package to
+
+internal fun foo(p: Int)

nj2k/testData/copyPaste/MethodDeclarationWithNoBody.java

@@ -0,0 +1,5 @@
+class A {
+    public <selection>void foo(int p)</selection> {
+        System.out.println("foo");
+    }
+}

nj2k/testData/copyPaste/MethodReferenceWithoutQualifier.expected.kt

@@ -0,0 +1,4 @@
+fun main(args: Array<String>) {
+    reference(arg)
+    somethingElse()
+}

nj2k/testData/copyPaste/MethodReferenceWithoutQualifier.java

@@ -0,0 +1,6 @@
+// NO_CONVERSION_EXPECTED
+class A {
+    public static void main(String[] args) {
+        qualifier.<selection>reference(arg)</selection>;
+    }
+}

nj2k/testData/copyPaste/MethodReferenceWithoutQualifier.to.kt

@@ -0,0 +1,4 @@
+fun main(args: Array<String>) {
+    <caret>
+    somethingElse()
+}

nj2k/testData/copyPaste/MethodWithNoAnnotation.expected.kt

@@ -0,0 +1,5 @@
+package to
+
+fun foo(): String {
+    return ""
+}

nj2k/testData/copyPaste/MethodWithNoAnnotation.java

@@ -0,0 +1,6 @@
+public class JavaClass {
+    @Deprecated
+<selection>    public String foo() {
+        return "";
+    }
+</selection>}

nj2k/testData/copyPaste/MethodWithOnlyOneAnnotation.expected.kt

@@ -0,0 +1,6 @@
+package to
+
+@SomeAnnotation
+fun foo(): String {
+    return ""
+}

nj2k/testData/copyPaste/MethodWithOnlyOneAnnotation.java

@@ -0,0 +1,7 @@
+public class JavaClass {
+    @Deprecated
+<selection>    @SomeAnnotation
+    public String foo() {
+        return "";
+    }
+</selection>}

nj2k/testData/copyPaste/OnlyClosingBrace.expected.kt

@@ -0,0 +1 @@
+}

nj2k/testData/copyPaste/OnlyClosingBrace.java

@@ -0,0 +1,6 @@
+// NO_CONVERSION_EXPECTED
+class A {
+    public static void main(String[] args) {
+        //sdasd
+    }
+<selection>}</selection>

nj2k/testData/copyPaste/OnlyClosingBrace.to.kt

@@ -0,0 +1 @@
+<caret>

nj2k/testData/copyPaste/OnlyOneBraceFromBlock.expected.kt

@@ -0,0 +1,4 @@
+fun main(args: Array<String>) {
+    {
+        val a = Any()
+}

nj2k/testData/copyPaste/OnlyOneBraceFromBlock.java

@@ -0,0 +1,5 @@
+class A {
+    public static void main(String[] args) <selection>{
+        Object a = new Object();</selection>
+    }
+}

nj2k/testData/copyPaste/OnlyOneBraceFromBlock.to.kt

@@ -0,0 +1,3 @@
+fun main(args: Array<String>) {
+    <caret>
+}

nj2k/testData/copyPaste/OnlyQualifier.expected.kt

@@ -0,0 +1,4 @@
+fun main(args: Array<String>) {
+    qualifier
+    somethingElse()
+}

nj2k/testData/copyPaste/OnlyQualifier.java

@@ -0,0 +1,6 @@
+// NO_CONVERSION_EXPECTED
+class A {
+    public static void main(String[] args) {
+        <selection>qualifier</selection>.reference(arg);
+    }
+}

nj2k/testData/copyPaste/OnlyQualifier.to.kt

@@ -0,0 +1,4 @@
+fun main(args: Array<String>) {
+    <caret>
+    somethingElse()
+}

nj2k/testData/copyPaste/RawTypeRef.expected.kt

@@ -0,0 +1 @@
+class B : X<*>

nj2k/testData/copyPaste/RawTypeRef.java

@@ -0,0 +1,7 @@
+interface X<T> {
+
+}
+
+class A implements <selection>X</selection> {
+
+}

nj2k/testData/copyPaste/RawTypeRef.to.kt

@@ -0,0 +1 @@
+class B : <caret>

nj2k/testData/copyPaste/RedundantTypeCast.expected.kt

@@ -0,0 +1,6 @@
+fun foo(o: Any) {
+    if (o is String) {
+        val l = o.length
+    }
+    somethingElse()
+}

nj2k/testData/copyPaste/RedundantTypeCast.java

@@ -0,0 +1,7 @@
+class C {
+    void foo(Object o) {
+<selection>        if (o instanceof String) {
+            int l = ((String) o).length();
+        }
+</selection>    }
+}

nj2k/testData/copyPaste/RedundantTypeCast.to.kt

@@ -0,0 +1,3 @@
+fun foo(o: Any) {
+<caret>    somethingElse()
+}

nj2k/testData/copyPaste/RedundantTypeCast2.expected.kt

@@ -0,0 +1,5 @@
+fun foo(o: Any) {
+    if (o !is String) return
+    val l = o.length
+    somethingElse(o as String/* we should not remove this cast because it's not in pasted range*/)
+}