azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Move: Fix conflict checking when switching between similar libraries

Browse Source 
#KT-17006 Fixed
This commit is contained in:
Alexey Sedunov
2017-03-23 21:07:34 +03:00
parent 45b8cd29e1
commit 298ee266c3
25 changed files with 338 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFromJsModuleToJvmModule/after/A/A.iml
Vendored
+11
View 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>
idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFromJsModuleToJvmModule/after/A/src/packJvm/ClassUsageJs.kt
Vendored
+14
View File
@@ -0,0 +1,14 @@
package packJvm
class ClassUsageJs {
init {
listOf("example")
arrayOf("another")
Pair(1, "2")
}
@JsName("bar")
fun foo() {
}
}
idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFromJsModuleToJvmModule/after/A/src/packJvm/testJvm.kt
Vendored
+17
View File
@@ -0,0 +1,17 @@
package packJvm
class ClassUsageJvm {
init {
listOf("example")
arrayOf("another")
Pair(1, "2")
}
companion object {
@JvmStatic fun foo() {
}
}
}
class Foo
idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFromJsModuleToJvmModule/after/B/B.iml
Vendored
+11
View 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>
idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFromJsModuleToJvmModule/after/B/src/packJs/testJs.kt
Vendored
+3
View File
@@ -0,0 +1,3 @@
package packJs
class Foo
idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFromJsModuleToJvmModule/before/A/A.iml
Vendored
+11
View 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>
idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFromJsModuleToJvmModule/before/A/src/packJvm/testJvm.kt
Vendored
+17
View File
@@ -0,0 +1,17 @@
package packJvm
class ClassUsageJvm {
init {
listOf("example")
arrayOf("another")
Pair(1, "2")
}
companion object {
@JvmStatic fun foo() {
}
}
}
class Foo
idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFromJsModuleToJvmModule/before/B/B.iml
Vendored
+11
View 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>
idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFromJsModuleToJvmModule/before/B/src/packJs/testJs.kt
Vendored
+16
View File
@@ -0,0 +1,16 @@
package packJs
class <caret>ClassUsageJs {
init {
listOf("example")
arrayOf("another")
Pair(1, "2")
}
@JsName("bar")
fun foo() {
}
}
class Foo
idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFromJsModuleToJvmModule/conflicts.txt
Vendored
+1
View File
@@ -0,0 +1 @@
Constructor JsName(String), referenced in function packJs.ClassUsageJs.foo(), will not be accessible in module A
idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFromJsModuleToJvmModule/moveFromJsModuleToJvmModule.test
Vendored
+10
View File
@@ -0,0 +1,10 @@
{
"mainFile": "B/src/packJs/testJs.kt",
"type": "MOVE_KOTLIN_TOP_LEVEL_DECLARATIONS",
"targetPackage": "packJvm",
"targetSourceRoot": "A/src",
"isMultiModule": "true",
"withRuntime": "true",
"modulesWithRuntime": ["A"],
"modulesWithJsRuntime": ["B"]
}
idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFromJvmModuleToJsModule/after/A/A.iml
Vendored
+11
View 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>
idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFromJvmModuleToJsModule/after/A/src/packJvm/testJvm.kt
Vendored
+3
View File
@@ -0,0 +1,3 @@
package packJvm
class Foo
idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFromJvmModuleToJsModule/after/B/B.iml
Vendored
+11
View 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>
idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFromJvmModuleToJsModule/after/B/src/packJs/ClassUsageJvm.kt
Vendored
+15
View File
@@ -0,0 +1,15 @@
package packJs
class ClassUsageJvm {
init {
listOf("example")
arrayOf("another")
Pair(1, "2")
}
companion object {
@JvmStatic fun foo() {
}
}
}
idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFromJvmModuleToJsModule/after/B/src/packJs/testJs.kt
Vendored
+16
View File
@@ -0,0 +1,16 @@
package packJs
class ClassUsageJs {
init {
listOf("example")
arrayOf("another")
Pair(1, "2")
}
@JsName("bar")
fun foo() {
}
}
class Foo
idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFromJvmModuleToJsModule/before/A/A.iml
Vendored
+11
View 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>
idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFromJvmModuleToJsModule/before/A/src/packJvm/testJvm.kt
Vendored
+17
View File
@@ -0,0 +1,17 @@
package packJvm
class <caret>ClassUsageJvm {
init {
listOf("example")
arrayOf("another")
Pair(1, "2")
}
companion object {
@JvmStatic fun foo() {
}
}
}
class Foo
idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFromJvmModuleToJsModule/before/B/B.iml
Vendored
+11
View 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>
idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFromJvmModuleToJsModule/before/B/src/packJs/testJs.kt
Vendored
+16
View File
@@ -0,0 +1,16 @@
package packJs
class ClassUsageJs {
init {
listOf("example")
arrayOf("another")
Pair(1, "2")
}
@JsName("bar")
fun foo() {
}
}
class Foo
idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFromJvmModuleToJsModule/conflicts.txt
Vendored
+1
View File
@@ -0,0 +1 @@
Constructor JvmStatic(), referenced in function packJvm.ClassUsageJvm.Companion.foo(), will not be accessible in module B
idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFromJvmModuleToJsModule/moveFromJvmModuleToJsModule.test
Vendored
+10
View File
@@ -0,0 +1,10 @@
{
"mainFile": "A/src/packJvm/testJvm.kt",
"type": "MOVE_KOTLIN_TOP_LEVEL_DECLARATIONS",
"targetPackage": "packJs",
"targetSourceRoot": "B/src",
"isMultiModule": "true",
"withRuntime": "true",
"modulesWithRuntime": ["A"],
"modulesWithJsRuntime": ["B"]
}