From 448c3008f5d5019b2a2531452f4b51ab8d769ccb Mon Sep 17 00:00:00 2001 From: Valentin Kipyatkov Date: Tue, 29 Jul 2014 22:21:30 +0400 Subject: [PATCH] Completion: moved sorting to another package and renamed --- .../{weigher/JetCompletionSorting.kt => CompletionSorting.kt} | 4 ++-- .../jet/plugin/completion/JetKeywordCompletionContributor.kt | 3 +-- .../jet/plugin/completion/KotlinNamedParametersContributor.kt | 3 +-- 3 files changed, 4 insertions(+), 6 deletions(-) rename idea/src/org/jetbrains/jet/plugin/completion/{weigher/JetCompletionSorting.kt => CompletionSorting.kt} (97%) diff --git a/idea/src/org/jetbrains/jet/plugin/completion/weigher/JetCompletionSorting.kt b/idea/src/org/jetbrains/jet/plugin/completion/CompletionSorting.kt similarity index 97% rename from idea/src/org/jetbrains/jet/plugin/completion/weigher/JetCompletionSorting.kt rename to idea/src/org/jetbrains/jet/plugin/completion/CompletionSorting.kt index 656365366e4..a64573fd453 100644 --- a/idea/src/org/jetbrains/jet/plugin/completion/weigher/JetCompletionSorting.kt +++ b/idea/src/org/jetbrains/jet/plugin/completion/CompletionSorting.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.plugin.completion.weigher +package org.jetbrains.jet.plugin.completion import com.intellij.codeInsight.completion.CompletionResultSet import com.intellij.codeInsight.completion.CompletionParameters @@ -34,7 +34,7 @@ import org.jetbrains.jet.lang.resolve.name.isValidJavaFqName import org.jetbrains.jet.lang.resolve.ImportPath import org.jetbrains.jet.plugin.quickfix.ImportInsertHelper -public fun CompletionResultSet.addJetSorting(parameters: CompletionParameters): CompletionResultSet { +public fun CompletionResultSet.addKotlinSorting(parameters: CompletionParameters): CompletionResultSet { var sorter = CompletionSorter.defaultSorter(parameters, getPrefixMatcher())!! sorter = sorter.weighBefore("stats", PriorityWeigher, KindWeigher) diff --git a/idea/src/org/jetbrains/jet/plugin/completion/JetKeywordCompletionContributor.kt b/idea/src/org/jetbrains/jet/plugin/completion/JetKeywordCompletionContributor.kt index a0b5e4e2630..5c3ba069f7b 100644 --- a/idea/src/org/jetbrains/jet/plugin/completion/JetKeywordCompletionContributor.kt +++ b/idea/src/org/jetbrains/jet/plugin/completion/JetKeywordCompletionContributor.kt @@ -36,7 +36,6 @@ import com.intellij.openapi.util.text.StringUtil import com.intellij.codeInsight.completion.* import org.jetbrains.jet.plugin.completion.handlers.JetFunctionInsertHandler import org.jetbrains.jet.plugin.completion.handlers.JetKeywordInsertHandler -import org.jetbrains.jet.plugin.completion.weigher.addJetSorting import com.intellij.util.ProcessingContext import com.intellij.codeInsight.lookup.LookupElementBuilder import com.intellij.psi.filters.position.FilterPattern @@ -285,7 +284,7 @@ public open class JetKeywordCompletionContributor() : CompletionContributor() { } override fun addCompletions(parameters: CompletionParameters, context: ProcessingContext?, result: CompletionResultSet) { - result.addJetSorting(parameters).withPrefixMatcher(SimplePrefixMatcher(result.getPrefixMatcher().getPrefix())).addAllElements(elements) + result.addKotlinSorting(parameters).withPrefixMatcher(SimplePrefixMatcher(result.getPrefixMatcher().getPrefix())).addAllElements(elements) } override fun toString() : String = debugName diff --git a/idea/src/org/jetbrains/jet/plugin/completion/KotlinNamedParametersContributor.kt b/idea/src/org/jetbrains/jet/plugin/completion/KotlinNamedParametersContributor.kt index 1aa8d08717c..f7a199c1e21 100644 --- a/idea/src/org/jetbrains/jet/plugin/completion/KotlinNamedParametersContributor.kt +++ b/idea/src/org/jetbrains/jet/plugin/completion/KotlinNamedParametersContributor.kt @@ -32,7 +32,6 @@ import org.jetbrains.jet.lang.descriptors.FunctionDescriptor import com.intellij.codeInsight.lookup.LookupElementBuilder import org.jetbrains.jet.plugin.JetIcons import org.jetbrains.jet.lang.resolve.name.Name -import org.jetbrains.jet.plugin.completion.weigher.addJetSorting import org.jetbrains.jet.plugin.quickfix.QuickFixUtil import org.jetbrains.jet.renderer.DescriptorRenderer import com.intellij.codeInsight.completion.InsertHandler @@ -75,7 +74,7 @@ public class KotlinNamedParametersContributor : CompletionContributor() { val callElement = PsiTreeUtil.getParentOfType(valueArgument, javaClass()) ?: return val callSimpleName = callElement.getCallNameExpression() ?: return - val kotlinResultSet = result.addJetSorting(parameters) + val kotlinResultSet = result.addKotlinSorting(parameters) val callReference = callSimpleName.getReference() as JetReference