From f5bc5025dfedf531ca786bd4aa5ceec7a580abe2 Mon Sep 17 00:00:00 2001
From: Rustam Vishnyakov <rustam.vishnyakov@jetbrains.com>
Date: Thu, 10 Jan 2013 17:18:08 +0400
Subject: [PATCH] More default highlighting attributes

---
 colorSchemes/src/colorSchemes/Darcula.xml     | 26 +++++++++++++++++++
 .../DefaultLanguageHighlighterColors.java     | 21 ++++++++++++++-
 .../pages/DefaultLanguageColorsPage.java      | 25 ++++++++++++++++++
 3 files changed, 71 insertions(+), 1 deletion(-)

diff --git a/colorSchemes/src/colorSchemes/Darcula.xml b/colorSchemes/src/colorSchemes/Darcula.xml
index c962aa421520..3dbffb754473 100644
--- a/colorSchemes/src/colorSchemes/Darcula.xml
+++ b/colorSchemes/src/colorSchemes/Darcula.xml
@@ -35,6 +35,32 @@
         <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" />
+      </value>
+    </option>
+    <option name="DEFAULT_CLASS_REFERENCE">
+      <value>
+        <option name="FOREGROUND" value="769aa5" />
+      </value>
+    </option>
+
     <option name="ANNOTATION_ATTRIBUTE_NAME_ATTRIBUTES">
       <value>
         <option name="FOREGROUND" value="d0d0ff" />
diff --git a/platform/lang-api/src/com/intellij/openapi/editor/DefaultLanguageHighlighterColors.java b/platform/lang-api/src/com/intellij/openapi/editor/DefaultLanguageHighlighterColors.java
index c91de51f8a34..fc6787909f58 100644
--- a/platform/lang-api/src/com/intellij/openapi/editor/DefaultLanguageHighlighterColors.java
+++ b/platform/lang-api/src/com/intellij/openapi/editor/DefaultLanguageHighlighterColors.java
@@ -39,7 +39,7 @@ public class DefaultLanguageHighlighterColors {
   public final static TextAttributesKey STRING =
     TextAttributesKey.createTextAttributesKey("DEFAULT_STRING", SyntaxHighlighterColors.STRING);
   public final static TextAttributesKey BLOCk_COMMENT =
-    TextAttributesKey.createTextAttributesKey("DEFAULT_BLOCk_COMMENT", SyntaxHighlighterColors.JAVA_BLOCK_COMMENT);
+    TextAttributesKey.createTextAttributesKey("DEFAULT_BLOCK_COMMENT", SyntaxHighlighterColors.JAVA_BLOCK_COMMENT);
   public final static TextAttributesKey LINE_COMMENT =
     TextAttributesKey.createTextAttributesKey("DEFAULT_LINE_COMMENT", SyntaxHighlighterColors.LINE_COMMENT);
   public final static TextAttributesKey DOC_COMMENT =
@@ -59,5 +59,24 @@ public class DefaultLanguageHighlighterColors {
   public final static TextAttributesKey BRACKETS =
     TextAttributesKey.createTextAttributesKey("DEFAULT_BRACKETS", SyntaxHighlighterColors.BRACKETS);
 
+  public final static TextAttributesKey FUNCTION_DECLARATION =
+    TextAttributesKey.createTextAttributesKey("DEFAULT_FUNCTION_DECLARATION", IDENTIFIER);
+  public final static TextAttributesKey FUNCTION_CALL =
+    TextAttributesKey.createTextAttributesKey("DEFAULT_FUNCTION_CALL", IDENTIFIER);
+  public final static TextAttributesKey PARAMETER =
+    TextAttributesKey.createTextAttributesKey("DEFAULT_PARAMETER", IDENTIFIER);
+  public final static TextAttributesKey CLASS_NAME =
+    TextAttributesKey.createTextAttributesKey("DEFAULT_CLASS_NAME", IDENTIFIER);
+  public final static TextAttributesKey CLASS_REFERENCE =
+    TextAttributesKey.createTextAttributesKey("DEFAULT_CLASS_REFERENCE", IDENTIFIER);
+  public final static TextAttributesKey INSTANCE_METHOD =
+    TextAttributesKey.createTextAttributesKey("DEFAULT_INSTANCE_METHOD", FUNCTION_DECLARATION);
+  public final static TextAttributesKey INSTANCE_FIELD =
+    TextAttributesKey.createTextAttributesKey("DEFAULT_INSTANCE_FIELD", IDENTIFIER);
+  public final static TextAttributesKey STATIC_METHOD =
+    TextAttributesKey.createTextAttributesKey("DEFAULT_STATIC_METHOD", FUNCTION_DECLARATION);
+  public final static TextAttributesKey STATIC_FIELD =
+    TextAttributesKey.createTextAttributesKey("DEFAULT_STATIC_FIELD", IDENTIFIER);
+
 
 }
diff --git a/platform/lang-impl/src/com/intellij/openapi/options/colors/pages/DefaultLanguageColorsPage.java b/platform/lang-impl/src/com/intellij/openapi/options/colors/pages/DefaultLanguageColorsPage.java
index 868972a59dee..dc18b58a9e0d 100644
--- a/platform/lang-impl/src/com/intellij/openapi/options/colors/pages/DefaultLanguageColorsPage.java
+++ b/platform/lang-impl/src/com/intellij/openapi/options/colors/pages/DefaultLanguageColorsPage.java
@@ -57,6 +57,15 @@ public class DefaultLanguageColorsPage implements ColorSettingsPage, DisplayPrio
     TAG_HIGHLIGHTING_MAP.put("comma", DefaultLanguageHighlighterColors.COMMA);
     TAG_HIGHLIGHTING_MAP.put("brackets", DefaultLanguageHighlighterColors.BRACKETS);
     TAG_HIGHLIGHTING_MAP.put("parenths", DefaultLanguageHighlighterColors.PARENTHESES);
+    TAG_HIGHLIGHTING_MAP.put("func_decl", DefaultLanguageHighlighterColors.FUNCTION_DECLARATION);
+    TAG_HIGHLIGHTING_MAP.put("func_call", DefaultLanguageHighlighterColors.FUNCTION_CALL);
+    TAG_HIGHLIGHTING_MAP.put("param", DefaultLanguageHighlighterColors.PARAMETER);
+    TAG_HIGHLIGHTING_MAP.put("class_name", DefaultLanguageHighlighterColors.CLASS_NAME);
+    TAG_HIGHLIGHTING_MAP.put("class_ref", DefaultLanguageHighlighterColors.CLASS_REFERENCE);
+    TAG_HIGHLIGHTING_MAP.put("inst_method", DefaultLanguageHighlighterColors.INSTANCE_METHOD);
+    TAG_HIGHLIGHTING_MAP.put("inst_field", DefaultLanguageHighlighterColors.INSTANCE_FIELD);
+    TAG_HIGHLIGHTING_MAP.put("static_method", DefaultLanguageHighlighterColors.STATIC_METHOD);
+    TAG_HIGHLIGHTING_MAP.put("static_field", DefaultLanguageHighlighterColors.STATIC_FIELD);
   }
 
   private final AttributesDescriptor[] myAttributesDescriptors;
