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

Completion: moved signatures from "item text" to tail

Browse Source 
#KT-5652 Fixed
This commit is contained in:
Valentin Kipyatkov
2014-11-14 21:23:05 +03:00
parent b2f2c9ac75
commit 7410c36e3a
32 changed files with 112 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/testData/completion/basic/common/FunctionCompletionFormatting.kt
+1 -1
View File
@@ -4,4 +4,4 @@ fun some() {
tes<caret>
}
// EXIST: { lookupString:"test", itemText:"test(a: Int)" }
// EXIST: { lookupString:"test", itemText:"test", tailText:"(a: Int)" }
idea/testData/completion/basic/common/HigherOrderFunction1.kt
+2 -2
View File
@@ -4,5 +4,5 @@ fun test() {
fo<caret>
}
// EXIST: { lookupString:"foo", itemText: "foo(p: (String, Char) -> Unit)", typeText:"Unit" }
// EXIST: { lookupString:"foo", itemText: "foo { (String, Char) -> ... }", typeText:"Unit" }
// EXIST: { lookupString:"foo", itemText: "foo", tailText: "(p: (String, Char) -> Unit)", typeText:"Unit" }
// EXIST: { lookupString:"foo", itemText: "foo", tailText: " { (String, Char) -> ... }", typeText:"Unit" }
idea/testData/completion/basic/common/HigherOrderFunction2.kt
+8
View File
@@ -0,0 +1,8 @@
fun String.foo(p: (String, Char) -> Unit){}
fun test() {
"".fo<caret>
}
// EXIST: { lookupString:"foo", itemText: "foo", tailText: "(p: (String, Char) -> Unit) for String in <root>", typeText:"Unit" }
// EXIST: { lookupString:"foo", itemText: "foo", tailText: " { (String, Char) -> ... } for String in <root>", typeText:"Unit" }
idea/testData/completion/basic/java/ExtensionFromStandardLibrary.kt
+1 -1
View File
@@ -8,5 +8,5 @@ fun firstFun() {
}
// INVOCATION_COUNT: 1
// EXIST: { lookupString:"toLinkedList", itemText:"toLinkedList()", tailText:" for Iterable<T> in kotlin" }
// EXIST: { lookupString:"toLinkedList", itemText:"toLinkedList", tailText:"() for Iterable<T> in kotlin" }
// NUMBER: 1
idea/testData/completion/handlers/smart/JavaStaticMethodInsertsImport.kt
+2 -1
View File
@@ -2,4 +2,5 @@ fun foo(){
val l : java.util.Calendar = <caret>
}
// ELEMENT_TEXT: Calendar.getInstance(TimeZone!)
// ELEMENT_TEXT: Calendar.getInstance
// TAIL_TEXT: (TimeZone!)
idea/testData/completion/handlers/smart/JavaStaticMethodInsertsImport.kt.after
+2 -1
View File
@@ -4,4 +4,5 @@ fun foo(){
val l : java.util.Calendar = Calendar.getInstance(<caret>)
}
// ELEMENT_TEXT: Calendar.getInstance(TimeZone!)
// ELEMENT_TEXT: Calendar.getInstance
// TAIL_TEXT: (TimeZone!)
idea/testData/completion/handlers/smart/NullableValue2.kt
+2 -1
View File
@@ -6,4 +6,5 @@ fun bar() {
foo(<caret>)
}
// ELEMENT_TEXT: "?: getString(i: Int)"
// ELEMENT_TEXT: "?: getString"
// TAIL_TEXT: "(i: Int)"
idea/testData/completion/handlers/smart/NullableValue2.kt.after
+2 -1
View File
@@ -6,4 +6,5 @@ fun bar() {
foo(getString(<caret>) ?: )
}
// ELEMENT_TEXT: "?: getString(i: Int)"
// ELEMENT_TEXT: "?: getString"
// TAIL_TEXT: "(i: Int)"
idea/testData/completion/handlers/smart/NullableValue3.kt
+2 -1
View File
@@ -8,4 +8,5 @@ fun foo(){
val k : K = <caret>
}
// ELEMENT_TEXT: "!! K.bar()"
// ELEMENT_TEXT: "!! K.bar"
// TAIL_TEXT: "()"
idea/testData/completion/handlers/smart/NullableValue3.kt.after
+2 -1
View File
@@ -8,4 +8,5 @@ fun foo(){
val k : K = K.bar()!!<caret>
}
// ELEMENT_TEXT: "!! K.bar()"
// ELEMENT_TEXT: "!! K.bar"
// TAIL_TEXT: "()"
idea/testData/completion/smart/ClassObjectMembers.kt
+1 -1
View File
@@ -15,7 +15,7 @@ fun foo(){
}
// EXIST: { lookupString:"foo", itemText:"K.foo", tailText:" (sample)", typeText:"K" }
// EXIST: { lookupString:"bar", itemText:"K.bar()", tailText:" (sample)", typeText:"K" }
// EXIST: { lookupString:"bar", itemText:"K.bar", tailText:"() (sample)", typeText:"K" }
// ABSENT: { itemText: "K.x" }
// ABSENT: { itemText:"K.kk" }
// EXIST: { lookupString:"kk", itemText:"!! K.kk", tailText:" (sample)", typeText:"K?" }
idea/testData/completion/smart/ClassObjectMembersForNullable.kt
+1 -1
View File
@@ -14,6 +14,6 @@ fun foo(){
}
// EXIST: { lookupString:"foo", itemText:"K.foo", tailText:" (sample)", typeText:"K" }
// EXIST: { lookupString:"bar", itemText:"K.bar()", tailText:" (sample)", typeText:"K" }
// EXIST: { lookupString:"bar", itemText:"K.bar", tailText:"() (sample)", typeText:"K" }
// ABSENT: { itemText: "K.x" }
// EXIST: { lookupString:"kk", itemText:"K.kk", tailText:" (sample)", typeText:"K?" }
idea/testData/completion/smart/Constructor.kt
+1 -1
View File
@@ -2,4 +2,4 @@ class Foo
var a : Foo = <caret>
// EXIST: { lookupString:"Foo", itemText:"Foo()" }
// EXIST: { lookupString:"Foo", itemText:"Foo", tailText: "() (<root>)" }
idea/testData/completion/smart/ConstructorForGenericType.kt
+1 -1
View File
@@ -4,4 +4,4 @@ fun foo(p : Any){
var a : Foo<String> = <caret>
}
// EXIST: { lookupString:"Foo", itemText:"Foo<String>()" }
// EXIST: { lookupString:"Foo", itemText:"Foo<String>", tailText:"() (<root>)" }
idea/testData/completion/smart/ConstructorForJavaClass.kt
+1 -1
View File
@@ -2,4 +2,4 @@ import java.util.Date
var a : Date = <caret>
// EXIST: { lookupString:"Date", itemText:"Date(...)" }
// EXIST: { lookupString:"Date", itemText:"Date", tailText:"(...) (java.util)" }
idea/testData/completion/smart/ConstructorForNullable.kt
+1 -1
View File
@@ -4,4 +4,4 @@ fun foo(p : Any){
var a : Foo? = <caret>
}
// EXIST: { lookupString:"Foo", itemText:"Foo()" }
// EXIST: { lookupString:"Foo", itemText:"Foo", tailText: "() (<root>)" }
idea/testData/completion/smart/ConstructorWithParameters.kt
+1 -1
View File
@@ -2,4 +2,4 @@ class Foo(val p1: String, val p2: Any?)
var a : Foo = <caret>
// EXIST: { lookupString:"Foo", itemText:"Foo(p1: String, p2: Any?)" }
// EXIST: { lookupString:"Foo", itemText:"Foo", tailText:"(p1: String, p2: Any?) (<root>)" }
idea/testData/completion/smart/EmptyPrefix.kt
+1 -1
View File
@@ -26,4 +26,4 @@ fun f3() : String{}
// EXIST: f1
// EXIST: f2
// ABSENT: f3
// EXIST: { lookupString:"Foo", itemText:"Foo()" }
// EXIST: { lookupString:"Foo", itemText:"Foo", tailText: "() (<root>)" }
idea/testData/completion/smart/FunctionReference1.kt
+1 -1
View File
@@ -7,7 +7,7 @@ fun bar() {
fun f1(){}
fun f2(i: Int){}
// EXIST: { lookupString:"::f1", itemText:"::f1", tailText:"", typeText:"" }
// EXIST: { lookupString:"::f1", itemText:"::f1", tailText:null, typeText:null }
// ABSENT: ::f2
// ABSENT: ::Unit
// ABSENT: ::Nothing
idea/testData/completion/smart/InElvisOperator2.kt
+4 -4
View File
@@ -6,7 +6,7 @@ fun bar() {
foo1() ?: <caret>
}
// EXIST: { itemText:"foo3()" }
// ABSENT: { itemText:"foo2()" }
// EXIST: { itemText:"!! foo2()" }
// EXIST: { itemText:"?: foo2()" }
// EXIST: { itemText:"foo3" }
// ABSENT: { itemText:"foo2" }
// EXIST: { itemText:"!! foo2" }
// EXIST: { itemText:"?: foo2" }
idea/testData/completion/smart/JavaStaticMethods.kt
+3 -3
View File
@@ -2,6 +2,6 @@ fun foo(){
val l : java.util.Calendar = <caret>
}
// EXIST: { lookupString:"getInstance", itemText:"Calendar.getInstance()", tailText:" (java.util)", typeText:"Calendar!" }
// EXIST: { lookupString:"getInstance", itemText:"Calendar.getInstance(TimeZone!)", tailText:" (java.util)", typeText:"Calendar!" }
// EXIST: { lookupString:"getInstance", itemText:"Calendar.getInstance(TimeZone!, Locale!)", tailText:" (java.util)", typeText:"Calendar!" }
// EXIST: { lookupString:"getInstance", itemText:"Calendar.getInstance", tailText:"() (java.util)", typeText:"Calendar!" }
// EXIST: { lookupString:"getInstance", itemText:"Calendar.getInstance", tailText:"(TimeZone!) (java.util)", typeText:"Calendar!" }
// EXIST: { lookupString:"getInstance", itemText:"Calendar.getInstance", tailText:"(TimeZone!, Locale!) (java.util)", typeText:"Calendar!" }
idea/testData/completion/smart/NoExtensionMethodFromClassObject.kt
+1 -1
View File
@@ -10,4 +10,4 @@ fun foo(): X {
}
// ABSENT: f
// EXIST: { lookupString:"g", itemText:"X.g()" }
// EXIST: { lookupString:"g", itemText:"X.g", tailText:"() (<root>)" }
idea/testData/completion/smart/SAMExpected1.kt
+1 -1
View File
@@ -1,3 +1,3 @@
var a : Runnable = <caret>
// EXIST: {"lookupString":"Runnable", "tailText":"", "typeText":"Runnable", "itemText":"Runnable(function: () -> Unit)"}
// EXIST: {"lookupString":"Runnable", "itemText":"Runnable", "tailText":"(function: () -> Unit)", "typeText":"Runnable"}