From 32cecf5a4cf67e412484b04115169b3d3cd8a7cc Mon Sep 17 00:00:00 2001 From: Valentin Kipyatkov Date: Thu, 20 Aug 2015 16:29:15 +0300 Subject: [PATCH] KT-8828 Parameter name and type completion should not pop up when typing-in parameter name in template mode #KT-8828 Fixed --- .../jetbrains/kotlin/idea/completion/BasicCompletionSession.kt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/idea/idea-completion/src/org/jetbrains/kotlin/idea/completion/BasicCompletionSession.kt b/idea/idea-completion/src/org/jetbrains/kotlin/idea/completion/BasicCompletionSession.kt index 8c8b056abfa..0f553b68b6a 100644 --- a/idea/idea-completion/src/org/jetbrains/kotlin/idea/completion/BasicCompletionSession.kt +++ b/idea/idea-completion/src/org/jetbrains/kotlin/idea/completion/BasicCompletionSession.kt @@ -20,6 +20,7 @@ import com.intellij.codeInsight.completion.CompletionParameters import com.intellij.codeInsight.completion.CompletionResultSet import com.intellij.codeInsight.completion.CompletionSorter import com.intellij.codeInsight.completion.CompletionType +import com.intellij.codeInsight.template.TemplateManager import com.intellij.patterns.PatternCondition import com.intellij.patterns.StandardPatterns import com.intellij.psi.JavaPsiFacade @@ -163,7 +164,7 @@ class BasicCompletionSession(configuration: CompletionSessionConfiguration, } if (completionKind == CompletionKind.PARAMETER_NAME || completionKind == CompletionKind.ANNOTATION_TYPES_OR_PARAMETER_NAME) { - if (!shouldCompleteParameterNameAndType()) { + if (!shouldCompleteParameterNameAndType() || TemplateManager.getInstance(project).getActiveTemplate(parameters.editor) != null) { return true } }