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

color settings page code refactoring (following IDEA-CR-29030)

Browse Source
This commit is contained in:
Dmitry Batrak
2018-03-14 11:47:56 +03:00
parent 4cef8a998c
commit 18550560ed
2 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/lang-impl/src/com/intellij/application/options/colors/SimpleEditorPreview.java
+4 -5
View File
@@ -276,7 +276,7 @@ public class SimpleEditorPreview implements PreviewPanel {
for (final TextAttributesKey tokenHighlight : tokenHighlights) {
String type = tokenHighlight.getExternalName();
if (type != null && type.equals(attrKey)) {
HighlightData highlightData = new HighlightData(iterator.getStart(), iterator.getEnd(), BLINKING_HIGHLIGHTS_ATTRIBUTES, null);
HighlightData highlightData = new HighlightData(iterator.getStart(), iterator.getEnd(), BLINKING_HIGHLIGHTS_ATTRIBUTES);
highlights.add(highlightData);
matchingHighlights.add(highlightData);
}
@@ -358,8 +358,7 @@ public class SimpleEditorPreview implements PreviewPanel {
final boolean rainbowType = page.isRainbowType(highlightKey);
final boolean rainbowDemoType = highlightKey == RainbowHighlighter.RAINBOW_GRADIENT_DEMO;
if (rainbowType || rainbowDemoType) {
final HighlightData rainbowAnchor = new HighlightData(d.getStartOffset(), d.getEndOffset(), RainbowHighlighter.RAINBOW_ANCHOR,
null);
final HighlightData rainbowAnchor = new HighlightData(d.getStartOffset(), d.getEndOffset(), RainbowHighlighter.RAINBOW_ANCHOR);
if (isRainbowOn) {
// rainbow on
HighlightData rainbowTemp;
@@ -367,7 +366,7 @@ public class SimpleEditorPreview implements PreviewPanel {
rainbowTemp = getRainbowTemp(rainbowTempKeys, d.getStartOffset(), d.getEndOffset());
}
else {
rainbowTemp = new HighlightData(d.getStartOffset(), d.getEndOffset(), rainbowTempKeys[tempKeyIndex % colorCount], null);
rainbowTemp = new HighlightData(d.getStartOffset(), d.getEndOffset(), rainbowTempKeys[tempKeyIndex % colorCount]);
if (repeatAnchor && tempKeyIndex == colorCount/2) {
// anchor [Color#3] colored twice: it the end and in the beginning of rainbow-demo string
repeatAnchor = false;
@@ -411,6 +410,6 @@ public class SimpleEditorPreview implements PreviewPanel {
int startOffset, int endOffset) {
String id = myEditor.getDocument().getText(TextRange.create(startOffset, endOffset));
int index = UsedColors.getOrAddColorIndex((EditorImpl)myEditor, id, rainbowTempKeys.length);
return new HighlightData(startOffset, endOffset, rainbowTempKeys[index], null);
return new HighlightData(startOffset, endOffset, rainbowTempKeys[index]);
}
}
platform/lang-impl/src/com/intellij/application/options/colors/highlighting/HighlightData.java
+7 -2
View File
@@ -14,6 +14,7 @@ import com.intellij.openapi.editor.markup.RangeHighlighter;
import com.intellij.openapi.editor.markup.TextAttributes;
import com.intellij.util.ui.UIUtil;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import java.awt.*;
import java.util.Collection;
@@ -27,13 +28,17 @@ public class HighlightData {
private final TextAttributesKey myHighlightType;
private final ColorKey myAdditionalColorKey;
public HighlightData(int startOffset, TextAttributesKey highlightType, ColorKey additionalColorKey) {
public HighlightData(int startOffset, TextAttributesKey highlightType, @Nullable ColorKey additionalColorKey) {
myStartOffset = startOffset;
myHighlightType = highlightType;
myAdditionalColorKey = additionalColorKey;
}
public HighlightData(int startOffset, int endOffset, TextAttributesKey highlightType, ColorKey additionalColorKey) {
public HighlightData(int startOffset, int endOffset, TextAttributesKey highlightType) {
this(startOffset, endOffset, highlightType, null);
}
public HighlightData(int startOffset, int endOffset, TextAttributesKey highlightType, @Nullable ColorKey additionalColorKey) {
myStartOffset = startOffset;
myEndOffset = endOffset;
myHighlightType = highlightType;