From 53770f012ee0b0838d014206e4d9d4cbe8cb83d8 Mon Sep 17 00:00:00 2001
From: Rustam Vishnyakov <rustam.vishnyakov@jetbrains.com>
Date: Tue, 15 Jan 2013 15:24:29 +0400
Subject: [PATCH] Default language highlighter attributes for ActionScript +
 metadata key

---
 colorSchemes/src/colorSchemes/Darcula.xml     | 75 ++-----------------
 .../DefaultLanguageHighlighterColors.java     |  3 +
 .../pages/DefaultLanguageColorsPage.java      |  4 +
 .../src/messages/OptionsBundle.properties     |  1 +
 .../src/DefaultColorSchemesManager.xml        |  5 ++
 5 files changed, 18 insertions(+), 70 deletions(-)

diff --git a/colorSchemes/src/colorSchemes/Darcula.xml b/colorSchemes/src/colorSchemes/Darcula.xml
index 3be5ac1f9608..c0e715510fb1 100644
--- a/colorSchemes/src/colorSchemes/Darcula.xml
+++ b/colorSchemes/src/colorSchemes/Darcula.xml
@@ -140,6 +140,11 @@
         <option name="FOREGROUND" value="cc7832" />
       </value>
     </option>
+    <option name="DEFAULT_METADATA">
+      <value>
+        <option name="FOREGROUND" value="bbb529" />
+      </value>
+    </option>
 
     <option name="ANNOTATION_ATTRIBUTE_NAME_ATTRIBUTES">
       <value>
@@ -651,76 +656,6 @@
         <option name="ERROR_STRIPE_COLOR" />
       </value>
     </option>
-    <option name="ECMAL4.AL4.LOCAL_VARIABLE">
-      <value>
-        <option name="FOREGROUND" value="458383" />
-        <option name="BACKGROUND" />
-        <option name="FONT_TYPE" value="0" />
-        <option name="EFFECT_COLOR" />
-        <option name="EFFECT_TYPE" value="-1" />
-        <option name="ERROR_STRIPE_COLOR" />
-      </value>
-    </option>
-    <option name="ECMAL4.ATTRIBUTE">
-      <value>
-        <option name="FOREGROUND" value="bbb529" />
-        <option name="BACKGROUND" />
-        <option name="FONT_TYPE" value="0" />
-        <option name="EFFECT_COLOR" />
-        <option name="EFFECT_TYPE" value="-1" />
-        <option name="ERROR_STRIPE_COLOR" />
-      </value>
-    </option>
-    <option name="ECMAL4.INSTANCE_MEMBER_FUNCTION">
-      <value>
-        <option name="FOREGROUND" value="9876aa" />
-        <option name="BACKGROUND" />
-        <option name="FONT_TYPE" value="0" />
-        <option name="EFFECT_COLOR" />
-        <option name="EFFECT_TYPE" value="-1" />
-        <option name="ERROR_STRIPE_COLOR" />
-      </value>
-    </option>
-    <option name="ECMAL4.KEYWORD">
-      <value>
-        <option name="FOREGROUND" value="cc7832" />
-        <option name="BACKGROUND" />
-        <option name="FONT_TYPE" value="1" />
-        <option name="EFFECT_COLOR" />
-        <option name="EFFECT_TYPE" value="0" />
-        <option name="ERROR_STRIPE_COLOR" />
-      </value>
-    </option>
-    <option name="ECMAL4.PARAMETER">
-      <value>
-        <option name="FOREGROUND" />
-        <option name="BACKGROUND" />
-        <option name="FONT_TYPE" value="2" />
-        <option name="EFFECT_COLOR" />
-        <option name="EFFECT_TYPE" value="1" />
-        <option name="ERROR_STRIPE_COLOR" />
-      </value>
-    </option>
-    <option name="ECMAL4.REGEXP">
-      <value>
-        <option name="FOREGROUND" value="3fa29a" />
-        <option name="BACKGROUND" />
-        <option name="FONT_TYPE" value="0" />
-        <option name="EFFECT_COLOR" />
-        <option name="EFFECT_TYPE" value="-1" />
-        <option name="ERROR_STRIPE_COLOR" />
-      </value>
-    </option>
-    <option name="ECMAL4.STATIC_MEMBER_FUNCTION">
-      <value>
-        <option name="FOREGROUND" value="9876aa" />
-        <option name="BACKGROUND" />
-        <option name="FONT_TYPE" value="2" />
-        <option name="EFFECT_COLOR" />
-        <option name="EFFECT_TYPE" value="0" />
-        <option name="ERROR_STRIPE_COLOR" />
-      </value>
-    </option>
     <option name="EL.BOUNDS">
       <value>
         <option name="FOREGROUND" />
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 10c4612a6631..ac4cdef78851 100644
--- a/platform/lang-api/src/com/intellij/openapi/editor/DefaultLanguageHighlighterColors.java
+++ b/platform/lang-api/src/com/intellij/openapi/editor/DefaultLanguageHighlighterColors.java
@@ -99,4 +99,7 @@ public class DefaultLanguageHighlighterColors {
 
   public final static TextAttributesKey PREDEFINED_SYMBOL =
     TextAttributesKey.createTextAttributesKey("DEFAULT_PREDEFINED_SYMBOL", IDENTIFIER);
+
+  public final static TextAttributesKey METADATA =
+    TextAttributesKey.createTextAttributesKey("DEFAULT_METADATA", HighlighterColors.TEXT);
 }
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 a8f557d1bc4a..9064ae2d89c6 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
@@ -83,6 +83,7 @@ public class DefaultLanguageColorsPage implements ColorSettingsPage, DisplayPrio
     TAG_HIGHLIGHTING_MAP.put("valid_esc_seq", DefaultLanguageHighlighterColors.VALID_STRING_ESCAPE);
     TAG_HIGHLIGHTING_MAP.put("invalid_esc_seq", DefaultLanguageHighlighterColors.INVALID_STRING_ESCAPE);
     TAG_HIGHLIGHTING_MAP.put("predefined", DefaultLanguageHighlighterColors.PREDEFINED_SYMBOL);
