From 9a98e4afb85cbb65d93885ef2d9180769801b5e3 Mon Sep 17 00:00:00 2001
From: Anna Kozlova <anna.kozlova@jetbrains.com>
Date: Tue, 11 Sep 2012 10:31:33 +0400
Subject: [PATCH] inplace rename: check reference for member renamers only

---
 .../refactoring/rename/inplace/InplaceRefactoring.java   | 4 ----
 .../refactoring/rename/inplace/MemberInplaceRenamer.java | 9 +++++++++
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/platform/lang-impl/src/com/intellij/refactoring/rename/inplace/InplaceRefactoring.java b/platform/lang-impl/src/com/intellij/refactoring/rename/inplace/InplaceRefactoring.java
index a2fc0cc2413c..7f743742985f 100644
--- a/platform/lang-impl/src/com/intellij/refactoring/rename/inplace/InplaceRefactoring.java
+++ b/platform/lang-impl/src/com/intellij/refactoring/rename/inplace/InplaceRefactoring.java
@@ -220,10 +220,6 @@ public abstract class InplaceRefactoring {
   }
 
   protected boolean acceptReference(PsiReference reference) {
-    final PsiElement element = reference.getElement();
-    if (element instanceof PsiNamedElement) {
-      return Comparing.strEqual(((PsiNamedElement)element).getName(), myElementToRename.getName());
-    }
     return true;
   }
 
diff --git a/platform/lang-impl/src/com/intellij/refactoring/rename/inplace/MemberInplaceRenamer.java b/platform/lang-impl/src/com/intellij/refactoring/rename/inplace/MemberInplaceRenamer.java
index 4a86b817e16a..d7c610af617b 100644
--- a/platform/lang-impl/src/com/intellij/refactoring/rename/inplace/MemberInplaceRenamer.java
+++ b/platform/lang-impl/src/com/intellij/refactoring/rename/inplace/MemberInplaceRenamer.java
@@ -80,6 +80,15 @@ public class MemberInplaceRenamer extends VariableInplaceRenamer {
     return new MemberInplaceRenamer(variable, getSubstituted(), editor, initialName, myOldName);
   }
 
+  @Override
+  protected boolean acceptReference(PsiReference reference) {
+    final PsiElement element = reference.getElement();
+    if (element instanceof PsiNamedElement) {
+      return Comparing.strEqual(((PsiNamedElement)element).getName(), myElementToRename.getName());
+    }
+    return super.acceptReference(reference);
+  }
+
   @Override
   protected PsiElement checkLocalScope() {
     PsiFile currentFile = PsiDocumentManager.getInstance(myProject).getPsiFile(myEditor.getDocument());