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-130294 Draw line highlighters with no gap to the gutter splitter

Browse Source
This commit is contained in:
Egor.Ushakov
2014-09-24 16:00:18 +04:00
parent 67475da61e
commit 08874ccc2e
2 changed files with 25 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/platform-impl/src/com/intellij/openapi/editor/impl/EditorGutterComponentImpl.java
+12
View File
@@ -210,6 +210,7 @@ class EditorGutterComponentImpl extends EditorGutterComponentEx implements Mouse
paintFoldingBackground(g, clip);
paintFoldingLines((Graphics2D)g, clip);
paintLineMarkers(g, clip, firstVisibleOffset, lastVisibleOffset);
paintEditorBackgrounds(g, clip, firstVisibleOffset, lastVisibleOffset);
paintFoldingTree(g, clip, firstVisibleOffset, lastVisibleOffset);
paintLineNumbers(g, clip);
}
@@ -224,6 +225,17 @@ class EditorGutterComponentImpl extends EditorGutterComponentEx implements Mouse
}
}
private void paintEditorBackgrounds(Graphics g, Rectangle clip, int firstVisibleOffset, int lastVisibleOffset) {
IterationState state = new IterationState(myEditor, firstVisibleOffset, lastVisibleOffset, false, true);
while (!state.atEnd()) {
g.setColor(state.getMergedAttributes().getBackgroundColor());
int startX = getWhitespaceSeparatorOffset() + 1;
int y = myEditor.visualPositionToXY(myEditor.offsetToVisualPosition(state.getStartOffset())).y;
g.fillRect(startX, y, clip.width - startX, myEditor.getLineHeight());
state.advance();
}
}
private void processClose(final MouseEvent e) {
final IdeEventQueue queue = IdeEventQueue.getInstance();
platform/platform-impl/src/com/intellij/openapi/editor/impl/IterationState.java
+13 -4
View File
@@ -120,6 +120,10 @@ public final class IterationState {
private final Color myReadOnlyColor;
public IterationState(@NotNull EditorEx editor, int start, int end, boolean useCaretAndSelection) {
this(editor, start, end, useCaretAndSelection, false);
}
public IterationState(@NotNull EditorEx editor, int start, int end, boolean useCaretAndSelection, boolean useOnlyFullLineHighlighters) {
ApplicationManager.getApplication().assertReadAccessAllowed();
myDocument = editor.getDocument();
myStartOffset = start;
@@ -173,10 +177,10 @@ public final class IterationState {
myCaretRowEnd = caretModel.getVisualLineEnd();
MarkupModelEx editorMarkup = editor.getMarkupModel();
myView = new HighlighterSweep(editorMarkup, start, myEnd);
myView = new HighlighterSweep(editorMarkup, start, myEnd, useOnlyFullLineHighlighters);
final MarkupModelEx docMarkup = (MarkupModelEx)DocumentMarkupModel.forDocument(editor.getDocument(), editor.getProject(), true);
myDoc = new HighlighterSweep(docMarkup, start, myEnd);
myDoc = new HighlighterSweep(docMarkup, start, myEnd, useOnlyFullLineHighlighters);
myEndOffset = myStartOffset;
@@ -188,11 +192,16 @@ public final class IterationState {
int i;
private final RangeHighlighterEx[] highlighters;
private HighlighterSweep(@NotNull MarkupModelEx markupModel, int start, int end) {
private HighlighterSweep(@NotNull MarkupModelEx markupModel, int start, int end, final boolean onlyFullLine) {
// we have to get all highlighters in advance and sort them by affected offsets
// since these can be different from the real offsets the highlighters are sorted by in the tree. (See LINES_IN_RANGE perverts)
final List<RangeHighlighterEx> list = new ArrayList<RangeHighlighterEx>();
markupModel.processRangeHighlightersOverlappingWith(start, end, new CommonProcessors.CollectProcessor<RangeHighlighterEx>(list));
markupModel.processRangeHighlightersOverlappingWith(start, end, new CommonProcessors.CollectProcessor<RangeHighlighterEx>(list) {
@Override
protected boolean accept(RangeHighlighterEx ex) {
return !onlyFullLine || ex.getTargetArea() == HighlighterTargetArea.LINES_IN_RANGE;
}
});
highlighters = list.isEmpty() ? RangeHighlighterEx.EMPTY_ARRAY : list.toArray(new RangeHighlighterEx[list.size()]);
Arrays.sort(highlighters, RangeHighlighterEx.BY_AFFECTED_START_OFFSET);