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

Smart completion: fixed items ordering issue

Browse Source
This commit is contained in:
Valentin Kipyatkov
2014-10-28 20:20:33 +03:00
parent caf44969a4
commit 2b33501471
52 changed files with 103 additions and 88 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/testData/completion/smart/ClassObjectMembers.kt
+6 -6
View File
@@ -14,10 +14,10 @@ fun foo(){
val k : K = <caret>
}
// EXIST: { lookupString:"K.foo", itemText:"K.foo", tailText:" (sample)", typeText:"K" }
// EXIST: { lookupString:"K.bar", itemText:"K.bar()", tailText:" (sample)", typeText:"K" }
// ABSENT: K.x
// EXIST: { lookupString:"foo", itemText:"K.foo", tailText:" (sample)", typeText:"K" }
// EXIST: { lookupString:"bar", itemText:"K.bar()", tailText:" (sample)", typeText:"K" }
// ABSENT: { itemText: "K.x" }
// ABSENT: { itemText:"K.kk" }
// EXIST: { lookupString:"K.kk", itemText:"!! K.kk", tailText:" (sample)", typeText:"K?" }
// EXIST: { lookupString:"K.kk", itemText:"?: K.kk", tailText:" (sample)", typeText:"K?" }
// ABSENT: K.privateVal
// EXIST: { lookupString:"kk", itemText:"!! K.kk", tailText:" (sample)", typeText:"K?" }
// EXIST: { lookupString:"kk", itemText:"?: K.kk", tailText:" (sample)", typeText:"K?" }
// ABSENT: { itemText: "K.privateVal" }
idea/testData/completion/smart/ClassObjectMembersForNullable.kt
+4 -4
View File
@@ -13,7 +13,7 @@ fun foo(){
val k : K? = <caret>
}
// EXIST: { lookupString:"K.foo", itemText:"K.foo", tailText:" (sample)", typeText:"K" }
// EXIST: { lookupString:"K.bar", itemText:"K.bar()", tailText:" (sample)", typeText:"K" }
// ABSENT: K.x
// EXIST: { lookupString:"K.kk", itemText:"K.kk", tailText:" (sample)", typeText:"K?" }
// EXIST: { lookupString:"foo", itemText:"K.foo", 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/EnumMembers.kt
+2 -2
View File
@@ -9,5 +9,5 @@ fun foo(){
val f : Foo = <caret>
}
// EXIST: { lookupString:"Foo.X", itemText:"Foo.X", tailText:" (sample)", typeText:"Foo" }
// EXIST: { lookupString:"Foo.Y", itemText:"Foo.Y", tailText:" (sample)", typeText:"Foo" }
// EXIST: { lookupString:"X", itemText:"Foo.X", tailText:" (sample)", typeText:"Foo" }
// EXIST: { lookupString:"Y", itemText:"Foo.Y", tailText:" (sample)", typeText:"Foo" }
idea/testData/completion/smart/EqOperator.kt
+2 -2
View File
@@ -7,8 +7,8 @@ fun f(e1: E, e2: E?, x: Any) {
if (e1 == <caret>
}
// EXIST: E.A
// EXIST: E.B
// EXIST: { lookupString:"A", itemText:"E.A", typeText:"E" }
// EXIST: { lookupString:"B", itemText:"E.B", typeText:"E" }
// EXIST: { itemText:"e2" }
// ABSENT: { itemText:"!! e2" }
// ABSENT: e1
idea/testData/completion/smart/JavaEnumMembers.kt
+2 -2
View File
@@ -4,5 +4,5 @@ fun foo(){
val e : ElementType = <caret>
}
// EXIST: { lookupString:"ElementType.TYPE", itemText:"ElementType.TYPE", tailText:" (java.lang.annotation)", typeText:"ElementType" }
// EXIST: { lookupString:"ElementType.FIELD", itemText:"ElementType.FIELD", tailText:" (java.lang.annotation)", typeText:"ElementType" }
// EXIST: { lookupString:"TYPE", itemText:"ElementType.TYPE", tailText:" (java.lang.annotation)", typeText:"ElementType" }
// EXIST: { lookupString:"FIELD", itemText:"ElementType.FIELD", tailText:" (java.lang.annotation)", typeText:"ElementType" }
idea/testData/completion/smart/JavaEnumMembersForNullable.kt
+2 -2
View File
@@ -4,5 +4,5 @@ fun foo(){
var e : ElementType? = <caret>
}
// EXIST: { lookupString:"ElementType.TYPE", itemText:"ElementType.TYPE", tailText:" (java.lang.annotation)", typeText:"ElementType" }
// EXIST: { lookupString:"ElementType.FIELD", itemText:"ElementType.FIELD", tailText:" (java.lang.annotation)", typeText:"ElementType" }
// EXIST: { lookupString:"TYPE", itemText:"ElementType.TYPE", tailText:" (java.lang.annotation)", typeText:"ElementType" }
// EXIST: { lookupString:"FIELD", itemText:"ElementType.FIELD", tailText:" (java.lang.annotation)", typeText:"ElementType" }
idea/testData/completion/smart/JavaStaticFields.kt
+2 -2
View File
@@ -2,5 +2,5 @@ fun foo(){
var l : java.util.Locale = <caret>
}
// EXIST: { lookupString:"Locale.ENGLISH", itemText:"Locale.ENGLISH", tailText:" (java.util)", typeText:"Locale!" }
// EXIST: { lookupString:"Locale.FRENCH", itemText:"Locale.FRENCH", tailText:" (java.util)", typeText:"Locale!" }
// EXIST: { lookupString:"ENGLISH", itemText:"Locale.ENGLISH", tailText:" (java.util)", typeText:"Locale!" }
// EXIST: { lookupString:"FRENCH", itemText:"Locale.FRENCH", tailText:" (java.util)", typeText:"Locale!" }
idea/testData/completion/smart/JavaStaticFieldsForNullable.kt
+2 -2
View File
@@ -2,5 +2,5 @@ fun foo(){
var l : java.util.Locale? = <caret>
}
// EXIST: { lookupString:"Locale.ENGLISH", itemText:"Locale.ENGLISH", tailText:" (java.util)", typeText:"Locale!" }
// EXIST: { lookupString:"Locale.FRENCH", itemText:"Locale.FRENCH", tailText:" (java.util)", typeText:"Locale!" }
// EXIST: { lookupString:"ENGLISH", itemText:"Locale.ENGLISH", tailText:" (java.util)", typeText:"Locale!" }
// EXIST: { lookupString:"FRENCH", itemText:"Locale.FRENCH", tailText:" (java.util)", typeText:"Locale!" }
idea/testData/completion/smart/JavaStaticMethods.kt
+3 -3
View File
@@ -2,6 +2,6 @@ fun foo(){
val l : java.util.Calendar = <caret>
}
// EXIST: { lookupString:"Calendar.getInstance", itemText:"Calendar.getInstance()", tailText:" (java.util)", typeText:"Calendar!" }
// EXIST: { lookupString:"Calendar.getInstance", itemText:"Calendar.getInstance(TimeZone!)", tailText:" (java.util)", typeText:"Calendar!" }
// EXIST: { lookupString:"Calendar.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(TimeZone!)", tailText:" (java.util)", typeText:"Calendar!" }
// EXIST: { lookupString:"getInstance", itemText:"Calendar.getInstance(TimeZone!, Locale!)", tailText:" (java.util)", typeText:"Calendar!" }
idea/testData/completion/smart/NoExtensionMethodFromClassObject.kt
+2 -2
View File
@@ -9,5 +9,5 @@ fun foo(): X {
return <caret>
}
// ABSENT: X.f
// EXIST: X.g
// ABSENT: f
// EXIST: { lookupString:"g", itemText:"X.g()" }
idea/testData/completion/smart/NotEqOperator.kt
+2 -2
View File
@@ -7,8 +7,8 @@ fun f(e1: E, e2: E?, x: Any) {
if (e1 != <caret>
}
// EXIST: E.A
// EXIST: E.B
// EXIST: { lookupString:"A", itemText:"E.A" }
// EXIST: { lookupString:"B", itemText:"E.B" }
// EXIST: e2
// ABSENT: e1
// ABSENT: x
idea/testData/completion/smart/ObjectsFromType.kt
+2 -2
View File
@@ -10,5 +10,5 @@ fun foo(): T {
return <caret>
}
// EXIST: { lookupString:"T.Null", itemText:"T.Null", tailText:" (p)", typeText:"T" }
// ABSENT: T.Other
// EXIST: { lookupString:"Null", itemText:"T.Null", tailText:" (p)", typeText:"T" }
// ABSENT: Other
idea/testData/completion/smart/WhenEntryValue1.kt
+3 -3
View File
@@ -10,7 +10,7 @@ fun foo(e: E) {
}
}
// EXIST: E.A
// EXIST: E.B
// EXIST: E.C
// EXIST: { lookupString:"A", itemText:"E.A" }
// EXIST: { lookupString:"B", itemText:"E.B" }
// EXIST: { lookupString:"C", itemText:"E.C" }
// EXIST: {"lookupString":"else","tailText":" ->","itemText":"else"}
idea/testData/completion/smart/WhenEntryValue2.kt
+3 -3
View File
@@ -10,7 +10,7 @@ fun foo(e: E) {
}
}
// ABSENT: E.A
// EXIST: E.B
// EXIST: E.C
// ABSENT: A
// EXIST: { lookupString:"B", itemText:"E.B" }
// EXIST: { lookupString:"C", itemText:"E.C" }
// ABSENT:else
idea/testData/completion/smart/WhenEntryValue3.kt
+3 -3
View File
@@ -11,7 +11,7 @@ fun foo(e: E) {
}
}
// ABSENT: E.A
// EXIST: E.B
// EXIST: E.C
// ABSENT: A
// EXIST: { lookupString:"B", itemText:"E.B" }
// EXIST: { lookupString:"C", itemText:"E.C" }
// EXIST: {"lookupString":"else","tailText":" ->","itemText":"else"}
idea/testData/completion/smart/WhenEntryValue4.kt
+3 -3
View File
@@ -11,7 +11,7 @@ fun foo(e: E) {
}
}
// EXIST: E.A
// EXIST: E.B
// EXIST: E.C
// EXIST: { lookupString:"A", itemText:"E.A" }
// EXIST: { lookupString:"B", itemText:"E.B" }
// EXIST: { lookupString:"C", itemText:"E.C" }
// ABSENT: else
idea/testData/completion/smart/WhenEntryValue6.kt
+3 -3
View File
@@ -11,8 +11,8 @@ fun foo(e: E?) {
}
}
// ABSENT: E.A
// EXIST: E.B
// EXIST: E.C
// ABSENT: A
// EXIST: B
// EXIST: C
// EXIST: null
// EXIST: {"lookupString":"else","tailText":" ->","itemText":"else"}
idea/testData/completion/smart/WhenEntryValue7.kt
+1 -1
View File
@@ -11,5 +11,5 @@ fun foo(e: E) {
}
}
// EXIST: E.A
// EXIST: A
// ABSENT: else
idea/testData/completion/smart/WhenEntryValue8.kt
+2 -2
View File
@@ -7,6 +7,6 @@ fun foo(e: ElementType) {
}
}
// ABSENT: ElementType.FIELD
// EXIST: ElementType.TYPE
// ABSENT: FIELD
// EXIST: TYPE
// ABSENT: e