IPP: fix PsiInvalidElementAccessException (IDEA-266291)

GitOrigin-RevId: 583bccdd59cd8a8babf18bc33a7b31f0d180fcb4

plugins/IntentionPowerPak/src/com/siyeh/ipp/collections/ImmutableCollectionModelUtils.java

@@ -1,4 +1,4 @@
-// Copyright 2000-2020 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+// Copyright 2000-2021 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 package com.siyeh.ipp.collections;
 
 import com.intellij.codeInsight.BlockUtils;
@@ -14,6 +14,7 @@ import com.intellij.psi.util.PsiTreeUtil;
 import com.intellij.psi.util.PsiUtil;
 import com.intellij.refactoring.rename.inplace.VariableInplaceRenamer;
 import com.intellij.util.ObjectUtils;
+import com.intellij.util.containers.ContainerUtil;
 import com.siyeh.ig.PsiReplacementUtil;
 import com.siyeh.ig.callMatcher.CallMapper;
 import com.siyeh.ig.callMatcher.CallMatcher;
@@ -40,7 +41,6 @@ final class ImmutableCollectionModelUtils {
     if (type == null) return null;
     if (!CodeBlockSurrounder.canSurround(call)) return null;
     String assignedVariable = getAssignedVariable(call);
-    PsiExpression[] args = call.getArgumentList().getExpressions();
     PsiMethod method = call.resolveMethod();
     if (method == null) return null;
     PsiClassType classType = ObjectUtils.tryCast(call.getType(), PsiClassType.class);
@@ -50,7 +50,8 @@ final class ImmutableCollectionModelUtils {
       .map(PsiUtil::resolveClassInClassTypeOnly)
       .anyMatch(aClass -> isNonResolvedTypeParameter(aClass, call, resolveHelper));
     if (hasNonResolvedTypeParams) return null;
-    if ("ofEntries".equals(method.getName()) && Arrays.stream(args).anyMatch(arg -> extractPutArgs(arg) == null)) return null;
+    PsiExpression[] args = call.getArgumentList().getExpressions();
+    if ("ofEntries".equals(method.getName()) && ContainerUtil.exists(args, arg -> extractPutArgs(arg) == null)) return null;
     return new ImmutableCollectionModel(call, type, method, assignedVariable);
   }
 
@@ -179,8 +180,8 @@ final class ImmutableCollectionModelUtils {
       String assignedVariable = model.myAssignedVariable;
       if (assignedVariable != null) {
         String initializerText = model.myType.getInitializerText(model.myIsVarArgCall ? null : call.getText());
-        PsiReplacementUtil.replaceExpressionAndShorten(call, initializerText, new CommentTracker());
         PsiElement anchor = addUpdates(assignedVariable, model, statement);
+        PsiReplacementUtil.replaceExpressionAndShorten(call, initializerText, new CommentTracker());
         if (myEditor != null) myEditor.getCaretModel().moveToOffset(anchor.getTextRange().getEndOffset());
       }
       else {
@@ -250,7 +251,7 @@ final class ImmutableCollectionModelUtils {
     private static List<String> createUpdates(@NotNull String name, @NotNull ImmutableCollectionModel model) {
       boolean isMapOfEntriesCall = "ofEntries".equals(model.myCall.getMethodExpression().getReferenceName());
       List<String> updates = new ArrayList<>();
-      PsiExpression[] args = model.myArgs;
+      PsiExpression[] args = model.myCall.getArgumentList().getExpressions();
       for (int i = 0; i < args.length; i++) {
         PsiExpression arg = args[i];
         if (model.myType != CollectionType.MAP) {
@@ -297,7 +298,6 @@ final class ImmutableCollectionModelUtils {
     private PsiMethodCallExpression myCall;
     private final CollectionType myType;
     private final boolean myIsVarArgCall;
-    private final PsiExpression[] myArgs;
     private final String myAssignedVariable;
 
     @Contract(pure = true)
@@ -308,7 +308,6 @@ final class ImmutableCollectionModelUtils {
       myCall = call;
       myType = type;
       myIsVarArgCall = !method.isVarArgs() || MethodCallUtils.isVarArgCall(call);
-      myArgs = call.getArgumentList().getExpressions();
       myAssignedVariable = assignedVariable;
     }
   }

plugins/IntentionPowerPak/test/com/siyeh/ipp/collections/to_mutable_collection/MapOfEntriesNested.java

@@ -0,0 +1,9 @@
+import java.util.*;
+import static java.util.Map.entry;
+
+class MapOfEntriesNested {
+  Map<Integer, String> BINDINGS = <caret>Map.ofEntries(
+    entry(1, "one"),
+    entry(2, "two")
+  );
+}

plugins/IntentionPowerPak/test/com/siyeh/ipp/collections/to_mutable_collection/MapOfEntriesNested_after.java

@@ -0,0 +1,12 @@
+import java.util.*;
+import static java.util.Map.entry;
+
+class MapOfEntriesNested {
+  Map<Integer, String> BINDINGS;
+
+    {
+        BINDINGS = new HashMap<>();
+        BINDINGS.put(1, "one");
+        BINDINGS.put(2, "two");
+    }
+}

plugins/IntentionPowerPak/testSrc/com/siyeh/ipp/collections/ReplaceWithMutableCollectionIntentionTest.java

@@ -1,4 +1,4 @@
-// Copyright 2000-2019 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+// Copyright 2000-2021 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 package com.siyeh.ipp.collections;
 
 import com.intellij.testFramework.LightProjectDescriptor;
@@ -45,6 +45,7 @@ public class ReplaceWithMutableCollectionIntentionTest extends IPPTestCase {
 
   public void testMapOf() { doTest(); }
   public void testMapOfEntries() { doTest(); }
+  public void testMapOfEntriesNested() { doTest(); }
   public void testListOf() { doTest(); }
   public void testLambdaExpr() { doTest(); }
   public void testSingletonMap() { doTest(); }