From 828a7de9808f5c91ab71df22a1669331f4e8fcf8 Mon Sep 17 00:00:00 2001
From: Kirill Rakhman <kirill.rakhman@gmail.com>
Date: Wed, 9 Mar 2016 12:35:48 +0100
Subject: [PATCH] Simplify logic for last lambda fixer and set caret directly
 in first pass

---
 .../fixers/KotlinLastLambdaParameterFixer.kt  | 21 +++----------------
 .../codeInsight/smartEnter/SmartEnterTest.kt  |  6 +++---
 2 files changed, 6 insertions(+), 21 deletions(-)

diff --git a/idea/src/org/jetbrains/kotlin/idea/editor/fixers/KotlinLastLambdaParameterFixer.kt b/idea/src/org/jetbrains/kotlin/idea/editor/fixers/KotlinLastLambdaParameterFixer.kt
index 0883303316d..ef8107f50c3 100644
--- a/idea/src/org/jetbrains/kotlin/idea/editor/fixers/KotlinLastLambdaParameterFixer.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/editor/fixers/KotlinLastLambdaParameterFixer.kt
@@ -19,11 +19,9 @@ package org.jetbrains.kotlin.idea.editor.fixers
 import com.intellij.lang.SmartEnterProcessorWithFixers
 import com.intellij.openapi.editor.Editor
 import com.intellij.psi.PsiElement
-import com.intellij.psi.impl.source.tree.LeafPsiElement
 import org.jetbrains.kotlin.builtins.KotlinBuiltIns
 import org.jetbrains.kotlin.idea.caches.resolve.analyze
 import org.jetbrains.kotlin.idea.editor.KotlinSmartEnterHandler
-import org.jetbrains.kotlin.lexer.KtTokens
 import org.jetbrains.kotlin.psi.KtCallExpression
 import org.jetbrains.kotlin.psi.psiUtil.endOffset
 import org.jetbrains.kotlin.resolve.calls.callUtil.getResolvedCall
@@ -31,15 +29,8 @@ import org.jetbrains.kotlin.resolve.lazy.BodyResolveMode
 
 class KotlinLastLambdaParameterFixer : SmartEnterProcessorWithFixers.Fixer<KotlinSmartEnterHandler>() {
     override fun apply(editor: Editor, processor: KotlinSmartEnterHandler, element: PsiElement) {
-        if (element is KtCallExpression) {
-            addBracesIfNecessary(editor, element, processor)
-        }
-        else if (element is LeafPsiElement) {
-            registerErrorIfNecessary(element, processor)
-        }
-    }
+        if (element !is KtCallExpression) return
 
-    private fun addBracesIfNecessary(editor: Editor, element: KtCallExpression, processor: KotlinSmartEnterHandler) {
         val bindingContext = element.analyze(BodyResolveMode.PARTIAL)
         val resolvedCall = element.getResolvedCall(bindingContext) ?: return
 
@@ -56,16 +47,10 @@ class KotlinLastLambdaParameterFixer : SmartEnterProcessorWithFixers.Fixer<Kotli
                     offset++
                 }
 
-                doc.insertString(offset, "{  }")
+                doc.insertString(offset, "{ }")
                 processor.registerUnresolvedError(offset + 2)
+                processor.commit(editor)
             }
         }
     }
-
-    private fun registerErrorIfNecessary(element: LeafPsiElement, processor: KotlinSmartEnterHandler) {
-        if(element.elementType != KtTokens.LBRACE) return
-        if(element.parent?.parent?.parent?.parent !is KtCallExpression) return
-
-        processor.registerUnresolvedError(element.endOffset + 1)
-    }
 }
\ No newline at end of file
diff --git a/idea/tests/org/jetbrains/kotlin/idea/codeInsight/smartEnter/SmartEnterTest.kt b/idea/tests/org/jetbrains/kotlin/idea/codeInsight/smartEnter/SmartEnterTest.kt
index 6b68cf7f1b8..9a9f5bf3d2c 100644
--- a/idea/tests/org/jetbrains/kotlin/idea/codeInsight/smartEnter/SmartEnterTest.kt
+++ b/idea/tests/org/jetbrains/kotlin/idea/codeInsight/smartEnter/SmartEnterTest.kt
@@ -1294,12 +1294,12 @@ class SmartEnterTest : KotlinLightCodeInsightFixtureTestCase() {
             fun foo(a: Any, block: () -> Unit) {
             }
             fun test() {
-                foo(Any()) { <caret> }
+                foo(Any()) { <caret>}
             }
             """
     )
 
-    fun testExtensionLambdaParamImplicit1() = doFileTest(
+    fun testExtensionLambdaParam() = doFileTest(
             """
             fun foo(a: Any, block: Any.() -> Unit) {
             }
@@ -1312,7 +1312,7 @@ class SmartEnterTest : KotlinLightCodeInsightFixtureTestCase() {
             fun foo(a: Any, block: Any.() -> Unit) {
             }
             fun test() {
-                foo(Any()) { <caret> }
+                foo(Any()) { <caret>}
             }
             """
     )