From 744c3526a633a6de679bed8a5dfd583658a23c2d Mon Sep 17 00:00:00 2001
From: anna <Anna.Kozlova@jetbrains.com>
Date: Mon, 5 Dec 2011 21:41:56 +0100
Subject: [PATCH] EA-31581 - assert: DocumentImpl.createRangeMarker (roma)
 (cherry picked from commit 81c8c1d11c96f595ce5c2a51c15901e73cae4d45)

---
 .../rename/inplace/MemberInplaceRenamer.java           | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

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 2f15b6c13bb7..a5cb2d8d73f1 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
@@ -62,7 +62,15 @@ public class MemberInplaceRenamer extends VariableInplaceRenamer {
     super(elementToRename, editor);
     myOldName = elementToRename.getName();
     mySubstituted = substituted;
-    mySubstitutedRange = mySubstituted != null && mySubstituted != myElementToRename && mySubstituted.getTextRange() != null ? myEditor.getDocument().createRangeMarker(mySubstituted.getTextRange()) : null;
+    if (mySubstituted != null && mySubstituted != myElementToRename && mySubstituted.getTextRange() != null) {
+      final PsiFile containingFile = mySubstituted.getContainingFile();
+      if (!notSameFile(containingFile.getVirtualFile(), containingFile)) {
+        mySubstitutedRange = myEditor.getDocument().createRangeMarker(mySubstituted.getTextRange());
+      }
+    }
+    else {
+      mySubstitutedRange = null;
+    }
 
     showDialogAdvertisement("RenameElement");
   }