Skip to content

Commit e1c31e0

Browse files
authored
Merge pull request #36 from gaplo917/intellij-4-1-enhancement
Enhancement & Regression
2 parents 6d11411 + 0e5b9fd commit e1c31e0

File tree

4 files changed

+68
-28
lines changed

4 files changed

+68
-28
lines changed

README.md

Lines changed: 11 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,26 @@
11
# GapStyle - Being Productive Beyond Your Status Quo.
22

3-
The world-first\* productivity-oriented color scheme for intelliJ, VSCode to fill the gap
4-
between programming languages and human.
3+
The world-first\* productivity-oriented color scheme for intelliJ, VSCode to fill the gap between programming languages
4+
and human.
55

66
<p align="center">
77
<img align="center" src="gap-style-github-og-image-v4.png"/>
88
</p>
99

10-
GapStyle is a **_world-first_\*** **_productivity-oriented_** and
11-
**_semantic-highlighting-driven_** designed color scheme that
12-
**_[each supported language](#actively-maintain-language)_** is tailored with
13-
**_[rich colors while maintaining a comfortable contrast](#gapstyle-specification)_** to
14-
help developers boost reading and writing speed in different programming languages.
10+
GapStyle is a **_world-first_\*** **_productivity-oriented_** and **_semantic-highlighting-driven_** designed color
11+
scheme that **_[each supported language](#actively-maintain-language)_** is tailored with
12+
**_[rich colors while maintaining a comfortable contrast](#gapstyle-specification)_** to help developers boost reading
13+
and writing speed in different programming languages.
1514

16-
<small><i>\* The world-first color scheme uses color affinity design to boost developers'
17-
productivity by representing semantically similar syntax, i.e. class, abstract class, and
18-
interface in Kotlin, Java, Scala, etc. See
19-
[GapStyle Specification](https://github.com/gaplo917/GapStyle/tree/master/spec#color-palette)
15+
<small><i>\* The world-first color scheme uses affinitive color platte design to boost developers' productivity by using
16+
similar colors to represent semantically similar syntax, i.e. class, abstract class, and interface in Kotlin, Java,
17+
Scala, etc. See [GapStyle Specification](https://github.com/gaplo917/GapStyle/tree/master/spec#color-palette)
2018
</i></small>
2119

2220
## Objectives
2321

24-
- Optimize languages' color schemes to boost reading and writing speed on different
25-
languages. (Especially the language you are not familiar)
22+
- Optimize languages' color schemes to boost reading and writing speed on different languages. (Especially the language
23+
you are not familiar)
2624
- Quickly learn similar syntax with a universal designed color across different languages
2725
- Spot errors before program execution
2826

intellij/GapStyle/META-INF/plugin.xml

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<idea-plugin>
22
<id>color.scheme.GapStyle</id>
33
<name>GapStyle Color Scheme</name>
4-
<version>4.0</version>
4+
<version>4.1</version>
55
<vendor email="gaplotech@gmail.com" url="https://github.com/gaplo917/GapStyle">Gary Lo</vendor>
66
<description><![CDATA[
77
<h2><b>Being Productive Beyond Your Status Quo.</b></h2>
@@ -16,10 +16,20 @@
1616
<li><b>Objective 2:</b> Quickly learn similar syntax with a universal designed color across different languages. </li>
1717
<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>
1818
</ul>
19-
<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>
19+
<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>
2020
]]></description>
2121

2222
<change-notes><![CDATA[
23+
<h1>4.1</h1>
24+
<p>Being Productive Beyond Your Status Quo. Bring your productive experience further from GapStyle 3.1.</p>
25+
<ul>
26+
<li>[All] Enhance reassign variables style to</li>
27+
<li>[Elixir] Enhance Elixir styles</li>
28+
<li>[C++] Enhance Elixir styles</li>
29+
<li>[Python] Fix Python build-in variables color (regression)</li>
30+
<li>Add new plugin icon for branding</li>
31+
<li><a href=&quot;https://marketplace.visualstudio.com/items?itemName=gaplo917.gapstylevs&quot;>GapStyle VS 2.0</a> (VS Code support is available!)</li>
32+
</ul>
2333
<h1>4.0</h1>
2434
<p>Being Productive Beyond Your Status Quo. Bring your productive experience further from GapStyle 3.1.</p>
2535
<ul>

intellij/GapStyle/colors/GapStyle.xml

Lines changed: 45 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
<scheme name="GapStyle 4.0" version="142" parent_scheme="Darcula">
1+
<scheme name="GapStyle 4.1" version="142" parent_scheme="Darcula">
22
<metaInfo>
33
<property name="created">2018-10-15T04:33:26</property>
44
<property name="ide">idea</property>
55
<property name="ideVersion">2021.2.0.0</property>
6-
<property name="modified">2021-10-24T22:28:54</property>
6+
<property name="modified">2021-11-11T13:25:18</property>
77
</metaInfo>
88
<option name="LINE_SPACING" value="1.2"/>
99
<font>
@@ -822,13 +822,15 @@
822822
<option name="DEFAULT_REASSIGNED_LOCAL_VARIABLE">
823823
<value>
824824
<option name="FOREGROUND" value="cbad96"/>
825-
<option name="FONT_TYPE" value="1" />
825+
<option name="EFFECT_COLOR" value="707d95" />
826+
<option name="EFFECT_TYPE" value="1" />
826827
</value>
827828
</option>
828829
<option name="DEFAULT_REASSIGNED_PARAMETER">
829830
<value>
830831
<option name="FOREGROUND" value="fd971f"/>
831-
<option name="FONT_TYPE" value="1" />
832+
<option name="EFFECT_COLOR" value="707d95" />
833+
<option name="EFFECT_TYPE" value="1" />
832834
</value>
833835
</option>
834836
<option name="DEFAULT_SEMICOLON">
@@ -1064,7 +1066,26 @@
10641066
</value>
10651067
</option>
10661068
<option name="ELIXIR_IGNORED_VARIABLE" baseAttributes="ELIXIR_VARIABLE"/>
1067-
<option name="ELIXIR_MACRO_CALL" baseAttributes="ELIXIR_FUNCTION_CALL"/>
1069+
<option name="ELIXIR_KEYWORD">
1070+
<value>
1071+
<option name="FOREGROUND" value="f92672" />
1072+
<option name="FONT_TYPE" value="1" />
1073+
<option name="EFFECT_TYPE" value="1" />
1074+
</value>
1075+
</option>
1076+
<option name="ELIXIR_MACRO_CALL">
1077+
<value>
1078+
<option name="FOREGROUND" value="f92672" />
1079+
<option name="FONT_TYPE" value="1" />
1080+
<option name="EFFECT_TYPE" value="5" />
1081+
</value>
1082+
</option>
1083+
<option name="ELIXIR_MAP" baseAttributes="DEFAULT_BRACES" />
1084+
<option name="ELIXIR_MODULE_ATTRIBUTE">
1085+
<value>
1086+
<option name="FOREGROUND" value="bbb529" />
1087+
</value>
1088+
</option>
10681089
<option name="ELIXIR_MAP" baseAttributes="DEFAULT_BRACES"/>
10691090
<option name="ELIXIR_OPERATION_SIGN">
10701091
<value>
@@ -1083,6 +1104,8 @@
10831104
</option>
10841105
<option name="ELIXIR_PREDEFINED">
10851106
<value>
1107+
<option name="FOREGROUND" value="f92672" />
1108+
<option name="FONT_TYPE" value="1" />
10861109
<option name="EFFECT_TYPE" value="5"/>
10871110
</value>
10881111
</option>
@@ -1102,6 +1125,9 @@
11021125
<option name="FOREGROUND" value="e6db74"/>
11031126
</value>
11041127
</option>
1128+
<option name="ELIXIR_TYPE">
1129+
<value />
1130+
</option>
11051131
<option name="ELIXIR_TYPE_PARAMETER">
11061132
<value>
11071133
<option name="FOREGROUND" value="20999d"/>
@@ -1124,7 +1150,8 @@
11241150
</option>
11251151
<option name="ERL_ATTRIBUTE">
11261152
<value>
1127-
<option name="FOREGROUND" value="bbb529"/>
1153+
<option name="FOREGROUND" value="f92672" />
1154+
<option name="FONT_TYPE" value="1" />
11281155
</value>
11291156
</option>
11301157
<option name="ERL_BUILT_IN_TYPE">
@@ -2498,7 +2525,9 @@
24982525
</value>
24992526
</option>
25002527
<option name="OC.CONDITIONALLY_NOT_COMPILED">
2501-
<value />
2528+
<value>
2529+
<option name="FOREGROUND" value="686a4e" />
2530+
</value>
25022531
</option>
25032532
<option name="OC.CPP_KEYWORD">
25042533
<value>
@@ -2579,7 +2608,7 @@
25792608
</option>
25802609
<option name="OC.MESSAGE_ARGUMENT">
25812610
<value>
2582-
<option name="FOREGROUND" value="a6e22e"/>
2611+
<option name="FOREGROUND" value="9cda3e"/>
25832612
</value>
25842613
</option>
25852614
<option name="OC.METHOD_DECLARATION">
@@ -2638,7 +2667,7 @@
26382667
</option>
26392668
<option name="OC.STRUCT_LIKE">
26402669
<value>
2641-
<option name="FOREGROUND" value="cfd3"/>
2670+
<option name="FOREGROUND" value="66d9ef"/>
26422671
</value>
26432672
</option>
26442673
<option name="OC.TEMPLATE_TYPE">
@@ -2787,7 +2816,7 @@
27872816
</option>
27882817
<option name="PY.BUILTIN_NAME">
27892818
<value>
2790-
<option name="FOREGROUND" value="a6e22f"/>
2819+
<option name="FOREGROUND" value="4186f9"/>
27912820
<option name="EFFECT_TYPE" value="5"/>
27922821
</value>
27932822
</option>
@@ -2937,13 +2966,15 @@
29372966
<option name="REASSIGNED_LOCAL_VARIABLE_ATTRIBUTES">
29382967
<value>
29392968
<option name="FOREGROUND" value="cbad96"/>
2940-
<option name="FONT_TYPE" value="1" />
2969+
<option name="EFFECT_COLOR" value="707d95" />
2970+
<option name="EFFECT_TYPE" value="1" />
29412971
</value>
29422972
</option>
29432973
<option name="REASSIGNED_PARAMETER_ATTRIBUTES">
29442974
<value>
29452975
<option name="FOREGROUND" value="fd971f"/>
2946-
<option name="FONT_TYPE" value="1" />
2976+
<option name="EFFECT_COLOR" value="707d95" />
2977+
<option name="EFFECT_TYPE" value="1" />
29472978
</value>
29482979
</option>
29492980
<option name="REGEXP.CHARACTER">
@@ -3273,7 +3304,8 @@
32733304
<option name="ReSharper.FSHARP_MUTABLE_FUNCTION_IDENTIFIER">
32743305
<value>
32753306
<option name="FOREGROUND" value="a6e22e"/>
3276-
<option name="FONT_TYPE" value="1" />
3307+
<option name="EFFECT_COLOR" value="707d95" />
3308+
<option name="EFFECT_TYPE" value="1" />
32773309
</value>
32783310
</option>
32793311
<option name="ReSharper.FSHARP_STATIC_CLASS_IDENTIFIER">

intellij/GapStyle4.1.jar

18.6 KB
Binary file not shown.

0 commit comments

Comments
 (0)