Fixed ts if/for/while statements highlight error #325, Fixed subclass…

… highlight error #320
Binaryify · Aug 8, 2019 · dfcab8f · dfcab8f
1 parent 6d719c9
commit dfcab8f
Show file tree

Hide file tree

Showing 6 changed files with 49 additions and 14 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,11 @@
 # CHANGELOG
-## 2.26.1 | 2019.08.03
+## 2.26.3 | 2019.08.08
+- Fixed ts if/for/while statements highlight error [#325](https://github.com/Binaryify/OneDark-Pro/issues/325)
+
+- Fixed subclass highlight error [#320](https://github.com/Binaryify/OneDark-Pro/issues/320)
+
+
+## 2.26.2 | 2019.08.03
 - Change warning color to #d19a66 [#324](https://github.com/Binaryify/OneDark-Pro/issues/324)
 
 ## 2.26.1 | 2019.08.03

diff --git a/package.json b/package.json
@@ -2,7 +2,7 @@
   "name": "Material-theme",
   "displayName": "One Dark Pro",
   "description": "Atom's iconic One Dark theme for Visual Studio Code",
-  "version": "2.26.2",
+  "version": "2.26.3",
   "publisher": "zhuangtongfa",
   "bugs": {
     "url": "https://github.com/Binaryify/OneDark-Pro/issues"

diff --git a/src/syntax.js b/src/syntax.js
@@ -320,7 +320,7 @@ const configFactory = type => {
     },
     {
       name: 'operator logical',
-      scope: 'keyword.operator.logical.js',
+      scope: 'keyword.operator.logical',
       settings: {
         foreground: colorObj['fountainBlue']
       }
@@ -807,12 +807,20 @@ const configFactory = type => {
       }
     },
     {
-      name: 'Strings, Inherited Class',
-      scope: 'string, entity.other.inherited-class',
+      name: 'Strings',
+      scope: 'string',
       settings: {
         foreground: colorObj['green']
       }
     },
+    {
+        name: 'Inherited Class',
+        scope: 'entity.other.inherited-class',
+        settings: {
+          foreground: colorObj['chalky']
+        }
+      },
+
     {
       name: 'Constant other symbol',
       scope: 'constant.other.symbol',

diff --git a/themes/OneDark-Pro-bold.json b/themes/OneDark-Pro-bold.json
@@ -405,7 +405,7 @@
     },
     {
       "name": "operator logical",
-      "scope": "keyword.operator.logical.js",
+      "scope": "keyword.operator.logical",
       "settings": {
         "foreground": "#56b6c2"
       }
@@ -862,12 +862,19 @@
       }
     },
     {
-      "name": "Strings, Inherited Class",
-      "scope": "string, entity.other.inherited-class",
+      "name": "Strings",
+      "scope": "string",
       "settings": {
         "foreground": "#98c379"
       }
     },
+    {
+      "name": "Inherited Class",
+      "scope": "entity.other.inherited-class",
+      "settings": {
+        "foreground": "#E5C07B"
+      }
+    },
     {
       "name": "Constant other symbol",
       "scope": "constant.other.symbol",

diff --git a/themes/OneDark-Pro-vivid.json b/themes/OneDark-Pro-vivid.json
@@ -356,7 +356,7 @@
     },
     {
       "name": "operator logical",
-      "scope": "keyword.operator.logical.js",
+      "scope": "keyword.operator.logical",
       "settings": {
         "foreground": "#2bbac5"
       }
@@ -832,12 +832,19 @@
       }
     },
     {
-      "name": "Strings, Inherited Class",
-      "scope": "string, entity.other.inherited-class",
+      "name": "Strings",
+      "scope": "string",
       "settings": {
         "foreground": "#89ca78"
       }
     },
+    {
+      "name": "Inherited Class",
+      "scope": "entity.other.inherited-class",
+      "settings": {
+        "foreground": "#e5c07b"
+      }
+    },
     {
       "name": "Constant other symbol",
       "scope": "constant.other.symbol",

diff --git a/themes/OneDark-Pro.json b/themes/OneDark-Pro.json
@@ -356,7 +356,7 @@
     },
     {
       "name": "operator logical",
-      "scope": "keyword.operator.logical.js",
+      "scope": "keyword.operator.logical",
       "settings": {
         "foreground": "#56b6c2"
       }
@@ -832,12 +832,19 @@
       }
     },
     {
-      "name": "Strings, Inherited Class",
-      "scope": "string, entity.other.inherited-class",
+      "name": "Strings",
+      "scope": "string",
       "settings": {
         "foreground": "#98c379"
       }
     },
+    {
+      "name": "Inherited Class",
+      "scope": "entity.other.inherited-class",
+      "settings": {
+        "foreground": "#e5c07b"
+      }
+    },
     {
       "name": "Constant other symbol",
       "scope": "constant.other.symbol",