Merge pull request #50 from dinbtechit/feature/49-markdown-inconsistent

Fix: for #47 and #49 [skip ci]
dinbtechit · Jan 13, 2023 · ca3e489 · ca3e489
2 parents 1063524 + 5290d07
commit ca3e489
Show file tree

Hide file tree

Showing 4 changed files with 72 additions and 32 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -3,9 +3,12 @@
 # vscode-theme Changelog
 
 ## [Unreleased]
+# Fixed
+- #47 - Purple color is inconsistent - Fixed only in VSCode theme. Not affects Brighter theme.
+- #49 - Markdown color inconsistencies
 
 ## [1.7.6]
-### Fixed
+### Fixed
 - AppCode colors to be consistent with VSCode.
 
 ## [1.7.5]
@@ -135,4 +138,4 @@
 - Added extensive syntax highlighting for Dart/Flutter.
 
 ### Fixed
-- WelcomeScreen color issues and Toolbar border
+- WelcomeScreen color issues and Toolbar border
diff --git a/gradle.properties b/gradle.properties
@@ -3,7 +3,7 @@
 pluginGroup = com.github.dinbtechit.vscodetheme
 pluginName = VSCode Theme
 # SemVer format -> https://semver.org
-pluginVersion = 1.7.6
+pluginVersion = 1.7.7
 
 # Supported build number ranges and IntelliJ Platform versions -> https://plugins.jetbrains.com/docs/intellij/build-number-ranges.html
 pluginSinceBuild = 211

diff --git a/src/main/resources/themes/vscode_dark.xml b/src/main/resources/themes/vscode_dark.xml
@@ -231,12 +231,12 @@
         </option>
         <option name="DART_SECONDARY_KEYWORD">
             <value>
-                <option name="FOREGROUND" value="ce80b6"/>
+                <option name="FOREGROUND" value="c586C0"/>
             </value>
         </option>
         <option name="DART_SECONDARY_KEYWORD_WITH_BG">
             <value>
-                <option name="FOREGROUND" value="ce80b6"/>
+                <option name="FOREGROUND" value="c586C0"/>
                 <option name="BACKGROUND" value="1e1e1e"/>
             </value>
         </option>
@@ -368,12 +368,12 @@
         </option>
         <option name="DEFAULT_SECONDARY_KEYWORD">
             <value>
-                <option name="FOREGROUND" value="ce80b6"/>
+                <option name="FOREGROUND" value="c586C0"/>
             </value>
         </option>
         <option name="DEFAULT_SECONDARY_KEYWORD_WITH_BG">
             <value>
-                <option name="FOREGROUND" value="ce80b6"/>
+                <option name="FOREGROUND" value="c586C0"/>
                 <option name="BACKGROUND" value="1e1e1e"/>
             </value>
         </option>
@@ -568,7 +568,7 @@
         </option>
         <option name="JAVA.SECONDARY_KEYWORD">
             <value>
-                <option name="FOREGROUND" value="ce80b6"/>
+                <option name="FOREGROUND" value="c586C0"/>
             </value>
         </option>
         <option name="JAVA.TYPE_KEYWORD">
@@ -593,7 +593,7 @@
         </option>
         <option name="JS.FROM_KEYWORD">
             <value>
-                <option name="FOREGROUND" value="ce80b6"/>
+                <option name="FOREGROUND" value="c586C0"/>
                 <option name="BACKGROUND" value="1e1e1e"/>
             </value>
         </option>
@@ -626,7 +626,7 @@
         </option>
         <option name="JS.SECONDARY_KEYWORDS">
             <value>
-                <option name="FOREGROUND" value="ce80b6"/>
+                <option name="FOREGROUND" value="c586C0"/>
             </value>
         </option>
         <option name="JS.STATIC_MEMBER_FUNCTION">
@@ -806,14 +806,25 @@
                 <option name="FOREGROUND" value="cd905b"/>
             </value>
         </option>
+        <option name="MARKDOWN_LIST_ITEM">
+            <value>
+                <option name="FOREGROUND" value="f3f1f1"/>
+            </value>
+        </option>
         <option name="MARKDOWN_ORDERED_LIST">
             <value>
-                <option name="FOREGROUND" value="569cd6"/>
+                <option name="FOREGROUND" value="f3f1f1"/>
+            </value>
+        </option>
+        <option name="MARKDOWN_TEXT">
+            <value>
+                <option name="FOREGROUND" value="f3f1f1"/>
+                <option name="EFFECT_TYPE" value="5"/>
             </value>
         </option>
         <option name="MARKDOWN_UNORDERED_LIST">
             <value>
-                <option name="FOREGROUND" value="569cd6"/>
+                <option name="FOREGROUND" value="f3f1f1"/>
             </value>
         </option>
         <option name="MATCHED_BRACE_ATTRIBUTES">
@@ -991,12 +1002,12 @@
         </option>
         <option name="PY.SECONDARY_KEYWORD">
             <value>
-                <option name="FOREGROUND" value="ce80b6"/>
+                <option name="FOREGROUND" value="c586C0"/>
             </value>
         </option>
         <option name="PY.SECONDARY_KEYWORD_WITH_BG">
             <value>
-                <option name="FOREGROUND" value="ce80b6"/>
+                <option name="FOREGROUND" value="c586C0"/>
                 <option name="BACKGROUND" value="1e1e1e"/>
             </value>
         </option>
@@ -1084,6 +1095,21 @@
                 <option name="FONT_TYPE" value="2"/>
             </value>
         </option>
