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

WI-6048 Web IDE slows down tremendously up with big one-lined css file open

Browse Source 
Don't process fold regions which boundaries belong to the same logical line during gutter repainting
This commit is contained in:
Denis Zhdanov
2011-05-16 19:09:50 +04:00
parent c8c066b188
commit 5992341698
2 changed files with 48 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/platform-impl/src/com/intellij/openapi/editor/impl/EditorGutterComponentImpl.java
+45 -22
View File
@@ -690,18 +690,21 @@ class EditorGutterComponentImpl extends EditorGutterComponentEx implements Mouse
return new VisualPosition(myEditor.offsetToVisualPosition(offset).line, 0);
}
private void doPaintFoldingTree(Graphics2D g, Rectangle clip, int firstVisibleOffset, int lastVisibleOffset) {
int anchorX = getFoldingAreaOffset();
int width = getFoldingAnchorWidth();
private void doPaintFoldingTree(final Graphics2D g, final Rectangle clip, int firstVisibleOffset, int lastVisibleOffset) {
final int anchorX = getFoldingAreaOffset();
final int width = getFoldingAnchorWidth();
FoldRegion[] visibleFoldRegions = ((FoldingModelImpl)myEditor.getFoldingModel()).fetchVisible();
for (FoldRegion visibleFoldRegion : visibleFoldRegions) {
if (!visibleFoldRegion.isValid()) continue;
if (visibleFoldRegion.getStartOffset() > lastVisibleOffset) continue;
if (getEndOffset(visibleFoldRegion) < firstVisibleOffset) continue;
drawAnchor(visibleFoldRegion, width, clip, g, anchorX, false, false);
}
doForVisibleFoldRegions(
new Function<FoldRegion, Void>() {
@Override
public Void fun(FoldRegion foldRegion) {
drawAnchor(foldRegion, width, clip, g, anchorX, false, false);
return null;
}
},
firstVisibleOffset,
lastVisibleOffset
);
if (myActiveFoldRegion != null) {
drawAnchor(myActiveFoldRegion, width, clip, g, anchorX, true, true);
@@ -709,6 +712,23 @@ class EditorGutterComponentImpl extends EditorGutterComponentEx implements Mouse
}
}
private void doForVisibleFoldRegions(@NotNull Function<FoldRegion, Void> action, int firstVisibleOffset, int lastVisibleOffset) {
FoldRegion[] visibleFoldRegions = ((FoldingModelImpl)myEditor.getFoldingModel()).fetchVisible();
final Document document = myEditor.getDocument();
for (FoldRegion visibleFoldRegion : visibleFoldRegions) {
if (!visibleFoldRegion.isValid()) continue;
final int startOffset = visibleFoldRegion.getStartOffset();
if (startOffset > lastVisibleOffset) continue;
final int endOffset = getEndOffset(visibleFoldRegion);
if (endOffset < firstVisibleOffset) continue;
if (document.getLineNumber(startOffset) >= document.getLineNumber(endOffset)) {
//TODO den remove this check as soon as editor performance on dimension mapping is improved (IDEA-69317)
continue;
}
action.fun(visibleFoldRegion);
}
}
private void paintFoldingBackground(Graphics g, Rectangle clip, int firstVisibleOffset, int lastVisibleOffset) {
int lineX = getWhitespaceSeparatorOffset();
paintBackground(g, clip, getFoldingAreaOffset(), getFoldingAreaWidth());
@@ -721,26 +741,29 @@ class EditorGutterComponentImpl extends EditorGutterComponentEx implements Mouse
doPaintFoldingBoxBackground((Graphics2D)g, clip, firstVisibleOffset, lastVisibleOffset);
}
private void doPaintFoldingBoxBackground(Graphics2D g, Rectangle clip, int firstVisibleOffset, int lastVisibleOffset) {
private void doPaintFoldingBoxBackground(final Graphics2D g, final Rectangle clip, int firstVisibleOffset, int lastVisibleOffset) {
if (!isFoldingOutlineShown()) return;
UIUtil.drawVDottedLine(g, getWhitespaceSeparatorOffset(), clip.y, clip.y + clip.height, null, getOutlineColor(false));
int anchorX = getFoldingAreaOffset();
int width = getFoldingAnchorWidth();
FoldRegion[] visibleFoldRegions = ((FoldingModelImpl)myEditor.getFoldingModel()).fetchVisible();
final int anchorX = getFoldingAreaOffset();
final int width = getFoldingAnchorWidth();
if (myActiveFoldRegion != null) {
drawFoldingLines(myActiveFoldRegion, clip, width, anchorX, g);
}
for (FoldRegion visibleFoldRegion : visibleFoldRegions) {
if (!visibleFoldRegion.isValid()) continue;
if (visibleFoldRegion.getStartOffset() > lastVisibleOffset) continue;
if (getEndOffset(visibleFoldRegion) < firstVisibleOffset) continue;
drawAnchor(visibleFoldRegion, width, clip, g, anchorX, false, true);
}
doForVisibleFoldRegions(
new Function<FoldRegion, Void>() {
@Override
public Void fun(FoldRegion foldRegion) {
drawAnchor(foldRegion, width, clip, g, anchorX, false, true);
return null;
}
},
firstVisibleOffset,
lastVisibleOffset
);
}
public int getWhitespaceSeparatorOffset() {
platform/util/src/com/intellij/util/Function.java
+3 -1
View File
@@ -15,6 +15,8 @@
*/
package com.intellij.util;
import org.jetbrains.annotations.Nullable;
import java.util.Collection;
/**
@@ -23,7 +25,7 @@ import java.util.Collection;
*/
@SuppressWarnings({"unchecked"})
public interface Function<Param, Result> {
Result fun(Param param);
@Nullable Result fun(Param param);
/**
* @see FunctionUtil#id()