Merge pull request #36 from gaplo917/intellij-4-1-enhancement

Enhancement & Regression
gaplo917 · Nov 12, 2021 · e1c31e0 · e1c31e0
2 parents 6d11411 + 0e5b9fd
commit e1c31e0
Show file tree

Hide file tree

Showing 4 changed files with 68 additions and 28 deletions.
diff --git a/README.md b/README.md
@@ -1,28 +1,26 @@
 # GapStyle - Being Productive Beyond Your Status Quo.
 
-The world-first\* productivity-oriented color scheme for intelliJ, VSCode to fill the gap
-between programming languages and human.
+The world-first\* productivity-oriented color scheme for intelliJ, VSCode to fill the gap between programming languages
+and human.
 
 <p align="center">
   <img align="center" src="gap-style-github-og-image-v4.png"/>
 </p>
 
-GapStyle is a **_world-first_\*** **_productivity-oriented_** and
-**_semantic-highlighting-driven_** designed color scheme that
-**_[each supported language](#actively-maintain-language)_** is tailored with
-**_[rich colors while maintaining a comfortable contrast](#gapstyle-specification)_** to
-help developers boost reading and writing speed in different programming languages.
+GapStyle is a **_world-first_\*** **_productivity-oriented_** and **_semantic-highlighting-driven_** designed color
+scheme that **_[each supported language](#actively-maintain-language)_** is tailored with
+**_[rich colors while maintaining a comfortable contrast](#gapstyle-specification)_** to help developers boost reading
+and writing speed in different programming languages.
 
-<small><i>\* The world-first color scheme uses color affinity design to boost developers'
-productivity by representing semantically similar syntax, i.e. class, abstract class, and
-interface in Kotlin, Java, Scala, etc. See
-[GapStyle Specification](https://github.com/gaplo917/GapStyle/tree/master/spec#color-palette)
+<small><i>\* The world-first color scheme uses affinitive color platte design to boost developers' productivity by using
+similar colors to represent semantically similar syntax, i.e. class, abstract class, and interface in Kotlin, Java,
+Scala, etc. See [GapStyle Specification](https://github.com/gaplo917/GapStyle/tree/master/spec#color-palette)
 </i></small>
 
 ## Objectives
 
-- Optimize languages' color schemes to boost reading and writing speed on different
-  languages. (Especially the language you are not familiar)
+- Optimize languages' color schemes to boost reading and writing speed on different languages. (Especially the language
+  you are not familiar)
 - Quickly learn similar syntax with a universal designed color across different languages
 - Spot errors before program execution
 

diff --git a/intellij/GapStyle/META-INF/plugin.xml b/intellij/GapStyle/META-INF/plugin.xml
@@ -1,7 +1,7 @@
 <idea-plugin>
   <id>color.scheme.GapStyle</id>
   <name>GapStyle Color Scheme</name>
-  <version>4.0</version>
+  <version>4.1</version>
   <vendor email="[email protected]" url="https://github.com/gaplo917/GapStyle">Gary Lo</vendor>
   <description><![CDATA[
     <h2><b>Being Productive Beyond Your Status Quo.</b></h2>
@@ -16,10 +16,20 @@
     <li><b>Objective 2:</b> Quickly learn similar syntax with a universal designed color across different languages. </li>
     <li><b>Supported Languages:</b> Kotlin, Java, Swift, Dart, Rust, Scala, Javascript, Typescript, Go, Python, R, Android Logcat, Android Native (C / C++), Objective-C, SQL, HTML, CSS, PHP, Ruby, Erlang, Elixir</li>
     </ul>
-    <p>* 'world-first' color scheme uses <a href=&quot;https://github.com/gaplo917/GapStyle/tree/master/spec#color-palette&quot;>color affinity concept to boost developers' productivity by representing semantically similar syntax</a>, i.e. class, abstract class, and interface in Java.</p>
+    <p>* 'world-first' color scheme uses <a href=&quot;https://github.com/gaplo917/GapStyle/tree/master/spec#color-palette&quot;>affinitive color platte design to boost developers' productivity by using similar colors to represent semantically similar syntax</a>, i.e. class, abstract class, and interface in Java.</p>
   ]]></description>
 
   <change-notes><![CDATA[
+      <h1>4.1</h1>
+      <p>Being Productive Beyond Your Status Quo. Bring your productive experience further from GapStyle 3.1.</p>
+      <ul>
+        <li>[All] Enhance reassign variables style to</li>
+        <li>[Elixir] Enhance Elixir styles</li>
+        <li>[C++] Enhance Elixir styles</li>
+        <li>[Python] Fix Python build-in variables color (regression)</li>
+        <li>Add new plugin icon for branding</li>
+        <li><a href=&quot;https://marketplace.visualstudio.com/items?itemName=gaplo917.gapstylevs&quot;>GapStyle VS 2.0</a> (VS Code support is available!)</li>
+      </ul>
       <h1>4.0</h1>
       <p>Being Productive Beyond Your Status Quo. Bring your productive experience further from GapStyle 3.1.</p>
       <ul>

diff --git a/intellij/GapStyle/colors/GapStyle.xml b/intellij/GapStyle/colors/GapStyle.xml
@@ -1,9 +1,9 @@
-<scheme name="GapStyle 4.0" version="142" parent_scheme="Darcula">
+<scheme name="GapStyle 4.1" version="142" parent_scheme="Darcula">
     <metaInfo>
         <property name="created">2018-10-15T04:33:26</property>
         <property name="ide">idea</property>
         <property name="ideVersion">2021.2.0.0</property>
-        <property name="modified">2021-10-24T22:28:54</property>
+        <property name="modified">2021-11-11T13:25:18</property>
     </metaInfo>
     <option name="LINE_SPACING" value="1.2"/>
     <font>
@@ -822,13 +822,15 @@
         <option name="DEFAULT_REASSIGNED_LOCAL_VARIABLE">
             <value>
                 <option name="FOREGROUND" value="cbad96"/>
-                <option name="FONT_TYPE" value="1" />
+                <option name="EFFECT_COLOR" value="707d95" />
+                <option name="EFFECT_TYPE" value="1" />
             </value>
         </option>
         <option name="DEFAULT_REASSIGNED_PARAMETER">
             <value>
                 <option name="FOREGROUND" value="fd971f"/>
-                <option name="FONT_TYPE" value="1" />
+                <option name="EFFECT_COLOR" value="707d95" />
+                <option name="EFFECT_TYPE" value="1" />
             </value>
         </option>
         <option name="DEFAULT_SEMICOLON">
@@ -1064,7 +1066,26 @@
             </value>
         </option>
         <option name="ELIXIR_IGNORED_VARIABLE" baseAttributes="ELIXIR_VARIABLE"/>
-        <option name="ELIXIR_MACRO_CALL" baseAttributes="ELIXIR_FUNCTION_CALL"/>
+        <option name="ELIXIR_KEYWORD">
+            <value>
+                <option name="FOREGROUND" value="f92672" />
+                <option name="FONT_TYPE" value="1" />
+                <option name="EFFECT_TYPE" value="1" />
+            </value>
+        </option>
+        <option name="ELIXIR_MACRO_CALL">
+            <value>
+                <option name="FOREGROUND" value="f92672" />
+                <option name="FONT_TYPE" value="1" />
+                <option name="EFFECT_TYPE" value="5" />
+            </value>
+        </option>
+        <option name="ELIXIR_MAP" baseAttributes="DEFAULT_BRACES" />
+        <option name="ELIXIR_MODULE_ATTRIBUTE">
+            <value>
+                <option name="FOREGROUND" value="bbb529" />
+            </value>
+        </option>
         <option name="ELIXIR_MAP" baseAttributes="DEFAULT_BRACES"/>
         <option name="ELIXIR_OPERATION_SIGN">
             <value>
@@ -1083,6 +1104,8 @@
         </option>
         <option name="ELIXIR_PREDEFINED">
             <value>
+                <option name="FOREGROUND" value="f92672" />
+                <option name="FONT_TYPE" value="1" />
                 <option name="EFFECT_TYPE" value="5"/>
             </value>
         </option>
@@ -1102,6 +1125,9 @@
                 <option name="FOREGROUND" value="e6db74"/>
             </value>
         </option>
+        <option name="ELIXIR_TYPE">
+            <value />
+        </option>
         <option name="ELIXIR_TYPE_PARAMETER">
             <value>
                 <option name="FOREGROUND" value="20999d"/>
@@ -1124,7 +1150,8 @@
         </option>
         <option name="ERL_ATTRIBUTE">
             <value>
-                <option name="FOREGROUND" value="bbb529"/>
+                <option name="FOREGROUND" value="f92672" />
+                <option name="FONT_TYPE" value="1" />
             </value>
         </option>
         <option name="ERL_BUILT_IN_TYPE">
@@ -2498,7 +2525,9 @@
             </value>
         </option>
         <option name="OC.CONDITIONALLY_NOT_COMPILED">
-            <value />
+            <value>
+                <option name="FOREGROUND" value="686a4e" />
+            </value>
         </option>
         <option name="OC.CPP_KEYWORD">
             <value>
@@ -2579,7 +2608,7 @@
         </option>
         <option name="OC.MESSAGE_ARGUMENT">
             <value>
-                <option name="FOREGROUND" value="a6e22e"/>
+                <option name="FOREGROUND" value="9cda3e"/>
             </value>
         </option>
         <option name="OC.METHOD_DECLARATION">
@@ -2638,7 +2667,7 @@
         </option>
         <option name="OC.STRUCT_LIKE">
             <value>
-                <option name="FOREGROUND" value="cfd3"/>
+                <option name="FOREGROUND" value="66d9ef"/>
             </value>
         </option>
         <option name="OC.TEMPLATE_TYPE">
@@ -2787,7 +2816,7 @@
         </option>
         <option name="PY.BUILTIN_NAME">
             <value>
-                <option name="FOREGROUND" value="a6e22f"/>
+                <option name="FOREGROUND" value="4186f9"/>
                 <option name="EFFECT_TYPE" value="5"/>
             </value>
         </option>
@@ -2937,13 +2966,15 @@
         <option name="REASSIGNED_LOCAL_VARIABLE_ATTRIBUTES">
             <value>
                 <option name="FOREGROUND" value="cbad96"/>
-                <option name="FONT_TYPE" value="1" />
+                <option name="EFFECT_COLOR" value="707d95" />
+                <option name="EFFECT_TYPE" value="1" />
             </value>
         </option>
         <option name="REASSIGNED_PARAMETER_ATTRIBUTES">
             <value>
                 <option name="FOREGROUND" value="fd971f"/>
-                <option name="FONT_TYPE" value="1" />
+                <option name="EFFECT_COLOR" value="707d95" />
+                <option name="EFFECT_TYPE" value="1" />
             </value>
         </option>
         <option name="REGEXP.CHARACTER">
@@ -3273,7 +3304,8 @@
         <option name="ReSharper.FSHARP_MUTABLE_FUNCTION_IDENTIFIER">
             <value>
                 <option name="FOREGROUND" value="a6e22e"/>
-                <option name="FONT_TYPE" value="1" />
+                <option name="EFFECT_COLOR" value="707d95" />
+                <option name="EFFECT_TYPE" value="1" />
             </value>
         </option>
         <option name="ReSharper.FSHARP_STATIC_CLASS_IDENTIFIER">

diff --git a/intellij/GapStyle4.1.jar b/intellij/GapStyle4.1.jar