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/codeInsight/breadcrumbs/AnonymousObjects.txt
Vendored
+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>
idea/testData/codeInsight/breadcrumbs/Declarations.txt
Vendored
+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)