Minor. Moved test data to subdirectory.
This commit is contained in:
Evgeny Gerashchenko
@@ -0,0 +1,10 @@
|
||||
trait Hi {
|
||||
fun foo(): Int
|
||||
}
|
||||
|
||||
// Closing brace is intentionally missed
|
||||
val id = array("kotlin.FlexibleType"
|
||||
|
||||
private class Some(): Hi {
|
||||
override fun foo() = 1
|
||||
}
|
||||
@@ -0,0 +1,9 @@
|
||||
open class <lineMarker></lineMarker>A {
|
||||
open fun <lineMarker></lineMarker>a(){
|
||||
}
|
||||
}
|
||||
|
||||
class B:A(){
|
||||
override fun <lineMarker></lineMarker>a(){
|
||||
}
|
||||
}
|
||||
+12
@@ -0,0 +1,12 @@
|
||||
trait <lineMarker></lineMarker>TestTrait {
|
||||
fun <lineMarker></lineMarker>test()
|
||||
}
|
||||
|
||||
class A {
|
||||
class B {
|
||||
companion object : TestTrait { // TODO: No line marker
|
||||
override fun <lineMarker descr="Implements function in 'TestTrait'"></lineMarker>test() {
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,13 @@
|
||||
trait <lineMarker></lineMarker>A {
|
||||
fun <lineMarker></lineMarker>f() {
|
||||
}
|
||||
}
|
||||
|
||||
trait <lineMarker></lineMarker>B : A
|
||||
|
||||
open class <lineMarker></lineMarker>C(b : B) : B by b, A {
|
||||
}
|
||||
|
||||
class D(b : B) : C(b) {
|
||||
override fun <lineMarker descr="Overrides function in 'A'"></lineMarker>f() {}
|
||||
}
|
||||
@@ -0,0 +1,13 @@
|
||||
trait <lineMarker></lineMarker>A {
|
||||
val <lineMarker></lineMarker>f: Int
|
||||
get() = 3
|
||||
}
|
||||
|
||||
trait <lineMarker></lineMarker>B : A
|
||||
|
||||
open class <lineMarker></lineMarker>C(b : B) : B by b, A {
|
||||
}
|
||||
|
||||
class D(b : B) : C(b) {
|
||||
override val <lineMarker descr="Overrides property in 'A'"></lineMarker>f: Int = 2
|
||||
}
|
||||
@@ -0,0 +1,25 @@
|
||||
package sample
|
||||
|
||||
trait <lineMarker descr="*"></lineMarker>S<T> {
|
||||
fun <lineMarker descr="<html><body>Is implemented in <br> sample.S2</body></html>"></lineMarker>foo(t: T): T
|
||||
|
||||
val <lineMarker descr="<html><body>Is implemented in <br/> sample.S2</body></html>"></lineMarker>some: T? get
|
||||
|
||||
var <lineMarker descr="<html><body>Is implemented in <br/> sample.S2</body></html>"></lineMarker>other: T?
|
||||
get
|
||||
set
|
||||
}
|
||||
|
||||
open abstract class <lineMarker descr="*"></lineMarker>S1 : S<String>
|
||||
|
||||
class S2 : S1() {
|
||||
override val <lineMarker descr="Implements property in 'S<T>'"></lineMarker>some: String = "S"
|
||||
|
||||
override var <lineMarker descr="Implements property in 'S<T>'"></lineMarker>other: String?
|
||||
get() = null
|
||||
set(value) {}
|
||||
|
||||
override fun <lineMarker descr="Implements function in 'S<T>'"></lineMarker>foo(t: String): String {
|
||||
return super<S1>.foo(t)
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,11 @@
|
||||
trait <lineMarker></lineMarker>A {
|
||||
fun <lineMarker></lineMarker>f() {}
|
||||
}
|
||||
|
||||
trait <lineMarker></lineMarker>B : A
|
||||
|
||||
trait <lineMarker></lineMarker>C : B, A
|
||||
|
||||
class SomeClass() : C {
|
||||
override fun <lineMarker descr="Overrides function in 'A'"></lineMarker>f() {}
|
||||
}
|
||||
+13
@@ -0,0 +1,13 @@
|
||||
trait <lineMarker></lineMarker>A {
|
||||
fun <lineMarker></lineMarker><lineMarker></lineMarker>f() {}
|
||||
}
|
||||
|
||||
trait <lineMarker></lineMarker>B : A {
|
||||
override fun <lineMarker></lineMarker>f() {}
|
||||
}
|
||||
|
||||
trait <lineMarker></lineMarker>C : B, A
|
||||
|
||||
class SomeClass() : C {
|
||||
override fun <lineMarker descr="Overrides function in 'B'"></lineMarker>f() {}
|
||||
}
|
||||
@@ -0,0 +1,12 @@
|
||||
trait <lineMarker></lineMarker>A {
|
||||
val <lineMarker></lineMarker>f: Int
|
||||
get() = 2
|
||||
}
|
||||
|
||||
trait <lineMarker></lineMarker>B : A
|
||||
|
||||
trait <lineMarker></lineMarker>C : B, A
|
||||
|
||||
class SomeClass() : C {
|
||||
override val <lineMarker descr="Overrides property in 'A'"></lineMarker>f: Int = 4
|
||||
}
|
||||
@@ -0,0 +1,9 @@
|
||||
trait <lineMarker descr="*"></lineMarker>A {
|
||||
override fun <lineMarker descr="<html><body>Is implemented in <br> C</body></html>"><lineMarker descr="*"></lineMarker></lineMarker>toString() = "A"
|
||||
}
|
||||
|
||||
abstract class <lineMarker descr="*"></lineMarker>B: A
|
||||
|
||||
class C: B() {
|
||||
override fun <lineMarker descr="Overrides function in 'A'"></lineMarker>toString() = "B"
|
||||
}
|
||||
+25
@@ -0,0 +1,25 @@
|
||||
trait <lineMarker descr="*"></lineMarker>A {
|
||||
fun <lineMarker descr="<html><body>Is implemented in <br> C</body></html>"></lineMarker>foo(): String = "A"
|
||||
|
||||
// TODO: B shoudn't be mentioned
|
||||
val <lineMarker descr="<html><body>Is implemented in <br/> B<br> C</body></html>"></lineMarker>some: String? get() = null
|
||||
|
||||
// TODO: B shoudn't be mentioned
|
||||
var <lineMarker descr="<html><body>Is implemented in <br/> B<br> C</body></html>"></lineMarker>other: String?
|
||||
get() = null
|
||||
set(value) {}
|
||||
}
|
||||
|
||||
open class <lineMarker descr="*"></lineMarker>B: A
|
||||
|
||||
class C: B() {
|
||||
override val <lineMarker descr="Overrides property in 'A'"></lineMarker>some: String = "S"
|
||||
|
||||
override var <lineMarker descr="Overrides property in 'A'"></lineMarker>other: String?
|
||||
get() = null
|
||||
set(value) {}
|
||||
|
||||
override fun <lineMarker descr="Overrides function in 'A'"></lineMarker>foo(): String {
|
||||
return super<S1>.foo()
|
||||
}
|
||||
}
|
||||
+22
@@ -0,0 +1,22 @@
|
||||
trait <lineMarker></lineMarker>A1 {
|
||||
fun <lineMarker></lineMarker>foo()
|
||||
}
|
||||
|
||||
trait <lineMarker></lineMarker>B1 {
|
||||
fun <lineMarker></lineMarker>foo()
|
||||
}
|
||||
|
||||
class C1: A1, B1 {
|
||||
override fun <lineMarker descr="Implements function in 'A1'<br/>Implements function in 'B1'"></lineMarker>foo() {}
|
||||
}
|
||||
|
||||
/*
|
||||
LINEMARKER: Implements function in 'A1'<br/>Implements function in 'B1'
|
||||
TARGETS:
|
||||
NavigateToSeveralSuperElements.kt
|
||||
fun <1>foo()
|
||||
}
|
||||
|
||||
trait B1 {
|
||||
fun <2>foo()
|
||||
*/
|
||||
+9
@@ -0,0 +1,9 @@
|
||||
trait <lineMarker descr="*"></lineMarker>SkipSupport {
|
||||
fun <lineMarker descr="<html><body>Is implemented in <br> SkipSupportWithDefaults</body></html>"></lineMarker>skip()
|
||||
}
|
||||
|
||||
public trait <lineMarker descr="*"></lineMarker>SkipSupportWithDefaults : SkipSupport {
|
||||
override fun <lineMarker descr="Implements function in 'SkipSupport'"></lineMarker>skip() {}
|
||||
}
|
||||
|
||||
open class SkipSupportImpl : SkipSupportWithDefaults
|
||||
@@ -0,0 +1,9 @@
|
||||
trait <lineMarker descr="*"></lineMarker>A {
|
||||
fun <lineMarker descr="<html><body>Is implemented in <br> B</body></html>"></lineMarker>foo(str: String)
|
||||
fun <lineMarker descr="<html><body>Is implemented in <br> B</body></html>"></lineMarker>foo()
|
||||
}
|
||||
|
||||
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() { }
|
||||
}
|
||||
@@ -0,0 +1,16 @@
|
||||
open class <lineMarker></lineMarker>A {
|
||||
open fun <lineMarker></lineMarker>a(){
|
||||
}
|
||||
}
|
||||
|
||||
open class <lineMarker descr="<html><body>Is subclassed by<br> C</body></html>"></lineMarker>B:A(){
|
||||
override fun <lineMarker
|
||||
descr="<b>internal</b> <b>open</b> <b>fun</b> a(): kotlin.Unit <i>defined in</i> B<br/>overrides<br/><b>internal</b> <b>open</b> <b>fun</b> a(): kotlin.Unit <i>defined in</i> A"></lineMarker><lineMarker
|
||||
descr="<html><body>Is overridden in <br> C</body></html>"></lineMarker>a(){
|
||||
}
|
||||
}
|
||||
|
||||
class C:B(){
|
||||
override fun <lineMarker></lineMarker>a(){
|
||||
}
|
||||
}
|
||||
+19
@@ -0,0 +1,19 @@
|
||||
trait <lineMarker descr="*"></lineMarker>SkipSupport {
|
||||
fun <lineMarker descr="<html><body>Is implemented in <br> SkipSupportImpl<br> SkipSupportWithDefaults</body></html>"></lineMarker>skip(why: String)
|
||||
fun <lineMarker descr="<html><body>Is implemented in <br> SkipSupportWithDefaults</body></html>"></lineMarker>skip()
|
||||
}
|
||||
|
||||
public trait <lineMarker descr="*"></lineMarker>SkipSupportWithDefaults : SkipSupport {
|
||||
// TODO: should be "Is overriden in SkipSupportImpl"
|
||||
override fun <lineMarker descr="<html><body>Is implemented in <br> SkipSupportImpl</body></html>"><lineMarker descr="Implements function in 'SkipSupport'"></lineMarker></lineMarker>skip(why: String) {}
|
||||
|
||||
override fun <lineMarker descr="Implements function in 'SkipSupport'"></lineMarker>skip() {
|
||||
skip("not given")
|
||||
}
|
||||
}
|
||||
|
||||
open class SkipSupportImpl: SkipSupportWithDefaults {
|
||||
override fun <lineMarker descr="Overrides function in 'SkipSupportWithDefaults'"></lineMarker>skip(why: String) = throw RuntimeException(why)
|
||||
}
|
||||
|
||||
// KT-4428 Incorrect override icon shown for overloaded methods
|
||||
+10
@@ -0,0 +1,10 @@
|
||||
abstract class <lineMarker></lineMarker>A {
|
||||
open fun <lineMarker></lineMarker>a(){
|
||||
}
|
||||
}
|
||||
|
||||
open class B : A(){
|
||||
override fun <lineMarker></lineMarker>a(){
|
||||
}
|
||||
}
|
||||
|
||||
@@ -0,0 +1,15 @@
|
||||
// TODO: Declarations have no implementation and should be considered as "overloaded"
|
||||
trait <lineMarker descr="*"></lineMarker>First {
|
||||
val <lineMarker descr="<html><body>Is implemented in <br/> Second</body></html>"></lineMarker>some: Int
|
||||
var <lineMarker descr="<html><body>Is implemented in <br/> Second</body></html>"></lineMarker>other: String
|
||||
get
|
||||
set
|
||||
|
||||
fun <lineMarker descr="<html><body>Is implemented in <br> Second</body></html>"></lineMarker>foo()
|
||||
}
|
||||
|
||||
trait 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()
|
||||
}
|
||||
+13
@@ -0,0 +1,13 @@
|
||||
trait <lineMarker descr="*"></lineMarker>SkipSupport {
|
||||
fun <lineMarker descr="<html><body>Is implemented in <br> SkipSupportImpl1<br> SkipSupportWithDefaults</body></html>"></lineMarker>skip()
|
||||
}
|
||||
|
||||
public trait <lineMarker descr="*"></lineMarker>SkipSupportWithDefaults : SkipSupport {
|
||||
override fun <lineMarker descr="<html><body>Is implemented in <br> SkipSupportImpl1</body></html>"><lineMarker descr="Implements function in 'SkipSupport'"></lineMarker></lineMarker>skip() {}
|
||||
}
|
||||
|
||||
public trait SkipSupportImpl1 : SkipSupportWithDefaults {
|
||||
override fun <lineMarker descr="Overrides function in 'SkipSupportWithDefaults'"></lineMarker>skip() {}
|
||||
}
|
||||
|
||||
open class SkipSupportImpl : SkipSupportWithDefaults
|
||||
@@ -0,0 +1,7 @@
|
||||
open class <lineMarker></lineMarker>Base {
|
||||
open var <lineMarker></lineMarker>writable: Int = 12
|
||||
}
|
||||
|
||||
class SubBase: Base() {
|
||||
override var <lineMarker></lineMarker>writable: Int = 42
|
||||
}
|
||||
@@ -0,0 +1,10 @@
|
||||
public trait Foo {
|
||||
override fun <lineMarker descr="Overrides function in 'Any'"></lineMarker>toString() = "str"
|
||||
}
|
||||
|
||||
/*
|
||||
LINEMARKER: Overrides function in 'Any'
|
||||
TARGETS:
|
||||
Any.kt
|
||||
public open fun <1>toString(): String
|
||||
*/
|
||||
@@ -0,0 +1,9 @@
|
||||
trait <lineMarker></lineMarker>A {
|
||||
fun <lineMarker></lineMarker>a(){
|
||||
}
|
||||
}
|
||||
|
||||
class B :A {
|
||||
override fun <lineMarker></lineMarker>a(){
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user