From 050b78edc3d8d30cdc99c3e4e0d977c800b74ba2 Mon Sep 17 00:00:00 2001
From: Stanislav Dombrovsky <stanislav.dombrovsky@jetbrains.com>
Date: Thu, 1 Feb 2018 20:51:50 +0300
Subject: [PATCH] OC-16593, OC-16598, OC-16124 [fix execution point line
 color]. Related: https://github.com/JetBrains/colorSchemeTool/pull/21

---
 colorSchemes/src/colorSchemes/WarmNeon.xml        |  5 ++---
 colorSchemes/src/colorSchemes/all_hallows_eve.xml |  8 +-------
 colorSchemes/src/colorSchemes/blackboard.xml      | 12 +-----------
 colorSchemes/src/colorSchemes/cobalt.xml          |  8 +-------
 colorSchemes/src/colorSchemes/github.xml          | 13 +------------
 colorSchemes/src/colorSchemes/monokai.xml         |  6 ------
 colorSchemes/src/colorSchemes/rails_casts.xml     | 12 +-----------
 colorSchemes/src/colorSchemes/twilight.xml        |  8 +-------
 colorSchemes/src/colorSchemes/vibrant_ink.xml     |  6 ------
 9 files changed, 8 insertions(+), 70 deletions(-)

diff --git a/colorSchemes/src/colorSchemes/WarmNeon.xml b/colorSchemes/src/colorSchemes/WarmNeon.xml
index 6ebf1d417399..0aa33f780e88 100644
--- a/colorSchemes/src/colorSchemes/WarmNeon.xml
+++ b/colorSchemes/src/colorSchemes/WarmNeon.xml
@@ -18,7 +18,6 @@
     <option name="SELECTED_FOLDING_TREE_COLOR" value="32be33" />
     <option name="SELECTED_INDENT_GUIDE" value="6b5656" />
     <option name="SELECTION_BACKGROUND" value="348d34" />
-    <option name="TEARLINE_COLOR" value="404040" />
     <option name="WHITESPACES" value="656565" />
     <option name="WHITESPACES_MODIFIED_LINES_COLOR" value="6e5a5a" />
   </colors>
@@ -559,7 +558,7 @@
     </option>
     <option name="IDENTIFIER_UNDER_CARET_ATTRIBUTES">
       <value>
-        <option name="BACKGROUND" value="46464d" />
+        <option name="BACKGROUND" value="525259" />
         <option name="ERROR_STRIPE_COLOR" value="ccccff" />
       </value>
     </option>
@@ -1249,7 +1248,7 @@
     </option>
     <option name="WRITE_IDENTIFIER_UNDER_CARET_ATTRIBUTES">
       <value>
-        <option name="BACKGROUND" value="4d444d" />
+        <option name="BACKGROUND" value="594B52" />
         <option name="ERROR_STRIPE_COLOR" value="ffcdff" />
       </value>
     </option>
diff --git a/colorSchemes/src/colorSchemes/all_hallows_eve.xml b/colorSchemes/src/colorSchemes/all_hallows_eve.xml
index cf3263246915..218f20b020b6 100644
--- a/colorSchemes/src/colorSchemes/all_hallows_eve.xml
+++ b/colorSchemes/src/colorSchemes/all_hallows_eve.xml
@@ -413,7 +413,7 @@
         <option name="FOREGROUND" value="3387CC" />
       </value>
     </option>
-    <option baseAttributes="DEFAULT_FUNCTION_DECLARATION" name="DEFAULT_FUNCTION_CALL" />
+    <option baseAttributes="DEFAULT_IDENTIFIER" name="DEFAULT_FUNCTION_CALL" />
     <option baseAttributes="DEFAULT_IDENTIFIER" name="DEFAULT_FUNCTION_DECLARATION" />
     <option name="DEFAULT_GLOBAL_VARIABLE">
       <value>
@@ -535,12 +535,6 @@
         <option name="ERROR_STRIPE_COLOR" value="ff0000" />
       </value>
     </option>
-    <option name="EXECUTIONPOINT_ATTRIBUTES">
-      <value>
-        <option name="FOREGROUND" value="000101" />
-        <option name="BACKGROUND" value="c7c7ff" />
-      </value>
-    </option>
     <option name="FOLLOWED_HYPERLINK_ATTRIBUTES">
       <value>
         <option name="FOREGROUND" value="c7c7ff" />
