修复tsx, jsx的着色问题

CHANGELOG.md

@@ -1,5 +1,7 @@
 # 更新日志
 
+## [1.6.3] 2022-03-16
+- 修复jsx, tsx着色问题
 
 ## [1.6.2] 2022-03-14
 - 修复js字符串模板中的着色

data/logs/out.log

@@ -31,3 +31,17 @@ Build complete...
 Build complete...
 Build complete...
 Build complete...
+Build complete...
+Build complete...
+Build complete...
+Build complete...
+Build complete...
+Build complete...
+Build complete...
+Build complete...
+Build complete...
+Build complete...
+Build complete...
+Build complete...
+Build complete...
+Build complete...

package.json

@@ -3,13 +3,15 @@
   "displayName": "one plain",
   "description": "🔥 米白色主题",
   "icon": "logo.png",
-  "version": "1.6.2",
+  "version": "1.6.3",
   "publisher": "yutent",
   "author": "Yutent [@yutent]",
   "engines": {
     "vscode": "^1.29.0"
   },
-  "categories": ["Themes"],
+  "categories": [
+    "Themes"
+  ],
   "repository": {
     "type": "git",
     "url": "https://github.com/yutent/one-plain.git"
@@ -23,6 +25,16 @@
       }
     ]
   },
-  "keywords": ["theme", "one", "plain", "one plain", "mi", "color", "light", "one-plain", "yutent"],
+  "keywords": [
+    "theme",
+    "one",
+    "plain",
+    "one plain",
+    "mi",
+    "color",
+    "light",
+    "one-plain",
+    "yutent"
+  ],
   "license": "MIT"
 }

src/es.js

