From 65f5dd1dd546ef23fe320e226e8f3f420ad9fdbe Mon Sep 17 00:00:00 2001
From: Valentin Kipyatkov <valentin@jetbrains.com>
Date: Thu, 14 Jan 2016 17:24:57 +0300
Subject: [PATCH] Got rid of special methods "applyTo" without editor parameter
 in intentions

---
 .../AddOperatorModifierIntention.kt           |  4 ---
 .../AnonymousFunctionToLambdaIntention.kt     |  6 +---
 .../ConvertAssertToIfWithThrowIntention.kt    |  6 ++--
 .../ConvertToStringTemplateIntention.kt       |  6 +---
 .../idea/intentions/IfNullToElvisIntention.kt |  7 +---
 .../MoveLambdaOutsideParenthesesIntention.kt  |  4 ---
 .../ObjectLiteralToLambdaIntention.kt         |  4 ---
 .../RemoveUnnecessaryParenthesesIntention.kt  |  4 ---
 .../idea/intentions/SimplifyForIntention.kt   |  4 ---
 ...implifyNegatedBinaryExpressionIntention.kt |  4 ---
 .../intentions/IfThenToElvisIntention.kt      | 11 +++---
 .../intentions/IfThenToSafeAccessIntention.kt | 11 +++---
 .../ReplaceGetOrSetIntention.kt               |  4 ---
 .../kotlin/idea/j2k/J2kPostProcessings.kt     | 36 +++++++++----------
 14 files changed, 33 insertions(+), 78 deletions(-)

diff --git a/idea/src/org/jetbrains/kotlin/idea/intentions/AddOperatorModifierIntention.kt b/idea/src/org/jetbrains/kotlin/idea/intentions/AddOperatorModifierIntention.kt
index dc9f9f0ca42..29d1eabc2bf 100644
--- a/idea/src/org/jetbrains/kotlin/idea/intentions/AddOperatorModifierIntention.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/intentions/AddOperatorModifierIntention.kt
@@ -33,10 +33,6 @@ class AddOperatorModifierIntention : SelfTargetingRangeIntention<KtNamedFunction
     }
 
     override fun applyTo(element: KtNamedFunction, editor: Editor?) {
-        applyTo(element)
-    }
-
-    fun applyTo(element: KtNamedFunction) {
         element.addModifier(KtTokens.OPERATOR_KEYWORD)
     }
 }
diff --git a/idea/src/org/jetbrains/kotlin/idea/intentions/AnonymousFunctionToLambdaIntention.kt b/idea/src/org/jetbrains/kotlin/idea/intentions/AnonymousFunctionToLambdaIntention.kt
index b3a52ec903d..b0230af7355 100644
--- a/idea/src/org/jetbrains/kotlin/idea/intentions/AnonymousFunctionToLambdaIntention.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/intentions/AnonymousFunctionToLambdaIntention.kt
@@ -48,10 +48,6 @@ class AnonymousFunctionToLambdaIntention : SelfTargetingRangeIntention<KtNamedFu
     }
 
     override fun applyTo(element: KtNamedFunction, editor: Editor?) {
-        applyTo(element)
-    }
-
-    fun applyTo(element: KtNamedFunction) {
         val commentSaver = CommentSaver(element)
         val returnSaver = ReturnSaver(element)
 
@@ -95,7 +91,7 @@ class AnonymousFunctionToLambdaIntention : SelfTargetingRangeIntention<KtNamedFu
 
         val moveLambdaOutsideParenthesesIntention = MoveLambdaOutsideParenthesesIntention()
         if (moveLambdaOutsideParenthesesIntention.isApplicableTo(callExpression, replaced.textOffset)) {
-            moveLambdaOutsideParenthesesIntention.applyTo(callExpression)
+            moveLambdaOutsideParenthesesIntention.applyTo(callExpression, editor)
         }
     }
 }
\ No newline at end of file
diff --git a/idea/src/org/jetbrains/kotlin/idea/intentions/ConvertAssertToIfWithThrowIntention.kt b/idea/src/org/jetbrains/kotlin/idea/intentions/ConvertAssertToIfWithThrowIntention.kt
index 6842854e1fe..fc8bf02eba3 100644
--- a/idea/src/org/jetbrains/kotlin/idea/intentions/ConvertAssertToIfWithThrowIntention.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/intentions/ConvertAssertToIfWithThrowIntention.kt
@@ -90,7 +90,7 @@ class ConvertAssertToIfWithThrowIntention : SelfTargetingIntention<KtCallExpress
         )
         assertionErrorCall.valueArguments.single().getArgumentExpression()!!.replace(message)
 