+        <option name="SWIFT_PROPERTY">
+            <value>
+                <option name="FOREGROUND" value="94dbfd"/>
+            </value>
+        </option>
+        <option name="SWIFT_TUPLE_LABEL">
+            <value>
+                <option name="FOREGROUND" value="94dbfd"/>
+            </value>
+        </option>
+        <option name="SWIFT_WILDCARD">
+            <value>
+                <option name="FOREGROUND" value="94dbfd"/>
+            </value>
+        </option>
         <option name="Static method access" baseAttributes="STATIC_METHOD_ATTRIBUTES"/>
         <option name="Static property reference ID" baseAttributes="STATIC_FINAL_FIELD_ATTRIBUTES"/>
         <option name="TERMINAL_COMMAND_TO_RUN_USING_IDE">
@@ -1112,13 +1138,13 @@
         </option>
         <option name="TS.FROM_KEYWORD">
             <value>
-                <option name="FOREGROUND" value="ce80b6"/>
+                <option name="FOREGROUND" value="c586C0"/>
                 <option name="BACKGROUND" value="1e1e1e"/>
             </value>
         </option>
         <option name="TS.MODULE_KEYWORD">
             <value>
-                <option name="FOREGROUND" value="ce80b6"/>
+                <option name="FOREGROUND" value="c586C0"/>
             </value>
         </option>
         <option name="TS.PRIMITIVE.TYPES">
@@ -1143,6 +1169,11 @@
                 <option name="FOREGROUND" value="9cdcfe"/>
             </value>
         </option>
+        <option name="XML_CUSTOM_TAG_NAME">
+            <value>
+                <option name="FOREGROUND" value="47ccb1"/>
+            </value>
+        </option>
         <option name="XML_ENTITY_REFERENCE">
             <value>
                 <option name="FOREGROUND" value="4ec9b0"/>
@@ -1162,11 +1193,6 @@
                 <option name="EFFECT_TYPE" value="5"/>
             </value>
         </option>
-        <option name="XML_CUSTOM_TAG_NAME">
-            <value>
-                <option name="FOREGROUND" value="4ec9b0"/>
-            </value>
-        </option>
         <option name="XML_TAG_DATA" baseAttributes="TEXT"/>
         <option name="XML_TAG_NAME" baseAttributes="DEFAULT_KEYWORD"/>
         <option name="XPATH.KEYWORD" baseAttributes="DEFAULT_KEYWORD"/>

diff --git a/src/main/resources/themes/vscode_dark_brighter.xml b/src/main/resources/themes/vscode_dark_brighter.xml
@@ -1,9 +1,9 @@
 <scheme name="VSCode Dark Brighter" version="142" parent_scheme="Darcula">
     <metaInfo>
-        <property name="created">2022-12-08T18:02:31</property>
+        <property name="created">2023-01-12T22:21:59</property>
         <property name="ide">idea</property>
-        <property name="ideVersion">2022.1.1.0.0</property>
-        <property name="modified">2022-12-08T18:02:39</property>
+        <property name="ideVersion">2022.3.1.0.0</property>
+        <property name="modified">2023-01-12T22:22:02</property>
         <property name="originalScheme">_@user_VSCode Dark Brighter</property>
     </metaInfo>
     <colors>
@@ -806,14 +806,25 @@
                 <option name="FOREGROUND" value="cd905b"/>
             </value>
         </option>
+        <option name="MARKDOWN_LIST_ITEM">
+            <value>
+                <option name="FOREGROUND" value="f3f1f1"/>
+            </value>
+        </option>
         <option name="MARKDOWN_ORDERED_LIST">
             <value>
-                <option name="FOREGROUND" value="47a2ed"/>
+                <option name="FOREGROUND" value="f3f1f1"/>
+            </value>
+        </option>
+        <option name="MARKDOWN_TEXT">
+            <value>
+                <option name="FOREGROUND" value="f3f1f1"/>
+                <option name="EFFECT_TYPE" value="5"/>
             </value>
         </option>
         <option name="MARKDOWN_UNORDERED_LIST">
             <value>
-                <option name="FOREGROUND" value="47a2ed"/>
+                <option name="FOREGROUND" value="f3f1f1"/>
             </value>
         </option>
         <option name="MATCHED_BRACE_ATTRIBUTES">
@@ -1099,7 +1110,7 @@
                 <option name="FOREGROUND" value="8cd7ff"/>
             </value>
         </option>
-        <option name="Static method access" baseAttributes=""/>
+        <option name="Static method access" baseAttributes="STATIC_METHOD_ATTRIBUTES"/>
         <option name="TERMINAL_COMMAND_TO_RUN_USING_IDE">
             <value>
                 <option name="BACKGROUND" value="323333"/>
@@ -1157,6 +1168,11 @@
                 <option name="FOREGROUND" value="8cd7ff"/>
             </value>
         </option>
+        <option name="XML_CUSTOM_TAG_NAME">
+            <value>
+                <option name="FOREGROUND" value="47ccb1"/>
+            </value>
+        </option>
         <option name="XML_ENTITY_REFERENCE">
             <value>
                 <option name="FOREGROUND" value="47ccb1"/>
@@ -1176,11 +1192,6 @@
                 <option name="EFFECT_TYPE" value="5"/>
             </value>
         </option>
-        <option name="XML_CUSTOM_TAG_NAME">
-            <value>
-                <option name="FOREGROUND" value="47ccb1"/>
-            </value>
-        </option>
         <option name="XML_TAG_DATA" baseAttributes="TEXT"/>
         <option name="XML_TAG_NAME" baseAttributes="DEFAULT_KEYWORD"/>
         <option name="XPATH.KEYWORD" baseAttributes="DEFAULT_KEYWORD"/>