From 8fad4db8ce486777578636444be3c2ba4c06b9ac Mon Sep 17 00:00:00 2001 From: Nikolay Krasko Date: Fri, 19 Oct 2018 01:39:36 +0300 Subject: [PATCH] Auto-popup lambda type parameter info (KT-28401) #KT-28401 Fixed --- .../idea/completion/handlers/KotlinFunctionInsertHandler.kt | 4 +--- .../org/jetbrains/kotlin/idea/editor/KotlinTypedHandler.java | 1 + 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/idea/idea-completion/src/org/jetbrains/kotlin/idea/completion/handlers/KotlinFunctionInsertHandler.kt b/idea/idea-completion/src/org/jetbrains/kotlin/idea/completion/handlers/KotlinFunctionInsertHandler.kt index b42da892fda..cfe4a0dfae9 100644 --- a/idea/idea-completion/src/org/jetbrains/kotlin/idea/completion/handlers/KotlinFunctionInsertHandler.kt +++ b/idea/idea-completion/src/org/jetbrains/kotlin/idea/completion/handlers/KotlinFunctionInsertHandler.kt @@ -179,9 +179,7 @@ sealed class KotlinFunctionInsertHandler(callType: CallType<*>) : KotlinCallable if (!insertTypeArguments) { if (shouldPlaceCaretInBrackets(completionChar) || closeBracketOffset == null) { editor.caretModel.moveToOffset(openingBracketOffset + 1 + inBracketsShift) - if (!insertLambda) { - AutoPopupController.getInstance(project)?.autoPopupParameterInfo(editor, offsetElement) - } + AutoPopupController.getInstance(project)?.autoPopupParameterInfo(editor, offsetElement) } else { editor.caretModel.moveToOffset(closeBracketOffset + 1) } diff --git a/idea/src/org/jetbrains/kotlin/idea/editor/KotlinTypedHandler.java b/idea/src/org/jetbrains/kotlin/idea/editor/KotlinTypedHandler.java index 92e1d2bb845..1552b69f038 100644 --- a/idea/src/org/jetbrains/kotlin/idea/editor/KotlinTypedHandler.java +++ b/idea/src/org/jetbrains/kotlin/idea/editor/KotlinTypedHandler.java @@ -100,6 +100,7 @@ public class KotlinTypedHandler extends TypedHandlerDelegate { } if (iterator.atEnd() || !(SUPPRESS_AUTO_INSERT_CLOSE_BRACE_AFTER.contains(iterator.getTokenType()))) { + AutoPopupController.getInstance(project).autoPopupParameterInfo(editor, null); return Result.CONTINUE; }