-        simplifyConditionIfPossible(ifExpression)
+        simplifyConditionIfPossible(ifExpression, editor)
     }
 
     private fun extractMessageSingleExpression(functionLiteral: KtLambdaExpression, bindingContext: BindingContext): KtExpression? {
@@ -105,11 +105,11 @@ class ConvertAssertToIfWithThrowIntention : SelfTargetingIntention<KtCallExpress
         return valParameters.size > 1 && !KotlinBuiltIns.isAny(valParameters[1].type)
     }
 
-    private fun simplifyConditionIfPossible(ifExpression: KtIfExpression) {
+    private fun simplifyConditionIfPossible(ifExpression: KtIfExpression, editor: Editor?) {
         val condition = ifExpression.condition as KtPrefixExpression
         val simplifier = SimplifyNegatedBinaryExpressionIntention()
         if (simplifier.isApplicableTo(condition)) {
-            simplifier.applyTo(condition)
+            simplifier.applyTo(condition, editor)
         }
     }
 
diff --git a/idea/src/org/jetbrains/kotlin/idea/intentions/ConvertToStringTemplateIntention.kt b/idea/src/org/jetbrains/kotlin/idea/intentions/ConvertToStringTemplateIntention.kt
index 592afcc6de8..5d09bcc0d17 100644
--- a/idea/src/org/jetbrains/kotlin/idea/intentions/ConvertToStringTemplateIntention.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/intentions/ConvertToStringTemplateIntention.kt
@@ -43,11 +43,7 @@ class ConvertToStringTemplateIntention : SelfTargetingOffsetIndependentIntention
     }
 
     override fun applyTo(element: KtBinaryExpression, editor: Editor?) {
-        applyTo(element)
-    }
-
-    fun applyTo(element: KtBinaryExpression): KtStringTemplateExpression {
-        return element.replaced(buildReplacement(element))
+        element.replaced(buildReplacement(element))
     }
 
     fun shouldSuggestToConvert(expression: KtBinaryExpression): Boolean {
diff --git a/idea/src/org/jetbrains/kotlin/idea/intentions/IfNullToElvisIntention.kt b/idea/src/org/jetbrains/kotlin/idea/intentions/IfNullToElvisIntention.kt
index 364f95dc3e6..b9ea92d4660 100644
--- a/idea/src/org/jetbrains/kotlin/idea/intentions/IfNullToElvisIntention.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/intentions/IfNullToElvisIntention.kt
@@ -48,11 +48,6 @@ class IfNullToElvisIntention : SelfTargetingRangeIntention<KtIfExpression>(KtIfE
     }
 
     override fun applyTo(element: KtIfExpression, editor: Editor?) {
-        val newElvis = applyTo(element)
-        editor?.caretModel?.moveToOffset(newElvis.right!!.textOffset)
-    }
-
-    fun applyTo(element: KtIfExpression): KtBinaryExpression {
         val (initializer, declaration, ifNullExpr) = calcData(element)!!
         val factory = KtPsiFactory(element)
 
@@ -77,7 +72,7 @@ class IfNullToElvisIntention : SelfTargetingRangeIntention<KtIfExpression>(KtIfE
             declaration.setType(explicitTypeToAdd)
         }
 
-        return newElvis
+        editor?.caretModel?.moveToOffset(newElvis.right!!.textOffset)
     }
 
     private data class Data(
diff --git a/idea/src/org/jetbrains/kotlin/idea/intentions/MoveLambdaOutsideParenthesesIntention.kt b/idea/src/org/jetbrains/kotlin/idea/intentions/MoveLambdaOutsideParenthesesIntention.kt
index 0840b3bbac6..9b384aed3d8 100644
--- a/idea/src/org/jetbrains/kotlin/idea/intentions/MoveLambdaOutsideParenthesesIntention.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/intentions/MoveLambdaOutsideParenthesesIntention.kt
@@ -60,8 +60,4 @@ class MoveLambdaOutsideParenthesesIntention : SelfTargetingIntention<KtCallExpre
     override fun applyTo(element: KtCallExpression, editor: Editor?) {
         element.moveFunctionLiteralOutsideParentheses()
     }
-
-    fun applyTo(element: KtCallExpression) {
-        element.moveFunctionLiteralOutsideParentheses()
-    }
 }
diff --git a/idea/src/org/jetbrains/kotlin/idea/intentions/ObjectLiteralToLambdaIntention.kt b/idea/src/org/jetbrains/kotlin/idea/intentions/ObjectLiteralToLambdaIntention.kt
index ecd089d61a1..cd6a59042fe 100644
--- a/idea/src/org/jetbrains/kotlin/idea/intentions/ObjectLiteralToLambdaIntention.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/intentions/ObjectLiteralToLambdaIntention.kt
@@ -82,10 +82,6 @@ class ObjectLiteralToLambdaIntention : SelfTargetingRangeIntention<KtObjectLiter
     }
 
     override fun applyTo(element: KtObjectLiteralExpression, editor: Editor?) {
-        applyTo(element)
-    }
-
-    fun applyTo(element: KtObjectLiteralExpression) {
         val commentSaver = CommentSaver(element)
 
         val (@Suppress("UNUSED_VARIABLE") baseTypeRef, baseType, singleFunction) = extractData(element)!!
diff --git a/idea/src/org/jetbrains/kotlin/idea/intentions/RemoveUnnecessaryParenthesesIntention.kt b/idea/src/org/jetbrains/kotlin/idea/intentions/RemoveUnnecessaryParenthesesIntention.kt
index 2338800c57d..74174219671 100644
--- a/idea/src/org/jetbrains/kotlin/idea/intentions/RemoveUnnecessaryParenthesesIntention.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/intentions/RemoveUnnecessaryParenthesesIntention.kt
@@ -29,10 +29,6 @@ class RemoveUnnecessaryParenthesesIntention : SelfTargetingRangeIntention<KtPare
     }
 
     override fun applyTo(element: KtParenthesizedExpression, editor: Editor?) {
-        applyTo(element)
-    }
-
-    fun applyTo(element: KtParenthesizedExpression) {
         element.replace(element.expression!!)
     }
 }
