From 6dca9a45582da02deb34de6790052765407e4824 Mon Sep 17 00:00:00 2001 From: Valentin Kipyatkov Date: Thu, 3 Sep 2015 16:32:35 +0300 Subject: [PATCH] Auto-popup completion remebers cancellation for parameter name/type completion only --- .../kotlin/idea/completion/BasicCompletionSession.kt | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) 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 9b9032d5eef..5ccaaf4569e 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 @@ -165,14 +165,14 @@ class BasicCompletionSession(configuration: CompletionSessionConfiguration, } public fun shouldDisableAutoPopup(): Boolean { - if (LookupCancelWatcher.getInstance(project).wasAutoPopupRecentlyCancelled(parameters.editor, position.startOffset)) { - return true - } - if (completionKind == CompletionKind.PARAMETER_NAME || completionKind == CompletionKind.ANNOTATION_TYPES_OR_PARAMETER_NAME) { if (!shouldCompleteParameterNameAndType() || TemplateManager.getInstance(project).getActiveTemplate(parameters.editor) != null) { return true } + + if (LookupCancelWatcher.getInstance(project).wasAutoPopupRecentlyCancelled(parameters.editor, position.startOffset)) { + return true + } } return false