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

when the .getNavigationElement() is implemented to lead to a wildly different element (e.g. PsiPuppetVarWrapperImpl for "$mod" leads to a leaf element for identifier "mod"), correct the passed startOffset/endOffset accordingly to fix RUBY-19327 Variables names are partially highlighted in the Find Usages results

Browse Source
This commit is contained in:
Alexey Kudravtsev
2017-04-27 13:19:49 +03:00
parent 5e66eb1811
commit 9d3636bab7
1 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/core-api/src/com/intellij/usageView/UsageInfo.java
+7 -2
View File
@@ -35,8 +35,8 @@ public class UsageInfo {
public final boolean isNonCodeUsage;
protected boolean myDynamicUsage;
public UsageInfo(@NotNull PsiElement element, final int startOffset, final int endOffset, boolean isNonCodeUsage) {
element = element.getNavigationElement();
public UsageInfo(@NotNull PsiElement originalElement, final int startOffset, final int endOffset, boolean isNonCodeUsage) {
PsiElement element = originalElement.getNavigationElement();
PsiFile file = element.getContainingFile();
PsiElement topElement = file == null ? element : file;
LOG.assertTrue(topElement.isValid(), element);
@@ -55,6 +55,11 @@ public class UsageInfo {
else {
effectiveStart = startOffset;
effectiveEnd = endOffset;
if (element != originalElement && originalElement.getContainingFile() == file) {
int delta = originalElement.getTextRange().getStartOffset() - elementRange.getStartOffset();
effectiveStart += delta;
effectiveEnd += delta;
}
}
if (effectiveStart < 0 || effectiveStart > effectiveEnd) {