DeleteSideEffectsAwareFix: singular/plural message merged

Review: IDEA-CR-21623

java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/DeleteSideEffectsAwareFix.java

@@ -48,16 +48,11 @@ public class DeleteSideEffectsAwareFix implements IntentionAction, LowPriorityAc
     }
     else {
       PsiStatement[] statements = StatementExtractor.generateStatements(sideEffects, expression);
-      if (statements.length == 1) {
-        if (statements[0] instanceof PsiIfStatement) {
-          myMessage = QuickFixBundle.message("extract.side.effects.convert.to.if");
-        }
-        else {
-          myMessage = QuickFixBundle.message("extract.side.effects.single");
-        }
+      if (statements.length == 1 && statements[0] instanceof PsiIfStatement) {
+        myMessage = QuickFixBundle.message("extract.side.effects.convert.to.if");
       }
       else {
-        myMessage = QuickFixBundle.message("extract.side.effects.multiple");
+        myMessage = QuickFixBundle.message("extract.side.effects", statements.length);
       }
     }
   }

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/deleteSideEffectsAware/afterTriple.java

@@ -0,0 +1,10 @@
+// "Extract side effects" "true"
+import java.util.concurrent.atomic.AtomicInteger;
+
+public class Main {
+  public void test(AtomicInteger i) {
+      i.incrementAndGet();
+      i.incrementAndGet();
+      i.incrementAndGet();
+  }
+}

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/deleteSideEffectsAware/beforeTriple.java

@@ -0,0 +1,8 @@
+// "Extract side effects" "true"
+import java.util.concurrent.atomic.AtomicInteger;
+
+public class Main {
+  public void test(AtomicInteger i) {
+    i.incrementAndGet() <caret>+ i.incrementAndGet() + i.incrementAndGet();
+  }
+}

resources-en/src/messages/QuickFixBundle.properties

@@ -300,8 +300,7 @@ delete.reference.fix.text=Delete reference
 delete.unreachable.statement.fix.text=Delete unreachable statement
 
 extract.side.effects.convert.to.if=Convert to 'if' statement
-extract.side.effects.single=Extract side effect
-extract.side.effects.multiple=Extract side effects
+extract.side.effects=Extract side {0, choice, 1#effect|2#effects}
 extract.side.effects.family.name=Delete statement extracting side effects
 
 module.info.add.requires.family.name=Add 'requires' statement to module-info.java