From 7a01205e53dd59c3ed79b1ba800111c2c15a72a3 Mon Sep 17 00:00:00 2001
From: Dmitry Batkovich <dmitry.batkovich@jetbrains.com>
Date: Tue, 12 Aug 2014 16:14:33 +0400
Subject: [PATCH] highlight colors reverted

---
 colorSchemes/src/colorSchemes/Darcula.xml      |  12 ++++++------
 .../HighlightDisplayLevel.java                 |   2 +-
 platform/icons/src/general/errorMask.png       | Bin 1034 -> 273 bytes
 platform/icons/src/general/errorMask@2x.png    | Bin 1053 -> 0 bytes
 platform/icons/src/general/errorMask_dark.png  | Bin 0 -> 147 bytes
 .../MultiScopeSeverityIcon.java                |   2 +-
 .../src/DefaultColorSchemesManager.xml         |  12 ++++++------
 7 files changed, 14 insertions(+), 14 deletions(-)
 delete mode 100644 platform/icons/src/general/errorMask@2x.png
 create mode 100644 platform/icons/src/general/errorMask_dark.png

diff --git a/colorSchemes/src/colorSchemes/Darcula.xml b/colorSchemes/src/colorSchemes/Darcula.xml
index 2665674ca240..9691e1db6a5e 100644
--- a/colorSchemes/src/colorSchemes/Darcula.xml
+++ b/colorSchemes/src/colorSchemes/Darcula.xml
@@ -553,9 +553,9 @@
     </option>
     <option name="ERRORS_ATTRIBUTES">
       <value>
-        <option name="EFFECT_COLOR" value="dc3737" />
+        <option name="EFFECT_COLOR" value="bc3f3c" />
         <option name="EFFECT_TYPE" value="2" />
-        <option name="ERROR_STRIPE_COLOR" value="dc3737" />
+        <option name="ERROR_STRIPE_COLOR" value="bc3f3c" />
       </value>
     </option>
     <option name="EXECUTIONPOINT_ATTRIBUTES">
@@ -578,9 +578,9 @@
     </option>
     <option name="GENERIC_SERVER_ERROR_OR_WARNING">
       <value>
-        <option name="EFFECT_COLOR" value="fa8c00" />
+        <option name="EFFECT_COLOR" value="f49810" />
         <option name="EFFECT_TYPE" value="1" />
-        <option name="ERROR_STRIPE_COLOR" value="fa8c00" />
+        <option name="ERROR_STRIPE_COLOR" value="f49810" />
       </value>
     </option>
     <option name="GRADLE_CHANGE_CONFLICT">
@@ -1565,9 +1565,9 @@
     </option>
     <option name="WARNING_ATTRIBUTES">
       <value>
-        <option name="BACKGROUND" value="ffd900" />
+        <option name="BACKGROUND" value="52503a" />
         <option name="EFFECT_TYPE" value="2" />
-        <option name="ERROR_STRIPE_COLOR" value="ffd900" />
+        <option name="ERROR_STRIPE_COLOR" value="8c8c00" />
       </value>
     </option>
     <option name="WRITE_IDENTIFIER_UNDER_CARET_ATTRIBUTES">
diff --git a/platform/analysis-api/src/com/intellij/codeHighlighting/HighlightDisplayLevel.java b/platform/analysis-api/src/com/intellij/codeHighlighting/HighlightDisplayLevel.java
index d77144064518..75a2eca11e43 100644
--- a/platform/analysis-api/src/com/intellij/codeHighlighting/HighlightDisplayLevel.java
+++ b/platform/analysis-api/src/com/intellij/codeHighlighting/HighlightDisplayLevel.java
@@ -38,7 +38,7 @@ public class HighlightDisplayLevel {
                                                                                                         createIconByMask(CodeInsightColors.GENERIC_SERVER_ERROR_OR_WARNING));
   public static final HighlightDisplayLevel ERROR = new HighlightDisplayLevel(HighlightSeverity.ERROR, createIconByMask(CodeInsightColors.ERRORS_ATTRIBUTES));
   public static final HighlightDisplayLevel WARNING = new HighlightDisplayLevel(HighlightSeverity.WARNING, createIconByMask(CodeInsightColors.WARNINGS_ATTRIBUTES));
-  public static final HighlightDisplayLevel DO_NOT_SHOW = new HighlightDisplayLevel(HighlightSeverity.INFORMATION, createIconByMask(new Color(110, 180, 65)));
+  public static final HighlightDisplayLevel DO_NOT_SHOW = new HighlightDisplayLevel(HighlightSeverity.INFORMATION, createIconByMask(new Color(30, 160, 0)));
   /**
    * use #WEAK_WARNING instead
    */
