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

check reference range also for cached references (XmlRenameTest.testRenameInsideCDATA fixed)

Browse Source
This commit is contained in:
Anna Kozlova
2015-01-07 12:21:53 +01:00
parent 49f82c1948
commit 8ca75718a2
1 changed files with 37 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/lang-api/src/com/intellij/refactoring/util/MoveRenameUsageInfo.java
+37 -5
View File
@@ -22,6 +22,7 @@ import com.intellij.openapi.project.Project;
import com.intellij.openapi.util.TextRange;
import com.intellij.psi.*;
import com.intellij.usageView.UsageInfo;
import com.intellij.util.Function;
import org.jetbrains.annotations.Nullable;
public class MoveRenameUsageInfo extends UsageInfo{
@@ -90,18 +91,49 @@ public class MoveRenameUsageInfo extends UsageInfo{
public PsiReference getReference() {
if (myReference != null) {
final PsiElement element = myReference.getElement();
if (element != null && element.isValid()) return myReference;
if (element != null && element.isValid()) {
if (myReferenceRangeMarker == null) {
return myReference;
}
final PsiReference reference = checkReferenceRange(element, new Function<Integer, PsiReference>() {
@Override
public PsiReference fun(Integer start) {
return myReference;
}
});
if (reference != null) {
return reference;
}
}
}
if (myReferenceRangeMarker == null) return null;
final PsiElement element = getElement();
if (element == null) return null;
if (element == null || !element.isValid()) {
return null;
}
return checkReferenceRange(element, new Function<Integer, PsiReference>() {
@Override
public PsiReference fun(Integer start) {
return element.findReferenceAt(start);
}
});
}
@Nullable
private PsiReference checkReferenceRange(PsiElement element, Function<Integer, PsiReference> fn) {
final int start = myReferenceRangeMarker.getStartOffset() - element.getTextRange().getStartOffset();
final int end = myReferenceRangeMarker.getEndOffset() - element.getTextRange().getStartOffset();
final PsiReference reference = element.findReferenceAt(start);
if (reference == null) return null;
final PsiReference reference = fn.fun(start);
if (reference == null) {
return null;
}
final TextRange rangeInElement = reference.getRangeInElement();
if (rangeInElement.getStartOffset() != start || rangeInElement.getEndOffset() != end) return null;
if (rangeInElement.getStartOffset() != start || rangeInElement.getEndOffset() != end) {
return null;
}
return reference;
}
}