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

Move caret to generated element and add selection

Browse Source
This commit is contained in:
Nikolay Krasko
2014-10-03 22:26:09 +04:00
parent a50720d74d
commit 774af134fa
39 changed files with 178 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/testData/codeInsight/overrideImplement/checkNotImportedTypesFromJava/foo/Impl.kt.after
+1 -1
View File
@@ -6,7 +6,7 @@ import bar.Bar
class Impl: Foo() {
override fun foo(list: ArrayList<Int>?, other: Other?): Bar? {
throw UnsupportedOperationException()
<selection><caret>throw UnsupportedOperationException()</selection>
}
}
idea/testData/codeInsight/overrideImplement/complexMultiOverride.kt.after
+1 -1
View File
@@ -6,7 +6,7 @@ open class Base<A, B, C>() {
class C : Base<String, C, Unit>() {
override fun bar(value: () -> Unit): (String) -> Unit {
return super<Base>.bar(value)
<selection><caret>return super<Base>.bar(value)</selection>
}
override fun equals(other: Any?): Boolean {
return super<Base>.equals(other)
idea/testData/codeInsight/overrideImplement/delegatedMembers.kt.after
+1 -1
View File
@@ -5,7 +5,7 @@ trait T {
class C(t :T) : T by t {
override fun bar() {
throw UnsupportedOperationException()
<selection><caret>throw UnsupportedOperationException()</selection>
}
override fun equals(other: Any?): Boolean {
return super<T>.equals(other)
idea/testData/codeInsight/overrideImplement/emptyClassBodyFunctionMethod.kt.after
+1 -1
View File
@@ -5,6 +5,6 @@ trait T {
class C : T {
override fun Foo(): (String) -> Unit {
throw UnsupportedOperationException()
<selection><caret>throw UnsupportedOperationException()</selection>
}
}
idea/testData/codeInsight/overrideImplement/functionMethod.kt.after
+1 -1
View File
@@ -5,6 +5,6 @@ trait T {
class C : T {
override fun Foo(): (String) -> Unit {
throw UnsupportedOperationException()
<selection><caret>throw UnsupportedOperationException()</selection>
}
}
idea/testData/codeInsight/overrideImplement/functionProperty.kt
+2
View File
@@ -6,3 +6,5 @@ trait A {
fun some() : A {
return object : A {<caret>}
}
// TODO: need better selection and caret
idea/testData/codeInsight/overrideImplement/functionProperty.kt.after
+3 -1
View File
@@ -4,7 +4,9 @@ trait A {
}
fun some() : A {
return object : A {
return object : A {<caret>
override val method: () -> Unit? = ?
}
}
// TODO: need better selection and caret
idea/testData/codeInsight/overrideImplement/functionWithTypeParameters.kt.after
+1 -1
View File
@@ -4,6 +4,6 @@ trait Trait {
class TraitImpl : Trait {
override fun <A, B : Runnable, E : Map.Entry<A, B>> foo() where B : Cloneable, B : Comparable<B> {
throw UnsupportedOperationException()
<selection><caret>throw UnsupportedOperationException()</selection>
}
}
idea/testData/codeInsight/overrideImplement/generateMulti.kt.after
+1 -1
View File
@@ -8,7 +8,7 @@ trait Some<T> {
class SomeOther<S> : Some<S> {
override fun someFoo() {
throw UnsupportedOperationException()
<selection><caret>throw UnsupportedOperationException()</selection>
}
override fun someGenericFoo(): S {
throw UnsupportedOperationException()
idea/testData/codeInsight/overrideImplement/genericMethod.kt.after
+1 -1
View File
@@ -4,6 +4,6 @@ trait G<T> {
class GC() : G<Int> {
override fun foo(t: Int): Int {
throw UnsupportedOperationException()
<selection><caret>throw UnsupportedOperationException()</selection>
}
}
idea/testData/codeInsight/overrideImplement/genericTypesSeveralMethods.kt.after
+1 -1
View File
@@ -2,6 +2,6 @@
class MyClass<A: Comparable<A>> : Iterable<A> {
override fun iterator(): Iterator<A> {
throw UnsupportedOperationException()
<selection><caret>throw UnsupportedOperationException()</selection>
}
}
idea/testData/codeInsight/overrideImplement/implementSamAdapters/foo/Impl.kt.after
+1 -1
View File
@@ -2,6 +2,6 @@ package foo
class Impl: B {
override fun foo(r: Runnable?) {
throw UnsupportedOperationException()
<selection><caret>throw UnsupportedOperationException()</selection>
}
}
idea/testData/codeInsight/overrideImplement/inheritVisibilities.kt.after
+1 -1
View File
@@ -12,7 +12,7 @@ trait B {
class C : A(), B {
override fun equals(other: Any?): Boolean {
return super<A>.equals(other)
<selection><caret>return super<A>.equals(other)</selection>
}
override fun hashCode(): Int {
return super<A>.hashCode()
idea/testData/codeInsight/overrideImplement/javaInterfaceMethod/foo/Impl.kt.after
+1 -1
View File
@@ -2,6 +2,6 @@ import foo.Intf
class Impl(): Intf {
override fun getFooBar(): String? {
throw UnsupportedOperationException()
<selection><caret>throw UnsupportedOperationException()</selection>
}
}
idea/testData/codeInsight/overrideImplement/javaMethodWithPackageProtectedVisibility/foo/Impl.kt.after
+1 -1
View File
@@ -4,6 +4,6 @@ import foo.Intf
class Impl(): Intf() {
override fun getFooBar(): String? {
return super<Intf>.getFooBar()
<selection><caret>return super<Intf>.getFooBar()</selection>
}
}
idea/testData/codeInsight/overrideImplement/javaMethodWithPackageVisibility/foo/Impl.kt.after
+1 -1
View File
@@ -4,6 +4,6 @@ import foo.Intf
class Impl(): Intf() {
override fun getFooBar(): String? {
return super<Intf>.getFooBar()
<selection><caret>return super<Intf>.getFooBar()</selection>
}
}
idea/testData/codeInsight/overrideImplement/javaParameters/foo/Impl.kt.after
+1 -1
View File
@@ -2,6 +2,6 @@ import foo.Intf
class Impl(): Intf {
override fun fooBar(i: Int, s: Array<out String>?, foo: Any?) {
throw UnsupportedOperationException()
<selection><caret>throw UnsupportedOperationException()</selection>
}
}
idea/testData/codeInsight/overrideImplement/multiOverride.kt.after
+1 -1
View File
@@ -5,7 +5,7 @@ trait A {
class C : A {
override fun bar(): String {
return super<A>.bar()
<selection><caret>return super<A>.bar()</selection>
}
override fun equals(other: Any?): Boolean {
return super<A>.equals(other)
idea/testData/codeInsight/overrideImplement/overrideExplicitFunction.kt.after
+1 -1
View File
@@ -4,6 +4,6 @@ trait A {
class B : A {
override fun String.foo() {
throw UnsupportedOperationException()
<selection><caret>throw UnsupportedOperationException()</selection>
}
}
idea/testData/codeInsight/overrideImplement/overrideExtensionProperty.kt.after
+1 -1
View File
@@ -4,5 +4,5 @@ trait A {
class B : A {
override val String.prop: Int
get() = 0
get() = <selection><caret>0</selection>
}
idea/testData/codeInsight/overrideImplement/overrideFunctionProperty.kt
+2
View File
@@ -5,3 +5,5 @@ open class A() {
fun some() : A {
return object : A() {<caret>}
}
// TODO: need better selection and caret
idea/testData/codeInsight/overrideImplement/overrideFunctionProperty.kt.after
+3 -1
View File
@@ -3,7 +3,9 @@ open class A() {
}
fun some() : A {
return object : A() {
return object : A() {<caret>
override val method: () -> Unit? = ?
}
}
// TODO: need better selection and caret
idea/testData/codeInsight/overrideImplement/overrideGenericFunction.kt.after
+1 -1
View File
@@ -4,6 +4,6 @@ trait A<T> {
class C : A<C> {
override fun foo(value: C) {
super<A>.foo(value)
<selection><caret>super<A>.foo(value)</selection>
}
}
idea/testData/codeInsight/overrideImplement/overrideJavaMethod/foo/Impl.kt.after
+1 -1
View File
@@ -2,6 +2,6 @@ import foo.A
class C : A() {
override fun getAnswer(array: Array<out String>?, number: Int, value: Any?): Int {
return super<A>.getAnswer(array, number, value)
<selection><caret>return super<A>.getAnswer(array, number, value)</selection>
}
}
idea/testData/codeInsight/overrideImplement/overrideMutableExtensionProperty.kt.after
+1 -1
View File
@@ -4,7 +4,7 @@ trait A {
class B : A {
override var Int.foo: Double
get() = 0.0
get() = <selection><caret>0.0</selection>
set(value) {
}
}
idea/testData/codeInsight/overrideImplement/overrideNonUnitFunction.kt.after
+1 -1
View File
@@ -4,6 +4,6 @@ trait A {
class C : A {
override fun foo(value: String): Int {
return super<A>.foo(value)
<selection><caret>return super<A>.foo(value)</selection>
}
}
idea/testData/codeInsight/overrideImplement/overridePrimitiveProperty.kt.after
+1 -1
View File
@@ -10,7 +10,7 @@ trait T {
}
class C : T {
override val a1: Byte = 0
override val a1: Byte = <selection><caret>0</selection>
override val a2: Short = 0
override val a3: Int = 0
override val a4: Long = 0
idea/testData/codeInsight/overrideImplement/overrideRespectCaretPosition.kt.after
+1 -1
View File
@@ -6,7 +6,7 @@ open class A() {
class C : A() {
val constant = 42
// Some comment
override val bar: Int = 0
override val bar: Int = <selection><caret>0</selection>
override fun equals(other: Any?): Boolean {
return super<A>.equals(other)
}
idea/testData/codeInsight/overrideImplement/overrideSamAdapters/foo/Impl.kt.after
+1 -1
View File
@@ -2,6 +2,6 @@ package foo
class Impl: B() {
override fun foo(r: Runnable?) {
super<B>.foo(r)
<selection><caret>super<B>.foo(r)</selection>
}
}
idea/testData/codeInsight/overrideImplement/overrideUnitFunction.kt.after
+1 -1
View File
@@ -4,6 +4,6 @@ trait A {
class C : A {
override fun foo(value: String) {
super<A>.foo(value)
<selection><caret>super<A>.foo(value)</selection>
}
}
idea/testData/codeInsight/overrideImplement/propagationKJK/foo/Impl.kt.after
+1 -1
View File
@@ -2,6 +2,6 @@ package foo
class Impl : Bar() {
override fun f(): Any {
return super<Bar>.f()
<selection><caret>return super<Bar>.f()</selection>
}
}
idea/testData/codeInsight/overrideImplement/property.kt.after
+1 -1
View File
@@ -3,5 +3,5 @@ trait T {
}
class GC() : T {
override val v: Int = 0
override val v: Int = <selection><caret>0</selection>
}
idea/testData/codeInsight/overrideImplement/respectCaretPosition.kt.after
+1 -1
View File
@@ -6,7 +6,7 @@ trait Test {
class SomeTest : Test {
val hello = 12
override fun test() {
throw UnsupportedOperationException()
<selection><caret>throw UnsupportedOperationException()</selection>
}
override val testProp: Int = 0
/**
idea/testData/codeInsight/overrideImplement/sameTypeName/foo/Impl.kt.after
+1 -1
View File
@@ -3,6 +3,6 @@ import lib.ArrayFactory
public class Impl : ArrayFactory {
override fun create(): lib.Array {
throw UnsupportedOperationException()
<selection><caret>throw UnsupportedOperationException()</selection>
}
}
idea/testData/codeInsight/overrideImplement/traitGenericImplement.kt.after
+1 -1
View File
@@ -4,6 +4,6 @@ trait G<T> {
class GC<T>() : G<T> {
override fun foo(t: T): T {
throw UnsupportedOperationException()
<selection><caret>throw UnsupportedOperationException()</selection>
}
}
idea/testData/codeInsight/overrideImplement/traitNullableFunction.kt.after
+1 -1
View File
@@ -4,6 +4,6 @@ trait Some {
class SomeOther : Some {
override fun foo(some: Int?): Int {
throw UnsupportedOperationException()
<selection><caret>throw UnsupportedOperationException()</selection>
}
}
idea/testData/codeInsight/overrideImplement/withLib/fakeOverride.kt.after
+1 -1
View File
@@ -8,6 +8,6 @@ public open class B() : A() {
public open class C() : B() {
override fun foo() {
super<B>.foo()
<selection><caret>super<B>.foo()</selection>
}
}