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

Fix navigate to super declaration line marker tooltip

Browse Source 
Don't show overridden function signature each time, show only where it's declared
This commit is contained in:
Nikolay Krasko
2014-07-25 02:40:36 +04:00
parent 6a714436f2
commit 6aa5e53a00
7 changed files with 57 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/testData/codeInsight/lineMarker/ClassObjectInStaticNestedClass.kt
+1 -1
View File
@@ -5,7 +5,7 @@ trait <lineMarker></lineMarker>TestTrait {
class A {
class B {
class object : TestTrait { // TODO: No line marker
override fun <lineMarker descr="<b>internal</b> <b>open</b> <b>fun</b> test(): kotlin.Unit <i>defined in</i> A.B.&lt;class-object-for-B&gt;<br/>implements<br/><b>internal</b> <b>abstract</b> <b>fun</b> test(): kotlin.Unit <i>defined in</i> TestTrait"></lineMarker>test() {
override fun <lineMarker descr="Implements function in 'TestTrait'"></lineMarker>test() {
}
}
}
idea/testData/codeInsight/lineMarker/DelegatedFun.kt
+1 -1
View File
@@ -9,5 +9,5 @@ open class <lineMarker></lineMarker>C(b : B) : B by b, A {
}
class D(b : B) : C(b) {
override fun <lineMarker descr="<b>internal</b> <b>open</b> <b>fun</b> f(): kotlin.Unit <i>defined in</i> D<br/>overrides<br/><b>internal</b> <b>open</b> <b>fun</b> f(): kotlin.Unit <i>defined in</i> A"></lineMarker>f() {}
override fun <lineMarker descr="Overrides function in 'A'"></lineMarker>f() {}
}
idea/testData/codeInsight/lineMarker/DelegatedProperty.kt
+1 -1
View File
@@ -9,5 +9,5 @@ open class <lineMarker></lineMarker>C(b : B) : B by b, A {
}
class D(b : B) : C(b) {
override val <lineMarker descr="<b>internal</b> <b>open</b> <b>val</b> f: kotlin.Int <i>defined in</i> D<br/>overrides<br/><b>internal</b> <b>open</b> <b>val</b> f: kotlin.Int <i>defined in</i> A"></lineMarker>f: Int = 2
override val <lineMarker descr="Overrides property in 'A'"></lineMarker>f: Int = 2
}
idea/testData/codeInsight/lineMarker/FakeOverrideFun.kt
+1 -1
View File
@@ -7,5 +7,5 @@ trait <lineMarker></lineMarker>B : A
trait <lineMarker></lineMarker>C : B, A
class SomeClass() : C {
override fun <lineMarker descr="<b>internal</b> <b>open</b> <b>fun</b> f(): kotlin.Unit <i>defined in</i> SomeClass<br/>overrides<br/><b>internal</b> <b>open</b> <b>fun</b> f(): kotlin.Unit <i>defined in</i> A"></lineMarker>f() {}
override fun <lineMarker descr="Overrides function in 'A'"></lineMarker>f() {}
}
idea/testData/codeInsight/lineMarker/FakeOverrideFunWithMostRelevantImplementation.kt
+1 -1
View File
@@ -9,5 +9,5 @@ trait <lineMarker></lineMarker>B : A {
trait <lineMarker></lineMarker>C : B, A
class SomeClass() : C {
override fun <lineMarker descr="<b>internal</b> <b>open</b> <b>fun</b> f(): kotlin.Unit <i>defined in</i> SomeClass<br/>overrides<br/><b>internal</b> <b>open</b> <b>fun</b> f(): kotlin.Unit <i>defined in</i> B"></lineMarker>f() {}
override fun <lineMarker descr="Overrides function in 'B'"></lineMarker>f() {}
}
idea/testData/codeInsight/lineMarker/FakeOverrideProperty.kt
+1 -1
View File
@@ -8,5 +8,5 @@ trait <lineMarker></lineMarker>B : A
trait <lineMarker></lineMarker>C : B, A
class SomeClass() : C {
override val <lineMarker descr="<b>internal</b> <b>open</b> <b>val</b> f: kotlin.Int <i>defined in</i> SomeClass<br/>overrides<br/><b>internal</b> <b>open</b> <b>val</b> f: kotlin.Int <i>defined in</i> A"></lineMarker>f: Int = 4
override val <lineMarker descr="Overrides property in 'A'"></lineMarker>f: Int = 4
}