mirror of
https://github.com/jlengrand/kotlin.git
synced 2026-05-14 00:21:34 +00:00
Move: Convert AbstractMoveTest to light fixture test case
Extract multi-module move test to a separate class
This commit is contained in:
11
idea/testData/refactoring/moveMultiModule/moveFromJsModuleToJvmModule/after/A/A.iml
vendored
Normal file
11
idea/testData/refactoring/moveMultiModule/moveFromJsModuleToJvmModule/after/A/A.iml
vendored
Normal file
@@ -0,0 +1,11 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<module type="JAVA_MODULE" version="4">
|
||||
<component name="NewModuleRootManager" inherit-compiler-output="true">
|
||||
<exclude-output />
|
||||
<content url="file://$MODULE_DIR$">
|
||||
<sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
|
||||
</content>
|
||||
<orderEntry type="inheritedJdk" />
|
||||
<orderEntry type="sourceFolder" forTests="false" />
|
||||
</component>
|
||||
</module>
|
||||
@@ -0,0 +1,14 @@
|
||||
package packJvm
|
||||
|
||||
class ClassUsageJs {
|
||||
init {
|
||||
listOf("example")
|
||||
arrayOf("another")
|
||||
Pair(1, "2")
|
||||
}
|
||||
|
||||
@JsName("bar")
|
||||
fun foo() {
|
||||
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,17 @@
|
||||
package packJvm
|
||||
|
||||
class ClassUsageJvm {
|
||||
init {
|
||||
listOf("example")
|
||||
arrayOf("another")
|
||||
Pair(1, "2")
|
||||
}
|
||||
|
||||
companion object {
|
||||
@JvmStatic fun foo() {
|
||||
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
class Foo
|
||||
11
idea/testData/refactoring/moveMultiModule/moveFromJsModuleToJvmModule/after/B/B.iml
vendored
Normal file
11
idea/testData/refactoring/moveMultiModule/moveFromJsModuleToJvmModule/after/B/B.iml
vendored
Normal file
@@ -0,0 +1,11 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<module type="JAVA_MODULE" version="4">
|
||||
<component name="NewModuleRootManager" inherit-compiler-output="true">
|
||||
<exclude-output />
|
||||
<content url="file://$MODULE_DIR$">
|
||||
<sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
|
||||
</content>
|
||||
<orderEntry type="inheritedJdk" />
|
||||
<orderEntry type="sourceFolder" forTests="false" />
|
||||
</component>
|
||||
</module>
|
||||
@@ -0,0 +1,3 @@
|
||||
package packJs
|
||||
|
||||
class Foo
|
||||
11
idea/testData/refactoring/moveMultiModule/moveFromJsModuleToJvmModule/before/A/A.iml
vendored
Normal file
11
idea/testData/refactoring/moveMultiModule/moveFromJsModuleToJvmModule/before/A/A.iml
vendored
Normal file
@@ -0,0 +1,11 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<module type="JAVA_MODULE" version="4">
|
||||
<component name="NewModuleRootManager" inherit-compiler-output="true">
|
||||
<exclude-output />
|
||||
<content url="file://$MODULE_DIR$">
|
||||
<sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
|
||||
</content>
|
||||
<orderEntry type="inheritedJdk" />
|
||||
<orderEntry type="sourceFolder" forTests="false" />
|
||||
</component>
|
||||
</module>
|
||||
@@ -0,0 +1,17 @@
|
||||
package packJvm
|
||||
|
||||
class ClassUsageJvm {
|
||||
init {
|
||||
listOf("example")
|
||||
arrayOf("another")
|
||||
Pair(1, "2")
|
||||
}
|
||||
|
||||
companion object {
|
||||
@JvmStatic fun foo() {
|
||||
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
class Foo
|
||||
11
idea/testData/refactoring/moveMultiModule/moveFromJsModuleToJvmModule/before/B/B.iml
vendored
Normal file
11
idea/testData/refactoring/moveMultiModule/moveFromJsModuleToJvmModule/before/B/B.iml
vendored
Normal file
@@ -0,0 +1,11 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<module type="JAVA_MODULE" version="4">
|
||||
<component name="NewModuleRootManager" inherit-compiler-output="true">
|
||||
<exclude-output />
|
||||
<content url="file://$MODULE_DIR$">
|
||||
<sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
|
||||
</content>
|
||||
<orderEntry type="inheritedJdk" />
|
||||
<orderEntry type="sourceFolder" forTests="false" />
|
||||
</component>
|
||||
</module>
|
||||
@@ -0,0 +1,16 @@
|
||||
package packJs
|
||||
|
||||
class <caret>ClassUsageJs {
|
||||
init {
|
||||
listOf("example")
|
||||
arrayOf("another")
|
||||
Pair(1, "2")
|
||||
}
|
||||
|
||||
@JsName("bar")
|
||||
fun foo() {
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
class Foo
|
||||
1
idea/testData/refactoring/moveMultiModule/moveFromJsModuleToJvmModule/conflicts.txt
vendored
Normal file
1
idea/testData/refactoring/moveMultiModule/moveFromJsModuleToJvmModule/conflicts.txt
vendored
Normal file
@@ -0,0 +1 @@
|
||||
Constructor JsName(String), referenced in function packJs.ClassUsageJs.foo(), will not be accessible in module A
|
||||
@@ -0,0 +1,9 @@
|
||||
{
|
||||
"mainFile": "B/src/packJs/testJs.kt",
|
||||
"type": "MOVE_KOTLIN_TOP_LEVEL_DECLARATIONS",
|
||||
"targetPackage": "packJvm",
|
||||
"targetSourceRoot": "A/src",
|
||||
"withRuntime": "true",
|
||||
"modulesWithRuntime": ["A"],
|
||||
"modulesWithJsRuntime": ["B"]
|
||||
}
|
||||
Reference in New Issue
Block a user