diff --git a/colorSchemes/src/colorSchemes/blackboard.xml b/colorSchemes/src/colorSchemes/blackboard.xml
index 42649ba35577..62c6d0b5c60f 100644
--- a/colorSchemes/src/colorSchemes/blackboard.xml
+++ b/colorSchemes/src/colorSchemes/blackboard.xml
@@ -420,11 +420,7 @@
         <option name="FOREGROUND" value="D8FA3C" />
       </value>
     </option>
-    <option name="DEFAULT_FUNCTION_CALL">
-      <value>
-        <option name="FOREGROUND" value="FF6400" />
-      </value>
-    </option>
+    <option baseAttributes="DEFAULT_IDENTIFIER" name="DEFAULT_FUNCTION_CALL" />
     <option name="DEFAULT_FUNCTION_DECLARATION">
       <value>
         <option name="FOREGROUND" value="FF6400" />
@@ -572,12 +568,6 @@
         <option name="ERROR_STRIPE_COLOR" value="ff0000" />
       </value>
     </option>
-    <option name="EXECUTIONPOINT_ATTRIBUTES">
-      <value>
-        <option name="FOREGROUND" value="000101" />
-        <option name="BACKGROUND" value="c7c7ff" />
-      </value>
-    </option>
     <option name="FOLLOWED_HYPERLINK_ATTRIBUTES">
       <value>
         <option name="FOREGROUND" value="c7c7ff" />
diff --git a/colorSchemes/src/colorSchemes/cobalt.xml b/colorSchemes/src/colorSchemes/cobalt.xml
index 7b5e0a7b9c0f..09894eb8cbc6 100644
--- a/colorSchemes/src/colorSchemes/cobalt.xml
+++ b/colorSchemes/src/colorSchemes/cobalt.xml
@@ -518,7 +518,7 @@
     </option>
     <option name="DEFAULT_FUNCTION_CALL">
       <value>
-        <option name="FOREGROUND" value="FFDD00" />
+        <option name="FOREGROUND" value="CCCCCC" />
       </value>
     </option>
     <option name="DEFAULT_FUNCTION_DECLARATION">
@@ -705,12 +705,6 @@
         <option name="ERROR_STRIPE_COLOR" value="ff0000" />
       </value>
     </option>
-    <option name="EXECUTIONPOINT_ATTRIBUTES">
-      <value>
-        <option name="FOREGROUND" value="000101" />
-        <option name="BACKGROUND" value="c7c7ff" />
-      </value>
-    </option>
     <option name="FOLLOWED_HYPERLINK_ATTRIBUTES">
       <value>
         <option name="FOREGROUND" value="c7c7ff" />
diff --git a/colorSchemes/src/colorSchemes/github.xml b/colorSchemes/src/colorSchemes/github.xml
index ccc8df53e47b..f5d1b4fdda17 100644
--- a/colorSchemes/src/colorSchemes/github.xml
+++ b/colorSchemes/src/colorSchemes/github.xml
@@ -459,12 +459,7 @@
     </option>
     <option baseAttributes="TEXT" name="DEFAULT_DOT" />
     <option baseAttributes="DEFAULT_IDENTIFIER" name="DEFAULT_ENTITY" />
-    <option name="DEFAULT_FUNCTION_CALL">
-      <value>
-        <option name="FOREGROUND" value="990000" />
-        <option name="FONT_TYPE" value="1" />
-      </value>
-    </option>
+    <option baseAttributes="DEFAULT_IDENTIFIER" name="DEFAULT_FUNCTION_CALL" />
     <option name="DEFAULT_FUNCTION_DECLARATION">
       <value>
         <option name="FOREGROUND" value="990000" />
@@ -626,12 +621,6 @@
         <option name="ERROR_STRIPE_COLOR" value="ff0000" />
       </value>
     </option>
-    <option name="EXECUTIONPOINT_ATTRIBUTES">
-      <value>
-        <option name="FOREGROUND" value="ffffff" />
-        <option name="BACKGROUND" value="ff" />
-      </value>
-    </option>
     <option name="FOLLOWED_HYPERLINK_ATTRIBUTES">
       <value>
         <option name="FOREGROUND" value="0000ff" />
