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

KT-9813 Parameter name&type completion gets in the way of typing

Browse Source 
#KT-9813 Fixed
This commit is contained in:
Valentin Kipyatkov
2015-10-29 16:32:10 +03:00
parent 752cdd5f83
commit 7e2b37bb0f
42 changed files with 81 additions and 80 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/idea-completion/src/org/jetbrains/kotlin/idea/completion/ParameterNameAndTypeCompletion.kt
+3 -2
View File
@@ -33,9 +33,9 @@ import org.jetbrains.kotlin.descriptors.DeclarationDescriptor
import org.jetbrains.kotlin.idea.core.KotlinIndicesHelper
import org.jetbrains.kotlin.idea.core.KotlinNameSuggester
import org.jetbrains.kotlin.idea.core.formatter.JetCodeStyleSettings
import org.jetbrains.kotlin.idea.util.getResolutionScope
import org.jetbrains.kotlin.idea.resolve.ResolutionFacade
import org.jetbrains.kotlin.idea.util.IdeDescriptorRenderers
import org.jetbrains.kotlin.idea.util.getResolutionScope
import org.jetbrains.kotlin.psi.KtDeclaration
import org.jetbrains.kotlin.psi.KtExpression
import org.jetbrains.kotlin.psi.KtParameter
@@ -194,7 +194,8 @@ class ParameterNameAndTypeCompletion(
}
}
private val lookupString = parameterName + ": " + delegate.lookupString
// we need space before colon in lookupString otherwise completion list is not closed on typing ':' (see KT-9813)
private val lookupString = parameterName + " : " + delegate.lookupString
override fun getLookupString() = lookupString
override fun getAllLookupStrings() = setOf(lookupString)
idea/idea-completion/testData/basic/common/override/InConstructorParameters.kt
Vendored
+1 -1
View File
@@ -18,5 +18,5 @@ class A(overr<caret>) : Base2(), I
// EXIST: { itemText: "override val someVal: Int", tailText: null, typeText: "I", attributes: "bold" }
// EXIST: { itemText: "override var someVar: Int", tailText: null, typeText: "I", attributes: "bold" }
// EXIST: { itemText: "override val fromBase: String", tailText: null, typeText: "Base1", attributes: "" }
// EXIST_JAVA_ONLY: { lookupString: "override: Override", itemText: "override: Override" }
// EXIST_JAVA_ONLY: { itemText: "override: Override" }
// NOTHING_ELSE
idea/idea-completion/testData/basic/common/parameterNameAndType/ByAbbreviation.kt
Vendored
+1 -1
View File
@@ -4,4 +4,4 @@ class DeclarationDescriptor
fun f(dd<caret>)
// EXIST: { lookupString: "declarationDescriptor: DeclarationDescriptor", itemText: "declarationDescriptor: DeclarationDescriptor", tailText: " (pack)" }
// EXIST: { lookupString: "declarationDescriptor : DeclarationDescriptor", itemText: "declarationDescriptor: DeclarationDescriptor", tailText: " (pack)" }
idea/idea-completion/testData/basic/common/parameterNameAndType/NoAutoInsertion.kt
Vendored
+1 -1
View File
@@ -3,5 +3,5 @@ class FooBaaaaar
fun f(fooBaaaa<caret>)
// AUTOCOMPLETE_SETTING: true
// EXIST: fooBaaaaar: FooBaaaaar
// EXIST: { itemText: "fooBaaaaar: FooBaaaaar" }
// NUMBER: 1
idea/idea-completion/testData/basic/common/parameterNameAndType/NotForAnonymousFunction.kt
Vendored
+1 -1
View File
@@ -6,4 +6,4 @@ fun f() {
x(fun (b<caret>))
}
// ABSENT: boo: Boo
// ABSENT: { itemText: "boo: Boo" }
idea/idea-completion/testData/basic/common/parameterNameAndType/NotForCatchParameter.kt
Vendored
+1 -1
View File
@@ -7,4 +7,4 @@ fun f() {
}
}
// ABSENT: "exception: Exception"
// ABSENT: { itemText: "exception: Exception" }
idea/idea-completion/testData/basic/common/parameterNameAndType/NotForLambdaParameter1.kt
Vendored
+1 -1
View File
@@ -6,4 +6,4 @@ fun f() {
val handler = { b<caret> }
}
// ABSENT: boo: Boo
// ABSENT: { itemText: "boo: Boo" }
idea/idea-completion/testData/basic/common/parameterNameAndType/NotForSetterParameter.kt
Vendored
+1 -1
View File
@@ -4,4 +4,4 @@ var v: Int
get(){}
set(v<caret>)
// ABSENT: voo: Voo
// ABSENT: { itemText: "voo: Voo" }
idea/idea-completion/testData/basic/common/parameterNameAndType/NotImported.kt
Vendored
+1 -1
View File
@@ -1,3 +1,3 @@
fun f(read<caret>)
// EXIST: { lookupString: "readOnlyProperty: ReadOnlyProperty", itemText: "readOnlyProperty: ReadOnlyProperty", tailText: "<R, T> (kotlin.properties)" }
// EXIST: { itemText: "readOnlyProperty: ReadOnlyProperty", tailText: "<R, T> (kotlin.properties)" }
idea/idea-completion/testData/basic/common/parameterNameAndType/NotImportedJava.kt
Vendored
+1 -1
View File
@@ -1,3 +1,3 @@
fun f(file<caret>)
// EXIST_JAVA_ONLY: { lookupString: "file: File", itemText: "file: File", tailText: " (java.io)" }
// EXIST_JAVA_ONLY: { itemText: "file: File", tailText: " (java.io)" }
idea/idea-completion/testData/basic/common/parameterNameAndType/ParametersInFile.kt
Vendored
+8 -8
View File
@@ -18,11 +18,11 @@ class C(val handler: () -> Unit) {
}
}
// 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"
// 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: { itemText: "localParam: String" }
// ABSENT: { itemText: "file: File" }
idea/idea-completion/testData/basic/common/parameterNameAndType/ParametersInFileTypeParameter1.kt
Vendored
+1 -1
View File
@@ -6,5 +6,5 @@ class X<T1> {
fun foo(xxx<caret>)
}
// EXIST: { lookupString: "xxxValue1: T1", itemText: "xxxValue1: T1", tailText: null }
// EXIST: { itemText: "xxxValue1: T1", tailText: null }
// NOTHING_ELSE
idea/idea-completion/testData/basic/common/parameterNameAndType/ParametersInFileTypeParameter3.kt
Vendored
+1 -1
View File
@@ -8,5 +8,5 @@ class X<T1> {
}
}
// EXIST: { lookupString: "xxxValue1: T1", itemText: "xxxValue1: T1", tailText: null }
// EXIST: { itemText: "xxxValue1: T1", tailText: null }
// NOTHING_ELSE
idea/idea-completion/testData/basic/common/parameterNameAndType/Simple.kt
Vendored
+3 -3
View File
@@ -6,6 +6,6 @@ class Boo
fun f(b<caret>)
// EXIST: { lookupString: "bar: FooBar", itemText: "bar: FooBar", tailText: " (pack)" }
// ABSENT: fooBar: FooBar
// EXIST: { lookupString: "boo: Boo", itemText: "boo: Boo", tailText: " (pack)" }
// EXIST: { lookupString: "bar : FooBar", itemText: "bar: FooBar", tailText: " (pack)" }
// ABSENT: { itemText: "fooBar: FooBar" }
// EXIST: { lookupString: "boo : Boo", itemText: "boo: Boo", tailText: " (pack)" }
idea/idea-completion/testData/basic/common/parameterNameAndType/URLConnection.kt
Vendored
+2 -2
View File
@@ -2,5 +2,5 @@ import java.net.URLConnection
fun foo(url<caret>){}
// EXIST_JAVA_ONLY: { lookupString: "urlConnection: URLConnection", itemText: "urlConnection: URLConnection", tailText: " (java.net)" }
// ABSENT: urlconnection
// EXIST_JAVA_ONLY: { itemText: "urlConnection: URLConnection", tailText: " (java.net)" }
// ABSENT: { itemText: "urlconnection: URLConnection" }
idea/idea-completion/testData/basic/common/parameterNameAndType/UserPrefix1.kt
Vendored
+3 -3
View File
@@ -6,6 +6,6 @@ class Boo
fun f(myB<caret>)
// EXIST: { lookupString: "myBar: FooBar", itemText: "myBar: FooBar", tailText: " (pack)" }
// ABSENT: myBFooBar: FooBar
// EXIST: { lookupString: "myBoo: Boo", itemText: "myBoo: Boo", tailText: " (pack)" }
// EXIST: { lookupString: "myBar : FooBar", itemText: "myBar: FooBar", tailText: " (pack)" }
// ABSENT: { itemText: "myBFooBar: FooBar" }
// EXIST: { lookupString: "myBoo : Boo", itemText: "myBoo: Boo", tailText: " (pack)" }
idea/idea-completion/testData/basic/common/parameterNameAndType/UserPrefix2.kt
Vendored
+1 -1
View File
@@ -1,3 +1,3 @@
fun f(myF<caret>)
// EXIST_JAVA_ONLY: { lookupString: "myFile: File", itemText: "myFile: File", tailText: " (java.io)" }
// EXIST_JAVA_ONLY: { lookupString: "myFile : File", itemText: "myFile: File", tailText: " (java.io)" }
idea/idea-completion/testData/basic/common/parameterNameAndType/UserPrefix3.kt
Vendored
+2 -2
View File
@@ -6,6 +6,6 @@ class Fuu
fun f(myFooF<caret>)
// EXIST: { lookupString: "myFooFaa: FooFaa", itemText: "myFooFaa: FooFaa", tailText: " (pack)" }
// EXIST: { lookupString: "myFooFuu: 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" }
idea/idea-completion/testData/basic/common/parameterNameAndType/ValParameter.kt
Vendored
+3 -3
View File
@@ -6,6 +6,6 @@ class Boo
class C(val b<caret>)
// EXIST: { lookupString: "bar: FooBar", itemText: "bar: FooBar", tailText: " (pack)" }
// ABSENT: fooBar: FooBar
// EXIST: { lookupString: "boo: Boo", itemText: "boo: Boo", tailText: " (pack)" }
// EXIST: { itemText: "bar: FooBar", tailText: " (pack)" }
// ABSENT: { itemText: "fooBar: FooBar" }
// EXIST: { itemText: "boo: Boo", tailText: " (pack)" }
idea/idea-completion/testData/basic/common/parameterNameAndType/VarParameter.kt
Vendored
+3 -3
View File
@@ -6,6 +6,6 @@ class Boo
class C(private var b<caret>)
// EXIST: { lookupString: "bar: FooBar", itemText: "bar: FooBar", tailText: " (pack)" }
// ABSENT: fooBar: FooBar
// EXIST: { lookupString: "boo: Boo", itemText: "boo: Boo", tailText: " (pack)" }
// EXIST: { itemText: "bar: FooBar", tailText: " (pack)" }
// ABSENT: { itemText: "fooBar: FooBar" }
// EXIST: { itemText: "boo: Boo", tailText: " (pack)" }
idea/idea-completion/testData/basic/multifile/ParameterNameAndTypeNestedClasses/ParameterNameAndTypeNestedClasses.kt
Vendored
+6 -6
View File
@@ -3,9 +3,9 @@ fun f(nested: Outer.Nested.NestedNested?){}
fun foo(nest<caret>)
// 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>)" }
// 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>)" }
idea/idea-completion/testData/handlers/basic/parameterNameAndType/CodeStyleSettings.kt
Vendored
+1 -1
View File
@@ -5,4 +5,4 @@ class FooBar
fun f(b<caret>)
// ELEMENT: bar: FooBar
// ELEMENT_TEXT: bar: FooBar
idea/idea-completion/testData/handlers/basic/parameterNameAndType/CodeStyleSettings.kt.after
Vendored
+1 -1
View File
@@ -5,4 +5,4 @@ class FooBar
fun f(bar :FooBar<caret>)
// ELEMENT: bar: FooBar
// ELEMENT_TEXT: bar: FooBar
idea/idea-completion/testData/handlers/basic/parameterNameAndType/Comma.kt
Vendored
+1 -1
View File
@@ -2,5 +2,5 @@ class FooBar
fun f(b<caret>)
// ELEMENT: bar: FooBar
// ELEMENT_TEXT: bar: FooBar
// CHAR: ','
idea/idea-completion/testData/handlers/basic/parameterNameAndType/Comma.kt.after
Vendored
+1 -1
View File
@@ -2,5 +2,5 @@ class FooBar
fun f(bar: FooBar, <caret>)
// ELEMENT: bar: FooBar
// ELEMENT_TEXT: bar: FooBar
// CHAR: ','
idea/idea-completion/testData/handlers/basic/parameterNameAndType/InsertImport.kt
Vendored
+1 -1
View File
@@ -1,3 +1,3 @@
fun f(file<caret>)
// ELEMENT: "file: File"
// ELEMENT_TEXT: "file: File"
idea/idea-completion/testData/handlers/basic/parameterNameAndType/InsertImport.kt.after
Vendored
+1 -1
View File
@@ -2,4 +2,4 @@ import java.io.File
fun f(file: File<caret>)
// ELEMENT: "file: File"
// ELEMENT_TEXT: "file: File"
idea/idea-completion/testData/handlers/basic/parameterNameAndType/ParameterInFile.kt
Vendored
+1 -1
View File
@@ -2,4 +2,4 @@ fun foo(xxx: ((java.io.File) -> List<String>)?)
fun bar(x<caret>)
// ELEMENT: xxx: ((File) -> List<String>)?
// ELEMENT_TEXT: xxx: ((File) -> List<String>)?
idea/idea-completion/testData/handlers/basic/parameterNameAndType/ParameterInFile.kt.after
Vendored
+1 -1
View File
@@ -4,4 +4,4 @@ fun foo(xxx: ((java.io.File) -> List<String>)?)
fun bar(xxx: ((File) -> List<String>)?<caret>)
// ELEMENT: xxx: ((File) -> List<String>)?
// ELEMENT_TEXT: xxx: ((File) -> List<String>)?
idea/idea-completion/testData/handlers/basic/parameterNameAndType/Simple.kt
Vendored
+1 -1
View File
@@ -2,4 +2,4 @@ class FooBar
fun f(b<caret>)
// ELEMENT: bar: FooBar
// ELEMENT_TEXT: bar: FooBar
idea/idea-completion/testData/handlers/basic/parameterNameAndType/Simple.kt.after
Vendored
+1 -1
View File
@@ -2,4 +2,4 @@ class FooBar
fun f(bar: FooBar<caret>)
// ELEMENT: bar: FooBar
// ELEMENT_TEXT: bar: FooBar
idea/idea-completion/testData/handlers/basic/parameterNameAndType/TypeParameter.kt
Vendored
+1 -1
View File
@@ -1,3 +1,3 @@
fun<T> foo(t<caret>)
// ELEMENT: t: T
// ELEMENT_TEXT: t: T
idea/idea-completion/testData/handlers/basic/parameterNameAndType/TypeParameter.kt.after
Vendored
+1 -1
View File
@@ -1,3 +1,3 @@
fun<T> foo(t: T<caret>)
// ELEMENT: t: T
// ELEMENT_TEXT: t: T
idea/idea-completion/testData/handlers/basic/parameterNameAndType/UserPrefix.kt
Vendored
+1 -1
View File
@@ -2,4 +2,4 @@ class FooBar
fun f(myFo<caret>)
// ELEMENT: myFooBar: FooBar
// ELEMENT_TEXT: myFooBar: FooBar
idea/idea-completion/testData/handlers/basic/parameterNameAndType/UserPrefix.kt.after
Vendored
+1 -1
View File
@@ -2,4 +2,4 @@ class FooBar
fun f(myFooBar: FooBar<caret>)
// ELEMENT: myFooBar: FooBar
// ELEMENT_TEXT: myFooBar: FooBar
idea/idea-completion/testData/weighers/basic/parameterNameAndType/Deprecated.kt
Vendored
+3 -3
View File
@@ -4,6 +4,6 @@ class MyClassC
fun foo(myCla<caret>)
// ORDER: myClassA: MyClassA
// ORDER: myClassC: MyClassC
// ORDER: myClassB: MyClassB
// ORDER: myClassA : MyClassA
// ORDER: myClassC : MyClassC
// ORDER: myClassB : MyClassB
idea/idea-completion/testData/weighers/basic/parameterNameAndType/FromCurrentFilePriority.kt
Vendored
+6 -6
View File
@@ -8,9 +8,9 @@ fun h(myFileX: String)
fun foo(myFi<caret>)
// ORDER: myFileY: Int
// ORDER: myFileB: MyFileB
// ORDER: myFileX: Int
// ORDER: myFileX: String
// ORDER: myFileA: MyFileA
// ORDER: myFileC: MyFileC
// ORDER: myFileY : Int
// ORDER: myFileB : MyFileB
// ORDER: myFileX : Int
// ORDER: myFileX : String
// ORDER: myFileA : MyFileA
// ORDER: myFileC : MyFileC
idea/idea-completion/testData/weighers/basic/parameterNameAndType/ImportedFirst.kt
Vendored
+4 -4
View File
@@ -2,7 +2,7 @@ import ppp.MyClassB
fun foo(myCla<caret>)
// ORDER: myClassB: MyClassB
// ORDER: myClassA: MyClassA
// ORDER: myClassC: MyClassC
// ORDER: myClaaa: MyClaaa
// ORDER: myClassB : MyClassB
// ORDER: myClassA : MyClassA
// ORDER: myClassC : MyClassC
// ORDER: myClaaa : MyClaaa
idea/idea-completion/testData/weighers/basic/parameterNameAndType/MoreWordsMatchFirst.kt
Vendored
+2 -2
View File
@@ -2,5 +2,5 @@ class MyAbsoluteSpecificStream
fun foo(myAbSpeStream<caret>)
// ORDER: myAbsoluteSpecificStream: MyAbsoluteSpecificStream
// ORDER: myAbSpecificStream: SpecificStream
// ORDER: myAbsoluteSpecificStream : MyAbsoluteSpecificStream
// ORDER: myAbSpecificStream : SpecificStream
idea/idea-completion/testData/weighers/basic/parameterNameAndType/ShorterFirst.kt
Vendored
+2 -2
View File
@@ -3,5 +3,5 @@ class MyFileStream
fun foo(myFi<caret>)
// ORDER: myFile: MyFile
// ORDER: myFileStream: MyFileStream
// ORDER: myFile : MyFile
// ORDER: myFileStream : MyFileStream
idea/idea-completion/testData/weighers/basic/parameterNameAndType/StartMatchFirst.kt
Vendored
+2 -2
View File
@@ -3,5 +3,5 @@ class FaOaOa
fun foo(foo<caret>)
// ORDER: fooBar: FooBar
// ORDER: faOaOa: FaOaOa
// ORDER: fooBar : FooBar
// ORDER: faOaOa : FaOaOa
idea/idea-completion/testData/weighers/basic/parameterNameAndType/UserPrefix.kt
Vendored
+3 -3
View File
@@ -6,6 +6,6 @@ class Xaa
fun foo(zzzYyyX<caret>)
// ORDER: zzzYyyXxx: ZzzYyyXxx
// ORDER: zzzYyyXoo: YyyXoo
// ORDER: zzzYyyXaa: Xaa
// ORDER: zzzYyyXxx : ZzzYyyXxx
// ORDER: zzzYyyXoo : YyyXoo
// ORDER: zzzYyyXaa : Xaa