Use static colors instead of inheritance for default language attributes (sufficient for backwards compatibility)

This commit is contained in:
Rustam Vishnyakov
2013-01-11 14:44:13 +04:00
parent 34e356a958
commit 7bca29941d
2 changed files with 65 additions and 33 deletions
+52 -20
View File
@@ -30,26 +30,6 @@
<option name="REMOTE_HOST_MAPPED_BACKGROUND_KEY" value="164716" />
</colors>
<attributes>
<option name="DEFAULT_TEMPLATE_LANGUAGE_COLOR">
<value>
<option name="BACKGROUND" value="141414"/>
</value>
</option>
<option name="DEFAULT_FUNCTION_DECLARATION">
<value>
<option name="FOREGROUND" value="ffc66d" />
</value>
</option>
<option name="DEFAULT_FUNCTION_CALL">
<value>
<option name="FOREGROUND" value="cc7833" />
</value>
</option>
<option name="DEFAULT_PARAMETER">
<value>
<option name="FOREGROUND"/>
</value>
</option>
<option name="DEFAULT_CLASS_NAME">
<value>
<option name="FOREGROUND" value="da4939" />
@@ -60,6 +40,58 @@
<option name="FOREGROUND" value="769aa5" />
</value>
</option>
<option name="DEFAULT_COMMA">
<value>
<option name="FOREGROUND" value="cc7832" />
</value>
</option>
<option name="DEFAULT_DOC_COMMENT">
<value>
<option name="FOREGROUND" value="629755" />
<option name="FONT_TYPE" value="2" />
</value>
</option>
<option name="DEFAULT_FUNCTION_CALL">
<value>
<option name="FOREGROUND" value="cc7833" />
</value>
</option>
<option name="DEFAULT_FUNCTION_DECLARATION">
<value>
<option name="FOREGROUND" value="ffc66d" />
</value>
</option>
<option name="DEFAULT_KEYWORD">
<value>
<option name="FOREGROUND" value="cc7832" />
<option name="FONT_TYPE" value="1" />
</value>
</option>
<option name="DEFAULT_LINE_COMMENT">
<value>
<option name="FOREGROUND" value="808080" />
</value>
</option>
<option name="DEFAULT_NUMBER">
<value>
<option name="FOREGROUND" value="6897bb" />
</value>
</option>
<option name="DEFAULT_SEMICOLON">
<value>
<option name="FOREGROUND" value="cc7832" />
</value>
</option>
<option name="DEFAULT_STRING">
<value>
<option name="FOREGROUND" value="a5c25c" />
</value>
</option>
<option name="DEFAULT_TEMPLATE_LANGUAGE_COLOR">
<value>
<option name="BACKGROUND" value="141414" />
</value>
</option>
<option name="ANNOTATION_ATTRIBUTE_NAME_ATTRIBUTES">
<value>
@@ -30,31 +30,31 @@ public class DefaultLanguageHighlighterColors {
public final static TextAttributesKey IDENTIFIER =
TextAttributesKey.createTextAttributesKey("DEFAULT_IDENTIFIER");
public final static TextAttributesKey NUMBER =
TextAttributesKey.createTextAttributesKey("DEFAULT_NUMBER", SyntaxHighlighterColors.NUMBER);
TextAttributesKey.createTextAttributesKey("DEFAULT_NUMBER", SyntaxHighlighterColors.NUMBER.getDefaultAttributes());
public final static TextAttributesKey KEYWORD =
TextAttributesKey.createTextAttributesKey("DEFAULT_KEYWORD", SyntaxHighlighterColors.KEYWORD);
TextAttributesKey.createTextAttributesKey("DEFAULT_KEYWORD", SyntaxHighlighterColors.KEYWORD.getDefaultAttributes());
public final static TextAttributesKey STRING =
TextAttributesKey.createTextAttributesKey("DEFAULT_STRING", SyntaxHighlighterColors.STRING);
TextAttributesKey.createTextAttributesKey("DEFAULT_STRING", SyntaxHighlighterColors.STRING.getDefaultAttributes());
public final static TextAttributesKey BLOCk_COMMENT =
TextAttributesKey.createTextAttributesKey("DEFAULT_BLOCK_COMMENT", SyntaxHighlighterColors.JAVA_BLOCK_COMMENT);
TextAttributesKey.createTextAttributesKey("DEFAULT_BLOCK_COMMENT", SyntaxHighlighterColors.JAVA_BLOCK_COMMENT.getDefaultAttributes());
public final static TextAttributesKey LINE_COMMENT =
TextAttributesKey.createTextAttributesKey("DEFAULT_LINE_COMMENT", SyntaxHighlighterColors.LINE_COMMENT);
TextAttributesKey.createTextAttributesKey("DEFAULT_LINE_COMMENT", SyntaxHighlighterColors.LINE_COMMENT.getDefaultAttributes());
public final static TextAttributesKey DOC_COMMENT =
TextAttributesKey.createTextAttributesKey("DEFAULT_DOC_COMMENT", SyntaxHighlighterColors.DOC_COMMENT);
TextAttributesKey.createTextAttributesKey("DEFAULT_DOC_COMMENT", SyntaxHighlighterColors.DOC_COMMENT.getDefaultAttributes());
public final static TextAttributesKey OPERATION_SIGN =
TextAttributesKey.createTextAttributesKey("DEFAULT_OPERATION_SIGN", SyntaxHighlighterColors.OPERATION_SIGN);
TextAttributesKey.createTextAttributesKey("DEFAULT_OPERATION_SIGN", SyntaxHighlighterColors.OPERATION_SIGN.getDefaultAttributes());
public final static TextAttributesKey BRACES =
TextAttributesKey.createTextAttributesKey("DEFAULT_BRACES", SyntaxHighlighterColors.BRACES);
TextAttributesKey.createTextAttributesKey("DEFAULT_BRACES", SyntaxHighlighterColors.BRACES.getDefaultAttributes());
public final static TextAttributesKey DOT =
TextAttributesKey.createTextAttributesKey("DEFAULT_DOT", SyntaxHighlighterColors.DOT);
TextAttributesKey.createTextAttributesKey("DEFAULT_DOT", SyntaxHighlighterColors.DOT.getDefaultAttributes());
public final static TextAttributesKey SEMICOLON =
TextAttributesKey.createTextAttributesKey("DEFAULT_SEMICOLON", SyntaxHighlighterColors.JAVA_SEMICOLON);
TextAttributesKey.createTextAttributesKey("DEFAULT_SEMICOLON", SyntaxHighlighterColors.JAVA_SEMICOLON.getDefaultAttributes());
public final static TextAttributesKey COMMA =
TextAttributesKey.createTextAttributesKey("DEFAULT_COMMA", SyntaxHighlighterColors.COMMA);
TextAttributesKey.createTextAttributesKey("DEFAULT_COMMA", SyntaxHighlighterColors.COMMA.getDefaultAttributes());
public final static TextAttributesKey PARENTHESES =
TextAttributesKey.createTextAttributesKey("DEFAULT_PARENTHS", SyntaxHighlighterColors.PARENTHS);
TextAttributesKey.createTextAttributesKey("DEFAULT_PARENTHS", SyntaxHighlighterColors.PARENTHS.getDefaultAttributes());
public final static TextAttributesKey BRACKETS =
TextAttributesKey.createTextAttributesKey("DEFAULT_BRACKETS", SyntaxHighlighterColors.BRACKETS);
TextAttributesKey.createTextAttributesKey("DEFAULT_BRACKETS", SyntaxHighlighterColors.BRACKETS.getDefaultAttributes());
public final static TextAttributesKey LABEL =
TextAttributesKey.createTextAttributesKey("DEFAULT_LABEL", IDENTIFIER);