From faad78042fe262c147772f7384c2283fd351dcfb Mon Sep 17 00:00:00 2001 From: Anna Kozlova Date: Thu, 27 Jun 2013 12:35:28 +0400 Subject: [PATCH] EA-47345 - IAE: RenamePsiElementProcessor.forElement --- .../intellij/refactoring/rename/PsiElementRenameHandler.java | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/platform/lang-impl/src/com/intellij/refactoring/rename/PsiElementRenameHandler.java b/platform/lang-impl/src/com/intellij/refactoring/rename/PsiElementRenameHandler.java index 158aac456e0c..a27946a0a2e5 100644 --- a/platform/lang-impl/src/com/intellij/refactoring/rename/PsiElementRenameHandler.java +++ b/platform/lang-impl/src/com/intellij/refactoring/rename/PsiElementRenameHandler.java @@ -19,6 +19,7 @@ package com.intellij.refactoring.rename; import com.intellij.featureStatistics.FeatureUsageTracker; import com.intellij.openapi.actionSystem.DataContext; import com.intellij.openapi.actionSystem.DataKey; +import com.intellij.openapi.actionSystem.LangDataKeys; import com.intellij.openapi.actionSystem.PlatformDataKeys; import com.intellij.openapi.application.ApplicationManager; import com.intellij.openapi.diagnostic.Logger; @@ -57,6 +58,10 @@ public class PsiElementRenameHandler implements RenameHandler { @Override public void invoke(@NotNull Project project, Editor editor, PsiFile file, DataContext dataContext) { PsiElement element = getElement(dataContext); + if (element == null) { + element = BaseRefactoringAction.getElementAtCaret(editor, file); + } + editor.getScrollingModel().scrollToCaret(ScrollType.MAKE_VISIBLE); final PsiElement nameSuggestionContext = InjectedLanguageUtil.findElementAtNoCommit(file, editor.getCaretModel().getOffset()); invoke(element, project, nameSuggestionContext, editor);