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

restored limitation to line for java-related highlighters - IDEA-CR-31880

Browse Source
This commit is contained in:
Egor Ushakov
2018-04-23 20:16:53 +03:00
parent bf59a77e0d
commit 8751c22d4e
2 changed files with 17 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/debugger/impl/src/com/intellij/debugger/impl/DebuggerUtilsEx.java
+12 -1
View File
@@ -860,10 +860,21 @@ public abstract class DebuggerUtilsEx extends DebuggerUtils {
@Nullable
@Override
public TextRange getHighlightRange() {
return SourcePositionHighlighter.getHighlightRangeFor(mySourcePosition);
return intersectWithLine(SourcePositionHighlighter.getHighlightRangeFor(mySourcePosition), mySourcePosition.getFile(), getLine());
}
}
@Nullable
public static TextRange intersectWithLine(@Nullable TextRange range, @Nullable PsiFile file, int line) {
if (range != null && file != null) {
Document document = PsiDocumentManager.getInstance(file.getProject()).getDocument(file);
if (document != null) {
range = range.intersection(DocumentUtil.getLineTextRange(document, line));
}
}
return range;
}
@Nullable
public static PsiFile getPsiFile(@Nullable XSourcePosition position, Project project) {
ApplicationManager.getApplication().assertReadAccessAllowed();
java/debugger/impl/src/com/intellij/debugger/ui/breakpoints/JavaLineBreakpointType.java
+5 -2
View File
@@ -190,7 +190,10 @@ public class JavaLineBreakpointType extends JavaLineBreakpointTypeBase<JavaLineB
@Override
public TextRange getHighlightRange() {
return myElement != null ? myElement.getTextRange() : null;
if (myElement != null) {
return DebuggerUtilsEx.intersectWithLine(myElement.getTextRange(), myElement.getContainingFile(), mySourcePosition.getLine());
}
return null;
}
@NotNull
@@ -239,7 +242,7 @@ public class JavaLineBreakpointType extends JavaLineBreakpointTypeBase<JavaLineB
if (javaBreakpoint instanceof LineBreakpoint) {
PsiElement method = getContainingMethod((LineBreakpoint)javaBreakpoint);
if (method != null) {
return method.getTextRange();
return DebuggerUtilsEx.intersectWithLine(method.getTextRange(), method.getContainingFile(), breakpoint.getLine());
}
}
}