Snapshot aea001abfc1b38fec3a821bcd5174cc77dc75787 from master branch of git://git.jetbrains.org/idea/community.git

Change-Id: Icdea2a2bd7ad43b4d05967b1f0479db3bda1c93c

8 files changed, 60 insertions, 17 deletions

diff --git a/colorSchemes/src/colorSchemes/Darcula.xml b/colorSchemes/src/colorSchemes/Darcula.xml
index a387bd064e1c..9749f7e8c4b8 100644
--- a/colorSchemes/src/colorSchemes/Darcula.xml
+++ b/colorSchemes/src/colorSchemes/Darcula.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <scheme name="Darcula" version="1" parent_scheme="Default">
   <option name="LINE_SPACING" value="1.0" />
-  <option name="EDITOR_FONT_SIZE" value="12" />
-  <option name="EDITOR_FONT_NAME" value="Menlo" />
+  <option name="EDITOR_FONT_SIZE" value="12" linux="14"/>
+  <option name="EDITOR_FONT_NAME" value="Menlo" linux="Source Code Pro"/>
   <colors>
     <option name="ADDED_LINES_COLOR" value="295622" />
     <option name="ANNOTATIONS_COLOR" value="8b999f" />
@@ -134,6 +134,12 @@
         <option name="EFFECT_TYPE" value="1" />
       </value>
     </option>
+    <option name="COFFEESCRIPT.PARAMETER">
+      <value>
+        <option name="EFFECT_COLOR" value="a9b7c6" />
+        <option name="EFFECT_TYPE" value="1" />
+      </value>
+    </option>
     <option name="COFFEESCRIPT.JAVASCRIPT_CONTENT">
       <value>
         <option name="FOREGROUND" value="a9b7c6" />
@@ -287,7 +293,7 @@
     </option>
     <option name="CUSTOM_STRING_ATTRIBUTES">
       <value>
-        <option name="FOREGROUND" value="a5c25c" />
+        <option name="FOREGROUND" value="6A8759" />
       </value>
     </option>
     <option name="CUSTOM_VALID_STRING_ESCAPE_ATTRIBUTES">
@@ -364,7 +370,7 @@
     </option>
     <option name="DEFAULT_INVALID_STRING_ESCAPE">
       <value>
-        <option name="FOREGROUND" value="a5c25c" />
+        <option name="FOREGROUND" value="6A8759" />
         <option name="EFFECT_COLOR" value="ff0000" />
         <option name="EFFECT_TYPE" value="2" />
       </value>
@@ -415,7 +421,7 @@
     </option>
     <option name="DEFAULT_STRING">
       <value>
-        <option name="FOREGROUND" value="a5c25c" />
+        <option name="FOREGROUND" value="6A8759" />
       </value>
     </option>
     <option name="DEFAULT_VALID_STRING_ESCAPE">
@@ -548,7 +554,7 @@
     </option>
     <option name="GString">
       <value>
-        <option name="FOREGROUND" value="a5c25c" />
+        <option name="FOREGROUND" value="6A8759" />
       </value>
     </option>
     <option name="Groovy method declaration">
@@ -743,7 +749,7 @@
     </option>
     <option name="JAVA_INVALID_STRING_ESCAPE">
       <value>
-        <option name="FOREGROUND" value="a5c25c" />
+        <option name="FOREGROUND" value="6A8759" />
         <option name="EFFECT_COLOR" value="ff0000" />
         <option name="EFFECT_TYPE" value="2" />
       </value>
@@ -770,7 +776,7 @@
     </option>
     <option name="JAVA_STRING">
       <value>
-        <option name="FOREGROUND" value="a5c25c" />
+        <option name="FOREGROUND" value="6A8759" />
       </value>
     </option>
     <option name="JAVA_VALID_STRING_ESCAPE">
@@ -992,7 +998,7 @@
     </option>
     <option name="OC.STRING">
       <value>
-        <option name="FOREGROUND" value="a5c25c" />
+        <option name="FOREGROUND" value="6A8759" />
       </value>
     </option>
     <option name="OC.STRUCT_FIELD">
