i18n fix assignment: detect concatenations in rOperand

GitOrigin-RevId: 62ff07771c6b55807cddee1c0e514540c0b258d7

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/i18nize/afterAssignment.java

@@ -0,0 +1,6 @@
+class a {
+  void foo(String s) {
+    String desc;
+    desc = i18nizedExpr;
+  }
+}

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/i18nize/beforeAssignment.java

@@ -0,0 +1,6 @@
+class a {
+  void foo(String s) {
+    String desc;
+    desc = "Our " + s + " h<caret>as";
+  }
+}

java/java-tests/testSrc/com/intellij/java/codeInsight/daemon/quickFix/I18nizeTest.java

@@ -94,6 +94,7 @@ public class I18nizeTest extends LightJavaCodeInsightTestCase {
   public void testLongConcat() {doTest();}
   public void testCharacterLiteral() {doTest();}
   public void testNestedConcatenation() {doTest();}
+  public void testAssignment() {doTest();}
 
   public void testShortenClassReferences() {
     doTest("p.MyBundle.message(\"key\")");

plugins/java-i18n/src/com/intellij/codeInspection/i18n/I18nizeConcatenationQuickFix.java

@@ -17,6 +17,7 @@ import org.jetbrains.uast.*;
 import org.jetbrains.uast.expressions.UInjectionHost;
 import org.jetbrains.uast.expressions.UStringConcatenationsFacade;
 import org.jetbrains.uast.generate.UastCodeGenerationPlugin;
+import org.jetbrains.uast.util.UastExpressionUtils;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -108,7 +109,7 @@ public class I18nizeConcatenationQuickFix extends I18nizeQuickFix {
       UElement parent = topExpression.getUastParent();
       if (parent instanceof UParenthesizedExpression || 
           parent instanceof UIfExpression || 
-          parent instanceof UPolyadicExpression) {
+          parent instanceof UPolyadicExpression && !UastExpressionUtils.isAssignment(parent)) {
         topExpression = (UExpression)parent;
       }
       else {