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

Move: Specify conflict containing declaration more precisely

Browse Source 
Also do not render class fqname for member declarations

 #KT-17547 Fixed
This commit is contained in:
Alexey Sedunov
2017-04-24 14:52:21 +03:00
parent fba52359ac
commit 0a5f9d8181
16 changed files with 43 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/testData/refactoring/moveMultiModule/moveDirectoryToUnrelatedModuleConflict/conflicts.txt
Vendored
+2 -2
View File
@@ -1,3 +1,3 @@
Class test2.J, referenced in property test2.pack.Bar.j, will not be accessible in module A
Class test2.J, referenced in property test2.pack.Foo.j, will not be accessible in module A
Class test2.J, referenced in property Bar.j, will not be accessible in module A
Class test2.J, referenced in property Foo.j, will not be accessible in module A
Class test2.pack.Foo, referenced in field J.foo, will not be accessible from module B
idea/testData/refactoring/moveMultiModule/moveFileWithDeclarationsToUnrelatedModuleConflict/conflicts.txt
Vendored
+2 -1
View File
@@ -1 +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 a1.internalTargetVal, referenced in property a2.sourceVal, will not be accessible from module A
idea/testData/refactoring/moveMultiModule/moveFromJsModuleToJvmModule/conflicts.txt
Vendored
+1 -1
View File
@@ -1 +1 @@
Constructor JsName(String), referenced in function packJs.ClassUsageJs.foo(), will not be accessible in module A
Constructor JsName(String), referenced in function ClassUsageJs.foo(), will not be accessible in module A
idea/testData/refactoring/moveMultiModule/moveFromJvmModuleToJsModule/conflicts.txt
Vendored
+1 -1
View File
@@ -1 +1 @@
Constructor JvmStatic(), referenced in function packJvm.ClassUsageJvm.Companion.foo(), will not be accessible in module B
Constructor JvmStatic(), referenced in function ClassUsageJvm.Companion.foo(), will not be accessible in module B
idea/testData/refactoring/moveMultiModule/moveInternalToAnotherModule/conflicts.txt
Vendored
+3 -2
View File
@@ -1,5 +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 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
Class packA1.InternalContent, referenced in function InternalContentUser.useInternal(InternalContent), will not be accessible from module A
Class packA2.InternalContentUser, referenced in function InternalContent.useInternal(), will not be accessible in module B
Function InternalContentUser.internalFun(), referenced in function InternalContent.useInternal(), will not be accessible in module B
Function useInternal(InternalContent) uses internal function internalFun() which will be inaccessible after move
idea/testData/refactoring/moveMultiModule/moveMultipleFilesToUnrelatedModuleConflict/conflicts.txt
Vendored
+2 -2
View File
@@ -1,4 +1,4 @@
Class test.Bar, referenced in field J.bar, will not be accessible from module A
Class test.Foo, referenced in field J.foo, will not be accessible from module A
Class test.J, referenced in property test.Bar.j, will not be accessible in module B
Class test.J, referenced in property test.Foo.j, will not be accessible in module B
Class test.J, referenced in property Bar.j, will not be accessible in module B
Class test.J, referenced in property Foo.j, will not be accessible in module B
idea/testData/refactoring/moveMultiModule/movePackageToUnrelatedModuleConflict/conflicts.txt
Vendored
+2 -2
View File
@@ -1,3 +1,3 @@
Class test2.J, referenced in property test2.pack.Bar.j, will not be accessible in module A
Class test2.J, referenced in property test2.pack.Foo.j, will not be accessible in module A
Class test2.J, referenced in property Bar.j, will not be accessible in module A
Class test2.J, referenced in property Foo.j, will not be accessible in module A
Class test2.pack.Foo, referenced in field J.foo, will not be accessible from module B
idea/testData/refactoring/moveMultiModule/moveToUnrelatedModuleConflict/conflicts.txt
Vendored
+1 -1
View File
@@ -1 +1 @@
Property a.val1, referenced in file test.kt, will not be accessible from module A
Property a.val1, referenced in property a.val2, will not be accessible from module A