diff --git a/platform/icons/src/general/errorMask.png b/platform/icons/src/general/errorMask.png
index 38690e9cdd779b771c8fbf152d9ad2f674a5bd1b..c9e0305c1b3ceb81cf1d113cf0b9e280bb45e3df 100644
GIT binary patch
delta 256
zcmV+b0ssDr2$2Gi8Gi%-008`alxzS10N6=HK~#9!b<D92!B7+i;GgJVXjB+z(zNM-
zgqRW0gu#l*RD&4BVC)N+yn@9mn7n|eAn^c52NIh6PVQZ~CppRazdsik{2CInj@)z0
zh)d2HCbRb<UTfHM!xg6-viE5}JCFW#q+u)Zm|ZsLzudcbu6dqX8X{?TSz(#^Tkc{V
zO1qkdrF_zm7;>eMK^8>~bN1*nuOJNrCTtDir~PtoIccX=zW`rBGJAIJ-o=v8kl2EQ
zrh@n4(LYxYB?(PwJE$X25U;PJQ)^d45jK1@5nv*~Kko}Vx`=<ORTeq`0000<MNUMn
GLSTX|?sG~2

literal 1034
zcmbVLO>5LZ7!E8HDOM1?C?aDD(t^ok^0B)U8tZnmwJUBd+r{od#7Q#g#x|KWnRU~i
zir_&Iym;w<5b^H8bN_+|uj0w02M=|!-K`!<4+fI?$oo9c`}t;L{lVPqjaf;O=Gtp+
zSFD%I_tK2`J{dm!E|%-O)#sZm<Rg+%sSz-bf_6-{X_t~<fA5$sNm6Am>h*cQ^T_sD
ztdi13E#g$5C2487NQu8gIq>LqlsNLw&tGH^1&+LBb+k^}q=RVfAfuZH>plNq$H#%Z
zd=D%YwjhWpC!mOTliV&GdCY5zeR&OKFgD>kj(qA=zq0|FETh0uEydT632InH7BcJT
zF3>e(K+S;2P>^nG*hUtZJhD*Bg3#`|s}n78a^wN$sSV+1G*U-~%Cc>UFvd{Rp{^^!
zLdo|NP6{Q-=cf!V&HXG&dBhS>G7^ssxg!ftPeX{)PUnm`$tQ^tDT4(`AyPFM$7Nh&
z>zsG#UpLOR&U^bQg<YDnVdjf^g!5Cd$lb+4rJ?Y~ew;<3C}h`V{xGHqZ@Z2x{-{9|
z*w{0SnvXq2^E5*trl~7+ghM3^t2Drf65^Xvp7ZdUQNy){yMlB}L#Sn9LvLVfwO+SO
z)YMzr6x&X6P7<F^wIiWD!8R_$+Rcm-&axh3yVEY%7%<NA0ZT!%2^O}ZBw(X_v8>Q(
zz%I?Amo!+-SPaG~wxe_8u|+(Sh*+x{4U{l24aKYaSgD3)ort4H0$-lsga1t(6i&gi
zPyXqf>6K{4a(gxf;&3)cG!es-i79!vuvbnPY`cwK@zp!3v1hj{i-*_dPEJmKQ4d`G
r1b*CkSUIk~eF5xS_tDyinM0`}-F$z=eSP%%TZwJA*4>XQ&tLrk)~!JK

diff --git a/platform/icons/src/general/errorMask@2x.png b/platform/icons/src/general/errorMask@2x.png
deleted file mode 100644
index 560f53709f243e5fac2256b5bad43ad5a1ad8bf5..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1053
zcmbVLO>5LZ7)~ilsjMCZ(LymzFBMEOlaJj^Xj*qSTf6ACWxLSDgE~nj-Pk6RCQ~=v
zqn?C%5PJ0HMNs?$9>kM)6a>MO_y_9ITb*ootB2Bqfn?ry@;>kP^K5P9c42aAlH<5S
zW7%%8^J@N1oM+!3J?l3+uF-mjt`nd3P=dLNM;y#ILbQon7<qd;pYc4$jqe2Q4(&AW
znl1??l-o#I7&A1-%`av#a<?$$9lRMtmT>s~gTM!#C2Z(T(2Q%i8!Yz|yxw1FyZtTK
z@Px$$em*mqgAh~1XW@2~nwcdG{F+S8uVsNBn9watI8Lh5T;ppb!MrZ%q6?tLmkbH&
zP%FcmyaJ#q1678q2o)0;Ce-=iBd}<R=bJ5iX&8%Xme8d%Hf6cj>q$LTBFUx<4a1Ou
zA}fl>EW~s#q9_xibav#y#;KbGF%3w>=N^$mcBv(>Opi+l<7V^3ag+`l#abq3D3+lF
z<S@+Z8d#^ah5x2;s&(4li?Q6oDcMb2HV=Px1ZKTEJ5X-OvN2bafDHw0+r-@saYP%o
zC9pq|7kH-OsA|bI91%D`6_KVXVi_8~==(+N84x4nY9l|V;bBP!WnHa8MF$YpwQ@x%
z+qHVNR)M+!wCV`kh*F9o7ms2GEcOsvITLHv5{xKG+JtP6wqUJGC`r2{=4&;6ZX<|1
z(o1jT6FM%~#!2uPdrJuk`9X`#;FR!&jvNiKT8jXCqVH*{=oDQ;Ec#j*G1WnyD-7}8
z|F%wMNy+)1{IfTsE4GZec)|jvobU)oj64Zr$(vvH7sjw^!>+Wm@6O8-xj!>r7`r_F
zeC)#hi-Uu&tIelJM@NTu9$dc_PWN}fqmQr8y}Gi0Zy?O+Q*SR$CkxyJ;AV`%r*F!o
PpE+S0^%eVF_2H9060Avu

diff --git a/platform/icons/src/general/errorMask_dark.png b/platform/icons/src/general/errorMask_dark.png
new file mode 100644
index 0000000000000000000000000000000000000000..d2c4cfda28cf9708672d0a44d08925a0e24a3aba
GIT binary patch
literal 147
zcmeAS@N?(olHy`uVBq!ia0vp^JRr=$1|-8uW1a&k$r9IylHmNblJdl&R0hYC{G?O`
z&)mfH)S%SFl*+=BsWw1Grk*a2Ar-fh=9uN)Qe;y)xH<j2M1(`nnKNfpk7TS^yS6tm
sNkOnDOF~8}!r>xsmt&GC1B(R187bb*#eZ*R01aU9boFyt=akR{0G0bKy8r+H

literal 0
HcmV?d00001

diff --git a/platform/lang-impl/src/com/intellij/profile/codeInspection/ui/inspectionsTree/MultiScopeSeverityIcon.java b/platform/lang-impl/src/com/intellij/profile/codeInspection/ui/inspectionsTree/MultiScopeSeverityIcon.java
index 360138095d04..099dbb622261 100644
--- a/platform/lang-impl/src/com/intellij/profile/codeInspection/ui/inspectionsTree/MultiScopeSeverityIcon.java
+++ b/platform/lang-impl/src/com/intellij/profile/codeInspection/ui/inspectionsTree/MultiScopeSeverityIcon.java
@@ -62,7 +62,6 @@ public class MultiScopeSeverityIcon implements Icon {
 
     final Collection<HighlightSeverity> values = myScopeToAverageSeverityMap.values();
     int idx = 0;
-    ((Graphics2D)g).setComposite(AlphaComposite.getInstance(AlphaComposite.SRC_OVER, 0.5f));
     for (final HighlightSeverity severity : values) {
       final Icon icon = HighlightDisplayLevel.find(severity).getIcon();
       g.setColor(icon instanceof HighlightDisplayLevel.SingleColorIconWithMask ?
@@ -71,6 +70,7 @@ public class MultiScopeSeverityIcon implements Icon {
       g.fillRect(x, j, partWidth, getIconHeight());
       idx++;
     }
+    g.drawImage(HighlightDisplayLevel.ImageHolder.ourErrorMaskImage, i, j, null);
   }
 
   @Override
diff --git a/platform/platform-resources/src/DefaultColorSchemesManager.xml b/platform/platform-resources/src/DefaultColorSchemesManager.xml
index 6dce76772a7f..e0737bb3195d 100644
--- a/platform/platform-resources/src/DefaultColorSchemesManager.xml
+++ b/platform/platform-resources/src/DefaultColorSchemesManager.xml
@@ -239,9 +239,9 @@
         <value>
           <option name="FOREGROUND"/>
           <option name="BACKGROUND"/>
-          <option name="EFFECT_COLOR" value="dc3737"/>
+          <option name="EFFECT_COLOR" value="ff0000"/>
           <option name="EFFECT_TYPE" value="2"/>
-          <option name="ERROR_STRIPE_COLOR" value="dc3737" />
+          <option name="ERROR_STRIPE_COLOR" value="ff0000" />
         </value>
       </option>
       <option name="BLINKING_HIGHLIGHTS_ATTRIBUTES">
@@ -281,19 +281,19 @@
       <option name="WARNING_ATTRIBUTES">
         <value>
           <option name="FOREGROUND"/>
-          <option name="BACKGROUND" value="ffd900"/>
+          <option name="BACKGROUND" value="f6ebbc"/>
           <option name="EFFECT_COLOR"/>
           <option name="EFFECT_TYPE" value="1"/>
-          <option name="ERROR_STRIPE_COLOR" value="ffd900" />
+          <option name="ERROR_STRIPE_COLOR" value="ffff00" />
         </value>
       </option>
       <option name="GENERIC_SERVER_ERROR_OR_WARNING">
         <value>
           <option name="FOREGROUND"/>
           <option name="BACKGROUND"/>
-          <option name="EFFECT_COLOR" value="fa8c00"/>
+          <option name="EFFECT_COLOR" value="f49810"/>
           <option name="EFFECT_TYPE" value="2"/>
-          <option name="ERROR_STRIPE_COLOR" value="fa8c00" />
+          <option name="ERROR_STRIPE_COLOR" value="f49810" />
         </value>
       </option>
       <option name="DUPLICATE_FROM_SERVER">