diff --git a/colorSchemes/src/colorSchemes/monokai.xml b/colorSchemes/src/colorSchemes/monokai.xml
index a924dca56ed7..8793fbd7f24d 100644
--- a/colorSchemes/src/colorSchemes/monokai.xml
+++ b/colorSchemes/src/colorSchemes/monokai.xml
@@ -600,12 +600,6 @@
         <option name="ERROR_STRIPE_COLOR" value="ff0000" />
       </value>
     </option>
-    <option name="EXECUTIONPOINT_ATTRIBUTES">
-      <value>
-        <option name="FOREGROUND" value="000101" />
-        <option name="BACKGROUND" value="c7c7ff" />
-      </value>
-    </option>
     <option name="FOLLOWED_HYPERLINK_ATTRIBUTES">
       <value>
         <option name="FOREGROUND" value="c7c7ff" />
diff --git a/colorSchemes/src/colorSchemes/rails_casts.xml b/colorSchemes/src/colorSchemes/rails_casts.xml
index 838502a24feb..a6c6a94d0ea9 100644
--- a/colorSchemes/src/colorSchemes/rails_casts.xml
+++ b/colorSchemes/src/colorSchemes/rails_casts.xml
@@ -449,11 +449,7 @@
         <option name="FOREGROUND" value="6D9CBE" />
       </value>
     </option>
-    <option name="DEFAULT_FUNCTION_CALL">
-      <value>
-        <option name="FOREGROUND" value="FFC66D" />
-      </value>
-    </option>
+    <option baseAttributes="DEFAULT_IDENTIFIER" name="DEFAULT_FUNCTION_CALL" />
     <option name="DEFAULT_FUNCTION_DECLARATION">
       <value>
         <option name="FOREGROUND" value="FFC66D" />
@@ -610,12 +606,6 @@
         <option name="ERROR_STRIPE_COLOR" value="ff0000" />
       </value>
     </option>
-    <option name="EXECUTIONPOINT_ATTRIBUTES">
-      <value>
-        <option name="FOREGROUND" value="000101" />
-        <option name="BACKGROUND" value="c7c7ff" />
-      </value>
-    </option>
     <option name="FOLLOWED_HYPERLINK_ATTRIBUTES">
       <value>
         <option name="FOREGROUND" value="c7c7ff" />
diff --git a/colorSchemes/src/colorSchemes/twilight.xml b/colorSchemes/src/colorSchemes/twilight.xml
index 8bb99c7d8383..d1b1624f9d99 100644
--- a/colorSchemes/src/colorSchemes/twilight.xml
+++ b/colorSchemes/src/colorSchemes/twilight.xml
@@ -456,7 +456,7 @@
     </option>
     <option name="DEFAULT_FUNCTION_CALL">
       <value>
-        <option name="FOREGROUND" value="9B703F" />
+        <option name="FOREGROUND" value="7587A6" />
       </value>
     </option>
     <option name="DEFAULT_FUNCTION_DECLARATION">
@@ -622,12 +622,6 @@
         <option name="ERROR_STRIPE_COLOR" value="ff0000" />
       </value>
     </option>
-    <option name="EXECUTIONPOINT_ATTRIBUTES">
-      <value>
-        <option name="FOREGROUND" value="000101" />
-        <option name="BACKGROUND" value="c7c7ff" />
-      </value>
-    </option>
     <option name="FOLLOWED_HYPERLINK_ATTRIBUTES">
       <value>
         <option name="FOREGROUND" value="c7c7ff" />
diff --git a/colorSchemes/src/colorSchemes/vibrant_ink.xml b/colorSchemes/src/colorSchemes/vibrant_ink.xml
index c5614bdf9ab4..99201f1988ca 100644
--- a/colorSchemes/src/colorSchemes/vibrant_ink.xml
+++ b/colorSchemes/src/colorSchemes/vibrant_ink.xml
@@ -575,12 +575,6 @@
         <option name="EFFECT_TYPE" value="2" />
       </value>
     </option>
-    <option name="EXECUTIONPOINT_ATTRIBUTES">
-      <value>
-        <option name="FOREGROUND" value="101" />
-        <option name="BACKGROUND" value="c7c7ff" />
-      </value>
-    </option>
     <option name="FOLDED_TEXT_ATTRIBUTES">
       <value>
         <option name="FOREGROUND" value="3c3d3c" />