ReplaceWithTraditionalAssignmentIntention - smaller range

idea/src/org/jetbrains/kotlin/idea/intentions/ReplaceWithTraditionalAssignmentIntention.kt

@@ -22,11 +22,12 @@ import org.jetbrains.kotlin.psi.JetBinaryExpression
 import org.jetbrains.kotlin.psi.JetPsiFactory
 import org.jetbrains.kotlin.psi.JetSimpleNameExpression
 
-public class ReplaceWithTraditionalAssignmentIntention : JetSelfTargetingOffsetIndependentIntention<JetBinaryExpression>(javaClass(), "Replace with traditional assignment") {
+public class ReplaceWithTraditionalAssignmentIntention : JetSelfTargetingIntention<JetBinaryExpression>(javaClass(), "Replace with traditional assignment") {
-    override fun isApplicableTo(element: JetBinaryExpression): Boolean {
+    override fun isApplicableTo(element: JetBinaryExpression, caretOffset: Int): Boolean {
-        return element.getOperationToken() in JetTokens.AUGMENTED_ASSIGNMENTS
+        if (element.getOperationToken() !in JetTokens.AUGMENTED_ASSIGNMENTS) return false
-               && element.getLeft() is JetSimpleNameExpression
+        if (element.getLeft() !is JetSimpleNameExpression) return false
-               && element.getRight() != null
+        if (element.getRight() == null) return false
+        return element.getOperationReference().getTextRange().containsOffset(caretOffset)
     }
 
     override fun applyTo(element: JetBinaryExpression, editor: Editor) {

idea/testData/intentions/replaceWithTraditionalAssignment/complexRightExpression.kt

@@ -2,5 +2,5 @@ fun foo() {
     var x = 0
     val a = 1
     val b = 1
-    <caret>x += a / b
+    x <caret>+= a / b
 }

idea/testData/intentions/replaceWithTraditionalAssignment/nonAssignmentExpression.kt

@@ -1,5 +1,5 @@
 // IS_APPLICABLE: false
 fun foo() {
     var x = 0
-    <caret>x + 1
+    x <caret>+ 1
 }

idea/testData/intentions/replaceWithTraditionalAssignment/nonAugmentedAssign.kt

@@ -3,5 +3,5 @@ fun foo() {
     var x = 0
     val a = 1
     val b = 1
-    <caret>x = a / b
+    x <caret>= a / b
 }

idea/testData/intentions/replaceWithTraditionalAssignment/simple.kt

@@ -1,4 +1,4 @@
 fun foo() {
     var x = 0
-    <caret>x += 1
+    x <caret>+= 1
 }

idea/testData/intentions/replaceWithTraditionalAssignment/simple.kt.after

@@ -1,4 +1,4 @@
 fun foo() {
     var x = 0
-    <caret>x = x + 1
+    x <caret>= x + 1
 }