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

EA-26860

Browse Source
This commit is contained in:
Alexey Kudravtsev
2011-04-18 17:06:15 +04:00
parent 14a8536234
commit 6ea3392196
1 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/lang-impl/src/com/intellij/codeInsight/highlighting/HighlightUsagesHandler.java
+7 -4
View File
@@ -19,8 +19,6 @@ package com.intellij.codeInsight.highlighting;
import com.intellij.codeInsight.CodeInsightBundle;
import com.intellij.codeInsight.TargetElementUtilBase;
import com.intellij.find.EditorSearchComponent;
import com.intellij.find.FindManager;
import com.intellij.find.FindModel;
import com.intellij.find.findUsages.PsiElement2UsageTargetAdapter;
import com.intellij.injected.editor.EditorWindow;
import com.intellij.lang.injection.InjectedLanguageManager;
@@ -384,14 +382,19 @@ public class HighlightUsagesHandler extends HighlightHandlerBase {
List<TextRange> answer = new ArrayList<TextRange>(relativeRanges.size());
for (TextRange relativeRange : relativeRanges) {
PsiElement element = ref.getElement();
TextRange range = element.getTextRange().cutOut(relativeRange);
TextRange range = safeCut(element.getTextRange(), relativeRange);
// injection occurs
answer.add(InjectedLanguageManager.getInstance(element.getProject()).injectedToHost(element, range));
}
return answer;
}
private static TextRange safeCut(TextRange range, TextRange relative) {
int start = Math.min(range.getEndOffset(), range.getStartOffset() + relative.getStartOffset());
int end = Math.min(range.getEndOffset(), range.getStartOffset() + relative.getEndOffset());
return new TextRange(start, end);
}
@Nullable
public static PsiElement getNameIdentifier(@NotNull PsiElement element) {
if (element instanceof PsiNameIdentifierOwner) {