+    TAG_HIGHLIGHTING_MAP.put("metadata", DefaultLanguageHighlighterColors.METADATA);
   }
 
   private final static AttributesDescriptor[] ATTRIBUTES_DESCRIPTORS = {
@@ -142,6 +143,8 @@ public class DefaultLanguageColorsPage implements ColorSettingsPage, DisplayPrio
       OptionsBundle.message("options.language.defaults.parameter"), DefaultLanguageHighlighterColors.PARAMETER),
     new AttributesDescriptor(
       OptionsBundle.message("options.language.defaults.interface.name"), DefaultLanguageHighlighterColors.INTERFACE_NAME),
+    new AttributesDescriptor(
+      OptionsBundle.message("options.language.defaults.metadata"), DefaultLanguageHighlighterColors.METADATA),
     new AttributesDescriptor(
       OptionsBundle.message("options.language.defaults.class.name"), DefaultLanguageHighlighterColors.CLASS_NAME),
     new AttributesDescriptor(
@@ -198,6 +201,7 @@ public class DefaultLanguageColorsPage implements ColorSettingsPage, DisplayPrio
       "    Local <local_var>variable</local_var>\n" +
       "Function <func_call>call</func_call>()\n" +
       "Interface <interface>Name</interface>\n" +
+      "<metadata>@Metadata</metadata>\n" +
       "Class <class_name>Name</class_name>\n" +
       "    instance <inst_method>method</inst_method>\n" +
       "    instance <inst_field>field</inst_field>\n" +
diff --git a/platform/platform-resources-en/src/messages/OptionsBundle.properties b/platform/platform-resources-en/src/messages/OptionsBundle.properties
index 4f8416fa5c99..c3c4cff26eb3 100644
--- a/platform/platform-resources-en/src/messages/OptionsBundle.properties
+++ b/platform/platform-resources-en/src/messages/OptionsBundle.properties
@@ -182,6 +182,7 @@ options.language.defaults.static.method=Static method
 options.language.defaults.static.field=Static field
 options.language.defaults.template.language=Template language
 options.language.defaults.predefined=Predefined symbol
+options.language.defaults.metadata=Metadata
 
 options.java.color.descriptor.full.coverage=Full line coverage
 options.java.color.descriptor.partial.coverage=Partial line coverage
diff --git a/platform/platform-resources/src/DefaultColorSchemesManager.xml b/platform/platform-resources/src/DefaultColorSchemesManager.xml
index c0ba37511bb9..40757fe7e034 100644
--- a/platform/platform-resources/src/DefaultColorSchemesManager.xml
+++ b/platform/platform-resources/src/DefaultColorSchemesManager.xml
@@ -85,6 +85,11 @@
           <option name="FONT_TYPE" value="2"/>
         </value>
       </option>
+      <option name="DEFAULT_METADATA">
+        <value>
+          <option name="FOREGROUND" value="808000" />
+        </value>
+      </option>
 
       <option name="LINE_PARTIAL_COVERAGE">
         <value>