priority of array index expression (IDEA-147503)

java/java-psi-impl/src/com/intellij/psi/impl/source/tree/java/ReplaceExpressionUtil.java

@@ -75,7 +75,7 @@ public class ReplaceExpressionUtil {
     }
     else if (i == JavaElementType.ARRAY_ACCESS_EXPRESSION) {
       int role = ((CompositeElement)oldParent).getChildRole(oldExpr);
-      return role != ChildRole.ARRAY_DIMENSION && priority < parentPriority;
+      return role != ChildRole.ARRAY_DIMENSION && role != ChildRole.INDEX && priority < parentPriority;
     }
     else if (i == JavaElementType.ARRAY_INITIALIZER_EXPRESSION) {
       return false;

java/java-tests/testData/refactoring/inlineLocal/ArrayAccessPriority.java

@@ -0,0 +1,6 @@
+class C {
+  void f(int[] a, int i) {
+    int i1 = i + 1;
+    int temp = a[i<caret>1];
+  }
+}

java/java-tests/testData/refactoring/inlineLocal/ArrayAccessPriority.java.after

@@ -0,0 +1,5 @@
+class C {
+  void f(int[] a, int i) {
+      int temp = a[i + 1];
+  }
+}

java/java-tests/testSrc/com/intellij/refactoring/inline/InlineLocalTest.java

@@ -244,6 +244,10 @@ public class InlineLocalTest extends LightCodeInsightTestCase {
     doTest(true);
   }
 
+  public void testArrayAccessPriority() throws Exception {
+    doTest(true);
+  }
+
   public void testLocalVarInsideLambdaBodyWriteUsage() throws Exception {
     doTest(true, "Cannot perform refactoring.\n" +
                  "Variable 'hello' is accessed for writing");