From 30c6e67b8112162b1bd7d43e548da3340c4c239c Mon Sep 17 00:00:00 2001
From: Eugene Kudelevsky <Eugene.Kudelevsky@jetbrains.com>
Date: Fri, 7 Oct 2011 18:41:58 +0400
Subject: [PATCH] WI-7830 setting for base background/foreground of html code

---
 .../src/messages/OptionsBundle.properties                      | 1 +
 resources-en/src/search/searchableOptions.xml                  | 1 +
 .../src/com/intellij/ide/highlighter/HtmlFileHighlighter.java  | 2 +-
 .../intellij/openapi/options/colors/pages/HTMLColorsPage.java  | 1 +
 .../src/com/intellij/openapi/editor/XmlHighlighterColors.java  | 3 +++
 5 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/platform/platform-resources-en/src/messages/OptionsBundle.properties b/platform/platform-resources-en/src/messages/OptionsBundle.properties
index 8dd4bb1d610f..80147583cdbd 100644
--- a/platform/platform-resources-en/src/messages/OptionsBundle.properties
+++ b/platform/platform-resources-en/src/messages/OptionsBundle.properties
@@ -21,6 +21,7 @@ options.general.attribute.descriptor.text.search.result=Text search result
 options.general.attribute.descriptor.template.variable=Template variable
 
 options.html.attribute.descriptor.comment=Comment
+options.html.attribute.descriptor.code=HTML code
 options.html.attribute.descriptor.tag=Tag
 options.html.attribute.descriptor.tag.name=Tag name
 options.html.attribute.descriptor.attribute.name=Attribute name
diff --git a/resources-en/src/search/searchableOptions.xml b/resources-en/src/search/searchableOptions.xml
index 26fe133530a9..69752c0eb607 100644
--- a/resources-en/src/search/searchableOptions.xml
+++ b/resources-en/src/search/searchableOptions.xml
@@ -7562,6 +7562,7 @@
     <option name="comment" hit="Comment" />
     <option name="entity" hit="Entity reference" />
     <option name="reference" hit="Entity reference" />
+    <option name="code" hit="HTML code" />
     <option name="tag" hit="Tag" />
     <option name="name" hit="Tag name" />
     <option name="tag" hit="Tag name" />
diff --git a/xml/impl/src/com/intellij/ide/highlighter/HtmlFileHighlighter.java b/xml/impl/src/com/intellij/ide/highlighter/HtmlFileHighlighter.java
index 9bba8f89dab3..daff833257be 100644
--- a/xml/impl/src/com/intellij/ide/highlighter/HtmlFileHighlighter.java
+++ b/xml/impl/src/com/intellij/ide/highlighter/HtmlFileHighlighter.java
@@ -87,7 +87,7 @@ public class HtmlFileHighlighter extends SyntaxHighlighterBase {
 
   @NotNull
   public TextAttributesKey[] getTokenHighlights(IElementType tokenType) {
-    return pack(keys1.get(tokenType), keys2.get(tokenType));
+    return pack(XmlHighlighterColors.HTML_CODE, pack(keys1.get(tokenType), keys2.get(tokenType)));
   }
 
   public static final void registerEmbeddedTokenAttributes(Map<IElementType, TextAttributesKey> _keys1,
diff --git a/xml/impl/src/com/intellij/openapi/options/colors/pages/HTMLColorsPage.java b/xml/impl/src/com/intellij/openapi/options/colors/pages/HTMLColorsPage.java
index ae87ea48ac3a..417fcf3b01db 100644
--- a/xml/impl/src/com/intellij/openapi/options/colors/pages/HTMLColorsPage.java
+++ b/xml/impl/src/com/intellij/openapi/options/colors/pages/HTMLColorsPage.java
@@ -34,6 +34,7 @@ import java.util.Map;
 
 public class HTMLColorsPage implements ColorSettingsPage {
   private static final AttributesDescriptor[] ATTRS = new AttributesDescriptor[] {
+    new AttributesDescriptor(OptionsBundle.message("options.html.attribute.descriptor.code"), XmlHighlighterColors.HTML_CODE),
     new AttributesDescriptor(OptionsBundle.message("options.html.attribute.descriptor.comment"), XmlHighlighterColors.HTML_COMMENT),
     new AttributesDescriptor(OptionsBundle.message("options.html.attribute.descriptor.tag"), XmlHighlighterColors.HTML_TAG),
     new AttributesDescriptor(OptionsBundle.message("options.html.attribute.descriptor.tag.name"), XmlHighlighterColors.HTML_TAG_NAME),
diff --git a/xml/openapi/src/com/intellij/openapi/editor/XmlHighlighterColors.java b/xml/openapi/src/com/intellij/openapi/editor/XmlHighlighterColors.java
index 3188fd1aa777..43f0da56674b 100644
--- a/xml/openapi/src/com/intellij/openapi/editor/XmlHighlighterColors.java
+++ b/xml/openapi/src/com/intellij/openapi/editor/XmlHighlighterColors.java
@@ -39,4 +39,7 @@ public class XmlHighlighterColors {
   public static final TextAttributesKey HTML_ATTRIBUTE_NAME = TextAttributesKey.createTextAttributesKey("HTML_ATTRIBUTE_NAME");
   public static final TextAttributesKey HTML_ATTRIBUTE_VALUE = TextAttributesKey.createTextAttributesKey("HTML_ATTRIBUTE_VALUE");
   public static final TextAttributesKey HTML_ENTITY_REFERENCE = TextAttributesKey.createTextAttributesKey("HTML_ENTITY_REFERENCE");
+
+  public static final TextAttributesKey HTML_CODE =
+    TextAttributesKey.createTextAttributesKey("HTML_CODE", HighlighterColors.TEXT.getDefaultAttributes().clone());
 }