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

Move: Do not consider type alias -> expect class change as a conflict

Browse Source 
Given they have the same fqname

 #KT-23594 Fixed
This commit is contained in:
Alexey Sedunov
2018-07-11 13:21:28 +03:00
parent 1c30a12d95
commit 5275e19c76
14 changed files with 154 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/testData/refactoring/moveMultiModule/moveRefToLibTypeAliasImplementingLibExpectClass/after/A/A.iml
Vendored
+21
View File
@@ -0,0 +1,21 @@
<?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>
<component name="FacetManager">
<facet type="kotlin-language" name="Kotlin">
<configuration version="3" platform="Common (experimental) " useProjectSettings="false">
<compilerSettings />
<compilerArguments>
<option name="multiPlatform" value="true" />
</compilerArguments>
</configuration>
</facet>
</component>
</module>
idea/testData/refactoring/moveMultiModule/moveRefToLibTypeAliasImplementingLibExpectClass/after/A/src/Foo.kt
Vendored
+5
View File
@@ -0,0 +1,5 @@
class Foo {
fun foo() {
throw IllegalStateException()
}
}
idea/testData/refactoring/moveMultiModule/moveRefToLibTypeAliasImplementingLibExpectClass/after/A/src/dummy.txt
Vendored
View File
idea/testData/refactoring/moveMultiModule/moveRefToLibTypeAliasImplementingLibExpectClass/after/B/B.iml
Vendored
+23
View File
@@ -0,0 +1,23 @@
<?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="module" module-name="A" scope="COMPILE" />
</component>
<component name="FacetManager">
<facet type="kotlin-language" name="Kotlin">
<configuration version="3" platform="JVM 1.8" useProjectSettings="false">
<implements>A</implements>
<compilerSettings />
<compilerArguments>
<option name="multiPlatform" value="true" />
</compilerArguments>
</configuration>
</facet>
</component>
</module>
idea/testData/refactoring/moveMultiModule/moveRefToLibTypeAliasImplementingLibExpectClass/after/B/src/test.kt
Vendored
+1
View File
@@ -0,0 +1 @@
class Bar
idea/testData/refactoring/moveMultiModule/moveRefToLibTypeAliasImplementingLibExpectClass/before/A/A.iml
Vendored
+21
View File
@@ -0,0 +1,21 @@
<?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>
<component name="FacetManager">
<facet type="kotlin-language" name="Kotlin">
<configuration version="3" platform="Common (experimental) " useProjectSettings="false">
<compilerSettings />
<compilerArguments>
<option name="multiPlatform" value="true" />
</compilerArguments>
</configuration>
</facet>
</component>
</module>
idea/testData/refactoring/moveMultiModule/moveRefToLibTypeAliasImplementingLibExpectClass/before/A/src/dummy.txt
Vendored
View File
idea/testData/refactoring/moveMultiModule/moveRefToLibTypeAliasImplementingLibExpectClass/before/B/B.iml
Vendored
+23
View File
@@ -0,0 +1,23 @@
<?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="module" module-name="A" scope="COMPILE" />
</component>
<component name="FacetManager">
<facet type="kotlin-language" name="Kotlin">
<configuration version="3" platform="JVM 1.8" useProjectSettings="false">
<implements>A</implements>
<compilerSettings />
<compilerArguments>
<option name="multiPlatform" value="true" />
</compilerArguments>
</configuration>
</facet>
</component>
</module>
idea/testData/refactoring/moveMultiModule/moveRefToLibTypeAliasImplementingLibExpectClass/before/B/src/test.kt
Vendored
+7
View File
@@ -0,0 +1,7 @@
class <caret>Foo {
fun foo() {
throw IllegalStateException()
}
}
class Bar
idea/testData/refactoring/moveMultiModule/moveRefToLibTypeAliasImplementingLibExpectClass/moveRefToLibTypeAliasImplementingLibExpectClass.test
Vendored
+9
View File
@@ -0,0 +1,9 @@
{
"mainFile": "B/src/test.kt",
"type": "MOVE_KOTLIN_TOP_LEVEL_DECLARATIONS",
"targetPackage": "",
"targetSourceRoot": "A/src",
"withRuntime": "true",
"modulesWithRuntime": ["B"],
"modulesWithCommonRuntime": ["A"]
}