Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
KT-8542 Override dialog: only one class from hierarchy is shown
#KT-8542 Fixed
- Loading branch information
1 parent
29379c0
commit 63dc843
Showing
14 changed files
with
437 additions
and
308 deletions.
There are no files selected for viewing
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
11 changes: 11 additions & 0 deletions
11
idea/testData/codeInsight/overrideImplement/ambiguousSuper.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,11 @@ | ||
| interface I { | ||
| open fun foo(){} | ||
| } | ||
|
|
||
| open class A { | ||
| open fun foo(){} | ||
| } | ||
|
|
||
| class C : A(), I { | ||
| <caret> | ||
| } |
29 changes: 29 additions & 0 deletions
29
idea/testData/codeInsight/overrideImplement/ambiguousSuper.kt.after
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,29 @@ | ||
| interface I { | ||
| open fun foo(){} | ||
| } | ||
|
|
||
| open class A { | ||
| open fun foo(){} | ||
| } | ||
|
|
||
| class C : A(), I { | ||
| override fun equals(other: Any?): Boolean { | ||
| <selection><caret>return super<A>.equals(other)</selection> | ||
| } | ||
|
|
||
| override fun foo() { | ||
| super<A>.foo() | ||
| } | ||
|
|
||
| override fun foo() { | ||
| super<I>.foo() | ||
| } | ||
|
|
||
| override fun hashCode(): Int { | ||
| return super<A>.hashCode() | ||
| } | ||
|
|
||
| override fun toString(): String { | ||
| return super<A>.toString() | ||
| } | ||
| } |
18 changes: 18 additions & 0 deletions
18
idea/testData/codeInsight/overrideImplement/doNotOverrideFinal.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,18 @@ | ||
| open class A { | ||
| fun a(){} | ||
| fun b(){} | ||
| } | ||
|
|
||
| interface I { | ||
| fun b() | ||
| } | ||
|
|
||
| abstract class B : A() { | ||
| open fun f(){} | ||
| abstract fun g() | ||
| fun h(){} | ||
| } | ||
|
|
||
| class C : B(), I { | ||
| <caret> | ||
| } |
36 changes: 36 additions & 0 deletions
36
idea/testData/codeInsight/overrideImplement/doNotOverrideFinal.kt.after
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,36 @@ | ||
| open class A { | ||
| fun a(){} | ||
| fun b(){} | ||
| } | ||
|
|
||
| interface I { | ||
| fun b() | ||
| } | ||
|
|
||
| abstract class B : A() { | ||
| open fun f(){} | ||
| abstract fun g() | ||
| fun h(){} | ||
| } | ||
|
|
||
| class C : B(), I { | ||
| override fun equals(other: Any?): Boolean { | ||
| <selection><caret>return super<B>.equals(other)</selection> | ||
| } | ||
|
|
||
| override fun f() { | ||
| super<B>.f() | ||
| } | ||
|
|
||
| override fun g() { | ||
| throw UnsupportedOperationException() | ||
| } | ||
|
|
||
| override fun hashCode(): Int { | ||
| return super<B>.hashCode() | ||
| } | ||
|
|
||
| override fun toString(): String { | ||
| return super<B>.toString() | ||
| } | ||
| } |
21 changes: 21 additions & 0 deletions
21
idea/testData/codeInsight/overrideImplement/superPreference.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,21 @@ | ||
| abstract class A : I1 { | ||
| open fun a(){} | ||
| } | ||
|
|
||
| interface I1 { | ||
| fun i1() | ||
| fun i() | ||
| } | ||
|
|
||
| interface I2 { | ||
| fun i2() | ||
| fun a() | ||
| } | ||
|
|
||
| interface I3 { | ||
| fun i() | ||
| } | ||
|
|
||
| abstract class B : I2, A(), I3 { | ||
| <caret> | ||
| } |
Oops, something went wrong.