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

Cleanup in DefaultLineMarkerRenderer

Browse Source 
GitOrigin-RevId: 73315f0dc72be61549129925ec0c21f48fa2647b
This commit is contained in:
Alexander.Kirsanov
2020-04-08 17:07:23 +00:00
committed by intellij-monorepo-bot
parent e1a8fd8362
commit 657cf85b5a
2 changed files with 11 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/lang-impl/src/com/intellij/codeInsight/highlighting/BraceHighlightingHandler.java
+1 -1
View File
@@ -449,7 +449,7 @@ public class BraceHighlightingHandler {
editor.putUserData(LINE_MARKER_IN_EDITOR_KEY, null);
}
public static LineMarkerRenderer createLineMarkerRenderer(boolean matched) {
public static @NotNull LineMarkerRenderer createLineMarkerRenderer(boolean matched) {
final TextAttributesKey key = matched ? CodeInsightColors.MATCHED_BRACE_ATTRIBUTES : CodeInsightColors.UNMATCHED_BRACE_ATTRIBUTES;
return new DefaultLineMarkerRenderer(key, 1, 0, LineMarkerRendererEx.Position.RIGHT);
}
platform/platform-impl/src/com/intellij/openapi/editor/markup/DefaultLineMarkerRenderer.java
+10 -13
View File
@@ -12,23 +12,19 @@ import java.awt.*;
public class DefaultLineMarkerRenderer implements LineMarkerRendererEx {
private final TextAttributesKey myAttributesKey;
private final int myThickness;
private final int myDeepness;
private final int myDepth;
private final Position myPosition;
private final Color myColor;
public DefaultLineMarkerRenderer(TextAttributesKey myAttributesKey) {
this(myAttributesKey, 1, 0, Position.RIGHT);
}
public DefaultLineMarkerRenderer(TextAttributesKey myAttributesKey, int thickness) {
public DefaultLineMarkerRenderer(@NotNull TextAttributesKey myAttributesKey, int thickness) {
this(myAttributesKey, thickness, 0, Position.RIGHT);
}
public DefaultLineMarkerRenderer(TextAttributesKey attributesKey, int thickness, int deepness, Position position) {
public DefaultLineMarkerRenderer(@NotNull TextAttributesKey attributesKey, int thickness, int depth, Position position) {
myAttributesKey = attributesKey;
myThickness = thickness;
myDeepness = deepness;
myDepth = depth;
myPosition = position;
EditorColorsScheme scheme = EditorColorsManager.getInstance().getGlobalScheme();
@@ -38,7 +34,8 @@ public class DefaultLineMarkerRenderer implements LineMarkerRendererEx {
if (color != null) {
myColor = ColorUtil.isDark(scheme.getDefaultBackground()) ? ColorUtil.shift(color, 1.5d) : color.darker();
} else {
}
else {
myColor = null;
}
}
@@ -49,16 +46,16 @@ public class DefaultLineMarkerRenderer implements LineMarkerRendererEx {
g.setColor(myColor);
g.fillRect(r.x, r.y, myThickness, r.height);
g.fillRect(r.x + myThickness, r.y, myDeepness, myThickness);
g.fillRect(r.x + myThickness, r.y + r.height - myThickness, myDeepness, myThickness);
g.fillRect(r.x + myThickness, r.y, myDepth, myThickness);
g.fillRect(r.x + myThickness, r.y + r.height - myThickness, myDepth, myThickness);
}
public TextAttributesKey getAttributesKey() {
return myAttributesKey;
}
public int getDeepness() {
return myDeepness;
public int getDepth() {
return myDepth;
}
public int getThickness() {