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: fix range check for injected usages

Browse Source
This commit is contained in:
anna
2013-04-12 11:38:48 +02:00
parent 2597ae1c53
commit 18f71959cb
1 changed files with 13 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/InplaceRefactoring.java
+13 -5
View File
@@ -608,8 +608,8 @@ public abstract class InplaceRefactoring {
final PsiElement selectedElement,
final TemplateBuilderImpl builder,
int offset) {
if (reference.getElement() == selectedElement &&
reference.getRangeInElement().shiftRight(selectedElement.getTextRange().getStartOffset()).containsOffset(offset)) {
final PsiElement element = reference.getElement();
if (element == selectedElement && checkRangeContainsOffset(offset, reference.getRangeInElement(), element)) {
builder.replaceElement(reference, PRIMARY_VARIABLE_NAME, createLookupExpression(), true);
}
else {
@@ -671,7 +671,7 @@ public abstract class InplaceRefactoring {
//prefer reference in case of self-references
for (PsiReference ref : refs) {
final PsiElement element = ref.getElement();
if (ref.getRangeInElement().shiftRight(element.getTextRange().getStartOffset()).containsOffset(offset)) return element;
if (checkRangeContainsOffset(offset, ref.getRangeInElement(), element)) return element;
}
if (nameIdentifier != null) {
@@ -680,14 +680,22 @@ public abstract class InplaceRefactoring {
}
for (Pair<PsiElement, TextRange> stringUsage : stringUsages) {
final PsiElement element = stringUsage.first;
if (stringUsage.second.shiftRight(element.getTextRange().getStartOffset()).containsOffset(offset)) return element;
if (checkRangeContainsOffset(offset, stringUsage.second, stringUsage.first)) return stringUsage.first;
}
LOG.error(nameIdentifier + " by " + this.getClass().getName());
return null;
}
private boolean checkRangeContainsOffset(int offset, final TextRange textRange, PsiElement element) {
int startOffset = element.getTextRange().getStartOffset();
final PsiLanguageInjectionHost injectionHost = InjectedLanguageManager.getInstance(myProject).getInjectionHost(element);
if (injectionHost != null) {
startOffset += injectionHost.getTextOffset();
}
return textRange.shiftRight(startOffset).containsOffset(offset);
}
protected boolean isRestart() {
final Boolean isRestart = myEditor.getUserData(INTRODUCE_RESTART);
return isRestart != null && isRestart;