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 rename: references are preferred to name identifiers to use self-reference elements instead of identifiers (~sql quoted names), isReference at caret is checked by range of selected element

Browse Source
This commit is contained in:
anna
2013-04-10 19:55:40 +02:00
parent a275880c7b
commit 9e2f1dd76c
1 changed files with 12 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/lang-impl/src/com/intellij/refactoring/rename/inplace/InplaceRefactoring.java
+12 -19
View File
@@ -270,7 +270,7 @@ public abstract class InplaceRefactoring {
boolean subrefOnPrimaryElement = false;
for (PsiReference ref : refs) {
if (isReferenceAtCaret(nameIdentifier, ref, offset)) {
if (isReferenceAtCaret(selectedElement, ref)) {
builder.replaceElement(ref, PRIMARY_VARIABLE_NAME, createLookupExpression(), true);
subrefOnPrimaryElement = true;
continue;
@@ -327,12 +327,8 @@ public abstract class InplaceRefactoring {
return true;
}
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 boolean isReferenceAtCaret(PsiElement selectedElement, PsiReference ref) {
return selectedElement != null && selectedElement.getTextRange().contains(ref.getElement().getTextRange());
}
protected void beforeTemplateStart() {
@@ -613,7 +609,7 @@ public abstract class InplaceRefactoring {
final TemplateBuilderImpl builder,
int offset) {
if (reference.getElement() == selectedElement &&
contains(reference.getRangeInElement().shiftRight(selectedElement.getTextRange().getStartOffset()), offset)) {
reference.getRangeInElement().shiftRight(selectedElement.getTextRange().getStartOffset()).containsOffset(offset)) {
builder.replaceElement(reference, PRIMARY_VARIABLE_NAME, createLookupExpression(), true);
}
else {
@@ -672,29 +668,26 @@ public abstract class InplaceRefactoring {
final Collection<PsiReference> refs,
Collection<Pair<PsiElement, TextRange>> stringUsages,
final int offset) {
if (nameIdentifier != null) {
final TextRange range = nameIdentifier.getTextRange();
if (range != null && contains(range, offset)) return nameIdentifier;
}
//prefer reference in case of self-references
for (PsiReference ref : refs) {
final PsiElement element = ref.getElement();
if (contains(ref.getRangeInElement().shiftRight(element.getTextRange().getStartOffset()), offset)) return element;
if (ref.getRangeInElement().shiftRight(element.getTextRange().getStartOffset()).containsOffset(offset)) return element;
}
if (nameIdentifier != null) {
final TextRange range = nameIdentifier.getTextRange();
if (range != null && range.containsOffset(offset)) return nameIdentifier;
}
for (Pair<PsiElement, TextRange> stringUsage : stringUsages) {
final PsiElement element = stringUsage.first;
if (contains(stringUsage.second.shiftRight(element.getTextRange().getStartOffset()), offset)) return element;
if (stringUsage.second.shiftRight(element.getTextRange().getStartOffset()).containsOffset(offset)) return element;
}
LOG.error(nameIdentifier + " by " + this.getClass().getName());
return null;
}
private static boolean contains(final TextRange range, final int offset) {
return range.getStartOffset() <= offset && offset <= range.getEndOffset();
}
protected boolean isRestart() {
final Boolean isRestart = myEditor.getUserData(INTRODUCE_RESTART);
return isRestart != null && isRestart;