diff --git a/idea/src/org/jetbrains/kotlin/idea/intentions/SimplifyForIntention.kt b/idea/src/org/jetbrains/kotlin/idea/intentions/SimplifyForIntention.kt
index 442f544da96..82ce87a0461 100644
--- a/idea/src/org/jetbrains/kotlin/idea/intentions/SimplifyForIntention.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/intentions/SimplifyForIntention.kt
@@ -40,10 +40,6 @@ class SimplifyForIntention : SelfTargetingRangeIntention<KtForExpression>(
         "Simplify 'for'"
 ) {
     override fun applyTo(element: KtForExpression, editor: Editor?) {
-        applyTo(element)
-    }
-
-    fun applyTo(element: KtForExpression) {
         val (propertiesToRemove, removeSelectorInLoopRange) = collectPropertiesToRemove(element) ?: return
 
         val loopRange = element.loopRange ?: return
diff --git a/idea/src/org/jetbrains/kotlin/idea/intentions/SimplifyNegatedBinaryExpressionIntention.kt b/idea/src/org/jetbrains/kotlin/idea/intentions/SimplifyNegatedBinaryExpressionIntention.kt
index 0cf31cd3dc7..de9e8782594 100644
--- a/idea/src/org/jetbrains/kotlin/idea/intentions/SimplifyNegatedBinaryExpressionIntention.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/intentions/SimplifyNegatedBinaryExpressionIntention.kt
@@ -69,10 +69,6 @@ class SimplifyNegatedBinaryExpressionIntention : SelfTargetingRangeIntention<KtP
     }
 
     override fun applyTo(element: KtPrefixExpression, editor: Editor?) {
-        applyTo(element)
-    }
-
-    fun applyTo(element: KtPrefixExpression) {
         val expression = KtPsiUtil.deparenthesize(element.baseExpression)!!
         val operation = (expression as KtOperationExpression).operationReference.getReferencedNameElementType().negate()!!.value
 
diff --git a/idea/src/org/jetbrains/kotlin/idea/intentions/branchedTransformations/intentions/IfThenToElvisIntention.kt b/idea/src/org/jetbrains/kotlin/idea/intentions/branchedTransformations/intentions/IfThenToElvisIntention.kt
index 9d07951ec31..6a9c7ae7f9f 100644
--- a/idea/src/org/jetbrains/kotlin/idea/intentions/branchedTransformations/intentions/IfThenToElvisIntention.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/intentions/branchedTransformations/intentions/IfThenToElvisIntention.kt
@@ -57,11 +57,6 @@ class IfThenToElvisIntention : SelfTargetingOffsetIndependentIntention<KtIfExpre
     }
 
     override fun applyTo(element: KtIfExpression, editor: Editor?) {
-        val elvis = applyTo(element)
-        elvis.inlineLeftSideIfApplicableWithPrompt(editor)
-    }
-
-    fun applyTo(element: KtIfExpression): KtBinaryExpression {
         val condition = element.condition as KtBinaryExpression
 
         val thenClause = element.then!!
@@ -77,6 +72,10 @@ class IfThenToElvisIntention : SelfTargetingOffsetIndependentIntention<KtIfExpre
                 }
 
         val newExpr = element.replaced(KtPsiFactory(element).createExpressionByPattern("$0 ?: $1", left, right))
-        return KtPsiUtil.deparenthesize(newExpr) as KtBinaryExpression
+        val elvis = KtPsiUtil.deparenthesize(newExpr) as KtBinaryExpression
+
+        if (editor != null) {
+            elvis.inlineLeftSideIfApplicableWithPrompt(editor)
+        }
     }
 }
