From 7b063d03916ccbea6725647521049b6d76c43d8a Mon Sep 17 00:00:00 2001 From: Valentin Kipyatkov Date: Fri, 2 Oct 2015 22:25:15 +0300 Subject: [PATCH] Completion: lower priority for override member items #KT-9403 Fixed --- .../src/org/jetbrains/kotlin/idea/completion/CompletionUtils.kt | 2 +- .../org/jetbrains/kotlin/idea/completion/OverridesCompletion.kt | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/idea/idea-completion/src/org/jetbrains/kotlin/idea/completion/CompletionUtils.kt b/idea/idea-completion/src/org/jetbrains/kotlin/idea/completion/CompletionUtils.kt index 227a4700b90..e64042f950e 100644 --- a/idea/idea-completion/src/org/jetbrains/kotlin/idea/completion/CompletionUtils.kt +++ b/idea/idea-completion/src/org/jetbrains/kotlin/idea/completion/CompletionUtils.kt @@ -68,7 +68,7 @@ tailrec fun LookupElement.getUserDataDeep(key: Key): T? { enum class ItemPriority { DEFAULT, - BACKING_FIELD, + OVERRIDE, NAMED_PARAMETER } diff --git a/idea/idea-completion/src/org/jetbrains/kotlin/idea/completion/OverridesCompletion.kt b/idea/idea-completion/src/org/jetbrains/kotlin/idea/completion/OverridesCompletion.kt index a94e3903fa7..85a8eaac5bf 100644 --- a/idea/idea-completion/src/org/jetbrains/kotlin/idea/completion/OverridesCompletion.kt +++ b/idea/idea-completion/src/org/jetbrains/kotlin/idea/completion/OverridesCompletion.kt @@ -124,6 +124,8 @@ class OverridesCompletion( } } + lookupElement.assignPriority(ItemPriority.OVERRIDE) + collector.addElement(lookupElement) } }