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

IDEA-145517 extend selection improvement 3

Browse Source
This commit is contained in:
Gregory.Shrago
2017-08-25 07:57:16 +03:00
parent 095c5fd8e4
commit ab942bd988
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/lang-impl/src/com/intellij/codeInsight/editorActions/wordSelection/InjectedReferenceSelectioner.java
+4 -1
View File
@@ -20,6 +20,7 @@ import com.intellij.openapi.editor.Editor;
import com.intellij.openapi.util.TextRange;
import com.intellij.psi.PsiElement;
import com.intellij.psi.PsiLanguageInjectionHost;
import com.intellij.psi.impl.source.resolve.reference.impl.providers.PsiFileReference;
import com.intellij.psi.util.PsiTreeUtil;
import com.intellij.util.containers.ContainerUtil;
import com.intellij.util.containers.JBIterable;
@@ -41,6 +42,7 @@ public class InjectedReferenceSelectioner extends AbstractWordSelectioner {
if (host == null) return Collections.emptyList();
ArrayList<TextRange> ranges = JBIterable.of(host.getReferences())
.filter(PsiFileReference.class)
.map(r -> r.getRangeInElement().shiftRight(r.getElement().getTextRange().getStartOffset()))
.filter(r -> r.getStartOffset() <= cursorOffset)
.addAllTo(ContainerUtil.newArrayList());
@@ -53,7 +55,8 @@ public class InjectedReferenceSelectioner extends AbstractWordSelectioner {
smallest = r;
}
}
int endOffset = smallest == null ? cursorOffset : smallest.getEndOffset();
if (smallest == null) return Collections.emptyList();
int endOffset = smallest.getEndOffset();
for (ListIterator<TextRange> it = ranges.listIterator(); it.hasNext(); ) {
TextRange r = it.next();