@@ -1014,7 +1020,7 @@
     </option>
     <option name="PHP_EXEC_COMMAND_ID">
       <value>
-        <option name="FOREGROUND" value="a5c25c" />
+        <option name="FOREGROUND" value="6A8759" />
         <option name="BACKGROUND" value="5e6465" />
       </value>
     </option>
@@ -1042,7 +1048,7 @@
     </option>
     <option name="PROPERTIES.VALUE">
       <value>
-        <option name="FOREGROUND" value="a5c25c" />
+        <option name="FOREGROUND" value="6A8759" />
       </value>
     </option>
     <option name="PROTOCOL_REFERENCE">
@@ -1386,7 +1392,7 @@
     </option>
     <option name="SLIM_STRING_INTERPOLATED">
       <value>
-        <option name="FOREGROUND" value="a5c25c" />
+        <option name="FOREGROUND" value="6A8759" />
         <option name="FONT_TYPE" value="1" />
       </value>
     </option>
@@ -1456,7 +1462,7 @@
     </option>
     <option name="String">
       <value>
-        <option name="FOREGROUND" value="a5c25c" />
+        <option name="FOREGROUND" value="6A8759" />
       </value>
     </option>
     <option name="TAPESTRY_COMPONENT_PARAMATER">
@@ -1504,7 +1510,7 @@
     </option>
     <option name="TYPE_PARAMETER_NAME_ATTRIBUTES">
       <value>
-        <option name="FOREGROUND" value="247877" />
+        <option name="FOREGROUND" value="507874" />
       </value>
     </option>
     <option name="TYPO">
@@ -1515,7 +1521,7 @@
     </option>
     <option name="Type parameter">
       <value>
-        <option name="FOREGROUND" value="247877" />
+        <option name="FOREGROUND" value="507874" />
       </value>
     </option>
     <option name="UNMATCHED_BRACE_ATTRIBUTES">
@@ -1559,7 +1565,7 @@
     </option>
     <option name="VELOCITY_STRING">
       <value>
-        <option name="FOREGROUND" value="a5c25c" />
+        <option name="FOREGROUND" value="6A8759" />
         <option name="FONT_TYPE" value="1" />
       </value>
     </option>
@@ -1644,7 +1650,7 @@
     </option>
     <option name="XPATH.STRING">
       <value>
-        <option name="FOREGROUND" value="a5c25c" />
+        <option name="FOREGROUND" value="6A8759" />
         <option name="FONT_TYPE" value="1" />
       </value>
     </option>
diff --git a/colorSchemes/src/colorSchemes/all_hallows_eve.xml b/colorSchemes/src/colorSchemes/all_hallows_eve.xml
index f6b421223214..9483cad05e9f 100644
--- a/colorSchemes/src/colorSchemes/all_hallows_eve.xml
+++ b/colorSchemes/src/colorSchemes/all_hallows_eve.xml
@@ -136,6 +136,11 @@
         <option name="FOREGROUND" value="FFFFFF" />
       </value>
     </option>
+    <option name="COFFEESCRIPT.PARAMETER">
+      <value>
+        <option name="FONT_TYPE" value="2" />
+      </value>
+    </option>
     <option name="COFFEESCRIPT.HEREDOC_CONTENT">
       <value>
         <option name="FOREGROUND" value="66CC33" />
diff --git a/colorSchemes/src/colorSchemes/cobalt.xml b/colorSchemes/src/colorSchemes/cobalt.xml
index 753c6e4f8b36..8f3cb46aa1fd 100644
--- a/colorSchemes/src/colorSchemes/cobalt.xml
+++ b/colorSchemes/src/colorSchemes/cobalt.xml
@@ -138,6 +138,11 @@
         <option name="FOREGROUND" value="CCCCCC" />
       </value>
     </option>
+    <option name="COFFEESCRIPT.PARAMETER">
+      <value>
+        <option name="FOREGROUND" value="CCCCCC" />
+      </value>
+    </option>
     <option name="COFFEESCRIPT.HEREDOC_CONTENT">
       <value>
         <option name="FOREGROUND" value="3AD900" />
