EA-87016 - assert: PsiParameterListImpl.getParameterIndex

java/java-impl/src/com/intellij/refactoring/inline/InlineToAnonymousConstructorProcessor.java

@@ -369,7 +369,7 @@ class InlineToAnonymousConstructorProcessor {
       @Override public void visitReferenceExpression(final PsiReferenceExpression expression) {
         super.visitReferenceExpression(expression);
         final PsiElement psiElement = expression.resolve();
-        if (psiElement instanceof PsiParameter) {
+        if (psiElement instanceof PsiParameter && ((PsiParameter)psiElement).getDeclarationScope() == myConstructor) {
           parameterReferences.add(Pair.create(expression, (PsiParameter)psiElement));
         }
         else if ((psiElement instanceof PsiField || psiElement instanceof PsiMethod) &&

java/java-tests/testData/refactoring/inlineToAnonymousClass/UnrelatedParameters.java

@@ -0,0 +1,23 @@
+class Test {
+  class <caret>A implements Runnable {
+    public A(int[] args) {
+
+      for (int arg : args) {
+        System.out.println(arg);
+      }
+    }
+
+
+    @Override
+    public void run() {
+
+    }
+  }
+
+  abstract class U {
+    {
+      A a = new A(new int[8]);
+    }
+  }
+
+}

java/java-tests/testData/refactoring/inlineToAnonymousClass/UnrelatedParameters.java.after

@@ -0,0 +1,21 @@
+class Test {
+
+    abstract class U {
+    {
+        final int[] args = new int[8];
+        Runnable a = new Runnable() {
+            {
+                for (int arg : args) {
+                  System.out.println(arg);
+                }
+            }
+
+            @Override
+            public void run() {
+
+            }
+        };
+    }
+  }
+
+}

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

@@ -49,6 +49,10 @@ public class InlineToAnonymousClassTest extends LightRefactoringTestCase {
     doTest(false, false);
   }
 
+  public void testUnrelatedParameters() throws Exception {
+    doTest(false, false);
+  }
+
   public void testConstructorWithArgumentsInExpression() throws Exception {
     doTest(false, false);
   }