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

Cleanup: KotlinLineMarkerProvider

Browse Source
This commit is contained in:
Mikhail Glukhikh
2016-12-13 19:57:40 +03:00
parent 39ca78f584
commit a846e41b46
30 changed files with 143 additions and 137 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/testData/codeInsight/lineMarker/overrideImplement/BadCodeNoExceptions.kt
Vendored
+3 -3
View File
@@ -1,10 +1,10 @@
interface <lineMarker></lineMarker>Hi {
fun <lineMarker></lineMarker>foo(): Int
interface <lineMarker>Hi</lineMarker> {
fun <lineMarker>foo</lineMarker>(): Int
}
// Closing brace is intentionally missed
val id = array("kotlin.FlexibleType"
private class Some(): Hi {
override fun <lineMarker></lineMarker>foo() = 1
override fun <lineMarker>foo</lineMarker>() = 1
}
idea/testData/codeInsight/lineMarker/overrideImplement/Class.kt
Vendored
+3 -3
View File
@@ -1,9 +1,9 @@
open class <lineMarker></lineMarker>A {
open fun <lineMarker></lineMarker>a(){
open class <lineMarker>A</lineMarker> {
open fun <lineMarker>a</lineMarker>(){
}
}
class B:A(){
override fun <lineMarker></lineMarker>a(){
override fun <lineMarker>a</lineMarker>(){
}
}
idea/testData/codeInsight/lineMarker/overrideImplement/ClassObjectInStaticNestedClass.kt
Vendored
+3 -3
View File
@@ -1,11 +1,11 @@
interface <lineMarker></lineMarker>TestTrait {
fun <lineMarker></lineMarker>test()
interface <lineMarker>TestTrait</lineMarker> {
fun <lineMarker>test</lineMarker>()
}
class A {
class B {
companion object : TestTrait { // TODO: No line marker
override fun <lineMarker descr="Implements function in 'TestTrait'"></lineMarker>test() {
override fun <lineMarker descr="Implements function in 'TestTrait'">test</lineMarker>() {
}
}
}
idea/testData/codeInsight/lineMarker/overrideImplement/DelegatedFun.kt
Vendored
+5 -5
View File
@@ -1,13 +1,13 @@
interface <lineMarker></lineMarker>A {
fun <lineMarker></lineMarker>f() {
interface <lineMarker>A</lineMarker> {
fun <lineMarker>f</lineMarker>() {
}
}
interface <lineMarker></lineMarker>B : A
interface <lineMarker>B</lineMarker> : A
open class <lineMarker></lineMarker>C(b : B) : B by b, A {
open class <lineMarker>C</lineMarker>(b : B) : B by b, A {
}
class D(b : B) : C(b) {
override fun <lineMarker descr="Overrides function in 'A'"></lineMarker>f() {}
override fun <lineMarker descr="Overrides function in 'A'">f</lineMarker>() {}
}
idea/testData/codeInsight/lineMarker/overrideImplement/DelegatedProperty.kt
Vendored
+5 -5
View File
@@ -1,13 +1,13 @@
interface <lineMarker></lineMarker>A {
val <lineMarker></lineMarker>f: Int
interface <lineMarker>A</lineMarker> {
val <lineMarker>f</lineMarker>: Int
get() = 3
}
interface <lineMarker></lineMarker>B : A
interface <lineMarker>B</lineMarker> : A
open class <lineMarker></lineMarker>C(b : B) : B by b, A {
open class <lineMarker>C</lineMarker>(b : B) : B by b, A {
}
class D(b : B) : C(b) {
override val <lineMarker descr="Overrides property in 'A'"></lineMarker>f: Int = 2
override val <lineMarker descr="Overrides property in 'A'">f</lineMarker>: Int = 2
}
idea/testData/codeInsight/lineMarker/overrideImplement/EnumEntry.kt
Vendored
+2 -2
View File
@@ -1,7 +1,7 @@
enum class SampleEnum {
V1 {
override fun <lineMarker descr="Overrides function in 'SampleEnum'"></lineMarker>any() { super.any() }
override fun <lineMarker descr="Overrides function in 'SampleEnum'">any</lineMarker>() { super.any() }
};
open fun <lineMarker descr="<html><body>Is overridden in <br>&nbsp;&nbsp;&nbsp;&nbsp;Enum constant 'V1' in 'SampleEnum'</body></html>"></lineMarker>any() {}
open fun <lineMarker descr="<html><body>Is overridden in <br>&nbsp;&nbsp;&nbsp;&nbsp;Enum constant 'V1' in 'SampleEnum'</body></html>">any</lineMarker>() {}
}
idea/testData/codeInsight/lineMarker/overrideImplement/FakeOverrideForClasses.kt
Vendored
+8 -8
View File
@@ -1,25 +1,25 @@
package sample
interface <lineMarker descr="*"></lineMarker>S<T> {
fun <lineMarker descr="<html><body>Is implemented in <br>&nbsp;&nbsp;&nbsp;&nbsp;sample.S2</body></html>"></lineMarker>foo(t: T): T
interface <lineMarker descr="*">S</lineMarker><T> {
fun <lineMarker descr="<html><body>Is implemented in <br>&nbsp;&nbsp;&nbsp;&nbsp;sample.S2</body></html>">foo</lineMarker>(t: T): T
val <lineMarker descr="<html><body>Is implemented in <br/>&nbsp;&nbsp;&nbsp;&nbsp;sample.S2</body></html>"></lineMarker>some: T? get
val <lineMarker descr="<html><body>Is implemented in <br/>&nbsp;&nbsp;&nbsp;&nbsp;sample.S2</body></html>">some</lineMarker>: T? get
var <lineMarker descr="<html><body>Is implemented in <br/>&nbsp;&nbsp;&nbsp;&nbsp;sample.S2</body></html>"></lineMarker>other: T?
var <lineMarker descr="<html><body>Is implemented in <br/>&nbsp;&nbsp;&nbsp;&nbsp;sample.S2</body></html>">other</lineMarker>: T?
get
set
}
open abstract class <lineMarker descr="*"></lineMarker>S1 : S<String>
open abstract class <lineMarker descr="*">S1</lineMarker> : S<String>
class S2 : S1() {
override val <lineMarker descr="Implements property in 'S&lt;T&gt;'"></lineMarker>some: String = "S"
override val <lineMarker descr="Implements property in 'S&lt;T&gt;'">some</lineMarker>: String = "S"
override var <lineMarker descr="Implements property in 'S&lt;T&gt;'"></lineMarker>other: String?
override var <lineMarker descr="Implements property in 'S&lt;T&gt;'">other</lineMarker>: String?
get() = null
set(value) {}
override fun <lineMarker descr="Implements function in 'S&lt;T&gt;'"></lineMarker>foo(t: String): String {
override fun <lineMarker descr="Implements function in 'S&lt;T&gt;'">foo</lineMarker>(t: String): String {
return super<S1>.foo(t)
}
}
idea/testData/codeInsight/lineMarker/overrideImplement/FakeOverrideFun.kt
Vendored
+5 -5
View File
@@ -1,11 +1,11 @@
interface <lineMarker></lineMarker>A {
fun <lineMarker></lineMarker>f() {}
interface <lineMarker>A</lineMarker> {
fun <lineMarker>f</lineMarker>() {}
}
interface <lineMarker></lineMarker>B : A
interface <lineMarker>B</lineMarker> : A
interface <lineMarker></lineMarker>C : B, A
interface <lineMarker>C</lineMarker> : B, A
class SomeClass() : C {
override fun <lineMarker descr="Overrides function in 'A'"></lineMarker>f() {}
override fun <lineMarker descr="Overrides function in 'A'">f</lineMarker>() {}
}
idea/testData/codeInsight/lineMarker/overrideImplement/FakeOverrideFunWithMostRelevantImplementation.kt
Vendored
+6 -6
View File
@@ -1,13 +1,13 @@
interface <lineMarker></lineMarker>A {
fun <lineMarker></lineMarker><lineMarker></lineMarker>f() {}
interface <lineMarker>A</lineMarker> {
fun <lineMarker><lineMarker>f</lineMarker></lineMarker>() {}
}
interface <lineMarker></lineMarker>B : A {
override fun <lineMarker></lineMarker>f() {}
interface <lineMarker>B</lineMarker> : A {
override fun <lineMarker>f</lineMarker>() {}
}
interface <lineMarker></lineMarker>C : B, A
interface <lineMarker>C</lineMarker> : B, A
class SomeClass() : C {
override fun <lineMarker descr="Overrides function in 'B'"></lineMarker>f() {}
override fun <lineMarker descr="Overrides function in 'B'">f</lineMarker>() {}
}
idea/testData/codeInsight/lineMarker/overrideImplement/FakeOverrideProperty.kt
Vendored
+5 -5
View File
@@ -1,12 +1,12 @@
interface <lineMarker></lineMarker>A {
val <lineMarker></lineMarker>f: Int
interface <lineMarker>A</lineMarker> {
val <lineMarker>f</lineMarker>: Int
get() = 2
}
interface <lineMarker></lineMarker>B : A
interface <lineMarker>B</lineMarker> : A
interface <lineMarker></lineMarker>C : B, A
interface <lineMarker>C</lineMarker> : B, A
class SomeClass() : C {
override val <lineMarker descr="Overrides property in 'A'"></lineMarker>f: Int = 4
override val <lineMarker descr="Overrides property in 'A'">f</lineMarker>: Int = 4
}
idea/testData/codeInsight/lineMarker/overrideImplement/FakeOverrideToStringInTrait.kt
Vendored
+5 -5
View File
@@ -1,9 +1,9 @@
interface <lineMarker descr="*"></lineMarker>A {
override fun <lineMarker descr="<html><body>Is implemented in <br>&nbsp;&nbsp;&nbsp;&nbsp;C</body></html>"><lineMarker descr="*"></lineMarker></lineMarker>toString() = "A"
interface <lineMarker descr="*">A</lineMarker> {
override fun <lineMarker descr="<html><body>Is implemented in <br>&nbsp;&nbsp;&nbsp;&nbsp;C</body></html>"><lineMarker descr="*">toString</lineMarker></lineMarker>() = "A"
}
abstract class <lineMarker descr="*"></lineMarker>B: A
abstract class <lineMarker descr="*">B</lineMarker> : A
class C: B() {
override fun <lineMarker descr="Overrides function in 'A'"></lineMarker>toString() = "B"
class C : B() {
override fun <lineMarker descr="Overrides function in 'A'">toString</lineMarker>() = "B"
}
idea/testData/codeInsight/lineMarker/overrideImplement/FakeOverridesForTraitFunWithImpl.kt
Vendored
+8 -8
View File
@@ -1,25 +1,25 @@
interface <lineMarker descr="*"></lineMarker>A {
fun <lineMarker descr="<html><body>Is implemented in <br>&nbsp;&nbsp;&nbsp;&nbsp;C</body></html>"></lineMarker>foo(): String = "A"
interface <lineMarker descr="*">A</lineMarker> {
fun <lineMarker descr="<html><body>Is implemented in <br>&nbsp;&nbsp;&nbsp;&nbsp;C</body></html>">foo</lineMarker>(): String = "A"
// TODO: B shoudn't be mentioned
val <lineMarker descr="<html><body>Is implemented in <br/>&nbsp;&nbsp;&nbsp;&nbsp;B<br>&nbsp;&nbsp;&nbsp;&nbsp;C</body></html>"></lineMarker>some: String? get() = null
val <lineMarker descr="<html><body>Is implemented in <br/>&nbsp;&nbsp;&nbsp;&nbsp;B<br>&nbsp;&nbsp;&nbsp;&nbsp;C</body></html>">some</lineMarker>: String? get() = null
// TODO: B shoudn't be mentioned
var <lineMarker descr="<html><body>Is implemented in <br/>&nbsp;&nbsp;&nbsp;&nbsp;B<br>&nbsp;&nbsp;&nbsp;&nbsp;C</body></html>"></lineMarker>other: String?
var <lineMarker descr="<html><body>Is implemented in <br/>&nbsp;&nbsp;&nbsp;&nbsp;B<br>&nbsp;&nbsp;&nbsp;&nbsp;C</body></html>">other</lineMarker>: String?
get() = null
set(value) {}
}
open class <lineMarker descr="*"></lineMarker>B: A
open class <lineMarker descr="*">B</lineMarker> : A
class C: B() {
override val <lineMarker descr="Overrides property in 'A'"></lineMarker>some: String = "S"
override val <lineMarker descr="Overrides property in 'A'">some</lineMarker>: String = "S"
override var <lineMarker descr="Overrides property in 'A'"></lineMarker>other: String?
override var <lineMarker descr="Overrides property in 'A'">other</lineMarker>: String?
get() = null
set(value) {}
override fun <lineMarker descr="Overrides function in 'A'"></lineMarker>foo(): String {
override fun <lineMarker descr="Overrides function in 'A'">foo</lineMarker>(): String {
return super<S1>.foo()
}
}
idea/testData/codeInsight/lineMarker/overrideImplement/NavigateToSeveralSuperElements.kt
Vendored
+5 -5
View File
@@ -1,13 +1,13 @@
interface <lineMarker></lineMarker>A1 {
fun <lineMarker></lineMarker>foo()
interface <lineMarker>A1</lineMarker> {
fun <lineMarker>foo</lineMarker>()
}
interface <lineMarker></lineMarker>B1 {
fun <lineMarker></lineMarker>foo()
interface <lineMarker>B1</lineMarker> {
fun <lineMarker>foo</lineMarker>()
}
class C1: A1, B1 {
override fun <lineMarker descr="Implements function in 'A1'<br/>Implements function in 'B1'"></lineMarker>foo() {}
override fun <lineMarker descr="Implements function in 'A1'<br/>Implements function in 'B1'">foo</lineMarker>() {}
}
/*
idea/testData/codeInsight/lineMarker/overrideImplement/NoOverridingMarkerOnDefaultTraitImpl.kt
Vendored
+4 -4
View File
@@ -1,9 +1,9 @@
interface <lineMarker descr="*"></lineMarker>SkipSupport {
fun <lineMarker descr="<html><body>Is implemented in <br>&nbsp;&nbsp;&nbsp;&nbsp;SkipSupportWithDefaults</body></html>"></lineMarker>skip()
interface <lineMarker descr="*">SkipSupport</lineMarker> {
fun <lineMarker descr="<html><body>Is implemented in <br>&nbsp;&nbsp;&nbsp;&nbsp;SkipSupportWithDefaults</body></html>">skip</lineMarker>()
}
public interface <lineMarker descr="*"></lineMarker>SkipSupportWithDefaults : SkipSupport {
override fun <lineMarker descr="Implements function in 'SkipSupport'"></lineMarker>skip() {}
public interface <lineMarker descr="*">SkipSupportWithDefaults</lineMarker> : SkipSupport {
override fun <lineMarker descr="Implements function in 'SkipSupport'">skip</lineMarker>() {}
}
open class SkipSupportImpl : SkipSupportWithDefaults
idea/testData/codeInsight/lineMarker/overrideImplement/Overloads.kt
Vendored
+5 -5
View File
@@ -1,9 +1,9 @@
interface <lineMarker descr="*"></lineMarker>A {
fun <lineMarker descr="<html><body>Is implemented in <br>&nbsp;&nbsp;&nbsp;&nbsp;B</body></html>"></lineMarker>foo(str: String)
fun <lineMarker descr="<html><body>Is implemented in <br>&nbsp;&nbsp;&nbsp;&nbsp;B</body></html>"></lineMarker>foo()
interface <lineMarker descr="*">A</lineMarker> {
fun <lineMarker descr="<html><body>Is implemented in <br>&nbsp;&nbsp;&nbsp;&nbsp;B</body></html>">foo</lineMarker>(str: String)
fun <lineMarker descr="<html><body>Is implemented in <br>&nbsp;&nbsp;&nbsp;&nbsp;B</body></html>">foo</lineMarker>()
}
open class B : A {
override fun <lineMarker descr="Implements function in 'A'"></lineMarker>foo(str: String) { }
override fun <lineMarker descr="Implements function in 'A'"></lineMarker>foo() { }
override fun <lineMarker descr="Implements function in 'A'">foo</lineMarker>(str: String) { }
override fun <lineMarker descr="Implements function in 'A'">foo</lineMarker>() { }
}
idea/testData/codeInsight/lineMarker/overrideImplement/OverrideFunction.kt
Vendored
+6 -6
View File
@@ -1,14 +1,14 @@
open class <lineMarker></lineMarker>A {
open fun <lineMarker></lineMarker>a(){
open class <lineMarker>A</lineMarker> {
open fun <lineMarker>a</lineMarker>(){
}
}
open class <lineMarker></lineMarker>B:A(){
override fun <lineMarker></lineMarker><lineMarker></lineMarker>a(){
open class <lineMarker>B</lineMarker> : A(){
override fun <lineMarker><lineMarker>a</lineMarker></lineMarker>(){
}
}
class C:B(){
override fun <lineMarker></lineMarker>a(){
class C : B(){
override fun <lineMarker>a</lineMarker>(){
}
}
idea/testData/codeInsight/lineMarker/overrideImplement/OverrideIconForOverloadMethodBug.kt
Vendored
+7 -7
View File
@@ -1,19 +1,19 @@
interface <lineMarker descr="*"></lineMarker>SkipSupport {
fun <lineMarker descr="<html><body>Is implemented in <br>&nbsp;&nbsp;&nbsp;&nbsp;SkipSupportImpl<br>&nbsp;&nbsp;&nbsp;&nbsp;SkipSupportWithDefaults</body></html>"></lineMarker>skip(why: String)
fun <lineMarker descr="<html><body>Is implemented in <br>&nbsp;&nbsp;&nbsp;&nbsp;SkipSupportWithDefaults</body></html>"></lineMarker>skip()
interface <lineMarker descr="*">SkipSupport</lineMarker> {
fun <lineMarker descr="<html><body>Is implemented in <br>&nbsp;&nbsp;&nbsp;&nbsp;SkipSupportImpl<br>&nbsp;&nbsp;&nbsp;&nbsp;SkipSupportWithDefaults</body></html>">skip</lineMarker>(why: String)
fun <lineMarker descr="<html><body>Is implemented in <br>&nbsp;&nbsp;&nbsp;&nbsp;SkipSupportWithDefaults</body></html>">skip</lineMarker>()
}
public interface <lineMarker descr="*"></lineMarker>SkipSupportWithDefaults : SkipSupport {
public interface <lineMarker descr="*">SkipSupportWithDefaults</lineMarker> : SkipSupport {
// TODO: should be "Is overriden in SkipSupportImpl"
override fun <lineMarker descr="<html><body>Is implemented in <br>&nbsp;&nbsp;&nbsp;&nbsp;SkipSupportImpl</body></html>"><lineMarker descr="Implements function in 'SkipSupport'"></lineMarker></lineMarker>skip(why: String) {}
override fun <lineMarker descr="<html><body>Is implemented in <br>&nbsp;&nbsp;&nbsp;&nbsp;SkipSupportImpl</body></html>"><lineMarker descr="Implements function in 'SkipSupport'">skip</lineMarker></lineMarker>(why: String) {}
override fun <lineMarker descr="Implements function in 'SkipSupport'"></lineMarker>skip() {
override fun <lineMarker descr="Implements function in 'SkipSupport'">skip</lineMarker>() {
skip("not given")
}
}
open class SkipSupportImpl: SkipSupportWithDefaults {
override fun <lineMarker descr="Overrides function in 'SkipSupportWithDefaults'"></lineMarker>skip(why: String) = throw RuntimeException(why)
override fun <lineMarker descr="Overrides function in 'SkipSupportWithDefaults'">skip</lineMarker>(why: String) = throw RuntimeException(why)
}
// KT-4428 Incorrect override icon shown for overloaded methods
idea/testData/codeInsight/lineMarker/overrideImplement/OverrideMemberOfAbstractClass.kt
Vendored
+3 -3
View File
@@ -1,10 +1,10 @@
abstract class <lineMarker></lineMarker>A {
open fun <lineMarker></lineMarker>a(){
abstract class <lineMarker>A</lineMarker> {
open fun <lineMarker>a</lineMarker>(){
}
}
open class B : A(){
override fun <lineMarker></lineMarker>a(){
override fun <lineMarker>a</lineMarker>(){
}
}
idea/testData/codeInsight/lineMarker/overrideImplement/OverridenTraitDeclarations.kt
Vendored
+7 -7
View File
@@ -1,15 +1,15 @@
// TODO: Declarations have no implementation and should be considered as "overloaded"
interface <lineMarker descr="*"></lineMarker>First {
val <lineMarker descr="<html><body>Is implemented in <br/>&nbsp;&nbsp;&nbsp;&nbsp;Second</body></html>"></lineMarker>some: Int
var <lineMarker descr="<html><body>Is implemented in <br/>&nbsp;&nbsp;&nbsp;&nbsp;Second</body></html>"></lineMarker>other: String
interface <lineMarker descr="*">First</lineMarker> {
val <lineMarker descr="<html><body>Is implemented in <br/>&nbsp;&nbsp;&nbsp;&nbsp;Second</body></html>">some</lineMarker>: Int
var <lineMarker descr="<html><body>Is implemented in <br/>&nbsp;&nbsp;&nbsp;&nbsp;Second</body></html>">other</lineMarker>: String
get
set
fun <lineMarker descr="<html><body>Is implemented in <br>&nbsp;&nbsp;&nbsp;&nbsp;Second</body></html>"></lineMarker>foo()
fun <lineMarker descr="<html><body>Is implemented in <br>&nbsp;&nbsp;&nbsp;&nbsp;Second</body></html>">foo</lineMarker>()
}
interface Second : First {
override val <lineMarker descr="Overrides property in 'First'"></lineMarker>some: Int
override var <lineMarker descr="Overrides property in 'First'"></lineMarker>other: String
override fun <lineMarker descr="Overrides function in 'First'"></lineMarker>foo()
override val <lineMarker descr="Overrides property in 'First'">some</lineMarker>: Int
override var <lineMarker descr="Overrides property in 'First'">other</lineMarker>: String
override fun <lineMarker descr="Overrides function in 'First'">foo</lineMarker>()
}
idea/testData/codeInsight/lineMarker/overrideImplement/OverridingTooltipOnDefaultTraitImpl.kt
Vendored
+5 -5
View File
@@ -1,13 +1,13 @@
interface <lineMarker descr="*"></lineMarker>SkipSupport {
fun <lineMarker descr="<html><body>Is implemented in <br>&nbsp;&nbsp;&nbsp;&nbsp;SkipSupportImpl1<br>&nbsp;&nbsp;&nbsp;&nbsp;SkipSupportWithDefaults</body></html>"></lineMarker>skip()
interface <lineMarker descr="*">SkipSupport</lineMarker> {
fun <lineMarker descr="<html><body>Is implemented in <br>&nbsp;&nbsp;&nbsp;&nbsp;SkipSupportImpl1<br>&nbsp;&nbsp;&nbsp;&nbsp;SkipSupportWithDefaults</body></html>">skip</lineMarker>()
}
public interface <lineMarker descr="*"></lineMarker>SkipSupportWithDefaults : SkipSupport {
override fun <lineMarker descr="<html><body>Is implemented in <br>&nbsp;&nbsp;&nbsp;&nbsp;SkipSupportImpl1</body></html>"><lineMarker descr="Implements function in 'SkipSupport'"></lineMarker></lineMarker>skip() {}
public interface <lineMarker descr="*">SkipSupportWithDefaults</lineMarker> : SkipSupport {
override fun <lineMarker descr="<html><body>Is implemented in <br>&nbsp;&nbsp;&nbsp;&nbsp;SkipSupportImpl1</body></html>"><lineMarker descr="Implements function in 'SkipSupport'">skip</lineMarker></lineMarker>() {}
}
public interface SkipSupportImpl1 : SkipSupportWithDefaults {
override fun <lineMarker descr="Overrides function in 'SkipSupportWithDefaults'"></lineMarker>skip() {}
override fun <lineMarker descr="Overrides function in 'SkipSupportWithDefaults'">skip</lineMarker>() {}
}
open class SkipSupportImpl : SkipSupportWithDefaults
idea/testData/codeInsight/lineMarker/overrideImplement/PrimaryConstructorOpen.kt
Vendored
+3 -3
View File
@@ -1,10 +1,10 @@
open class <lineMarker></lineMarker>C(
open val <lineMarker descr="<html><body>Is overridden in <br/>&nbsp;&nbsp;&nbsp;&nbsp;D</body></html>"></lineMarker>s: String
open class <lineMarker>C</lineMarker>(
open val <lineMarker descr="<html><body>Is overridden in <br/>&nbsp;&nbsp;&nbsp;&nbsp;D</body></html>">s</lineMarker>: String
) {
}
class D : C("") {
override val <lineMarker></lineMarker>s: String get() = "q"
override val <lineMarker>s</lineMarker>: String get() = "q"
}
idea/testData/codeInsight/lineMarker/overrideImplement/PrimaryConstructorOverride.kt
Vendored
+3 -3
View File
@@ -1,7 +1,7 @@
interface <lineMarker></lineMarker>I {
val <lineMarker></lineMarker>name: String
interface <lineMarker>I</lineMarker> {
val <lineMarker>name</lineMarker>: String
}
class D(
override val <lineMarker descr="Implements property in 'I'"></lineMarker>name: String
override val <lineMarker descr="Implements property in 'I'">name</lineMarker>: String
): I
idea/testData/codeInsight/lineMarker/overrideImplement/PropertyOverride.kt
Vendored
+3 -3
View File
@@ -1,7 +1,7 @@
open class <lineMarker></lineMarker>Base {
open var <lineMarker></lineMarker>writable: Int = 12
open class <lineMarker>Base</lineMarker> {
open var <lineMarker>writable</lineMarker>: Int = 12
}
class SubBase: Base() {
override var <lineMarker></lineMarker>writable: Int = 42
override var <lineMarker>writable</lineMarker>: Int = 42
}
idea/testData/codeInsight/lineMarker/overrideImplement/ToStringInTrait.kt
Vendored
+1 -1
View File
@@ -1,5 +1,5 @@
public interface Foo {
override fun <lineMarker descr="Overrides function in 'Any'"></lineMarker>toString() = "str"
override fun <lineMarker descr="Overrides function in 'Any'">toString</lineMarker>() = "str"
}
/*
idea/testData/codeInsight/lineMarker/overrideImplement/Trait.kt
Vendored
+4 -4
View File
@@ -1,9 +1,9 @@
interface <lineMarker></lineMarker>A {
fun <lineMarker></lineMarker>a(){
interface <lineMarker>A</lineMarker> {
fun <lineMarker>a</lineMarker>(){
}
}
class B :A {
override fun <lineMarker></lineMarker>a(){
class B : A {
override fun <lineMarker>a</lineMarker>(){
}
}
idea/testData/codeInsight/lineMarker/recursiveCall/conventionCall.kt
Vendored
+1 -1
View File
@@ -5,7 +5,7 @@ operator fun Any.get(a: Int) {
}
class A {
override fun <lineMarker descr="Overrides function in 'Any'"></lineMarker>equals(other: Any?): Boolean {
override fun <lineMarker descr="Overrides function in 'Any'">equals</lineMarker>(other: Any?): Boolean {
this <lineMarker descr="Recursive call">==</lineMarker> other
return true
}
idea/testData/codeInsight/lineMarker/recursiveCall/superQualifier.kt
Vendored
+3 -3
View File
@@ -1,10 +1,10 @@
open class <lineMarker></lineMarker>Super {
open fun <lineMarker></lineMarker>f(a: Int) {
open class <lineMarker>Super</lineMarker> {
open fun <lineMarker>f</lineMarker>(a: Int) {
}
}
class F: Super() {
override fun <lineMarker></lineMarker>f(a: Int) {
override fun <lineMarker>f</lineMarker>(a: Int) {
if (a > 0) {
super.f(a - 1)
}
idea/testData/codeInsight/lineMarker/runMarkers/jUnitTestClassWithSubclasses.kt
Vendored
+1 -1
View File
@@ -4,7 +4,7 @@ package testing
import junit.framework.TestCase
import org.junit.Test
abstract class <lineMarker descr="*"><lineMarker descr="Run Test"></lineMarker>KBase</lineMarker> : TestCase() {
abstract class <lineMarker descr="*"><lineMarker descr="Run Test">KBase</lineMarker></lineMarker> : TestCase() {
@Test
fun testFoo() {
idea/testData/codeInsight/lineMarker/runMarkers/testNGTestClassWithSubclasses.kt
Vendored
+1 -1
View File
@@ -3,7 +3,7 @@ package testing
import org.testng.annotations.Test
abstract class <lineMarker descr="*"><lineMarker descr="Run Test"></lineMarker>KBase</lineMarker> {
abstract class <lineMarker descr="*"><lineMarker descr="Run Test">KBase</lineMarker></lineMarker> {
@Test
fun <lineMarker descr="*">testFoo</lineMarker>() {