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

inplace refactorings: check reference at caret according to editor offset

Browse Source
This commit is contained in:
anna
2013-04-09 09:46:58 +02:00
parent fc7b634ed3
commit ff169ee692
1 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/lang-impl/src/com/intellij/refactoring/rename/inplace/InplaceRefactoring.java
+7 -3
View File
@@ -270,7 +270,7 @@ public abstract class InplaceRefactoring {
boolean subrefOnPrimaryElement = false;
for (PsiReference ref : refs) {
if (isReferenceAtCaret(selectedElement, ref)) {
if (isReferenceAtCaret(nameIdentifier, ref, offset)) {
builder.replaceElement(ref, PRIMARY_VARIABLE_NAME, createLookupExpression(), true);
subrefOnPrimaryElement = true;
continue;
@@ -327,8 +327,12 @@ public abstract class InplaceRefactoring {
return true;
}
protected boolean isReferenceAtCaret(PsiElement nameIdentifier, PsiReference ref) {
return nameIdentifier != null && ref.getElement() == nameIdentifier.getParent();
protected boolean isReferenceAtCaret(PsiElement nameIdentifier, PsiReference ref, int offset) {
if (nameIdentifier != null && ref.getElement() == nameIdentifier.getParent()) {
final TextRange textRange = nameIdentifier.getTextRange();
return textRange != null && contains(textRange, offset);
}
return false;
}
protected void beforeTemplateStart() {