From f40fb623a62f1cab399f90b81ee02c558fb1de35 Mon Sep 17 00:00:00 2001 From: Alexey Sedunov Date: Tue, 5 Nov 2013 16:20:45 +0400 Subject: [PATCH] FindUsagesTest: Add overriding property without accessors --- .../findPropertyUsages/javaAndKotlinOverrides.0.kt | 10 +++++++--- .../findPropertyUsages/javaAndKotlinOverrides.1.java | 4 ++++ .../javaAndKotlinOverrides.results.txt | 6 ++++-- 3 files changed, 15 insertions(+), 5 deletions(-) diff --git a/idea/testData/findUsages/kotlin/findPropertyUsages/javaAndKotlinOverrides.0.kt b/idea/testData/findUsages/kotlin/findPropertyUsages/javaAndKotlinOverrides.0.kt index 88011243627..4ecf1b42c87 100644 --- a/idea/testData/findUsages/kotlin/findPropertyUsages/javaAndKotlinOverrides.0.kt +++ b/idea/testData/findUsages/kotlin/findPropertyUsages/javaAndKotlinOverrides.0.kt @@ -1,10 +1,10 @@ // PSI_ELEMENT: org.jetbrains.jet.lang.psi.JetProperty // OPTIONS: overrides -open class A { - open var foo: T +open class A(t: T) { + open var foo: T = t } -open class B: A() { +open class B: A("") { override var foo: String get() { println("get") @@ -20,3 +20,7 @@ open class B: A() { println(a.foo) } } + +open class D: A("") { + override var foo: String = "" +} \ No newline at end of file diff --git a/idea/testData/findUsages/kotlin/findPropertyUsages/javaAndKotlinOverrides.1.java b/idea/testData/findUsages/kotlin/findPropertyUsages/javaAndKotlinOverrides.1.java index fb1c9560d1b..fbd28a35093 100644 --- a/idea/testData/findUsages/kotlin/findPropertyUsages/javaAndKotlinOverrides.1.java +++ b/idea/testData/findUsages/kotlin/findPropertyUsages/javaAndKotlinOverrides.1.java @@ -1,4 +1,8 @@ class C extends A { + C(String s) { + super(s); + } + @Override public String getFoo() { return super.getFoo(); diff --git a/idea/testData/findUsages/kotlin/findPropertyUsages/javaAndKotlinOverrides.results.txt b/idea/testData/findUsages/kotlin/findPropertyUsages/javaAndKotlinOverrides.results.txt index 36753552b1b..d0ee39213b4 100644 --- a/idea/testData/findUsages/kotlin/findPropertyUsages/javaAndKotlinOverrides.results.txt +++ b/idea/testData/findUsages/kotlin/findPropertyUsages/javaAndKotlinOverrides.results.txt @@ -1,4 +1,6 @@ +Unclassified usage (12: 17) public void setFoo(String s) { Unclassified usage (13: 9) set(value: String) { -Unclassified usage (3: 19) public String getFoo() { -Unclassified usage (8: 17) public void setFoo(String s) { +Unclassified usage (25: 18) override var foo: String = "" +Unclassified usage (25: 18) override var foo: String = "" +Unclassified usage (7: 19) public String getFoo() { Unclassified usage (9: 9) get() {