From fa6fbc3b84a4ca8780992a0ec7a3dc85903c2678 Mon Sep 17 00:00:00 2001
From: "Anna.Kozlova" <anna.kozlova@jetbrains.com>
Date: Wed, 8 Feb 2017 20:34:01 +0100
Subject: [PATCH] be ready if editor is closed during inplace rename EA-95882 -
 TDDE: TraceableDisposable.throwDisposalError

---
 .../refactoring/rename/inplace/MemberInplaceRenamer.java      | 4 +++-
 1 file changed, 3 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 a6d1efaf1a2f..fc0cc1209a07 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
@@ -255,7 +255,9 @@ public class MemberInplaceRenamer extends VariableInplaceRenamer {
 
   protected void restoreCaretOffsetAfterRename() {
     if (myBeforeRevert != null) {
-      myEditor.getCaretModel().moveToOffset(myBeforeRevert.getEndOffset());
+      if (!myEditor.isDisposed()) {
+        myEditor.getCaretModel().moveToOffset(myBeforeRevert.getEndOffset());
+      }
       myBeforeRevert.dispose();
     }
   }