From e624f2c136988ae7020ca56d3df162d0fed271b4 Mon Sep 17 00:00:00 2001
From: Ilya Kirillov <ilya.kirillov@jetbrains.com>
Date: Mon, 10 May 2021 18:09:54 +0200
Subject: [PATCH] FIR IDE: do not pass resultSet in
 KotlinWithNameReferenceCompletionProvider as it is already available

---
 .../contributors/FirKeywordCompletionContributor.kt           | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/idea/idea-fir/src/org/jetbrains/kotlin/idea/completion/contributors/FirKeywordCompletionContributor.kt b/idea/idea-fir/src/org/jetbrains/kotlin/idea/completion/contributors/FirKeywordCompletionContributor.kt
index 0f5cf816963..5dec650da39 100644
--- a/idea/idea-fir/src/org/jetbrains/kotlin/idea/completion/contributors/FirKeywordCompletionContributor.kt
+++ b/idea/idea-fir/src/org/jetbrains/kotlin/idea/completion/contributors/FirKeywordCompletionContributor.kt
@@ -14,6 +14,7 @@ import org.jetbrains.kotlin.idea.completion.context.FirBasicCompletionContext
 import org.jetbrains.kotlin.idea.completion.context.FirNameReferencePositionContext
 import org.jetbrains.kotlin.idea.completion.context.FirPositionCompletionContext
 import org.jetbrains.kotlin.idea.completion.context.FirUnknownPositionContext
+import org.jetbrains.kotlin.idea.completion.contributors.keywords.OverrideKeywordHandler
 import org.jetbrains.kotlin.idea.completion.contributors.keywords.ReturnKeywordHandler
 import org.jetbrains.kotlin.idea.frontend.api.KtAnalysisSession
 import org.jetbrains.kotlin.platform.jvm.isJvm
@@ -72,7 +73,8 @@ internal class FirKeywordCompletionContributor(basicContext: FirBasicCompletionC
 
 private object ResolveDependentCompletionKeywordHandlers {
     val handlers = CompletionKeywordHandlers(
-        ReturnKeywordHandler
+        ReturnKeywordHandler,
+        OverrideKeywordHandler,
     )
 }