Skip to content

Commit 460a9fe

Browse files
committed
replace by new scheme api
1 parent 516dc21 commit 460a9fe

File tree

5 files changed

+124
-168
lines changed

5 files changed

+124
-168
lines changed
Lines changed: 59 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,71 @@
11
package consulo.python.impl;
22

3+
import com.jetbrains.python.impl.highlighting.PyHighlighter;
34
import consulo.annotation.component.ExtensionImpl;
4-
import consulo.colorScheme.AdditionalTextAttributesProvider;
5+
import consulo.colorScheme.AttributesFlyweightBuilder;
6+
import consulo.colorScheme.EditorColorSchemeExtender;
57
import consulo.colorScheme.EditorColorsScheme;
8+
import consulo.colorScheme.EffectType;
9+
import consulo.ui.color.RGBColor;
610
import jakarta.annotation.Nonnull;
711

812
/**
913
* @author VISTALL
1014
* @since 21/06/2023
1115
*/
1216
@ExtensionImpl
13-
public class PythonDarkAdditionalTextAttributesProvider implements AdditionalTextAttributesProvider {
14-
@Nonnull
15-
@Override
16-
public String getColorSchemeName() {
17-
return EditorColorsScheme.DARCULA_SCHEME_NAME;
18-
}
19-
20-
@Nonnull
21-
@Override
22-
public String getColorSchemeFile() {
23-
return "/colorSchemes/PythonDarcula.xml";
24-
}
17+
public class PythonDarkAdditionalTextAttributesProvider implements EditorColorSchemeExtender {
18+
@Nonnull
19+
@Override
20+
public String getColorSchemeId() {
21+
return EditorColorsScheme.DEFAULT_SCHEME_NAME;
22+
}
23+
24+
@Override
25+
public void extend(Builder builder) {
26+
builder.add(PyHighlighter.PY_BUILTIN_NAME, AttributesFlyweightBuilder.create()
27+
.withForeground(new RGBColor(0x80, 0x00, 0x0))
28+
.build());
29+
30+
builder.add(PyHighlighter.PY_CLASS_DEFINITION, AttributesFlyweightBuilder.create()
31+
.withBoldFont()
32+
.withEffect(EffectType.WAVE_UNDERSCORE, null)
33+
.build());
34+
35+
builder.add(PyHighlighter.PY_DECORATOR, AttributesFlyweightBuilder.create()
36+
.withForeground(new RGBColor(0xbb, 0xb5, 0x29))
37+
.withEffect(EffectType.WAVE_UNDERSCORE, null)
38+
.build());
39+
40+
builder.add(PyHighlighter.PY_FUNC_DEFINITION, AttributesFlyweightBuilder.create()
41+
.withBoldFont()
42+
.withEffect(EffectType.WAVE_UNDERSCORE, null)
43+
.build());
44+
45+
builder.add(PyHighlighter.PY_KEYWORD_ARGUMENT, AttributesFlyweightBuilder.create()
46+
.withForeground(new RGBColor(0xaa, 0x49, 0x26))
47+
.build());
48+
49+
builder.add(PyHighlighter.PY_PREDEFINED_DEFINITION, AttributesFlyweightBuilder.create()
50+
.withForeground(new RGBColor(0xB2, 0x00, 0xB2))
51+
.build());
52+
53+
builder.add(PyHighlighter.PY_PREDEFINED_USAGE, AttributesFlyweightBuilder.create()
54+
.withForeground(new RGBColor(0xB2, 0x00, 0xB2))
55+
.build());
56+
57+
builder.add(PyHighlighter.PY_SELF_PARAMETER, AttributesFlyweightBuilder.create()
58+
.withForeground(new RGBColor(0x94, 0x55, 0x8D))
59+
.build());
60+
61+
builder.add(PyHighlighter.PY_BYTE_STRING, AttributesFlyweightBuilder.create()
62+
.withForeground(new RGBColor(0xa5, 0xc2, 0x61))
63+
.withBoldFont()
64+
.build());
65+
66+
builder.add(PyHighlighter.PY_UNICODE_STRING, AttributesFlyweightBuilder.create()
67+
.withForeground(new RGBColor(0x00, 0x80, 0x80))
68+
.withBoldFont()
69+
.build());
70+
}
2571
}

python-impl/src/main/java/consulo/python/impl/PythonDefaultAdditionalTextAttributesProvider.java

Lines changed: 0 additions & 25 deletions
This file was deleted.
Lines changed: 65 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,65 @@
1+
package consulo.python.impl;
2+
3+
import com.jetbrains.python.impl.highlighting.PyHighlighter;
4+
import consulo.annotation.component.ExtensionImpl;
5+
import consulo.colorScheme.AttributesFlyweightBuilder;
6+
import consulo.colorScheme.EditorColorSchemeExtender;
7+
import consulo.colorScheme.EditorColorsScheme;
8+
import consulo.colorScheme.EffectType;
9+
import consulo.ui.color.RGBColor;
10+
import jakarta.annotation.Nonnull;
11+
12+
/**
13+
* @author VISTALL
14+
* @since 21/06/2023
15+
*/
16+
@ExtensionImpl
17+
public class PythonLightAdditionalTextAttributesProvider implements EditorColorSchemeExtender {
18+
@Nonnull
19+
@Override
20+
public String getColorSchemeId() {
21+
return EditorColorsScheme.DEFAULT_SCHEME_NAME;
22+
}
23+
24+
@Override
25+
public void extend(Builder builder) {
26+
builder.add(PyHighlighter.PY_BUILTIN_NAME, AttributesFlyweightBuilder.create()
27+
.withForeground(new RGBColor(0x80, 0x00, 0x0))
28+
.build());
29+
30+
builder.add(PyHighlighter.PY_CLASS_DEFINITION, AttributesFlyweightBuilder.create()
31+
.withForeground(new RGBColor(0, 0, 0))
32+
.withEffect(EffectType.WAVE_UNDERSCORE, null)
33+
.build());
34+
35+
builder.add(PyHighlighter.PY_DECORATOR, AttributesFlyweightBuilder.create()
36+
.withForeground(new RGBColor(0x00, 0x00, 0xB2))
37+
.build());
38+
39+
builder.add(PyHighlighter.PY_FUNC_DEFINITION, AttributesFlyweightBuilder.create()
40+
.withForeground(new RGBColor(0, 0, 0))
41+
.withEffect(EffectType.WAVE_UNDERSCORE, null)
42+
.build());
43+
44+
builder.add(PyHighlighter.PY_KEYWORD_ARGUMENT, AttributesFlyweightBuilder.create()
45+
.withForeground(new RGBColor(0x66, 0x00, 0x99))
46+
.build());
47+
48+
builder.add(PyHighlighter.PY_PREDEFINED_DEFINITION, AttributesFlyweightBuilder.create()
49+
.withForeground(new RGBColor(0xB2, 0x00, 0xB2))
50+
.build());
51+
52+
builder.add(PyHighlighter.PY_PREDEFINED_USAGE, AttributesFlyweightBuilder.create()
53+
.withForeground(new RGBColor(0xB2, 0x00, 0xB2))
54+
.build());
55+
56+
builder.add(PyHighlighter.PY_SELF_PARAMETER, AttributesFlyweightBuilder.create()
57+
.withForeground(new RGBColor(0x94, 0x55, 0x8D))
58+
.build());
59+
60+
builder.add(PyHighlighter.PY_UNICODE_STRING, AttributesFlyweightBuilder.create()
61+
.withForeground(new RGBColor(0x00, 0x80, 0x80))
62+
.withBoldFont()
63+
.build());
64+
}
65+
}

python-impl/src/main/resources/colorSchemes/PythonDarcula.xml

Lines changed: 0 additions & 68 deletions
This file was deleted.

python-impl/src/main/resources/colorSchemes/PythonDefault.xml

Lines changed: 0 additions & 62 deletions
This file was deleted.

0 commit comments

Comments
 (0)