diff --git a/colorSchemes/src/colorSchemes/github.xml b/colorSchemes/src/colorSchemes/github.xml
index a2979fc4ad35..7e0e50c3d09d 100644
--- a/colorSchemes/src/colorSchemes/github.xml
+++ b/colorSchemes/src/colorSchemes/github.xml
@@ -116,6 +116,11 @@
         <option name="FOREGROUND" value="108888" />
       </value>
     </option>
+    <option name="COFFEESCRIPT.PARAMETER">
+      <value>
+        <option name="FONT_TYPE" value="2" />
+      </value>
+    </option>
     <option name="COFFEESCRIPT.HEREDOC_CONTENT">
       <value>
         <option name="FOREGROUND" value="DD1144" />
diff --git a/colorSchemes/src/colorSchemes/monokai.xml b/colorSchemes/src/colorSchemes/monokai.xml
index 362f11fd2f51..472c99dfa881 100644
--- a/colorSchemes/src/colorSchemes/monokai.xml
+++ b/colorSchemes/src/colorSchemes/monokai.xml
@@ -130,6 +130,12 @@
         <option name="FOREGROUND" value="E6DB74" />
       </value>
     </option>
+    <option name="COFFEESCRIPT.PARAMETER">
+      <value>
+        <option name="FOREGROUND" value="FD971F" />
+        <option name="FONT_TYPE" value="2" />
+      </value>
+    </option>
     <option name="COFFEESCRIPT.JAVASCRIPT_ID">
       <value>
         <option name="FOREGROUND" value="E6DB74" />
diff --git a/colorSchemes/src/colorSchemes/rails_casts.xml b/colorSchemes/src/colorSchemes/rails_casts.xml
index 8bcc529c9d2f..1770d473695e 100644
--- a/colorSchemes/src/colorSchemes/rails_casts.xml
+++ b/colorSchemes/src/colorSchemes/rails_casts.xml
@@ -113,6 +113,12 @@
         <option name="FOREGROUND" value="D0D0FF" />
       </value>
     </option>
+    <option name="COFFEESCRIPT.PARAMETER">
+      <value>
+        <option name="EFFECT_TYPE" value="1" />
+        <option name="EFFECT_COLOR" value="E6E1DC" />
+      </value>
+    </option>
     <option name="COFFEESCRIPT.HEREDOC_CONTENT">
       <value>
         <option name="FOREGROUND" value="A5C261" />
diff --git a/colorSchemes/src/colorSchemes/twilight.xml b/colorSchemes/src/colorSchemes/twilight.xml
index ddca67554351..d30254e6a19d 100644
--- a/colorSchemes/src/colorSchemes/twilight.xml
+++ b/colorSchemes/src/colorSchemes/twilight.xml
@@ -111,6 +111,11 @@
         <option name="FOREGROUND" value="7587A6" />
       </value>
     </option>
+    <option name="COFFEESCRIPT.PARAMETER">
+      <value>
+        <option name="FOREGROUND" value="7587A6" />
+      </value>
+    </option>
     <option name="COFFEESCRIPT.HEREDOC_CONTENT">
       <value>
         <option name="FOREGROUND" value="8F9D6A" />
diff --git a/colorSchemes/src/colorSchemes/vibrant_ink.xml b/colorSchemes/src/colorSchemes/vibrant_ink.xml
index 54b4b64c2c16..1b0c677e6546 100644
--- a/colorSchemes/src/colorSchemes/vibrant_ink.xml
+++ b/colorSchemes/src/colorSchemes/vibrant_ink.xml
@@ -142,6 +142,11 @@
         <option name="FOREGROUND" value="66ff00" />
       </value>
     </option>
+    <option name="COFFEESCRIPT.PARAMETER">
+      <value>
+        <option name="FONT_TYPE" value="2" />
+      </value>
+    </option>
     <option name="COFFEESCRIPT.HEREDOC_ID">
       <value>
         <option name="FOREGROUND" value="66ff00" />