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-194054 Misplaced gutter icons in folded region preview popup

Browse Source
This commit is contained in:
Dmitry Batrak
2018-06-18 15:31:00 +03:00
parent a68b164809
commit f53ef178d9
1 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/platform-impl/src/com/intellij/openapi/editor/impl/EditorGutterComponentImpl.java
+9 -2
View File
@@ -118,6 +118,7 @@ class EditorGutterComponentImpl extends EditorGutterComponentEx implements Mouse
private final EditorImpl myEditor;
private final FoldingAnchorsOverlayStrategy myAnchorsDisplayStrategy;
@Nullable private TIntObjectHashMap<List<GutterMark>> myLineToGutterRenderers;
private boolean myLineToGutterRenderersCacheForLogicalLines;
private int myStartIconAreaWidth = START_ICON_AREA_WIDTH;
private int myIconsAreaWidth;
private int myLineNumberAreaWidth;
@@ -743,11 +744,17 @@ class EditorGutterComponentImpl extends EditorGutterComponentEx implements Mouse
}
}
private boolean logicalLinesMatchVisualOnes() {
return myEditor.getSoftWrapModel().getSoftWrapsIntroducedLinesNumber() == 0 &&
ArrayUtil.isEmpty(myEditor.getFoldingModel().fetchTopLevel());
}
void clearLineToGutterRenderersCache() {
myLineToGutterRenderers = null;
}
private void buildGutterRenderersCache() {
myLineToGutterRenderersCacheForLogicalLines = logicalLinesMatchVisualOnes();
myLineToGutterRenderers = new TIntObjectHashMap<>();
processRangeHighlighters(0, myEditor.getDocument().getTextLength(), highlighter -> {
GutterMark renderer = highlighter.getGutterIconRenderer();
@@ -824,14 +831,14 @@ class EditorGutterComponentImpl extends EditorGutterComponentEx implements Mouse
@Nullable
private List<GutterMark> getGutterRenderers(int line) {
if (myLineToGutterRenderers == null) {
if (myLineToGutterRenderers == null || myLineToGutterRenderersCacheForLogicalLines != logicalLinesMatchVisualOnes()) {
buildGutterRenderersCache();
}
return myLineToGutterRenderers.get(line);
}
private void processGutterRenderers(@NotNull TIntObjectProcedure<List<GutterMark>> processor) {
if (myLineToGutterRenderers == null) {
if (myLineToGutterRenderers == null || myLineToGutterRenderersCacheForLogicalLines != logicalLinesMatchVisualOnes()) {
buildGutterRenderersCache();
}
myLineToGutterRenderers.forEachEntry(processor);