Changed lookup strings and prefix matchers for parameter name&type completion to get more stable and correct ordering
This commit is contained in:
Valentin Kipyatkov
+1
-1
@@ -18,5 +18,5 @@ class A(overr<caret>) : Base2(), I
|
||||
// EXIST: { itemText: "override val someVal: Int", tailText: null, typeText: "I" }
|
||||
// EXIST: { itemText: "override var someVar: Int", tailText: null, typeText: "I" }
|
||||
// EXIST: { itemText: "override val fromBase: String", tailText: null, typeText: "Base1" }
|
||||
// EXIST_JAVA_ONLY: { lookupString: "override", itemText: "override: Override" }
|
||||
// EXIST_JAVA_ONLY: { lookupString: "override: Override", itemText: "override: Override" }
|
||||
// NOTHING_ELSE
|
||||
|
||||
+1
-1
@@ -4,4 +4,4 @@ class DeclarationDescriptor
|
||||
|
||||
fun f(dd<caret>)
|
||||
|
||||
// EXIST: { lookupString: "declarationDescriptor", itemText: "declarationDescriptor: DeclarationDescriptor", tailText: " (pack)" }
|
||||
// EXIST: { lookupString: "declarationDescriptor: DeclarationDescriptor", itemText: "declarationDescriptor: DeclarationDescriptor", tailText: " (pack)" }
|
||||
|
||||
+1
-1
@@ -3,5 +3,5 @@ class FooBaaaaar
|
||||
fun f(fooBaaaa<caret>)
|
||||
|
||||
// AUTOCOMPLETE_SETTING: true
|
||||
// EXIST: fooBaaaaar
|
||||
// EXIST: fooBaaaaar: FooBaaaaar
|
||||
// NUMBER: 1
|
||||
|
||||
+1
-1
@@ -2,5 +2,5 @@ import kotlin.properties.*
|
||||
|
||||
fun f(readonlypr<caret>)
|
||||
|
||||
// EXIST: { lookupString: "readOnlyProperty", itemText: "readOnlyProperty: ReadOnlyProperty", tailText: "<R, T> (kotlin.properties)" }
|
||||
// EXIST: { itemText: "readOnlyProperty: ReadOnlyProperty", tailText: "<R, T> (kotlin.properties)" }
|
||||
// NUMBER: 1
|
||||
|
||||
+1
-1
@@ -2,5 +2,5 @@ import java.sql.*
|
||||
|
||||
fun f(blob<caret>)
|
||||
|
||||
// EXIST_JAVA_ONLY: { lookupString: "blob", itemText: "blob: Blob", tailText: " (java.sql)" }
|
||||
// EXIST_JAVA_ONLY: { itemText: "blob: Blob", tailText: " (java.sql)" }
|
||||
// NUMBER_JAVA: 1
|
||||
|
||||
+3
-3
@@ -10,7 +10,7 @@ fun f3(algorithmException: MyAlgorithmException){}
|
||||
|
||||
fun f(algorith<caret>)
|
||||
|
||||
// EXIST_JAVA_ONLY: { lookupString: "algorithmException", itemText: "algorithmException: NoSuchAlgorithmException", tailText: " (java.security)" }
|
||||
// EXIST_JAVA_ONLY: { lookupString: "algorithmException", itemText: "algorithmException: NoSuchAlgorithmException?", tailText: " (java.security)" }
|
||||
// EXIST: { lookupString: "algorithmException", itemText: "algorithmException: MyAlgorithmException", tailText: " (ppp)" }
|
||||
// EXIST_JAVA_ONLY: { itemText: "algorithmException: NoSuchAlgorithmException", tailText: " (java.security)" }
|
||||
// EXIST_JAVA_ONLY: { itemText: "algorithmException: NoSuchAlgorithmException?", tailText: " (java.security)" }
|
||||
// EXIST: { itemText: "algorithmException: MyAlgorithmException", tailText: " (ppp)" }
|
||||
// NOTHING_ELSE
|
||||
|
||||
+1
-1
@@ -6,4 +6,4 @@ fun f() {
|
||||
x(fun (b<caret>))
|
||||
}
|
||||
|
||||
// ABSENT: boo
|
||||
// ABSENT: boo: Boo
|
||||
|
||||
+1
-1
@@ -7,4 +7,4 @@ fun f() {
|
||||
}
|
||||
}
|
||||
|
||||
// ABSENT: "exception"
|
||||
// ABSENT: "exception: Exception"
|
||||
|
||||
+1
-1
@@ -6,4 +6,4 @@ fun f() {
|
||||
val handler = { b<caret> }
|
||||
}
|
||||
|
||||
// ABSENT: boo
|
||||
// ABSENT: boo: Boo
|
||||
|
||||
+1
-1
@@ -4,4 +4,4 @@ var v: Int
|
||||
get(){}
|
||||
set(v<caret>)
|
||||
|
||||
// ABSENT: voo
|
||||
// ABSENT: voo: Voo
|
||||
|
||||
+1
-1
@@ -1,3 +1,3 @@
|
||||
fun f(read<caret>)
|
||||
|
||||
// EXIST: { lookupString: "readOnlyProperty", itemText: "readOnlyProperty: ReadOnlyProperty", tailText: "<R, T> (kotlin.properties)" }
|
||||
// EXIST: { lookupString: "readOnlyProperty: ReadOnlyProperty", itemText: "readOnlyProperty: ReadOnlyProperty", tailText: "<R, T> (kotlin.properties)" }
|
||||
|
||||
+1
-1
@@ -1,3 +1,3 @@
|
||||
fun f(file<caret>)
|
||||
|
||||
// EXIST_JAVA_ONLY: { lookupString: "file", itemText: "file: File", tailText: " (java.io)" }
|
||||
// EXIST_JAVA_ONLY: { lookupString: "file: File", itemText: "file: File", tailText: " (java.io)" }
|
||||
|
||||
+8
-8
@@ -18,11 +18,11 @@ class C(val handler: () -> Unit) {
|
||||
}
|
||||
}
|
||||
|
||||
// EXIST: { lookupString: "strings", itemText: "strings: List<String>", tailText: " (kotlin)" }
|
||||
// EXIST: { lookupString: "numbers", itemText: "numbers: List<Int>", tailText: " (kotlin)" }
|
||||
// EXIST: { lookupString: "value", itemText: "value: Any?", tailText: " (kotlin)" }
|
||||
// EXIST_JAVA_ONLY: { lookupString: "value", itemText: "value: File", tailText: " (java.io)" }
|
||||
// EXIST: { lookupString: "handler", itemText: "handler: (() -> String)?", tailText: null }
|
||||
// EXIST: { lookupString: "handler", itemText: "handler: () -> Unit", tailText: null }
|
||||
// ABSENT: "localParam"
|
||||
// ABSENT: "file"
|
||||
// EXIST: { lookupString: "strings: List", itemText: "strings: List<String>", tailText: " (kotlin)" }
|
||||
// EXIST: { lookupString: "numbers: List", itemText: "numbers: List<Int>", tailText: " (kotlin)" }
|
||||
// EXIST: { lookupString: "value: Any", itemText: "value: Any?", tailText: " (kotlin)" }
|
||||
// EXIST_JAVA_ONLY: { lookupString: "value: File", itemText: "value: File", tailText: " (java.io)" }
|
||||
// EXIST: { lookupString: "handler: (() -> String)?", itemText: "handler: (() -> String)?", tailText: null }
|
||||
// EXIST: { lookupString: "handler: () -> Unit", itemText: "handler: () -> Unit", tailText: null }
|
||||
// ABSENT: "localParam: String"
|
||||
// ABSENT: "file: File"
|
||||
|
||||
Vendored
+2
-2
@@ -14,6 +14,6 @@ class X {
|
||||
|
||||
fun foo(neste<caret>)
|
||||
|
||||
// EXIST: { lookupString: "nested", itemText: "nested: X.PublicNested", tailText: " (ppp)" }
|
||||
// EXIST: { lookupString: "nestedList", itemText: "nestedList: List<X.PublicNested>", tailText: " (kotlin)" }
|
||||
// EXIST: { itemText: "nested: X.PublicNested", tailText: " (ppp)" }
|
||||
// EXIST: { itemText: "nestedList: List<X.PublicNested>", tailText: " (kotlin)" }
|
||||
// NOTHING_ELSE
|
||||
|
||||
idea/idea-completion/testData/basic/common/parameterNameAndType/ParametersInFileInaccessibleType2.kt
Vendored
+2
-2
@@ -14,6 +14,6 @@ class X {
|
||||
|
||||
class C(val neste<caret>)
|
||||
|
||||
// EXIST: { lookupString: "nested", itemText: "nested: X.PublicNested", tailText: " (ppp)" }
|
||||
// EXIST: { lookupString: "nestedList", itemText: "nestedList: List<X.PublicNested>", tailText: " (kotlin)" }
|
||||
// EXIST: { itemText: "nested: X.PublicNested", tailText: " (ppp)" }
|
||||
// EXIST: { itemText: "nestedList: List<X.PublicNested>", tailText: " (kotlin)" }
|
||||
// NOTHING_ELSE
|
||||
|
||||
Vendored
+1
-1
@@ -6,5 +6,5 @@ class X<T1> {
|
||||
fun foo(xxx<caret>)
|
||||
}
|
||||
|
||||
// EXIST: { lookupString: "xxxValue1", itemText: "xxxValue1: T1", tailText: null }
|
||||
// EXIST: { lookupString: "xxxValue1: T1", itemText: "xxxValue1: T1", tailText: null }
|
||||
// NOTHING_ELSE
|
||||
|
||||
Vendored
+1
-1
@@ -8,5 +8,5 @@ class X<T1> {
|
||||
}
|
||||
}
|
||||
|
||||
// EXIST: { lookupString: "xxxValue1", itemText: "xxxValue1: T1", tailText: null }
|
||||
// EXIST: { lookupString: "xxxValue1: T1", itemText: "xxxValue1: T1", tailText: null }
|
||||
// NOTHING_ELSE
|
||||
|
||||
@@ -6,6 +6,6 @@ class Boo
|
||||
|
||||
fun f(b<caret>)
|
||||
|
||||
// EXIST: { lookupString: "bar", itemText: "bar: FooBar", tailText: " (pack)" }
|
||||
// ABSENT: fooBar
|
||||
// EXIST: { lookupString: "boo", itemText: "boo: Boo", tailText: " (pack)" }
|
||||
// EXIST: { lookupString: "bar: FooBar", itemText: "bar: FooBar", tailText: " (pack)" }
|
||||
// ABSENT: fooBar: FooBar
|
||||
// EXIST: { lookupString: "boo: Boo", itemText: "boo: Boo", tailText: " (pack)" }
|
||||
|
||||
+1
-1
@@ -2,5 +2,5 @@ import java.net.URLConnection
|
||||
|
||||
fun foo(url<caret>){}
|
||||
|
||||
// EXIST_JAVA_ONLY: { lookupString: "urlConnection", itemText: "urlConnection: URLConnection", tailText: " (java.net)" }
|
||||
// EXIST_JAVA_ONLY: { lookupString: "urlConnection: URLConnection", itemText: "urlConnection: URLConnection", tailText: " (java.net)" }
|
||||
// ABSENT: urlconnection
|
||||
|
||||
+3
-3
@@ -6,6 +6,6 @@ class Boo
|
||||
|
||||
fun f(myB<caret>)
|
||||
|
||||
// EXIST: { lookupString: "Bar", itemText: "myBar: FooBar", tailText: " (pack)" }
|
||||
// ABSENT: FooBar
|
||||
// EXIST: { lookupString: "Boo", itemText: "myBoo: Boo", tailText: " (pack)" }
|
||||
// EXIST: { lookupString: "myBar: FooBar", itemText: "myBar: FooBar", tailText: " (pack)" }
|
||||
// ABSENT: myBFooBar: FooBar
|
||||
// EXIST: { lookupString: "myBoo: Boo", itemText: "myBoo: Boo", tailText: " (pack)" }
|
||||
|
||||
+1
-1
@@ -1,3 +1,3 @@
|
||||
fun f(myF<caret>)
|
||||
|
||||
// EXIST_JAVA_ONLY: { lookupString: "File", itemText: "myFile: File", tailText: " (java.io)" }
|
||||
// EXIST_JAVA_ONLY: { lookupString: "myFile: File", itemText: "myFile: File", tailText: " (java.io)" }
|
||||
|
||||
+2
-2
@@ -6,6 +6,6 @@ class Fuu
|
||||
|
||||
fun f(myFooF<caret>)
|
||||
|
||||
// EXIST: { lookupString: "FooFaa", itemText: "myFooFaa: FooFaa", tailText: " (pack)" }
|
||||
// EXIST: { lookupString: "Fuu", itemText: "myFooFuu: Fuu", tailText: " (pack)" }
|
||||
// EXIST: { lookupString: "myFooFaa: FooFaa", itemText: "myFooFaa: FooFaa", tailText: " (pack)" }
|
||||
// EXIST: { lookupString: "myFooFuu: Fuu", itemText: "myFooFuu: Fuu", tailText: " (pack)" }
|
||||
// ABSENT: { itemText: "myFooFooFaa: FooFaa" }
|
||||
|
||||
+3
-3
@@ -6,6 +6,6 @@ class Boo
|
||||
|
||||
class C(val b<caret>)
|
||||
|
||||
// EXIST: { lookupString: "bar", itemText: "bar: FooBar", tailText: " (pack)" }
|
||||
// ABSENT: fooBar
|
||||
// EXIST: { lookupString: "boo", itemText: "boo: Boo", tailText: " (pack)" }
|
||||
// EXIST: { lookupString: "bar: FooBar", itemText: "bar: FooBar", tailText: " (pack)" }
|
||||
// ABSENT: fooBar: FooBar
|
||||
// EXIST: { lookupString: "boo: Boo", itemText: "boo: Boo", tailText: " (pack)" }
|
||||
|
||||
+3
-3
@@ -6,6 +6,6 @@ class Boo
|
||||
|
||||
class C(private var b<caret>)
|
||||
|
||||
// EXIST: { lookupString: "bar", itemText: "bar: FooBar", tailText: " (pack)" }
|
||||
// ABSENT: fooBar
|
||||
// EXIST: { lookupString: "boo", itemText: "boo: Boo", tailText: " (pack)" }
|
||||
// EXIST: { lookupString: "bar: FooBar", itemText: "bar: FooBar", tailText: " (pack)" }
|
||||
// ABSENT: fooBar: FooBar
|
||||
// EXIST: { lookupString: "boo: Boo", itemText: "boo: Boo", tailText: " (pack)" }
|
||||
|
||||
+6
-6
@@ -3,9 +3,9 @@ fun f(nested: Outer.Nested.NestedNested?){}
|
||||
|
||||
fun foo(nest<caret>)
|
||||
|
||||
// EXIST: { lookupString: "nested", itemText: "nested: Outer.Nested?", tailText: " (<root>)" }
|
||||
// EXIST: { lookupString: "nested", itemText: "nested: Outer.Nested", tailText: " (<root>)" }
|
||||
// EXIST: { lookupString: "nested", itemText: "nested: Outer.Nested.NestedNested?", tailText: " (<root>)" }
|
||||
// EXIST: { lookupString: "nested", itemText: "nested: Outer.Nested.NestedNested", tailText: " (<root>)" }
|
||||
// EXIST: { lookupString: "nested", itemText: "nested: JavaOuter.Nested", tailText: " (<root>)" }
|
||||
// EXIST: { lookupString: "nested", itemText: "nested: JavaOuter.Nested.NestedNested", tailText: " (<root>)" }
|
||||
// EXIST: { lookupString: "nested: Nested", itemText: "nested: Outer.Nested?", tailText: " (<root>)" }
|
||||
// EXIST: { lookupString: "nested: Nested", itemText: "nested: Outer.Nested", tailText: " (<root>)" }
|
||||
// EXIST: { lookupString: "nested: NestedNested", itemText: "nested: Outer.Nested.NestedNested?", tailText: " (<root>)" }
|
||||
// EXIST: { lookupString: "nested: NestedNested", itemText: "nested: Outer.Nested.NestedNested", tailText: " (<root>)" }
|
||||
// EXIST: { lookupString: "nested: Nested", itemText: "nested: JavaOuter.Nested", tailText: " (<root>)" }
|
||||
// EXIST: { lookupString: "nested: NestedNested", itemText: "nested: JavaOuter.Nested.NestedNested", tailText: " (<root>)" }
|
||||
|
||||
Reference in New Issue
Block a user