@@ -5,7 +5,9 @@ module.exports = [
     name: 'import constant',
     scope: [
       'meta.import.js variable.other.readwrite.alias.js',
-      'meta.import.ts variable.other.readwrite.alias.ts'
+      'meta.import.jsx variable.other.readwrite.alias.jsx',
+      'meta.import.ts variable.other.readwrite.alias.ts',
+      'meta.import.tsx variable.other.readwrite.alias.tsx'
     ],
     settings: {
       foreground: vars.blue2
@@ -16,8 +18,12 @@ module.exports = [
     scope: [
       'meta.import.js string.quoted.single.js',
       'meta.import.js string.quoted.double.js',
+      'meta.import.jsx string.quoted.single.jsx',
+      'meta.import.jsx string.quoted.double.jsx',
       'meta.import.ts string.quoted.single.ts',
-      'meta.import.ts string.quoted.double.ts'
+      'meta.import.ts string.quoted.double.ts',
+      'meta.import.tsx string.quoted.single.tsx',
+      'meta.import.tsx string.quoted.double.tsx'
     ],
     settings: {
       fontStyle: 'underline',
@@ -135,7 +141,15 @@ module.exports = [
       'string.template.js meta.template.expression.js meta.array.literal.js meta.brace.square.js',
       'string.template.js meta.template.expression.js meta.brace.round.js',
       'string.template.ts meta.template.expression.ts meta.array.literal.ts meta.brace.square.ts',
-      'string.template.ts meta.template.expression.ts meta.brace.round.ts'
+      'string.template.ts meta.template.expression.ts meta.brace.round.ts',
+      'meta.tag.attributes.jsx punctuation.section.embedded.begin.jsx',
+      'meta.tag.attributes.jsx punctuation.section.embedded.end.jsx',
+      'meta.tag.without-attributes.jsx punctuation.section.embedded.begin.jsx',
+      'meta.tag.without-attributes.jsx punctuation.section.embedded.end.jsx',
+      'meta.tag.attributes.tsx punctuation.section.embedded.begin.tsx',
+      'meta.tag.attributes.tsx punctuation.section.embedded.end.tsx',
+      'meta.tag.without-attributes.tsx punctuation.section.embedded.begin.tsx',
+      'meta.tag.without-attributes.tsx punctuation.section.embedded.end.tsx'
     ],
     settings: {
       foreground: vars.common
@@ -223,5 +237,23 @@ module.exports = [
       fontStyle: 'italic bold',
       foreground: vars.common
     }
+  },
+  {
+    name: 'jsx Tag',
+    scope: [
+      'entity.name.tag.jsx support.class.component.jsx',
+      'entity.name.tag.tsx support.class.component.tsx'
+    ],
+    settings: {
+      fontStyle: 'normal',
+      foreground: '#FF5370'
+    }
+  },
+  {
+    name: 'Tag Content String',
+    scope: ['meta.tag.tsx meta.tag.without-attributes.tsx meta.jsx.children.tsx'],
+    settings: {
+      foreground: '#546e7a'
+    }
   }
 ]

themes/color-theme.json

@@ -491,14 +491,14 @@
     },
     {
       "name": "import constant",
-      "scope": "meta.import.js variable.other.readwrite.alias.js, meta.import.ts variable.other.readwrite.alias.ts",
+      "scope": "meta.import.js variable.other.readwrite.alias.js, meta.import.jsx variable.other.readwrite.alias.jsx, meta.import.ts variable.other.readwrite.alias.ts, meta.import.tsx variable.other.readwrite.alias.tsx",
       "settings": {
         "foreground": "#0096ff"
       }
     },
     {
       "name": "import path",
-      "scope": "meta.import.js string.quoted.single.js, meta.import.js string.quoted.double.js, meta.import.ts string.quoted.single.ts, meta.import.ts string.quoted.double.ts",
+      "scope": "meta.import.js string.quoted.single.js, meta.import.js string.quoted.double.js, meta.import.jsx string.quoted.single.jsx, meta.import.jsx string.quoted.double.jsx, meta.import.ts string.quoted.single.ts, meta.import.ts string.quoted.double.ts, meta.import.tsx string.quoted.single.tsx, meta.import.tsx string.quoted.double.tsx",
       "settings": {
         "fontStyle": "underline",
         "foreground": "#90a4ae"
@@ -575,7 +575,7 @@
     },
     {
       "name": "Punctuation",
-      "scope": "meta.object.member.js meta.array.literal.js meta.brace.square.js, meta.object.member.js meta.arrow.js meta.brace.round.js, string.template.js meta.template.expression.js meta.array.literal.js meta.brace.square.js, string.template.js meta.template.expression.js meta.brace.round.js, string.template.ts meta.template.expression.ts meta.array.literal.ts meta.brace.square.ts, string.template.ts meta.template.expression.ts meta.brace.round.ts",
+      "scope": "meta.object.member.js meta.array.literal.js meta.brace.square.js, meta.object.member.js meta.arrow.js meta.brace.round.js, string.template.js meta.template.expression.js meta.array.literal.js meta.brace.square.js, string.template.js meta.template.expression.js meta.brace.round.js, string.template.ts meta.template.expression.ts meta.array.literal.ts meta.brace.square.ts, string.template.ts meta.template.expression.ts meta.brace.round.ts, meta.tag.attributes.jsx punctuation.section.embedded.begin.jsx, meta.tag.attributes.jsx punctuation.section.embedded.end.jsx, meta.tag.without-attributes.jsx punctuation.section.embedded.begin.jsx, meta.tag.without-attributes.jsx punctuation.section.embedded.end.jsx, meta.tag.attributes.tsx punctuation.section.embedded.begin.tsx, meta.tag.attributes.tsx punctuation.section.embedded.end.tsx, meta.tag.without-attributes.tsx punctuation.section.embedded.begin.tsx, meta.tag.without-attributes.tsx punctuation.section.embedded.end.tsx",
       "settings": {
         "foreground": "#90a4ae"
       }
@@ -626,6 +626,21 @@
         "foreground": "#90a4ae"
       }
     },
+    {
+      "name": "jsx Tag",
+      "scope": "entity.name.tag.jsx support.class.component.jsx, entity.name.tag.tsx support.class.component.tsx",
+      "settings": {
+        "fontStyle": "normal",
+        "foreground": "#FF5370"
+      }
+    },
+    {
+      "name": "Tag Content String",
+      "scope": "meta.tag.tsx meta.tag.without-attributes.tsx meta.jsx.children.tsx",
+      "settings": {
+        "foreground": "#546e7a"
+      }
+    },
     {
       "name": "PHP Constants",
       "scope": "constant.other.php, support.constant.ext.php, support.constant.std.php,support.constant.core.php, support.constant.parser-token.php, constant",