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 71f8ed525d82..05ef6acfda32 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 @@ -338,7 +338,12 @@ public abstract class InplaceRefactoring { protected boolean isReferenceAtCaret(PsiElement selectedElement, PsiReference ref) { final TextRange textRange = ref.getRangeInElement().shiftRight(ref.getElement().getTextRange().getStartOffset()); - return selectedElement != null && selectedElement.getTextRange().contains(textRange); + if (selectedElement != null){ + final TextRange selectedElementRange = selectedElement.getTextRange(); + LOG.assertTrue(selectedElementRange != null, selectedElement); + if (selectedElementRange != null && selectedElementRange.contains(textRange)) return true; + } + return false; } protected void beforeTemplateStart() {