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

Move: Fix processing of conflicting usages

Browse Source 
Exclude conflict-associated usages from refactoring.
Move search of file internal usages to MoveKotlinDeclarationsProcessor
This commit is contained in:
Alexey Sedunov
2017-03-04 21:28:10 +03:00
parent a21f19d613
commit 13de9aea81
13 changed files with 88 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/misc/moveFileWithDeclarationsToUnrelatedModuleConflict/after/A/src/a2/internalSource.kt
Vendored
+2 -2
View File
@@ -1,5 +1,5 @@
package a2
import b.internalTargetVal
import a1.internalTargetVal
internal val sourceVal = b.internalTargetVal
internal val sourceVal = internalTargetVal
idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/misc/moveFileWithDeclarationsToUnrelatedModuleConflict/conflicts.txt
Vendored
+1 -2
View File
@@ -1,3 +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
Property sourceVal uses property internalTargetVal which will be inaccessible after move
Property a1.internalTargetVal, referenced in file internalSource.kt, will not be accessible from module A
idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/misc/moveToUnrelatedModuleConflict/after/A/src/a/test.kt
Vendored
+1 -1
View File
@@ -1,3 +1,3 @@
package a
val val2 = target.val1
val val2 = val1
idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/misc/moveToUnrelatedModuleConflict/conflicts.txt
Vendored
-1
View File
@@ -1,2 +1 @@
Property a.val1, referenced in file test.kt, will not be accessible from module A
Property a.val1, referenced in file test.kt, will not be accessible from module A
idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/misc/visibilityConflictInImport/after/A/src/a2/internalSource.kt
Vendored
+1 -1
View File
@@ -1,3 +1,3 @@
package a2
import b.internalTargetVal
import a1.internalTargetVal