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

do not recreate breakpoint highlighter if not requested implicitly, this fixes jumping breakpoints on several quick line insertions

Browse Source
This commit is contained in:
Egor.Ushakov
2014-06-05 18:21:32 +04:00
parent 44fc6242ef
commit f8e2be2ba9
1 changed files with 12 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/xdebugger-impl/src/com/intellij/xdebugger/impl/breakpoints/XLineBreakpointImpl.java
+12 -7
View File
@@ -91,10 +91,11 @@ public class XLineBreakpointImpl<P extends XBreakpointProperties> extends XBreak
RangeHighlighterEx highlighter = myHighlighter;
if (highlighter != null &&
(!highlighter.isValid() ||
highlighter.getStartOffset() >= document.getTextLength() ||
document.getLineNumber(highlighter.getStartOffset()) != getLine())) {
highlighter.dispose();
myHighlighter = null;
highlighter.getStartOffset() >= document.getTextLength()
// it seems that this check is not needed - we always update line number from the highlighter
// and highlighter is removed on line and file change anyway
/*|| document.getLineNumber(highlighter.getStartOffset()) != getLine()*/)) {
removeHighlighter();
highlighter = null;
}
@@ -213,7 +214,7 @@ public class XLineBreakpointImpl<P extends XBreakpointProperties> extends XBreak
public boolean copy(int line, VirtualFile file) {
if (canMoveTo(line, file)) {
setFileUrl(file.getUrl());
setLine(line);
setLine(line, true);
return true;
}
return false;
@@ -232,7 +233,7 @@ public class XLineBreakpointImpl<P extends XBreakpointProperties> extends XBreak
public void updatePosition() {
if (myHighlighter != null && myHighlighter.isValid()) {
setLine(myHighlighter.getDocument().getLineNumber(myHighlighter.getStartOffset()));
setLine(myHighlighter.getDocument().getLineNumber(myHighlighter.getStartOffset()), false);
}
}
@@ -240,14 +241,18 @@ public class XLineBreakpointImpl<P extends XBreakpointProperties> extends XBreak
if (!Comparing.equal(getFileUrl(), newUrl)) {
myState.setFileUrl(newUrl);
mySourcePosition = null;
removeHighlighter();
fireBreakpointChanged();
}
}
private void setLine(final int line) {
private void setLine(final int line, boolean removeHighlighter) {
if (getLine() != line) {
myState.setLine(line);
mySourcePosition = null;
if (removeHighlighter) {
removeHighlighter();
}
fireBreakpointChanged();
}
}