Skip to content

Commit 9e18fa5

Browse files
halirutanhalirutan
committed
Fixed color settings panel
1 parent 20e691f commit 9e18fa5

5 files changed

Lines changed: 31 additions & 34 deletions

File tree

‎resources/colors/MathematicaDarcula.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -107,8 +107,8 @@
107107
<option name="MMA.USAGE_MESSAGE">
108108
<value>
109109
<option name="FOREGROUND" value="CC7832"/>
110-
<option name="EFFECT_COLOR" value="CC7832"/>
111-
<option name="EFFECT_TYPE" value="1"/>
110+
<option name="FONT_TYPE" value="1"/>
111+
112112
</value>
113113
</option>
114114

‎resources/colors/demoText.txt‎

Lines changed: 17 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,13 @@
1-
<usg>VariationalD::usage</usg> = "VariationalD[f, u[x], x] or
2-
VariationalD[f, u[x,y,...], {x,y,...}] returns the first variational
3-
derivative of the functional defined by the integrand f";
1+
(* Mathematica Package *)
2+
(* <cs>:Title:</cs> Variational Methods Package *)
3+
(* <cs>:Context:</cs> VariationalMethods` *)
44

5-
(* Implementation of the package *)
6-
VariationalD[<pat>f_</pat>, (<pat>y_</pat>)[<pat>x_</pat>, <pat>r___</pat>], <pat>w</pat>:{<pat>x_</pat>, <pat>r___</pat>}]/;integrandQ[<pat>f</pat>] :=
7-
Module[{<mod>Dfuncs</mod>, <mod>Dtimes</mod>, <mod>dummyfunc</mod>},
5+
VariationalD<usg>::usage</usg> = "VariationalD[f, u[x], x] or ...";
6+
VariationalD<msg>::args</msg> = "VariationalD takes a single integrand...";
7+
VariationalD<msg>::argx</msg> = "The second argument of VariationalD ...";
8+
9+
VariationalD[<pat>f</pat>_, (<pat>y</pat>_)[<pat>x</pat>_, <pat>r</pat>___], <pat>w</pat>:{<pat>x</pat>_, <pat>r</pat>___}]/;integrandQ[<pat>f</pat>] :=
10+
<k>Module</k>[{<mod>Dfuncs</mod>, <mod>Dtimes</mod>, <mod>dummyfunc</mod>},
811
<mod>Dfuncs</mod> = <k>Union</k>[<k>Cases</k>[{<pat>f</pat>}, <k>Derivative</k>[__][<pat>y</pat>][__], <k>Infinity</k>]];
912
<mod>Dtimes</mod> = (<k>Head</k>[<k>Head</k>[<slot>#1</slot>]] & ) /@ <mod>Dfuncs</mod> /. <k>Derivative</k> -> <k>List</k>;
1013
<k>Simplify</k>[<k>D</k>[<pat>f</pat>, <pat>y</pat>[<pat>x</pat>, <pat>r</pat>]] + (<k>ReleaseHold</k>[<k>Thread</k>[<mod>dummyfunc</mod>[(<k>D</k>[<pat>f</pat>,
@@ -13,7 +16,12 @@ VariationalD[<pat>f_</pat>, (<pat>y_</pat>)[<pat>x_</pat>, <pat>r___</pat>], <pa
1316
(<k>Thread</k>[{<pat>w</pat>, <slot>#1</slot>}] & ) /@ <mod>Dtimes</mod>]]] /. <mod>dummyfunc</mod> -> <k>D</k>) .
1417
<fn>((-1)^<slot>#1</slot> & ) /@ (<k>Apply</k>[<k>Plus</k>, <slot>#1</slot>] &</fn> ) /@ <mod>Dtimes</mod>] ]
1518

16-
VariationalD[<pat>f_</pat>, <pat>v</pat>:{(<pat>y_</pat>)[<pat>x_</pat>, <pat>r___</pat>], <pat>___</pat>}, <pat>w</pat>:{<pat>x_</pat>, <pat>r___</pat>}] :=
19+
VariationalD[<pat>f</pat>_, <pat>v</pat>:{(<pat>y_</pat>)[<pat>x_</pat>, <pat>r___</pat>], <pat>___</pat>}, <pat>w</pat>:{<pat>x_</pat>, <pat>r___</pat>}] :=
1720
(VariationalD[<pat>f</pat>, <slot>#1</slot>, <pat>w</pat>] & ) /@ <pat>v</pat> /;
18-
<k>If</k>[<k>Apply</k>[<k>And</k>, (<k>MatchQ</k>[<slot>#1</slot>, <pat>_</pat>[<k>Apply</k>[<k>Sequence</k>, <pat>w</pat>]]] & ) /@ <pat>v</pat>],
19-
<k>True</k>, <k>Message</k>[<msg>VariationalD::argx</msg>, <pat>w</pat>]]
21+
<k>If</k>[<k>Apply</k>[<k>And</k>, (<k>MatchQ</k>[<slot>#1</slot>, <pat>_</pat>[<k>Apply</k>[<k>Sequence</k>, <pat>w</pat>]]] & ) /@ <pat>v</pat>],
22+
<k>True</k>, <k>Message</k>[VariationalD<msg>::argx</msg>, <pat>w</pat>]]
23+
24+
EulerEquations[<pat>f</pat>_, <pat>funcs</pat>_, <pat>vars</pat>_]/;integrandQ[<pat>f</pat>] :=
25+
<k>Block</k>[{<blk>result</blk>=iEulerEquations[<pat>f</pat>, <pat>funcs</pat>, <pat>vars</pat>]},
26+
<blk>result</blk> /; <blk>result</blk> =!= <k>$Failed</k>
27+
]

‎src/de/halirutan/mathematica/codeinsight/highlighting/MathematicaColorSettingsPage.java‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,10 @@ public class MathematicaColorSettingsPage implements ColorSettingsPage {
5555
new AttributesDescriptor("Parenthesis", BRACE),
5656
new AttributesDescriptor("String", STRING),
5757
new AttributesDescriptor("Comment", COMMENT),
58-
new AttributesDescriptor("Patterns and arguments", PATTERN),
58+
new AttributesDescriptor("Comment Special", COMMENT_SPECIAL),
59+
new AttributesDescriptor("Module Variables", MODULE_LOCALIZED),
60+
new AttributesDescriptor("Block Variables", BLOCK_LOCALIZED),
61+
new AttributesDescriptor("Patterns and Arguments", PATTERN),
5962
new AttributesDescriptor("Anonymous functions", ANONYMOUS_FUNCTION),
6063
new AttributesDescriptor("Slots", SLOT),
6164
new AttributesDescriptor("Usage message", USAGE_MESSAGE),
@@ -99,10 +102,12 @@ public Map<String, TextAttributesKey> getAdditionalHighlightingTagToDescriptorMa
99102
map.put("usg", USAGE_MESSAGE);
100103
map.put("msg", MESSAGE);
101104
map.put("mod", MODULE_LOCALIZED);
105+
map.put("blk", BLOCK_LOCALIZED);
102106
map.put("fn", ANONYMOUS_FUNCTION);
103107
map.put("slot", SLOT);
104108
map.put("s", STRING);
105109
map.put("c", COMMENT);
110+
map.put("cs", COMMENT_SPECIAL);
106111
map.put("o", OPERATORS);
107112
map.put("b", BRACE);
108113
map.put("l", LITERAL);

‎src/de/halirutan/mathematica/codeinsight/highlighting/MathematicaHighlightingAnnotator.java‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -148,9 +148,14 @@ public void visitStringifiedSymbol(final StringifiedSymbol stringifiedSymbol) {
148148

149149
@Override
150150
public void visitMessageName(final MessageName messageName) {
151+
final StringifiedSymbol tag = messageName.getTag();
152+
TextAttributesKey color = MathematicaSyntaxHighlighterColors.MESSAGE;
153+
if ("usage".equals(tag.getText())) {
154+
color = MathematicaSyntaxHighlighterColors.USAGE_MESSAGE;
155+
}
151156
final ASTNode[] children = messageName.getNode().getChildren(null);
152157
for (int i = 1; i < children.length; i++) {
153-
setHighlightingStrict(children[i].getPsi(), myHolder, MathematicaSyntaxHighlighterColors.MESSAGE);
158+
setHighlightingStrict(children[i].getPsi(), myHolder, color);
154159
}
155160
}
156161

‎src/de/halirutan/mathematica/codeinsight/highlighting/MathematicaSyntaxHighlighterColors.java‎

Lines changed: 0 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -30,27 +30,6 @@
3030

3131
public class MathematicaSyntaxHighlighterColors {
3232

33-
// //Define colors from built-ins based on color-scheme
34-
// static final boolean isDark = UIManager.getLookAndFeel().getName().contains("Darcula");
35-
//
36-
// private static Color getFG(TextAttributesKey id) {
37-
// return id.getDefaultAttributes().getForegroundColor();
38-
// }
39-
//
40-
// private static Color getBG(TextAttributesKey id) {
41-
// return id.getDefaultAttributes().getBackgroundColor();
42-
// }
43-
44-
// static final Color BLUE = getFG(DefaultLanguageHighlighterColors.NUMBER);
45-
// static final Color GRAY = getFG(DefaultLanguageHighlighterColors.LINE_COMMENT);
46-
// static final Color GREEN = isDark ?
47-
// getFG(DefaultLanguageHighlighterColors.DOC_COMMENT) :
48-
// getFG(DefaultLanguageHighlighterColors.STRING);
49-
// static final Color PINK = getFG(DefaultLanguageHighlighterColors.STATIC_FIELD);
50-
// static final Color FOREGROUND = getFG(DefaultLanguageHighlighterColors.IDENTIFIER);
51-
// static final Color BACKGROUND = getBG(DefaultLanguageHighlighterColors.IDENTIFIER);
52-
53-
5433
public final static TextAttributesKey COMMENT = TextAttributesKey.createTextAttributesKey("MMA.COMMENT");
5534
public final static TextAttributesKey COMMENT_SPECIAL = TextAttributesKey.createTextAttributesKey("MMA.COMMENT_SPECIAL");
5635
public final static TextAttributesKey STRING = TextAttributesKey.createTextAttributesKey("MMA.STRING");

0 commit comments

Comments
 (0)