@@ -77,6 +86,15 @@ public class DefaultLanguageColorsPage implements ColorSettingsPage, DisplayPrio
       new AttributesDescriptor(this, "Line comment", DefaultLanguageHighlighterColors.LINE_COMMENT),
       new AttributesDescriptor(this, "Block comment", DefaultLanguageHighlighterColors.BLOCk_COMMENT),
       new AttributesDescriptor(this, "Doc comment", DefaultLanguageHighlighterColors.DOC_COMMENT),
+      new AttributesDescriptor(this, "Function declaration", DefaultLanguageHighlighterColors.FUNCTION_DECLARATION),
+      new AttributesDescriptor(this, "Function call", DefaultLanguageHighlighterColors.FUNCTION_CALL),
+      new AttributesDescriptor(this, "Parameter", DefaultLanguageHighlighterColors.PARAMETER),
+      new AttributesDescriptor(this, "Class name", DefaultLanguageHighlighterColors.CLASS_NAME),
+      new AttributesDescriptor(this, "Class reference", DefaultLanguageHighlighterColors.CLASS_REFERENCE),
+      new AttributesDescriptor(this, "Instance method", DefaultLanguageHighlighterColors.INSTANCE_METHOD),
+      new AttributesDescriptor(this, "Instance field", DefaultLanguageHighlighterColors.INSTANCE_FIELD),
+      new AttributesDescriptor(this, "Static method", DefaultLanguageHighlighterColors.STATIC_METHOD),
+      new AttributesDescriptor(this, "Static field", DefaultLanguageHighlighterColors.STATIC_FIELD),
       new AttributesDescriptor(this, "Template language", DefaultLanguageHighlighterColors.TEMPLATE_LANGUAGE_COLOR),
     };
   }
@@ -109,6 +127,13 @@ public class DefaultLanguageColorsPage implements ColorSettingsPage, DisplayPrio
       "<line_comment>// Line comment</line_comment>\n" +
       "<block_comment>/* Block comment */</block_comment>\n" +
       "<doc_comment>/** Doc comment */</doc_comment>\n" +
+      "Function <func_decl>declaration</func_decl> (<param>parameter</param>)\n" +
+      "Function <func_call>call</func_call>()\n" +
+      "Class <class_name>Name</class_name>\n" +
+      "    instance <inst_method>method</inst_method>\n" +
+      "    instance <inst_field>field</inst_field>\n" +
+      "    static <static_method>method</static_method>\n" +
+      "    static <static_field>field</static_field>\n" +
       "<template_language>{% Template language %}</template_language>";
   }