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-69627 - IAE: TextRange.intersects

Browse Source
This commit is contained in:
Egor.Ushakov
2015-06-17 19:26:01 +03:00
parent df404bb813
commit 17677c8f42
1 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/debugger/impl/src/com/intellij/debugger/impl/DebuggerUtilsEx.java
+9 -4
View File
@@ -813,7 +813,7 @@ public abstract class DebuggerUtilsEx extends DebuggerUtils {
public void visitLambdaExpression(PsiLambdaExpression expression) {
super.visitLambdaExpression(expression);
PsiElement body = expression.getBody();
if (!onlyOnTheLine || (body != null && lineRange.intersects(body.getTextRange()))) {
if (!onlyOnTheLine || (body != null && intersects(lineRange, body))) {
lambdas.add(expression);
}
}
@@ -825,7 +825,7 @@ public abstract class DebuggerUtilsEx extends DebuggerUtils {
lambdas.add((PsiLambdaExpression)method);
}
for (PsiElement sibling = getNextElement(element); sibling != null; sibling = getNextElement(sibling)) {
if (!lineRange.intersects(sibling.getTextRange())) {
if (!intersects(lineRange, sibling)) {
break;
}
sibling.accept(lambdaCollector);
@@ -833,15 +833,20 @@ public abstract class DebuggerUtilsEx extends DebuggerUtils {
return lambdas;
}
public static boolean intersects(@NotNull TextRange range, @NotNull PsiElement elem) {
TextRange elemRange = elem.getTextRange();
return elemRange != null && elemRange.intersects(range);
}
@Nullable
public static PsiElement getFirstElementOnTheLine(PsiLambdaExpression lambda, Document document, int line) {
ApplicationManager.getApplication().assertReadAccessAllowed();
TextRange lineRange = new TextRange(document.getLineStartOffset(line), document.getLineEndOffset(line));
if (!lineRange.intersects(lambda.getTextRange())) return null;
if (!intersects(lineRange, lambda)) return null;
PsiElement body = lambda.getBody();
if (body instanceof PsiCodeBlock) {
for (PsiStatement statement : ((PsiCodeBlock)body).getStatements()) {
if (lineRange.intersects(statement.getTextRange())) {
if (intersects(lineRange, statement)) {
return statement;
}
}