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

Completion: moved sorting to another package and renamed

Browse Source
This commit is contained in:
Valentin Kipyatkov
2014-07-29 22:21:30 +04:00
parent 752a6cef0d
commit 448c3008f5
3 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/src/org/jetbrains/jet/plugin/completion/weigher/JetCompletionSorting.kt → idea/src/org/jetbrains/jet/plugin/completion/CompletionSorting.kt
+2 -2
View File
@@ -14,7 +14,7 @@
* limitations under the License. * 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.CompletionResultSet
import com.intellij.codeInsight.completion.CompletionParameters 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.lang.resolve.ImportPath
import org.jetbrains.jet.plugin.quickfix.ImportInsertHelper 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())!! var sorter = CompletionSorter.defaultSorter(parameters, getPrefixMatcher())!!
sorter = sorter.weighBefore("stats", PriorityWeigher, KindWeigher) sorter = sorter.weighBefore("stats", PriorityWeigher, KindWeigher)
idea/src/org/jetbrains/jet/plugin/completion/JetKeywordCompletionContributor.kt
+1 -2
View File
@@ -36,7 +36,6 @@ import com.intellij.openapi.util.text.StringUtil
import com.intellij.codeInsight.completion.* import com.intellij.codeInsight.completion.*
import org.jetbrains.jet.plugin.completion.handlers.JetFunctionInsertHandler import org.jetbrains.jet.plugin.completion.handlers.JetFunctionInsertHandler
import org.jetbrains.jet.plugin.completion.handlers.JetKeywordInsertHandler import org.jetbrains.jet.plugin.completion.handlers.JetKeywordInsertHandler
import org.jetbrains.jet.plugin.completion.weigher.addJetSorting
import com.intellij.util.ProcessingContext import com.intellij.util.ProcessingContext
import com.intellij.codeInsight.lookup.LookupElementBuilder import com.intellij.codeInsight.lookup.LookupElementBuilder
import com.intellij.psi.filters.position.FilterPattern 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) { 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 override fun toString() : String = debugName
idea/src/org/jetbrains/jet/plugin/completion/KotlinNamedParametersContributor.kt
+1 -2
View File
@@ -32,7 +32,6 @@ import org.jetbrains.jet.lang.descriptors.FunctionDescriptor
import com.intellij.codeInsight.lookup.LookupElementBuilder import com.intellij.codeInsight.lookup.LookupElementBuilder
import org.jetbrains.jet.plugin.JetIcons import org.jetbrains.jet.plugin.JetIcons
import org.jetbrains.jet.lang.resolve.name.Name 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.plugin.quickfix.QuickFixUtil
import org.jetbrains.jet.renderer.DescriptorRenderer import org.jetbrains.jet.renderer.DescriptorRenderer
import com.intellij.codeInsight.completion.InsertHandler import com.intellij.codeInsight.completion.InsertHandler
@@ -75,7 +74,7 @@ public class KotlinNamedParametersContributor : CompletionContributor() {
val callElement = PsiTreeUtil.getParentOfType(valueArgument, javaClass<JetCallElement>()) ?: return val callElement = PsiTreeUtil.getParentOfType(valueArgument, javaClass<JetCallElement>()) ?: return
val callSimpleName = callElement.getCallNameExpression() ?: return val callSimpleName = callElement.getCallNameExpression() ?: return
val kotlinResultSet = result.addJetSorting(parameters) val kotlinResultSet = result.addKotlinSorting(parameters)
val callReference = callSimpleName.getReference() as JetReference val callReference = callSimpleName.getReference() as JetReference