diff --git a/idea/src/org/jetbrains/kotlin/idea/intentions/branchedTransformations/intentions/IfThenToSafeAccessIntention.kt b/idea/src/org/jetbrains/kotlin/idea/intentions/branchedTransformations/intentions/IfThenToSafeAccessIntention.kt
index 39338829bc7..7adb1e6fc41 100644
--- a/idea/src/org/jetbrains/kotlin/idea/intentions/branchedTransformations/intentions/IfThenToSafeAccessIntention.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/intentions/branchedTransformations/intentions/IfThenToSafeAccessIntention.kt
@@ -51,11 +51,6 @@ class IfThenToSafeAccessIntention : SelfTargetingOffsetIndependentIntention<KtIf
     }
 
     override fun applyTo(element: KtIfExpression, editor: Editor?) {
-        val safeAccessExpr = applyTo(element)
-        safeAccessExpr.inlineReceiverIfApplicableWithPrompt(editor)
-    }
-
-    fun applyTo(element: KtIfExpression): KtSafeQualifiedExpression {
         val condition = element.condition as KtBinaryExpression
         val receiverExpression = condition.expressionComparedToNull()!!
 
@@ -69,7 +64,11 @@ class IfThenToSafeAccessIntention : SelfTargetingOffsetIndependentIntention<KtIf
                 }
 
         val newExpr = KtPsiFactory(element).createExpressionByPattern("$0?.$1", receiverExpression, selectorExpression) as KtSafeQualifiedExpression
-        return element.replaced(newExpr)
+        val safeAccessExpr = element.replaced(newExpr)
+
+        if (editor != null) {
+            safeAccessExpr.inlineReceiverIfApplicableWithPrompt(editor)
+        }
     }
 
     private fun clauseContainsAppropriateDotQualifiedExpression(clause: KtExpression, receiverExpression: KtExpression)
