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

KT-44079 [Sealed Interfaces]: move refactoring update

Browse Source 
The idea behind this commit is that Move Refactoring should warn
developers in case their intention potentially breaks sealed
hierarchies (members must share the same module and package).

Provided algorithm has two goals:
- prevent destruction of correct hierarchies
- help in fixing broken ones
This commit is contained in:
Andrei Klunnyi
2021-01-22 14:41:19 +01:00
committed by Space
parent de3678a805
commit 690fb47cbb
116 changed files with 847 additions and 132 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/testData/refactoring/moveMultiModule/moveSealedCheckTargetPackageHasNoMembersCrossModuleBig/after/A/A.iml
Vendored
+12
View File
@@ -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="module" module-name="B" />
</component>
</module>
idea/testData/refactoring/moveMultiModule/moveSealedCheckTargetPackageHasNoMembersCrossModuleBig/after/A/src/sealed/SealedHierarchy.kt
Vendored
+17
View File
@@ -0,0 +1,17 @@
package sealed
sealed interface SealedInterfaceB
sealed interface SealedInterfaceC
sealed interface SealedInterfaceD: InterfaceI, SealedInterfaceA, SealedInterfaceB, SealedInterfaceC
interface InterfaceE: SealedInterfaceD
sealed interface SealedInterfaceF: InterfaceE
sealed interface SealedInterfaceG
interface InterfaceH: InterfaceE
interface InterfaceI
class ClassA: InterfaceE
class ClassC
sealed class SealedClassB: SealedInterfaceB, SealedInterfaceC, ClassC()
class ClassD: SealedClassB()
sealed class SealedClassE: SealedClassB(), SealedInterfaceG
class ClassF: ClassD()
idea/testData/refactoring/moveMultiModule/moveSealedCheckTargetPackageHasNoMembersCrossModuleBig/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/moveMultiModule/moveSealedCheckTargetPackageHasNoMembersCrossModuleBig/after/B/src/sealed/HelloGitEmptyDir.kt
Vendored
+3
View File
@@ -0,0 +1,3 @@
package sealed
interface HelloGitEmptyDir
idea/testData/refactoring/moveMultiModule/moveSealedCheckTargetPackageHasNoMembersCrossModuleBig/after/B/src/sealed/SealedInterfaceA.kt
Vendored
+3
View File
@@ -0,0 +1,3 @@
package sealed
sealed interface SealedInterfaceA
idea/testData/refactoring/moveMultiModule/moveSealedCheckTargetPackageHasNoMembersCrossModuleBig/before/A/A.iml
Vendored
+12
View File
@@ -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="module" module-name="B" />
</component>
</module>
idea/testData/refactoring/moveMultiModule/moveSealedCheckTargetPackageHasNoMembersCrossModuleBig/before/A/src/sealed/SealedHierarchy.kt
Vendored
+18
View File
@@ -0,0 +1,18 @@
package sealed
sealed interface <caret>SealedInterfaceA
sealed interface SealedInterfaceB
sealed interface SealedInterfaceC
sealed interface SealedInterfaceD: InterfaceI, SealedInterfaceA, SealedInterfaceB, SealedInterfaceC
interface InterfaceE: SealedInterfaceD
sealed interface SealedInterfaceF: InterfaceE
sealed interface SealedInterfaceG
interface InterfaceH: InterfaceE
interface InterfaceI
class ClassA: InterfaceE
class ClassC
sealed class SealedClassB: SealedInterfaceB, SealedInterfaceC, ClassC()
class ClassD: SealedClassB()
sealed class SealedClassE: SealedClassB(), SealedInterfaceG
class ClassF: ClassD()
idea/testData/refactoring/moveMultiModule/moveSealedCheckTargetPackageHasNoMembersCrossModuleBig/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/moveMultiModule/moveSealedCheckTargetPackageHasNoMembersCrossModuleBig/before/B/src/sealed/HelloGitEmptyDir.kt
Vendored
+3
View File
@@ -0,0 +1,3 @@
package sealed
interface HelloGitEmptyDir
idea/testData/refactoring/moveMultiModule/moveSealedCheckTargetPackageHasNoMembersCrossModuleBig/conflicts.txt
Vendored
+1
View File
@@ -0,0 +1 @@
Sealed hierarchy of 'SealedInterfaceA' would be split. None of its members reside in the package 'sealed' of module 'B': [sealed.SealedInterfaceA, sealed.SealedInterfaceD, sealed.SealedInterfaceB, sealed.SealedClassB, sealed.SealedInterfaceC, sealed.ClassD, sealed.SealedClassE, sealed.SealedInterfaceG, sealed.InterfaceE].
idea/testData/refactoring/moveMultiModule/moveSealedCheckTargetPackageHasNoMembersCrossModuleBig/moveSealedCheckTargetPackageHasNoMembersCrossModuleBig.test
Vendored
+7
View File
@@ -0,0 +1,7 @@
{
"mainFile": "A/src/sealed/SealedHierarchy.kt",
"type": "MOVE_KOTLIN_TOP_LEVEL_DECLARATIONS",
"targetPackage": "sealed",
"targetSourceRoot": "B/src",
"withRuntime": "false"
}