Move: Convert AbstractMoveTest to light fixture test case
Extract multi-module move test to a separate class
This commit is contained in:
Alexey Sedunov
+12
@@ -0,0 +1,12 @@
|
||||
<?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" />
|
||||
<orderEntry type="library" name="KotlinJavaRuntime" level="project" />
|
||||
</component>
|
||||
</module>
|
||||
Vendored
Vendored
+5
@@ -0,0 +1,5 @@
|
||||
package y
|
||||
|
||||
fun foo() {
|
||||
|
||||
}
|
||||
+12
@@ -0,0 +1,12 @@
|
||||
<?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" />
|
||||
<orderEntry type="library" name="KotlinJavaRuntime" level="project" />
|
||||
</component>
|
||||
</module>
|
||||
Vendored
+5
@@ -0,0 +1,5 @@
|
||||
package y
|
||||
|
||||
fun foo() {
|
||||
|
||||
}
|
||||
+6
@@ -0,0 +1,6 @@
|
||||
{
|
||||
"mainFile": "A/src/x/test.kt",
|
||||
"type": "MOVE_DIRECTORY_WITH_CLASSES",
|
||||
"sourceDir": "A/src/x",
|
||||
"targetDir": "A/src/z"
|
||||
}
|
||||
+11
@@ -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>
|
||||
+5
@@ -0,0 +1,5 @@
|
||||
package a2
|
||||
|
||||
import a1.internalTargetVal
|
||||
|
||||
internal val sourceVal = internalTargetVal
|
||||
+11
@@ -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>
|
||||
+3
@@ -0,0 +1,3 @@
|
||||
package b
|
||||
|
||||
internal val internalTargetVal = 0
|
||||
+3
@@ -0,0 +1,3 @@
|
||||
package b
|
||||
|
||||
class X
|
||||
+11
@@ -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>
|
||||
+3
@@ -0,0 +1,3 @@
|
||||
package a1
|
||||
|
||||
internal val <caret>internalTargetVal = 0
|
||||
+5
@@ -0,0 +1,5 @@
|
||||
package a2
|
||||
|
||||
import a1.internalTargetVal
|
||||
|
||||
internal val sourceVal = internalTargetVal
|
||||
+11
@@ -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>
|
||||
+3
@@ -0,0 +1,3 @@
|
||||
package b
|
||||
|
||||
class X
|
||||
+2
@@ -0,0 +1,2 @@
|
||||
Property a1.internalTargetVal, referenced in file internalSource.kt, will not be accessible from module A
|
||||
Property a1.internalTargetVal, referenced in file internalSource.kt, will not be accessible from module A
|
||||
+6
@@ -0,0 +1,6 @@
|
||||
{
|
||||
"mainFile": "A/src/a1/internalTarget.kt",
|
||||
"type": "MOVE_FILES_WITH_DECLARATIONS",
|
||||
"targetDirectory": "B/src/b",
|
||||
"withRuntime": "true"
|
||||
}
|
||||
+11
@@ -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>
|
||||
+14
@@ -0,0 +1,14 @@
|
||||
package packJvm
|
||||
|
||||
class ClassUsageJs {
|
||||
init {
|
||||
listOf("example")
|
||||
arrayOf("another")
|
||||
Pair(1, "2")
|
||||
}
|
||||
|
||||
@JsName("bar")
|
||||
fun foo() {
|
||||
|
||||
}
|
||||
}
|
||||
idea/testData/refactoring/moveMultiModule/moveFromJsModuleToJvmModule/after/A/src/packJvm/testJvm.kt
Vendored
+17
@@ -0,0 +1,17 @@
|
||||
package packJvm
|
||||
|
||||
class ClassUsageJvm {
|
||||
init {
|
||||
listOf("example")
|
||||
arrayOf("another")
|
||||
Pair(1, "2")
|
||||
}
|
||||
|
||||
companion object {
|
||||
@JvmStatic fun foo() {
|
||||
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
class Foo
|
||||
+11
@@ -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>
|
||||
Vendored
+3
@@ -0,0 +1,3 @@
|
||||
package packJs
|
||||
|
||||
class Foo
|
||||
+11
@@ -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>
|
||||
+17
@@ -0,0 +1,17 @@
|
||||
package packJvm
|
||||
|
||||
class ClassUsageJvm {
|
||||
init {
|
||||
listOf("example")
|
||||
arrayOf("another")
|
||||
Pair(1, "2")
|
||||
}
|
||||
|
||||
companion object {
|
||||
@JvmStatic fun foo() {
|
||||
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
class Foo
|
||||
+11
@@ -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>
|
||||
Vendored
+16
@@ -0,0 +1,16 @@
|
||||
package packJs
|
||||
|
||||
class <caret>ClassUsageJs {
|
||||
init {
|
||||
listOf("example")
|
||||
arrayOf("another")
|
||||
Pair(1, "2")
|
||||
}
|
||||
|
||||
@JsName("bar")
|
||||
fun foo() {
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
class Foo
|
||||
+1
@@ -0,0 +1 @@
|
||||
Constructor JsName(String), referenced in function packJs.ClassUsageJs.foo(), will not be accessible in module A
|
||||
+9
@@ -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"]
|
||||
}
|
||||
+11
@@ -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>
|
||||
idea/testData/refactoring/moveMultiModule/moveFromJvmModuleToJsModule/after/A/src/packJvm/testJvm.kt
Vendored
+3
@@ -0,0 +1,3 @@
|
||||
package packJvm
|
||||
|
||||
class Foo
|
||||
+11
@@ -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>
|
||||
+15
@@ -0,0 +1,15 @@
|
||||
package packJs
|
||||
|
||||
class ClassUsageJvm {
|
||||
init {
|
||||
listOf("example")
|
||||
arrayOf("another")
|
||||
Pair(1, "2")
|
||||
}
|
||||
|
||||
companion object {
|
||||
@JvmStatic fun foo() {
|
||||
|
||||
}
|
||||
}
|
||||
}
|
||||
Vendored
+16
@@ -0,0 +1,16 @@
|
||||
package packJs
|
||||
|
||||
class ClassUsageJs {
|
||||
init {
|
||||
listOf("example")
|
||||
arrayOf("another")
|
||||
Pair(1, "2")
|
||||
}
|
||||
|
||||
@JsName("bar")
|
||||
fun foo() {
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
class Foo
|
||||
+11
@@ -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>
|
||||
+17
@@ -0,0 +1,17 @@
|
||||
package packJvm
|
||||
|
||||
class <caret>ClassUsageJvm {
|
||||
init {
|
||||
listOf("example")
|
||||
arrayOf("another")
|
||||
Pair(1, "2")
|
||||
}
|
||||
|
||||
companion object {
|
||||
@JvmStatic fun foo() {
|
||||
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
class Foo
|
||||
+11
@@ -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>
|
||||
Vendored
+16
@@ -0,0 +1,16 @@
|
||||
package packJs
|
||||
|
||||
class ClassUsageJs {
|
||||
init {
|
||||
listOf("example")
|
||||
arrayOf("another")
|
||||
Pair(1, "2")
|
||||
}
|
||||
|
||||
@JsName("bar")
|
||||
fun foo() {
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
class Foo
|
||||
+1
@@ -0,0 +1 @@
|
||||
Constructor JvmStatic(), referenced in function packJvm.ClassUsageJvm.Companion.foo(), will not be accessible in module B
|
||||
+9
@@ -0,0 +1,9 @@
|
||||
{
|
||||
"mainFile": "A/src/packJvm/testJvm.kt",
|
||||
"type": "MOVE_KOTLIN_TOP_LEVEL_DECLARATIONS",
|
||||
"targetPackage": "packJs",
|
||||
"targetSourceRoot": "B/src",
|
||||
"withRuntime": "true",
|
||||
"modulesWithRuntime": ["A"],
|
||||
"modulesWithJsRuntime": ["B"]
|
||||
}
|
||||
+13
@@ -0,0 +1,13 @@
|
||||
<?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" />
|
||||
<orderEntry type="library" name="KotlinJavaRuntime" level="project" />
|
||||
<orderEntry type="module" module-name="B" />
|
||||
</component>
|
||||
</module>
|
||||
+5
@@ -0,0 +1,5 @@
|
||||
package packA1
|
||||
|
||||
import packA2.InternalContentUser
|
||||
|
||||
class More
|
||||
+11
@@ -0,0 +1,11 @@
|
||||
package packA2
|
||||
|
||||
import packA1.InternalContent
|
||||
|
||||
class InternalContentUser {
|
||||
fun useInternal(p: InternalContent) = p.internalFun()
|
||||
|
||||
internal fun internalFun() {
|
||||
|
||||
}
|
||||
}
|
||||
+12
@@ -0,0 +1,12 @@
|
||||
<?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" />
|
||||
<orderEntry type="library" name="KotlinJavaRuntime" level="project" />
|
||||
</component>
|
||||
</module>
|
||||
+13
@@ -0,0 +1,13 @@
|
||||
package packB
|
||||
|
||||
class InternalContent {
|
||||
internal fun internalFun() {}
|
||||
|
||||
fun useInternalInside() {
|
||||
internalFun()
|
||||
}
|
||||
|
||||
fun useInternal() {
|
||||
InternalContentUser().internalFun()
|
||||
}
|
||||
}
|
||||
Vendored
+1
@@ -0,0 +1 @@
|
||||
This file is needed to ensure that containing directory is under version control
|
||||
+13
@@ -0,0 +1,13 @@
|
||||
<?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" />
|
||||
<orderEntry type="library" name="KotlinJavaRuntime" level="project" />
|
||||
<orderEntry type="module" module-name="B" />
|
||||
</component>
|
||||
</module>
|
||||
+17
@@ -0,0 +1,17 @@
|
||||
package packA1
|
||||
|
||||
import packA2.InternalContentUser
|
||||
|
||||
class <caret>InternalContent {
|
||||
internal fun internalFun() {}
|
||||
|
||||
fun useInternalInside() {
|
||||
internalFun()
|
||||
}
|
||||
|
||||
fun useInternal() {
|
||||
InternalContentUser().internalFun()
|
||||
}
|
||||
}
|
||||
|
||||
class More
|
||||
+11
@@ -0,0 +1,11 @@
|
||||
package packA2
|
||||
|
||||
import packA1.InternalContent
|
||||
|
||||
class InternalContentUser {
|
||||
fun useInternal(p: InternalContent) = p.internalFun()
|
||||
|
||||
internal fun internalFun() {
|
||||
|
||||
}
|
||||
}
|
||||
+12
@@ -0,0 +1,12 @@
|
||||
<?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" />
|
||||
<orderEntry type="library" name="KotlinJavaRuntime" level="project" />
|
||||
</component>
|
||||
</module>
|
||||
Vendored
+1
@@ -0,0 +1 @@
|
||||
This file is needed to ensure that containing directory is under version control
|
||||
+6
@@ -0,0 +1,6 @@
|
||||
Class InternalContent uses function internalFun() which will be inaccessible after move
|
||||
Class packA1.InternalContent, referenced in file InternalSource.kt, will not be accessible from module A
|
||||
Class packA1.InternalContent, referenced in file InternalSource.kt, will not be accessible from module A
|
||||
Class packA2.InternalContentUser, referenced in function packA1.InternalContent.useInternal(), will not be accessible in module B
|
||||
Function packA2.InternalContentUser.internalFun(), referenced in function packA1.InternalContent.useInternal(), will not be accessible in module B
|
||||
Function useInternal(InternalContent) uses internal function internalFun() which will be inaccessible after move
|
||||
+7
@@ -0,0 +1,7 @@
|
||||
{
|
||||
"mainFile": "A/src/packA1/InternalTarget.kt",
|
||||
"type": "MOVE_KOTLIN_TOP_LEVEL_DECLARATIONS",
|
||||
"targetPackage": "packB",
|
||||
"targetSourceRoot": "B/src",
|
||||
"withRuntime": "true"
|
||||
}
|
||||
+11
@@ -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>
|
||||
Vendored
+11
@@ -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>
|
||||
Vendored
+1
@@ -0,0 +1 @@
|
||||
fdgfg
|
||||
Vendored
+7
@@ -0,0 +1,7 @@
|
||||
package b
|
||||
|
||||
fun foo() = listOf(1, 2, 3)
|
||||
|
||||
fun bar() {
|
||||
|
||||
}
|
||||
+11
@@ -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>
|
||||
Vendored
Vendored
+7
@@ -0,0 +1,7 @@
|
||||
package a
|
||||
|
||||
fun <caret>foo() = listOf(1, 2, 3)
|
||||
|
||||
fun bar() {
|
||||
|
||||
}
|
||||
+11
@@ -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>
|
||||
Vendored
+1
@@ -0,0 +1 @@
|
||||
fdgfg
|
||||
+1
@@ -0,0 +1 @@
|
||||
Function kotlin.collections.listOf(vararg T), referenced in function a.foo(), will not be accessible in module B
|
||||
+7
@@ -0,0 +1,7 @@
|
||||
{
|
||||
"mainFile": "A/src/a/test.kt",
|
||||
"type": "MOVE_FILES_WITH_DECLARATIONS",
|
||||
"targetDirectory": "B/src/b",
|
||||
"withRuntime": "true",
|
||||
"modulesWithRuntime": ["A"]
|
||||
}
|
||||
+11
@@ -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>
|
||||
Vendored
+3
@@ -0,0 +1,3 @@
|
||||
package a
|
||||
|
||||
val val2 = val1
|
||||
+11
@@ -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>
|
||||
Vendored
+3
@@ -0,0 +1,3 @@
|
||||
package b
|
||||
|
||||
class X
|
||||
Vendored
+3
@@ -0,0 +1,3 @@
|
||||
package target
|
||||
|
||||
val val1 = 0
|
||||
+11
@@ -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>
|
||||
Vendored
+4
@@ -0,0 +1,4 @@
|
||||
package a
|
||||
|
||||
val <caret>val1 = 0
|
||||
val val2 = val1
|
||||
+11
@@ -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>
|
||||
Vendored
+3
@@ -0,0 +1,3 @@
|
||||
package b
|
||||
|
||||
class X
|
||||
+1
@@ -0,0 +1 @@
|
||||
Property a.val1, referenced in file test.kt, will not be accessible from module A
|
||||
+7
@@ -0,0 +1,7 @@
|
||||
{
|
||||
"mainFile": "A/src/a/test.kt",
|
||||
"type": "MOVE_KOTLIN_TOP_LEVEL_DECLARATIONS",
|
||||
"targetPackage": "target",
|
||||
"targetSourceRoot": "B/src",
|
||||
"withRuntime": "true"
|
||||
}
|
||||
+11
@@ -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>
|
||||
Vendored
+3
@@ -0,0 +1,3 @@
|
||||
package a2
|
||||
|
||||
import a1.internalTargetVal
|
||||
+11
@@ -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>
|
||||
idea/testData/refactoring/moveMultiModule/visibilityConflictInImport/after/B/src/b/internalTarget.kt
Vendored
+3
@@ -0,0 +1,3 @@
|
||||
package b
|
||||
|
||||
internal val internalTargetVal = 0
|
||||
+3
@@ -0,0 +1,3 @@
|
||||
package b
|
||||
|
||||
class X
|
||||
+11
@@ -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>
|
||||
Vendored
+3
@@ -0,0 +1,3 @@
|
||||
package a1
|
||||
|
||||
internal val <caret>internalTargetVal = 0
|
||||
+3
@@ -0,0 +1,3 @@
|
||||
package a2
|
||||
|
||||
import a1.internalTargetVal
|
||||
+11
@@ -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>
|
||||
Vendored
+3
@@ -0,0 +1,3 @@
|
||||
package b
|
||||
|
||||
class X
|
||||
+1
@@ -0,0 +1 @@
|
||||
Property a1.internalTargetVal, referenced in file internalSource.kt, will not be accessible from module A
|
||||
idea/testData/refactoring/moveMultiModule/visibilityConflictInImport/visibilityConflictInImport.test
Vendored
+6
@@ -0,0 +1,6 @@
|
||||
{
|
||||
"mainFile": "A/src/a1/internalTarget.kt",
|
||||
"type": "MOVE_FILES_WITH_DECLARATIONS",
|
||||
"targetDirectory": "B/src/b",
|
||||
"withRuntime": "true"
|
||||
}
|
||||
Reference in New Issue
Block a user