From bf977e4eb6f13cfb7eb6a8073cf3be2bc2d5c5dc Mon Sep 17 00:00:00 2001
From: "Maxim.Mossienko" <Maxim.Mossienko@jetbrains.com>
Date: Mon, 19 Jul 2010 23:05:54 +0400
Subject: [PATCH]  IDEA-48647    rename property: rename as a whole

---
 .../refactoring/rename/inplace/VariableInplaceRenamer.java    | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/platform/lang-impl/src/com/intellij/refactoring/rename/inplace/VariableInplaceRenamer.java b/platform/lang-impl/src/com/intellij/refactoring/rename/inplace/VariableInplaceRenamer.java
index 09c9ebdc6f5d..6b375936fafe 100644
--- a/platform/lang-impl/src/com/intellij/refactoring/rename/inplace/VariableInplaceRenamer.java
+++ b/platform/lang-impl/src/com/intellij/refactoring/rename/inplace/VariableInplaceRenamer.java
@@ -227,7 +227,9 @@ public class VariableInplaceRenamer {
             }
 
             //add highlights
-            addHighlights(rangesToHighlight, topLevelEditor, myHighlighters, highlightManager);
+            if (myHighlighters != null) { // can be null if finish is called during testing
+              addHighlights(rangesToHighlight, topLevelEditor, myHighlighters, highlightManager);
+            }
           }
         });
       }