MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

dbl rename on reference fixed

Browse Source
This commit is contained in:
anna
2012-03-11 17:37:35 +01:00
parent 3af1842bcd
commit 7128b53d2f
1 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/lang-impl/src/com/intellij/refactoring/rename/inplace/VariableInplaceRenameHandler.java
+10 -5
View File
@@ -26,10 +26,7 @@ import com.intellij.openapi.diagnostic.Logger;
import com.intellij.openapi.editor.Editor;
import com.intellij.openapi.editor.ScrollType;
import com.intellij.openapi.project.Project;
import com.intellij.psi.PsiElement;
import com.intellij.psi.PsiFile;
import com.intellij.psi.PsiNameIdentifierOwner;
import com.intellij.psi.PsiNamedElement;
import com.intellij.psi.*;
import com.intellij.psi.util.PsiTreeUtil;
import com.intellij.refactoring.rename.PsiElementRenameHandler;
import com.intellij.refactoring.rename.RenameHandler;
@@ -71,7 +68,15 @@ public class VariableInplaceRenameHandler implements RenameHandler {
PsiElement element = PsiElementRenameHandler.getElement(dataContext);
if (element == null) {
if (LookupManager.getActiveLookup(editor) != null) {
element = PsiTreeUtil.getParentOfType(file.findElementAt(editor.getCaretModel().getOffset()), PsiNamedElement.class);
final PsiElement elementUnderCaret = file.findElementAt(editor.getCaretModel().getOffset());
if (elementUnderCaret != null) {
final PsiElement parent = elementUnderCaret.getParent();
if (parent instanceof PsiReference) {
element = ((PsiReference)parent).resolve();
} else {
element = PsiTreeUtil.getParentOfType(elementUnderCaret, PsiNamedElement.class);
}
}
if (element == null) return;
} else {
return;