Move: Specify conflict containing declaration more precisely

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
+4 -4
View File
@@ -11,10 +11,10 @@ Crumbs:
Tooltips:
property <b><code>v</code></b>
object : java.lang.Runnable
property <b><code>v.&lt;no name provided&gt;.v2</code></b>
property <b><code>&lt;no name provided&gt;.v2</code></b>
object : A, B
function <b><code>v.&lt;no name provided&gt;.v2.&lt;no name provided&gt;.f()</code></b>
function <b><code>&lt;no name provided&gt;.f()</code></b>
object : java.io.Serializable, XXX
property <b><code>v.&lt;no name provided&gt;.v2.&lt;no name provided&gt;.f.&lt;no name provided&gt;.o</code></b>
property <b><code>&lt;no name provided&gt;.o</code></b>
object
function <b><code>v.&lt;no name provided&gt;.v2.&lt;no name provided&gt;.f.&lt;no name provided&gt;.o.&lt;no name provided&gt;.equals(Any?)</code></b>
function <b><code>&lt;no name provided&gt;.equals(Any?)</code></b>
+3 -3
View File
@@ -11,8 +11,8 @@ Tooltips:
class <b><code>Outer</code></b>
companion object <b><code>Outer.Companion</code></b>
class <b><code>Outer.Companion.SomeClass</code></b>
companion object <b><code>Outer.Companion.SomeClass.CompanionName</code></b>
object <b><code>Outer.Companion.SomeClass.CompanionName.SomeObject</code></b>
function <b><code>Outer.Companion.SomeClass.CompanionName.SomeObject.someFun(Int, Boolean) on String</code></b>
companion object <b><code>SomeClass.CompanionName</code></b>
object <b><code>SomeClass.CompanionName.SomeObject</code></b>
function <b><code>SomeObject.someFun(Int, Boolean) on String</code></b>
function <b><code>Outer.Companion.SomeClass.CompanionName.SomeObject.someFun.localFun()</code></b>
fun(x: Int, y: Char)
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -1 +1 @@
class test.A.C has 1 usage that is not safe to delete.
class A.C has 1 usage that is not safe to delete.
@@ -1 +1 @@
object test.A.O has 1 usage that is not safe to delete.
object A.O has 1 usage that is not safe to delete.
@@ -1 +1 @@
property context.&lt;no name provided&gt;.addition has 1 usage that is not safe to delete.
property &lt;no name provided&gt;.addition has 1 usage that is not safe to delete.