From 9b4070b881bee8e88e13bda9c932b94aa7863443 Mon Sep 17 00:00:00 2001 From: Valentin Kipyatkov Date: Thu, 8 Oct 2015 18:32:30 +0300 Subject: [PATCH] Changed lookup strings and prefix matchers for parameter name&type completion to get more stable and correct ordering --- .../ParameterNameAndTypeCompletion.kt | 49 +++++++++---------- .../override/InConstructorParameters.kt | 2 +- .../parameterNameAndType/ByAbbreviation.kt | 2 +- .../parameterNameAndType/NoAutoInsertion.kt | 2 +- .../parameterNameAndType/NoDuplication.kt | 2 +- .../parameterNameAndType/NoDuplicationJava.kt | 2 +- .../NoFromFileAndFromClassesDuplication.kt | 6 +-- .../NotForAnonymousFunction.kt | 2 +- .../NotForCatchParameter.kt | 2 +- .../NotForLambdaParameter1.kt | 2 +- .../NotForSetterParameter.kt | 2 +- .../parameterNameAndType/NotImported.kt | 2 +- .../parameterNameAndType/NotImportedJava.kt | 2 +- .../parameterNameAndType/ParametersInFile.kt | 16 +++--- .../ParametersInFileInaccessibleType.kt | 4 +- .../ParametersInFileInaccessibleType2.kt | 4 +- .../ParametersInFileTypeParameter1.kt | 2 +- .../ParametersInFileTypeParameter3.kt | 2 +- .../common/parameterNameAndType/Simple.kt | 6 +-- .../parameterNameAndType/URLConnection.kt | 2 +- .../parameterNameAndType/UserPrefix1.kt | 6 +-- .../parameterNameAndType/UserPrefix2.kt | 2 +- .../parameterNameAndType/UserPrefix3.kt | 4 +- .../parameterNameAndType/ValParameter.kt | 6 +-- .../parameterNameAndType/VarParameter.kt | 6 +-- .../ParameterNameAndTypeNestedClasses.kt | 12 ++--- .../parameterNameAndType/CodeStyleSettings.kt | 2 +- .../CodeStyleSettings.kt.after | 2 +- .../basic/parameterNameAndType/Comma.kt | 2 +- .../basic/parameterNameAndType/Comma.kt.after | 2 +- .../parameterNameAndType/InsertImport.kt | 2 +- .../InsertImport.kt.after | 2 +- .../parameterNameAndType/ParameterInFile.kt | 2 +- .../ParameterInFile.kt.after | 2 +- .../parameterNameAndType/ParameterInFile2.kt | 2 +- .../ParameterInFile2.kt.after | 2 +- .../basic/parameterNameAndType/Simple.kt | 2 +- .../parameterNameAndType/Simple.kt.after | 2 +- .../parameterNameAndType/TypeParameter.kt | 2 +- .../TypeParameter.kt.after | 2 +- .../basic/parameterNameAndType/UserPrefix.kt | 2 +- .../parameterNameAndType/UserPrefix.kt.after | 2 +- .../basic/parameterNameAndType/Deprecated.kt | 6 +-- .../FromCurrentFilePriority.kt | 12 ++--- .../parameterNameAndType/ImportedFirst.kt | 8 +-- .../MoreWordsMatchFirst.Data.kt | 5 ++ .../MoreWordsMatchFirst.kt | 6 +++ .../parameterNameAndType/ShorterFirst.kt | 4 +- .../parameterNameAndType/StartMatchFirst.kt | 4 +- .../basic/parameterNameAndType/UserPrefix.kt | 6 +-- .../BasicCompletionWeigherTestGenerated.java | 6 +++ 51 files changed, 127 insertions(+), 111 deletions(-) create mode 100644 idea/idea-completion/testData/weighers/basic/parameterNameAndType/MoreWordsMatchFirst.Data.kt create mode 100644 idea/idea-completion/testData/weighers/basic/parameterNameAndType/MoreWordsMatchFirst.kt diff --git a/idea/idea-completion/src/org/jetbrains/kotlin/idea/completion/ParameterNameAndTypeCompletion.kt b/idea/idea-completion/src/org/jetbrains/kotlin/idea/completion/ParameterNameAndTypeCompletion.kt index d6f8b432cf9..03ea5252235 100644 --- a/idea/idea-completion/src/org/jetbrains/kotlin/idea/completion/ParameterNameAndTypeCompletion.kt +++ b/idea/idea-completion/src/org/jetbrains/kotlin/idea/completion/ParameterNameAndTypeCompletion.kt @@ -52,7 +52,7 @@ class ParameterNameAndTypeCompletion( defaultPrefixMatcher: PrefixMatcher, private val resolutionFacade: ResolutionFacade ) { - private val parametersInCurrentFilePrefixMatcher = MyPrefixMatcher(defaultPrefixMatcher.getPrefix()) + private val modifiedPrefixMatcher = MyPrefixMatcher(defaultPrefixMatcher.prefix) private val prefixWords: Array private val nameSuggestionPrefixes: List // prefixes to use to generate parameter names from class names @@ -74,13 +74,13 @@ class ParameterNameAndTypeCompletion( private val suggestionsByTypesAdded = HashSet() public fun addFromImportedClasses(position: PsiElement, bindingContext: BindingContext, visibilityFilter: (DeclarationDescriptor) -> Boolean) { - for ((i, prefixMatcher) in nameSuggestionPrefixMatchers.withIndex()) { + for ((prefixMatcher, userPrefix) in nameSuggestionPrefixMatchers.zip(userPrefixes)) { val resolutionScope = position.getResolutionScope(bindingContext, resolutionFacade) val classifiers = resolutionScope.getDescriptorsFiltered(DescriptorKindFilter.NON_SINGLETON_CLASSIFIERS, prefixMatcher.toClassifierNamePrefixMatcher().asNameFilter()) for (classifier in classifiers) { if (visibilityFilter(classifier)) { - addSuggestionsForClassifier(classifier, userPrefixes[i], prefixMatcher, notImported = false) + addSuggestionsForClassifier(classifier, userPrefix, prefixMatcher, notImported = false) } } @@ -89,13 +89,13 @@ class ParameterNameAndTypeCompletion( } public fun addFromAllClasses(parameters: CompletionParameters, indicesHelper: KotlinIndicesHelper) { - for ((i, prefixMatcher) in nameSuggestionPrefixMatchers.withIndex()) { + for ((prefixMatcher, userPrefix) in nameSuggestionPrefixMatchers.zip(userPrefixes)) { AllClassesCompletion( parameters, indicesHelper, prefixMatcher.toClassifierNamePrefixMatcher(), resolutionFacade, { !it.isSingleton() } ).collect( - { addSuggestionsForClassifier(it, userPrefixes[i], prefixMatcher, notImported = true) }, - { addSuggestionsForJavaClass(it, userPrefixes[i], prefixMatcher, notImported = true) } - ) + { addSuggestionsForClassifier(it, userPrefix, prefixMatcher, notImported = true) }, + { addSuggestionsForJavaClass(it, userPrefix, prefixMatcher, notImported = true) } + ) collector.flushToResultSet() } @@ -111,12 +111,12 @@ class ParameterNameAndTypeCompletion( ProgressManager.checkCanceled() val name = parameter.getName() - if (name != null && parametersInCurrentFilePrefixMatcher.prefixMatches(name)) { + if (name != null && modifiedPrefixMatcher.prefixMatches(name)) { val descriptor = resolutionFacade.analyze(parameter)[BindingContext.VALUE_PARAMETER, parameter] if (descriptor != null) { val parameterType = descriptor.getType() if (parameterType.isVisible(visibilityFilter)) { - val lookupElement = MyLookupElement.create("", name, ArbitraryType(parameterType), lookupElementFactory) + val lookupElement = MyLookupElement.create(name, ArbitraryType(parameterType), lookupElementFactory) val count = lookupElementToCount[lookupElement] ?: 0 lookupElementToCount[lookupElement!!] = count + 1 } @@ -126,7 +126,7 @@ class ParameterNameAndTypeCompletion( for ((lookupElement, count) in lookupElementToCount) { lookupElement.putUserData(PRIORITY_KEY, -count) - collector.addElement(lookupElement, parametersInCurrentFilePrefixMatcher) + collector.addElement(lookupElement, modifiedPrefixMatcher) } } @@ -145,10 +145,10 @@ class ParameterNameAndTypeCompletion( val nameSuggestions = KotlinNameSuggester.getCamelNames(className, { true }, userPrefix.isEmpty()) for (name in nameSuggestions) { if (prefixMatcher.prefixMatches(name)) { - val lookupElement = MyLookupElement.create(userPrefix, name, type, lookupElementFactory) + val lookupElement = MyLookupElement.create(userPrefix + name, type, lookupElementFactory) if (lookupElement != null) { - lookupElement.putUserData(PRIORITY_KEY, userPrefix.length()) // suggestions with longer user prefix get smaller priority - collector.addElement(lookupElement, prefixMatcher, notImported) + lookupElement.putUserData(PRIORITY_KEY, userPrefix.length()) // suggestions with longer user prefix get lower priority + collector.addElement(lookupElement, modifiedPrefixMatcher, notImported = notImported) suggestionsByTypesAdded.add(type) } } @@ -184,28 +184,23 @@ class ParameterNameAndTypeCompletion( } private class MyLookupElement private constructor( - private val userPrefix: String, - private val nameSuggestion: String, + private val parameterName: String, private val type: Type, typeLookupElement: LookupElement ) : LookupElementDecorator(typeLookupElement) { companion object { - fun create(userPrefix: String, nameSuggestion: String, type: Type, factory: LookupElementFactory): LookupElement? { + fun create(parameterName: String, type: Type, factory: LookupElementFactory): LookupElement? { val typeLookupElement = type.createTypeLookupElement(factory) ?: return null - val lookupElement = MyLookupElement(userPrefix, nameSuggestion, type, typeLookupElement) + val lookupElement = MyLookupElement(parameterName, type, typeLookupElement) return lookupElement.suppressAutoInsertion() } } - private val parameterName = userPrefix + nameSuggestion + private val lookupString = parameterName + ": " + delegate.lookupString - override fun equals(other: Any?) - = other is MyLookupElement && nameSuggestion == other.nameSuggestion && userPrefix == other.userPrefix && type == other.type - override fun hashCode() = parameterName.hashCode() - - override fun getLookupString() = nameSuggestion - override fun getAllLookupStrings() = setOf(nameSuggestion) + override fun getLookupString() = lookupString + override fun getAllLookupStrings() = setOf(lookupString) override fun renderElement(presentation: LookupElementPresentation) { super.renderElement(presentation) @@ -216,7 +211,7 @@ class ParameterNameAndTypeCompletion( val settings = CodeStyleSettingsManager.getInstance(context.getProject()).getCurrentSettings().getCustomSettings(javaClass()) val spaceBefore = if (settings.SPACE_BEFORE_TYPE_COLON) " " else "" val spaceAfter = if (settings.SPACE_AFTER_TYPE_COLON) " " else "" - val text = nameSuggestion + spaceBefore + ":" + spaceAfter + val text = parameterName + spaceBefore + ":" + spaceAfter val startOffset = context.getStartOffset() context.getDocument().insertString(startOffset, text) @@ -225,6 +220,10 @@ class ParameterNameAndTypeCompletion( super.handleInsert(context) } + + override fun equals(other: Any?) + = other is MyLookupElement && parameterName == other.parameterName && type == other.type + override fun hashCode() = parameterName.hashCode() } private companion object { diff --git a/idea/idea-completion/testData/basic/common/override/InConstructorParameters.kt b/idea/idea-completion/testData/basic/common/override/InConstructorParameters.kt index 319b224a62e..1d60449f189 100644 --- a/idea/idea-completion/testData/basic/common/override/InConstructorParameters.kt +++ b/idea/idea-completion/testData/basic/common/override/InConstructorParameters.kt @@ -18,5 +18,5 @@ class A(overr) : 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 diff --git a/idea/idea-completion/testData/basic/common/parameterNameAndType/ByAbbreviation.kt b/idea/idea-completion/testData/basic/common/parameterNameAndType/ByAbbreviation.kt index 5c20882841b..8f8e94c553b 100644 --- a/idea/idea-completion/testData/basic/common/parameterNameAndType/ByAbbreviation.kt +++ b/idea/idea-completion/testData/basic/common/parameterNameAndType/ByAbbreviation.kt @@ -4,4 +4,4 @@ class DeclarationDescriptor fun f(dd) -// EXIST: { lookupString: "declarationDescriptor", itemText: "declarationDescriptor: DeclarationDescriptor", tailText: " (pack)" } +// EXIST: { lookupString: "declarationDescriptor: DeclarationDescriptor", itemText: "declarationDescriptor: DeclarationDescriptor", tailText: " (pack)" } diff --git a/idea/idea-completion/testData/basic/common/parameterNameAndType/NoAutoInsertion.kt b/idea/idea-completion/testData/basic/common/parameterNameAndType/NoAutoInsertion.kt index c771e0cc1fe..3efb24e9dd7 100644 --- a/idea/idea-completion/testData/basic/common/parameterNameAndType/NoAutoInsertion.kt +++ b/idea/idea-completion/testData/basic/common/parameterNameAndType/NoAutoInsertion.kt @@ -3,5 +3,5 @@ class FooBaaaaar fun f(fooBaaaa) // AUTOCOMPLETE_SETTING: true -// EXIST: fooBaaaaar +// EXIST: fooBaaaaar: FooBaaaaar // NUMBER: 1 diff --git a/idea/idea-completion/testData/basic/common/parameterNameAndType/NoDuplication.kt b/idea/idea-completion/testData/basic/common/parameterNameAndType/NoDuplication.kt index ad0b1a19883..8da3c4fcfa8 100644 --- a/idea/idea-completion/testData/basic/common/parameterNameAndType/NoDuplication.kt +++ b/idea/idea-completion/testData/basic/common/parameterNameAndType/NoDuplication.kt @@ -2,5 +2,5 @@ import kotlin.properties.* fun f(readonlypr) -// EXIST: { lookupString: "readOnlyProperty", itemText: "readOnlyProperty: ReadOnlyProperty", tailText: " (kotlin.properties)" } +// EXIST: { itemText: "readOnlyProperty: ReadOnlyProperty", tailText: " (kotlin.properties)" } // NUMBER: 1 diff --git a/idea/idea-completion/testData/basic/common/parameterNameAndType/NoDuplicationJava.kt b/idea/idea-completion/testData/basic/common/parameterNameAndType/NoDuplicationJava.kt index faaa1a9f30e..a6fc1369cf2 100644 --- a/idea/idea-completion/testData/basic/common/parameterNameAndType/NoDuplicationJava.kt +++ b/idea/idea-completion/testData/basic/common/parameterNameAndType/NoDuplicationJava.kt @@ -2,5 +2,5 @@ import java.sql.* fun f(blob) -// EXIST_JAVA_ONLY: { lookupString: "blob", itemText: "blob: Blob", tailText: " (java.sql)" } +// EXIST_JAVA_ONLY: { itemText: "blob: Blob", tailText: " (java.sql)" } // NUMBER_JAVA: 1 diff --git a/idea/idea-completion/testData/basic/common/parameterNameAndType/NoFromFileAndFromClassesDuplication.kt b/idea/idea-completion/testData/basic/common/parameterNameAndType/NoFromFileAndFromClassesDuplication.kt index 9e3f5901c66..debc2642a1e 100644 --- a/idea/idea-completion/testData/basic/common/parameterNameAndType/NoFromFileAndFromClassesDuplication.kt +++ b/idea/idea-completion/testData/basic/common/parameterNameAndType/NoFromFileAndFromClassesDuplication.kt @@ -10,7 +10,7 @@ fun f3(algorithmException: MyAlgorithmException){} fun f(algorith) -// 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 diff --git a/idea/idea-completion/testData/basic/common/parameterNameAndType/NotForAnonymousFunction.kt b/idea/idea-completion/testData/basic/common/parameterNameAndType/NotForAnonymousFunction.kt index 9556590a549..43c005be230 100644 --- a/idea/idea-completion/testData/basic/common/parameterNameAndType/NotForAnonymousFunction.kt +++ b/idea/idea-completion/testData/basic/common/parameterNameAndType/NotForAnonymousFunction.kt @@ -6,4 +6,4 @@ fun f() { x(fun (b)) } -// ABSENT: boo +// ABSENT: boo: Boo diff --git a/idea/idea-completion/testData/basic/common/parameterNameAndType/NotForCatchParameter.kt b/idea/idea-completion/testData/basic/common/parameterNameAndType/NotForCatchParameter.kt index 31c2525adf8..56707a70f14 100644 --- a/idea/idea-completion/testData/basic/common/parameterNameAndType/NotForCatchParameter.kt +++ b/idea/idea-completion/testData/basic/common/parameterNameAndType/NotForCatchParameter.kt @@ -7,4 +7,4 @@ fun f() { } } -// ABSENT: "exception" +// ABSENT: "exception: Exception" diff --git a/idea/idea-completion/testData/basic/common/parameterNameAndType/NotForLambdaParameter1.kt b/idea/idea-completion/testData/basic/common/parameterNameAndType/NotForLambdaParameter1.kt index 52d6f359858..bcd77856be6 100644 --- a/idea/idea-completion/testData/basic/common/parameterNameAndType/NotForLambdaParameter1.kt +++ b/idea/idea-completion/testData/basic/common/parameterNameAndType/NotForLambdaParameter1.kt @@ -6,4 +6,4 @@ fun f() { val handler = { b } } -// ABSENT: boo +// ABSENT: boo: Boo diff --git a/idea/idea-completion/testData/basic/common/parameterNameAndType/NotForSetterParameter.kt b/idea/idea-completion/testData/basic/common/parameterNameAndType/NotForSetterParameter.kt index 286389bf9b6..9c161b4a304 100644 --- a/idea/idea-completion/testData/basic/common/parameterNameAndType/NotForSetterParameter.kt +++ b/idea/idea-completion/testData/basic/common/parameterNameAndType/NotForSetterParameter.kt @@ -4,4 +4,4 @@ var v: Int get(){} set(v) -// ABSENT: voo +// ABSENT: voo: Voo diff --git a/idea/idea-completion/testData/basic/common/parameterNameAndType/NotImported.kt b/idea/idea-completion/testData/basic/common/parameterNameAndType/NotImported.kt index 181fb9881d1..726ce7fa6ea 100644 --- a/idea/idea-completion/testData/basic/common/parameterNameAndType/NotImported.kt +++ b/idea/idea-completion/testData/basic/common/parameterNameAndType/NotImported.kt @@ -1,3 +1,3 @@ fun f(read) -// EXIST: { lookupString: "readOnlyProperty", itemText: "readOnlyProperty: ReadOnlyProperty", tailText: " (kotlin.properties)" } +// EXIST: { lookupString: "readOnlyProperty: ReadOnlyProperty", itemText: "readOnlyProperty: ReadOnlyProperty", tailText: " (kotlin.properties)" } diff --git a/idea/idea-completion/testData/basic/common/parameterNameAndType/NotImportedJava.kt b/idea/idea-completion/testData/basic/common/parameterNameAndType/NotImportedJava.kt index 3f30d7f8940..5b0469e514c 100644 --- a/idea/idea-completion/testData/basic/common/parameterNameAndType/NotImportedJava.kt +++ b/idea/idea-completion/testData/basic/common/parameterNameAndType/NotImportedJava.kt @@ -1,3 +1,3 @@ fun f(file) -// EXIST_JAVA_ONLY: { lookupString: "file", itemText: "file: File", tailText: " (java.io)" } +// EXIST_JAVA_ONLY: { lookupString: "file: File", itemText: "file: File", tailText: " (java.io)" } diff --git a/idea/idea-completion/testData/basic/common/parameterNameAndType/ParametersInFile.kt b/idea/idea-completion/testData/basic/common/parameterNameAndType/ParametersInFile.kt index fcaa448d60b..b59186a578e 100644 --- a/idea/idea-completion/testData/basic/common/parameterNameAndType/ParametersInFile.kt +++ b/idea/idea-completion/testData/basic/common/parameterNameAndType/ParametersInFile.kt @@ -18,11 +18,11 @@ class C(val handler: () -> Unit) { } } -// EXIST: { lookupString: "strings", itemText: "strings: List", tailText: " (kotlin)" } -// EXIST: { lookupString: "numbers", itemText: "numbers: List", 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", tailText: " (kotlin)" } +// EXIST: { lookupString: "numbers: List", itemText: "numbers: List", 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" diff --git a/idea/idea-completion/testData/basic/common/parameterNameAndType/ParametersInFileInaccessibleType.kt b/idea/idea-completion/testData/basic/common/parameterNameAndType/ParametersInFileInaccessibleType.kt index 4bf0a9f3f08..c6831dd8ac0 100644 --- a/idea/idea-completion/testData/basic/common/parameterNameAndType/ParametersInFileInaccessibleType.kt +++ b/idea/idea-completion/testData/basic/common/parameterNameAndType/ParametersInFileInaccessibleType.kt @@ -14,6 +14,6 @@ class X { fun foo(neste) -// EXIST: { lookupString: "nested", itemText: "nested: X.PublicNested", tailText: " (ppp)" } -// EXIST: { lookupString: "nestedList", itemText: "nestedList: List", tailText: " (kotlin)" } +// EXIST: { itemText: "nested: X.PublicNested", tailText: " (ppp)" } +// EXIST: { itemText: "nestedList: List", tailText: " (kotlin)" } // NOTHING_ELSE diff --git a/idea/idea-completion/testData/basic/common/parameterNameAndType/ParametersInFileInaccessibleType2.kt b/idea/idea-completion/testData/basic/common/parameterNameAndType/ParametersInFileInaccessibleType2.kt index 30e2ec17b2d..7be342b9a9d 100644 --- a/idea/idea-completion/testData/basic/common/parameterNameAndType/ParametersInFileInaccessibleType2.kt +++ b/idea/idea-completion/testData/basic/common/parameterNameAndType/ParametersInFileInaccessibleType2.kt @@ -14,6 +14,6 @@ class X { class C(val neste) -// EXIST: { lookupString: "nested", itemText: "nested: X.PublicNested", tailText: " (ppp)" } -// EXIST: { lookupString: "nestedList", itemText: "nestedList: List", tailText: " (kotlin)" } +// EXIST: { itemText: "nested: X.PublicNested", tailText: " (ppp)" } +// EXIST: { itemText: "nestedList: List", tailText: " (kotlin)" } // NOTHING_ELSE diff --git a/idea/idea-completion/testData/basic/common/parameterNameAndType/ParametersInFileTypeParameter1.kt b/idea/idea-completion/testData/basic/common/parameterNameAndType/ParametersInFileTypeParameter1.kt index 66a689535e7..d765053dc70 100644 --- a/idea/idea-completion/testData/basic/common/parameterNameAndType/ParametersInFileTypeParameter1.kt +++ b/idea/idea-completion/testData/basic/common/parameterNameAndType/ParametersInFileTypeParameter1.kt @@ -6,5 +6,5 @@ class X { fun foo(xxx) } -// EXIST: { lookupString: "xxxValue1", itemText: "xxxValue1: T1", tailText: null } +// EXIST: { lookupString: "xxxValue1: T1", itemText: "xxxValue1: T1", tailText: null } // NOTHING_ELSE diff --git a/idea/idea-completion/testData/basic/common/parameterNameAndType/ParametersInFileTypeParameter3.kt b/idea/idea-completion/testData/basic/common/parameterNameAndType/ParametersInFileTypeParameter3.kt index f774cc86809..0f3771f3e89 100644 --- a/idea/idea-completion/testData/basic/common/parameterNameAndType/ParametersInFileTypeParameter3.kt +++ b/idea/idea-completion/testData/basic/common/parameterNameAndType/ParametersInFileTypeParameter3.kt @@ -8,5 +8,5 @@ class X { } } -// EXIST: { lookupString: "xxxValue1", itemText: "xxxValue1: T1", tailText: null } +// EXIST: { lookupString: "xxxValue1: T1", itemText: "xxxValue1: T1", tailText: null } // NOTHING_ELSE diff --git a/idea/idea-completion/testData/basic/common/parameterNameAndType/Simple.kt b/idea/idea-completion/testData/basic/common/parameterNameAndType/Simple.kt index 92b8fc83616..29329ee9303 100644 --- a/idea/idea-completion/testData/basic/common/parameterNameAndType/Simple.kt +++ b/idea/idea-completion/testData/basic/common/parameterNameAndType/Simple.kt @@ -6,6 +6,6 @@ class Boo fun f(b) -// 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)" } diff --git a/idea/idea-completion/testData/basic/common/parameterNameAndType/URLConnection.kt b/idea/idea-completion/testData/basic/common/parameterNameAndType/URLConnection.kt index b746eca68f9..2d38c8075af 100644 --- a/idea/idea-completion/testData/basic/common/parameterNameAndType/URLConnection.kt +++ b/idea/idea-completion/testData/basic/common/parameterNameAndType/URLConnection.kt @@ -2,5 +2,5 @@ import java.net.URLConnection fun foo(url){} -// 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 diff --git a/idea/idea-completion/testData/basic/common/parameterNameAndType/UserPrefix1.kt b/idea/idea-completion/testData/basic/common/parameterNameAndType/UserPrefix1.kt index cf271721723..85d045c982f 100644 --- a/idea/idea-completion/testData/basic/common/parameterNameAndType/UserPrefix1.kt +++ b/idea/idea-completion/testData/basic/common/parameterNameAndType/UserPrefix1.kt @@ -6,6 +6,6 @@ class Boo fun f(myB) -// 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)" } diff --git a/idea/idea-completion/testData/basic/common/parameterNameAndType/UserPrefix2.kt b/idea/idea-completion/testData/basic/common/parameterNameAndType/UserPrefix2.kt index ea1d514d431..c13849eba11 100644 --- a/idea/idea-completion/testData/basic/common/parameterNameAndType/UserPrefix2.kt +++ b/idea/idea-completion/testData/basic/common/parameterNameAndType/UserPrefix2.kt @@ -1,3 +1,3 @@ fun f(myF) -// EXIST_JAVA_ONLY: { lookupString: "File", itemText: "myFile: File", tailText: " (java.io)" } +// EXIST_JAVA_ONLY: { lookupString: "myFile: File", itemText: "myFile: File", tailText: " (java.io)" } diff --git a/idea/idea-completion/testData/basic/common/parameterNameAndType/UserPrefix3.kt b/idea/idea-completion/testData/basic/common/parameterNameAndType/UserPrefix3.kt index a7520f7da1d..5153f6d7934 100644 --- a/idea/idea-completion/testData/basic/common/parameterNameAndType/UserPrefix3.kt +++ b/idea/idea-completion/testData/basic/common/parameterNameAndType/UserPrefix3.kt @@ -6,6 +6,6 @@ class Fuu fun f(myFooF) -// 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" } diff --git a/idea/idea-completion/testData/basic/common/parameterNameAndType/ValParameter.kt b/idea/idea-completion/testData/basic/common/parameterNameAndType/ValParameter.kt index e6c580348ef..4fda87ca636 100644 --- a/idea/idea-completion/testData/basic/common/parameterNameAndType/ValParameter.kt +++ b/idea/idea-completion/testData/basic/common/parameterNameAndType/ValParameter.kt @@ -6,6 +6,6 @@ class Boo class C(val b) -// 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)" } diff --git a/idea/idea-completion/testData/basic/common/parameterNameAndType/VarParameter.kt b/idea/idea-completion/testData/basic/common/parameterNameAndType/VarParameter.kt index 226cf7be433..fc2532620de 100644 --- a/idea/idea-completion/testData/basic/common/parameterNameAndType/VarParameter.kt +++ b/idea/idea-completion/testData/basic/common/parameterNameAndType/VarParameter.kt @@ -6,6 +6,6 @@ class Boo class C(private var b) -// 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)" } diff --git a/idea/idea-completion/testData/basic/multifile/ParameterNameAndTypeNestedClasses/ParameterNameAndTypeNestedClasses.kt b/idea/idea-completion/testData/basic/multifile/ParameterNameAndTypeNestedClasses/ParameterNameAndTypeNestedClasses.kt index 2f2f8f20d21..c994f23b5c2 100644 --- a/idea/idea-completion/testData/basic/multifile/ParameterNameAndTypeNestedClasses/ParameterNameAndTypeNestedClasses.kt +++ b/idea/idea-completion/testData/basic/multifile/ParameterNameAndTypeNestedClasses/ParameterNameAndTypeNestedClasses.kt @@ -3,9 +3,9 @@ fun f(nested: Outer.Nested.NestedNested?){} fun foo(nest) -// EXIST: { lookupString: "nested", itemText: "nested: Outer.Nested?", tailText: " ()" } -// EXIST: { lookupString: "nested", itemText: "nested: Outer.Nested", tailText: " ()" } -// EXIST: { lookupString: "nested", itemText: "nested: Outer.Nested.NestedNested?", tailText: " ()" } -// EXIST: { lookupString: "nested", itemText: "nested: Outer.Nested.NestedNested", tailText: " ()" } -// EXIST: { lookupString: "nested", itemText: "nested: JavaOuter.Nested", tailText: " ()" } -// EXIST: { lookupString: "nested", itemText: "nested: JavaOuter.Nested.NestedNested", tailText: " ()" } +// EXIST: { lookupString: "nested: Nested", itemText: "nested: Outer.Nested?", tailText: " ()" } +// EXIST: { lookupString: "nested: Nested", itemText: "nested: Outer.Nested", tailText: " ()" } +// EXIST: { lookupString: "nested: NestedNested", itemText: "nested: Outer.Nested.NestedNested?", tailText: " ()" } +// EXIST: { lookupString: "nested: NestedNested", itemText: "nested: Outer.Nested.NestedNested", tailText: " ()" } +// EXIST: { lookupString: "nested: Nested", itemText: "nested: JavaOuter.Nested", tailText: " ()" } +// EXIST: { lookupString: "nested: NestedNested", itemText: "nested: JavaOuter.Nested.NestedNested", tailText: " ()" } diff --git a/idea/idea-completion/testData/handlers/basic/parameterNameAndType/CodeStyleSettings.kt b/idea/idea-completion/testData/handlers/basic/parameterNameAndType/CodeStyleSettings.kt index 0220ca6e717..d51ba5c8290 100644 --- a/idea/idea-completion/testData/handlers/basic/parameterNameAndType/CodeStyleSettings.kt +++ b/idea/idea-completion/testData/handlers/basic/parameterNameAndType/CodeStyleSettings.kt @@ -5,4 +5,4 @@ class FooBar fun f(b) -// ELEMENT: bar +// ELEMENT: bar: FooBar diff --git a/idea/idea-completion/testData/handlers/basic/parameterNameAndType/CodeStyleSettings.kt.after b/idea/idea-completion/testData/handlers/basic/parameterNameAndType/CodeStyleSettings.kt.after index 4a35270257d..9a8b274d7b2 100644 --- a/idea/idea-completion/testData/handlers/basic/parameterNameAndType/CodeStyleSettings.kt.after +++ b/idea/idea-completion/testData/handlers/basic/parameterNameAndType/CodeStyleSettings.kt.after @@ -5,4 +5,4 @@ class FooBar fun f(bar :FooBar) -// ELEMENT: bar +// ELEMENT: bar: FooBar diff --git a/idea/idea-completion/testData/handlers/basic/parameterNameAndType/Comma.kt b/idea/idea-completion/testData/handlers/basic/parameterNameAndType/Comma.kt index 21825a18939..b5ced56c40f 100644 --- a/idea/idea-completion/testData/handlers/basic/parameterNameAndType/Comma.kt +++ b/idea/idea-completion/testData/handlers/basic/parameterNameAndType/Comma.kt @@ -2,5 +2,5 @@ class FooBar fun f(b) -// ELEMENT: bar +// ELEMENT: bar: FooBar // CHAR: ',' diff --git a/idea/idea-completion/testData/handlers/basic/parameterNameAndType/Comma.kt.after b/idea/idea-completion/testData/handlers/basic/parameterNameAndType/Comma.kt.after index e2fc7d0a67e..47058a51689 100644 --- a/idea/idea-completion/testData/handlers/basic/parameterNameAndType/Comma.kt.after +++ b/idea/idea-completion/testData/handlers/basic/parameterNameAndType/Comma.kt.after @@ -2,5 +2,5 @@ class FooBar fun f(bar: FooBar, ) -// ELEMENT: bar +// ELEMENT: bar: FooBar // CHAR: ',' diff --git a/idea/idea-completion/testData/handlers/basic/parameterNameAndType/InsertImport.kt b/idea/idea-completion/testData/handlers/basic/parameterNameAndType/InsertImport.kt index c44f6430b18..fac489b7a5e 100644 --- a/idea/idea-completion/testData/handlers/basic/parameterNameAndType/InsertImport.kt +++ b/idea/idea-completion/testData/handlers/basic/parameterNameAndType/InsertImport.kt @@ -1,3 +1,3 @@ fun f(file) -// ELEMENT_TEXT: "file: File" +// ELEMENT: "file: File" diff --git a/idea/idea-completion/testData/handlers/basic/parameterNameAndType/InsertImport.kt.after b/idea/idea-completion/testData/handlers/basic/parameterNameAndType/InsertImport.kt.after index cf38dafd037..5328863b2ed 100644 --- a/idea/idea-completion/testData/handlers/basic/parameterNameAndType/InsertImport.kt.after +++ b/idea/idea-completion/testData/handlers/basic/parameterNameAndType/InsertImport.kt.after @@ -2,4 +2,4 @@ import java.io.File fun f(file: File) -// ELEMENT_TEXT: "file: File" +// ELEMENT: "file: File" diff --git a/idea/idea-completion/testData/handlers/basic/parameterNameAndType/ParameterInFile.kt b/idea/idea-completion/testData/handlers/basic/parameterNameAndType/ParameterInFile.kt index 37401715466..9e1244ed773 100644 --- a/idea/idea-completion/testData/handlers/basic/parameterNameAndType/ParameterInFile.kt +++ b/idea/idea-completion/testData/handlers/basic/parameterNameAndType/ParameterInFile.kt @@ -2,4 +2,4 @@ fun foo(xxx: ((java.io.File) -> List)?) fun bar(x) -// ELEMENT: xxx +// ELEMENT: xxx: ((File) -> List)? diff --git a/idea/idea-completion/testData/handlers/basic/parameterNameAndType/ParameterInFile.kt.after b/idea/idea-completion/testData/handlers/basic/parameterNameAndType/ParameterInFile.kt.after index fd81012fa34..3e9c1816e45 100644 --- a/idea/idea-completion/testData/handlers/basic/parameterNameAndType/ParameterInFile.kt.after +++ b/idea/idea-completion/testData/handlers/basic/parameterNameAndType/ParameterInFile.kt.after @@ -4,4 +4,4 @@ fun foo(xxx: ((java.io.File) -> List)?) fun bar(xxx: ((File) -> List)?) -// ELEMENT: xxx +// ELEMENT: xxx: ((File) -> List)? diff --git a/idea/idea-completion/testData/handlers/basic/parameterNameAndType/ParameterInFile2.kt b/idea/idea-completion/testData/handlers/basic/parameterNameAndType/ParameterInFile2.kt index 744e27ae7d8..c715a958a18 100644 --- a/idea/idea-completion/testData/handlers/basic/parameterNameAndType/ParameterInFile2.kt +++ b/idea/idea-completion/testData/handlers/basic/parameterNameAndType/ParameterInFile2.kt @@ -2,4 +2,4 @@ fun foo(xxx: java.io.File?) fun bar(x) -// ELEMENT: xxx +// ELEMENT_TEXT: xxx: File? diff --git a/idea/idea-completion/testData/handlers/basic/parameterNameAndType/ParameterInFile2.kt.after b/idea/idea-completion/testData/handlers/basic/parameterNameAndType/ParameterInFile2.kt.after index 886dfb92907..10fb2141b29 100644 --- a/idea/idea-completion/testData/handlers/basic/parameterNameAndType/ParameterInFile2.kt.after +++ b/idea/idea-completion/testData/handlers/basic/parameterNameAndType/ParameterInFile2.kt.after @@ -4,4 +4,4 @@ fun foo(xxx: java.io.File?) fun bar(xxx: File?) -// ELEMENT: xxx +// ELEMENT_TEXT: xxx: File? diff --git a/idea/idea-completion/testData/handlers/basic/parameterNameAndType/Simple.kt b/idea/idea-completion/testData/handlers/basic/parameterNameAndType/Simple.kt index 77b3bbb4082..293571898b9 100644 --- a/idea/idea-completion/testData/handlers/basic/parameterNameAndType/Simple.kt +++ b/idea/idea-completion/testData/handlers/basic/parameterNameAndType/Simple.kt @@ -2,4 +2,4 @@ class FooBar fun f(b) -// ELEMENT: bar +// ELEMENT: bar: FooBar diff --git a/idea/idea-completion/testData/handlers/basic/parameterNameAndType/Simple.kt.after b/idea/idea-completion/testData/handlers/basic/parameterNameAndType/Simple.kt.after index 5f3ad6bd6c5..8cfb452c371 100644 --- a/idea/idea-completion/testData/handlers/basic/parameterNameAndType/Simple.kt.after +++ b/idea/idea-completion/testData/handlers/basic/parameterNameAndType/Simple.kt.after @@ -2,4 +2,4 @@ class FooBar fun f(bar: FooBar) -// ELEMENT: bar +// ELEMENT: bar: FooBar diff --git a/idea/idea-completion/testData/handlers/basic/parameterNameAndType/TypeParameter.kt b/idea/idea-completion/testData/handlers/basic/parameterNameAndType/TypeParameter.kt index 1fc146184f5..5bd26eae45d 100644 --- a/idea/idea-completion/testData/handlers/basic/parameterNameAndType/TypeParameter.kt +++ b/idea/idea-completion/testData/handlers/basic/parameterNameAndType/TypeParameter.kt @@ -1,3 +1,3 @@ fun foo(t) -// ELEMENT: t +// ELEMENT: t: T diff --git a/idea/idea-completion/testData/handlers/basic/parameterNameAndType/TypeParameter.kt.after b/idea/idea-completion/testData/handlers/basic/parameterNameAndType/TypeParameter.kt.after index 837d0a1aaa9..b811d0b5e66 100644 --- a/idea/idea-completion/testData/handlers/basic/parameterNameAndType/TypeParameter.kt.after +++ b/idea/idea-completion/testData/handlers/basic/parameterNameAndType/TypeParameter.kt.after @@ -1,3 +1,3 @@ fun foo(t: T) -// ELEMENT: t +// ELEMENT: t: T diff --git a/idea/idea-completion/testData/handlers/basic/parameterNameAndType/UserPrefix.kt b/idea/idea-completion/testData/handlers/basic/parameterNameAndType/UserPrefix.kt index 872ae2cdb96..4b5abbd5e9d 100644 --- a/idea/idea-completion/testData/handlers/basic/parameterNameAndType/UserPrefix.kt +++ b/idea/idea-completion/testData/handlers/basic/parameterNameAndType/UserPrefix.kt @@ -2,4 +2,4 @@ class FooBar fun f(myFo) -// ELEMENT: FooBar +// ELEMENT: myFooBar: FooBar diff --git a/idea/idea-completion/testData/handlers/basic/parameterNameAndType/UserPrefix.kt.after b/idea/idea-completion/testData/handlers/basic/parameterNameAndType/UserPrefix.kt.after index ba272cb1284..4461c5323a2 100644 --- a/idea/idea-completion/testData/handlers/basic/parameterNameAndType/UserPrefix.kt.after +++ b/idea/idea-completion/testData/handlers/basic/parameterNameAndType/UserPrefix.kt.after @@ -2,4 +2,4 @@ class FooBar fun f(myFooBar: FooBar) -// ELEMENT: FooBar +// ELEMENT: myFooBar: FooBar diff --git a/idea/idea-completion/testData/weighers/basic/parameterNameAndType/Deprecated.kt b/idea/idea-completion/testData/weighers/basic/parameterNameAndType/Deprecated.kt index 0f2a8ac23ef..0672b7c1c36 100644 --- a/idea/idea-completion/testData/weighers/basic/parameterNameAndType/Deprecated.kt +++ b/idea/idea-completion/testData/weighers/basic/parameterNameAndType/Deprecated.kt @@ -4,6 +4,6 @@ class MyClassC fun foo(myCla) -// ORDER: myClassA -// ORDER: myClassC -// ORDER: myClassB +// ORDER: myClassA: MyClassA +// ORDER: myClassC: MyClassC +// ORDER: myClassB: MyClassB diff --git a/idea/idea-completion/testData/weighers/basic/parameterNameAndType/FromCurrentFilePriority.kt b/idea/idea-completion/testData/weighers/basic/parameterNameAndType/FromCurrentFilePriority.kt index e567fa16a47..489a308aa5e 100644 --- a/idea/idea-completion/testData/weighers/basic/parameterNameAndType/FromCurrentFilePriority.kt +++ b/idea/idea-completion/testData/weighers/basic/parameterNameAndType/FromCurrentFilePriority.kt @@ -8,9 +8,9 @@ fun h(myFileX: String) fun foo(myFi) -// ORDER: myFileY -// ORDER: myFileB -// ORDER: myFileX -// ORDER: myFileX -// ORDER: myFileA -// ORDER: myFileC +// ORDER: myFileY: Int +// ORDER: myFileB: MyFileB +// ORDER: myFileX: Int +// ORDER: myFileX: String +// ORDER: myFileA: MyFileA +// ORDER: myFileC: MyFileC diff --git a/idea/idea-completion/testData/weighers/basic/parameterNameAndType/ImportedFirst.kt b/idea/idea-completion/testData/weighers/basic/parameterNameAndType/ImportedFirst.kt index e7e4f559f50..09774bab0ca 100644 --- a/idea/idea-completion/testData/weighers/basic/parameterNameAndType/ImportedFirst.kt +++ b/idea/idea-completion/testData/weighers/basic/parameterNameAndType/ImportedFirst.kt @@ -2,7 +2,7 @@ import ppp.MyClassB fun foo(myCla) -// ORDER: myClassB -// ORDER: myClassA -// ORDER: myClassC -// ORDER: myClaaa +// ORDER: myClassB: MyClassB +// ORDER: myClassA: MyClassA +// ORDER: myClassC: MyClassC +// ORDER: myClaaa: MyClaaa diff --git a/idea/idea-completion/testData/weighers/basic/parameterNameAndType/MoreWordsMatchFirst.Data.kt b/idea/idea-completion/testData/weighers/basic/parameterNameAndType/MoreWordsMatchFirst.Data.kt new file mode 100644 index 00000000000..47a69a63ccc --- /dev/null +++ b/idea/idea-completion/testData/weighers/basic/parameterNameAndType/MoreWordsMatchFirst.Data.kt @@ -0,0 +1,5 @@ +package other + +class SpecificStream + +class SimpleStream diff --git a/idea/idea-completion/testData/weighers/basic/parameterNameAndType/MoreWordsMatchFirst.kt b/idea/idea-completion/testData/weighers/basic/parameterNameAndType/MoreWordsMatchFirst.kt new file mode 100644 index 00000000000..8d6a827cdc3 --- /dev/null +++ b/idea/idea-completion/testData/weighers/basic/parameterNameAndType/MoreWordsMatchFirst.kt @@ -0,0 +1,6 @@ +class MyAbsoluteSpecificStream + +fun foo(myAbSpeStream) + +// ORDER: myAbsoluteSpecificStream: MyAbsoluteSpecificStream +// ORDER: myAbSpecificStream: SpecificStream diff --git a/idea/idea-completion/testData/weighers/basic/parameterNameAndType/ShorterFirst.kt b/idea/idea-completion/testData/weighers/basic/parameterNameAndType/ShorterFirst.kt index 3cc36b59436..46c482a9136 100644 --- a/idea/idea-completion/testData/weighers/basic/parameterNameAndType/ShorterFirst.kt +++ b/idea/idea-completion/testData/weighers/basic/parameterNameAndType/ShorterFirst.kt @@ -3,5 +3,5 @@ class MyFileStream fun foo(myFi) -// ORDER: myFile -// ORDER: myFileStream +// ORDER: myFile: MyFile +// ORDER: myFileStream: MyFileStream diff --git a/idea/idea-completion/testData/weighers/basic/parameterNameAndType/StartMatchFirst.kt b/idea/idea-completion/testData/weighers/basic/parameterNameAndType/StartMatchFirst.kt index 79d4574048b..c7b471a4b77 100644 --- a/idea/idea-completion/testData/weighers/basic/parameterNameAndType/StartMatchFirst.kt +++ b/idea/idea-completion/testData/weighers/basic/parameterNameAndType/StartMatchFirst.kt @@ -3,5 +3,5 @@ class FaOaOa fun foo(foo) -// ORDER: fooBar -// ORDER: faOaOa +// ORDER: fooBar: FooBar +// ORDER: faOaOa: FaOaOa diff --git a/idea/idea-completion/testData/weighers/basic/parameterNameAndType/UserPrefix.kt b/idea/idea-completion/testData/weighers/basic/parameterNameAndType/UserPrefix.kt index 277f6a107d7..84a25b1a668 100644 --- a/idea/idea-completion/testData/weighers/basic/parameterNameAndType/UserPrefix.kt +++ b/idea/idea-completion/testData/weighers/basic/parameterNameAndType/UserPrefix.kt @@ -6,6 +6,6 @@ class Xaa fun foo(zzzYyyX) -// ORDER: zzzYyyXxx -// ORDER: YyyXoo -// ORDER: Xaa +// ORDER: zzzYyyXxx: ZzzYyyXxx +// ORDER: zzzYyyXoo: YyyXoo +// ORDER: zzzYyyXaa: Xaa diff --git a/idea/idea-completion/tests/org/jetbrains/kotlin/idea/completion/test/weighers/BasicCompletionWeigherTestGenerated.java b/idea/idea-completion/tests/org/jetbrains/kotlin/idea/completion/test/weighers/BasicCompletionWeigherTestGenerated.java index 077c7dcf373..ab30f75efe1 100644 --- a/idea/idea-completion/tests/org/jetbrains/kotlin/idea/completion/test/weighers/BasicCompletionWeigherTestGenerated.java +++ b/idea/idea-completion/tests/org/jetbrains/kotlin/idea/completion/test/weighers/BasicCompletionWeigherTestGenerated.java @@ -268,6 +268,12 @@ public class BasicCompletionWeigherTestGenerated extends AbstractBasicCompletion doTest(fileName); } + @TestMetadata("MoreWordsMatchFirst.kt") + public void testMoreWordsMatchFirst() throws Exception { + String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/weighers/basic/parameterNameAndType/MoreWordsMatchFirst.kt"); + doTest(fileName); + } + @TestMetadata("ShorterFirst.kt") public void testShorterFirst() throws Exception { String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/weighers/basic/parameterNameAndType/ShorterFirst.kt");