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
+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)