diff --git a/idea/src/org/jetbrains/kotlin/idea/intentions/conventionNameCalls/ReplaceGetOrSetIntention.kt b/idea/src/org/jetbrains/kotlin/idea/intentions/conventionNameCalls/ReplaceGetOrSetIntention.kt
index 291a39c495b..3d9dbc1f161 100644
--- a/idea/src/org/jetbrains/kotlin/idea/intentions/conventionNameCalls/ReplaceGetOrSetIntention.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/intentions/conventionNameCalls/ReplaceGetOrSetIntention.kt
@@ -87,10 +87,6 @@ class ReplaceGetOrSetIntention : SelfTargetingRangeIntention<KtDotQualifiedExpre
     }
 
     override fun applyTo(element: KtDotQualifiedExpression, editor: Editor?) {
-        applyTo(element)
-    }
-
-    fun applyTo(element: KtDotQualifiedExpression) {
         val isSet = element.toResolvedCall(BodyResolveMode.PARTIAL)!!.resultingDescriptor.name == OperatorNameConventions.SET
         val allArguments = element.callExpression!!.valueArguments
         assert(allArguments.isNotEmpty())
diff --git a/idea/src/org/jetbrains/kotlin/idea/j2k/J2kPostProcessings.kt b/idea/src/org/jetbrains/kotlin/idea/j2k/J2kPostProcessings.kt
index 6d985e3d7cc..582cbcdecf7 100644
--- a/idea/src/org/jetbrains/kotlin/idea/j2k/J2kPostProcessings.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/j2k/J2kPostProcessings.kt
@@ -56,17 +56,17 @@ object J2KPostProcessingRegistrar {
         _processings.add(RemoveRedundantSamAdaptersProcessing())
         _processings.add(AccessorBodyToExpression())
 
-        registerIntentionBasedProcessing(IfThenToSafeAccessIntention()) { applyTo(it) }
-        registerIntentionBasedProcessing(IfThenToElvisIntention()) { applyTo(it) }
-        registerIntentionBasedProcessing(IfNullToElvisIntention()) { applyTo(it) }
-        registerIntentionBasedProcessing(SimplifyNegatedBinaryExpressionIntention()) { applyTo(it) }
-        registerIntentionBasedProcessing(ReplaceGetOrSetIntention(), additionalChecker = ReplaceGetOrSetInspection.additionalChecker) { applyTo(it) }
-        registerIntentionBasedProcessing(AddOperatorModifierIntention()) { applyTo(it) }
-        registerIntentionBasedProcessing(ObjectLiteralToLambdaIntention()) { applyTo(it) }
-        registerIntentionBasedProcessing(AnonymousFunctionToLambdaIntention()) { applyTo(it) }
-        registerIntentionBasedProcessing(RemoveUnnecessaryParenthesesIntention()) { applyTo(it) }
-        registerIntentionBasedProcessing(SimplifyForIntention()) { applyTo(it) }
-        registerIntentionBasedProcessing(SimplifyAssertNotNullIntention()) { applyTo(it, null) }
+        registerIntentionBasedProcessing(IfThenToSafeAccessIntention())
+        registerIntentionBasedProcessing(IfThenToElvisIntention())
+        registerIntentionBasedProcessing(IfNullToElvisIntention())
+        registerIntentionBasedProcessing(SimplifyNegatedBinaryExpressionIntention())
+        registerIntentionBasedProcessing(ReplaceGetOrSetIntention(), additionalChecker = ReplaceGetOrSetInspection.additionalChecker)
+        registerIntentionBasedProcessing(AddOperatorModifierIntention())
+        registerIntentionBasedProcessing(ObjectLiteralToLambdaIntention())
+        registerIntentionBasedProcessing(AnonymousFunctionToLambdaIntention())
+        registerIntentionBasedProcessing(RemoveUnnecessaryParenthesesIntention())
+        registerIntentionBasedProcessing(SimplifyForIntention())
+        registerIntentionBasedProcessing(SimplifyAssertNotNullIntention())
 
         registerDiagnosticBasedProcessing<KtBinaryExpressionWithTypeRHS>(Errors.USELESS_CAST) { element, diagnostic ->
             val expression = RemoveUselessCastFix.invoke(element)
@@ -106,17 +106,15 @@ object J2KPostProcessingRegistrar {
     }
 
     private inline fun <reified TElement : KtElement, TIntention: SelfTargetingRangeIntention<TElement>> registerIntentionBasedProcessing(
-            intention: TIntention,
-            crossinline apply: TIntention.(TElement) -> Unit
+            intention: TIntention
     ) {
         //TODO: replace with optional argument when supported for inline functions
-        return registerIntentionBasedProcessing<TElement, TIntention>(intention, { true }, apply)
+        return registerIntentionBasedProcessing<TElement, TIntention>(intention, { true })
     }
 
     private inline fun <reified TElement : KtElement, TIntention: SelfTargetingRangeIntention<TElement>> registerIntentionBasedProcessing(
             intention: TIntention,
-            noinline additionalChecker: (TElement) -> Boolean,
-            crossinline apply: TIntention.(TElement) -> Unit
+            noinline additionalChecker: (TElement) -> Boolean
     ) {
         _processings.add(object : J2kPostProcessing {
             override fun createAction(element: KtElement, diagnostics: Diagnostics): (() -> Unit)? {
@@ -124,7 +122,7 @@ object J2KPostProcessingRegistrar {
                 val tElement = element as TElement
                 if (intention.applicabilityRange(tElement) == null) return null
                 if (!additionalChecker(tElement)) return null
-                return { intention.apply(element) }
+                return { intention.applyTo(element, null) }
             }
         })
     }
@@ -172,7 +170,7 @@ object J2KPostProcessingRegistrar {
             if (element !is KtCallExpression) return null
             val literalArgument = element.valueArguments.lastOrNull()?.getArgumentExpression()?.unpackFunctionLiteral() ?: return null
             if (!intention.isApplicableTo(element, literalArgument.textOffset)) return null
-            return { intention.applyTo(element) }
+            return { intention.applyTo(element, null) }
         }
     }
 
@@ -181,7 +179,7 @@ object J2KPostProcessingRegistrar {
 
         override fun createAction(element: KtElement, diagnostics: Diagnostics): (() -> Unit)? {
             if (element is KtBinaryExpression && intention.isApplicableTo(element) && intention.shouldSuggestToConvert(element)) {
-                return { intention.applyTo(element) }
+                return { intention.applyTo(element, null) }
             }
             else {
                 return null