修复新版Git Blame的颜色换了API的bug

Add panelSectionHeader.background

.gitignore

@@ -1,6 +1,7 @@
 .DS_Store
 .AppleDouble
 .LSOverride
+data/
 
 
 # Thumbnails

.prettierrc.yaml

@@ -0,0 +1,10 @@
+jsxBracketSameLine: true
+jsxSingleQuote: true
+semi: false
+singleQuote: true
+printWidth: 100
+useTabs: false
+tabWidth: 2
+trailingComma: none
+bracketSpacing: true
+arrowParens: avoid

.travis.yml

@@ -1,14 +0,0 @@
-language: node_js
-
-os:
-  - osx
-
-node_js:
-  - node
-
-cache:
-  directories:
-    - "node_modules"
-
-notifications:
-  email: false

.vscodeignore

@@ -1,7 +1,10 @@
-.vscode/**
-.vscode-test/**
+.vscode/
+.vscode-test/
 .gitignore
-src
-src/**
+.prettierrc.yaml
+
+src/
+data/
 build.js
+app.yaml
 vsc-extension-quickstart.md

CHANGELOG.md

@@ -1,5 +1,36 @@
 # 更新日志
 
+## [1.7.0] 2025-07-17
+- 修复新版Git Blame的颜色换了API的bug
+
+## [1.6.9] 2025-03-11
+- 优化Git Blame的颜色
+
+## [1.6.6] 2022-03-24
+- 优化vue自定义组件标签颜色, 指令颜色
+- html的`link, a, img, script`标签的地址, 改为灰色
+
+## [1.6.5] 2022-03-16
+- 修复jsx, tsx着色问题
+- 支持js`?.`
+- 增加对dart语言的字符串模板的着色支持
+
+## [1.6.2] 2022-03-14
+- 修复js字符串模板中的着色
+- 优化import代码着色
+
+## [1.6.1] 2022-02-22
+- 优化列表颜色
+
+
+## [1.5.0] 2021-09-02
+- 优化滚动条配色
+- 优文件列表配色
+
+
+## [1.4.0] 2020-06-28
+- panelSectionHeader
+
 ## [1.3.8] 2019-08-26
 - 优化列表的hover配色
 - 优化搜索框内的选项按钮的配色

README.md

@@ -3,13 +3,15 @@
 >> 目前主题精心适配 `ts,js,scss,css,html,php,md,json`等语言的高亮, 其他语言适配, 如发现有不正常的高亮可以到[GitHub](https://github.com/yutent/one-plain.git)反馈, 我会第一时间适配。
 
 
-[![Version](https://vsmarketplacebadge.apphb.com/version-short/yutent.one-plain.svg)](https://marketplace.visualstudio.com/items?itemName=yutent.one-plain)
-[![Rating](https://vsmarketplacebadge.apphb.com/rating-short/yutent.one-plain.svg)](https://marketplace.visualstudio.com/items?itemName=yutent.one-plain)
-[![Installs](https://vsmarketplacebadge.apphb.com/installs/yutent.one-plain.svg)](https://marketplace.visualstudio.com/items?itemName=yutent.one-plain)
-[![Build Status](https://travis-ci.org/yutent/one-plain.svg?branch=master)](https://travis-ci.org/yutent/one-plain)
+[![Version](https://img.shields.io/visual-studio-marketplace/v/yutent.one-plain)](https://marketplace.visualstudio.com/items?itemName=yutent.one-plain)
+[![Rating](https://img.shields.io/visual-studio-marketplace/r/yutent.one-plain)](https://marketplace.visualstudio.com/items?itemName=yutent.one-plain)
+[![Downloads](https://img.shields.io/visual-studio-marketplace/d/yutent.one-plain)](https://marketplace.visualstudio.com/items?itemName=yutent.one-plain)
+[![Installs](https://img.shields.io/visual-studio-marketplace/i/yutent.one-plain)](https://marketplace.visualstudio.com/items?itemName=yutent.one-plain)
+
+
 
 ## 截图预览
-![截图](https://attach.cdn.doui.cc/one-plain.png?t=20181211)
+![截图](https://git.wkit.fun/yutent/one-plain/media/branch/master/demo.jpg)
 
 
 ## 安装(Installation)

app.yaml

@@ -0,0 +1,18 @@
+
+script: node ./build.js
+cwd: ./
+watch: true
+name: oss
+ignore_watch: [data, themes, package.json, package-lock.json, node_modules, .git, .gitignore, app.yaml]
+exec_mode: fork
+
+error_file: ./data/logs/error.log
+out_file: ./data/logs/out.log
+merge_logs: true
+min_uptime: 60s
+max_restarts: 1
+max_memory_restart: 300M
+env:
+  NODE_ENV: development
+  
+  

build.js

@@ -4,10 +4,9 @@
  * @date 2018/12/01 13:33:44
  */
 
-'use strict'
-
 const fs = require('iofs')
 const path = require('path')
+const readline = require('readline')
 
 const colors = require('./src/colors')
 
@@ -34,4 +33,11 @@ const theme = {
 }
 
 fs.echo(JSON.stringify(theme, '', 2), path.join('./themes', 'color-theme.json'))
+
+// 这个就只是单纯的用来阻止进程结束, 方便pm2
+readline.createInterface({
+  input: process.stdin,
+  output: process.stdout
+})
+
 console.log('Build complete...')

package.json

@@ -3,16 +3,18 @@
   "displayName": "one plain",
   "description": "🔥 米白色主题",
   "icon": "logo.png",
-  "version": "1.3.8",
+  "version": "1.7.0",
   "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"
+    "url": "https://git.wkit.fun/yutent/one-plain.git"
   },
   "contributes": {
     "themes": [

src/base.js

@@ -28,7 +28,7 @@ module.exports = [
     scope: ['invalid.deprecated'],
     settings: {
       fontStyle: 'italic',
-      foreground: '#FFB62C'
+      foreground: '#ffb62c'
     }
   },
   {
@@ -42,7 +42,7 @@ module.exports = [
     name: 'Keyword, Storage',
     scope: ['keyword', 'storage.type', 'storage.modifier'],
     settings: {
-      foreground: '#FF5370'
+      foreground: '#ff5370'
     }
   },
   {
@@ -58,6 +58,8 @@ module.exports = [
     scope: [
       'keyword.control',
       'meta.tag',
+      'punctuation.accessor',
+      'punctuation.accessor.optional',
       'punctuation.definition.tag',
       'punctuation.separator.inheritance.php',
       'punctuation.definition.tag.html',
@@ -92,7 +94,7 @@ module.exports = [
       'entity.name.function',
       'meta.function-call',
       'variable.function',
-      'support.function',
+      'support.function.js',
       'keyword.other.special-method',
       'meta.block-level'
     ],
@@ -273,24 +275,7 @@ module.exports = [
       foreground: '#e53935'
     }
   },
-  {
-    name: 'entity.name.method.js',
-    scope: ['entity.name.method.js'],
-    settings: {
-      fontStyle: 'italic',
-      foreground: '#6182B8'
-    }
-  },
-  {
-    name: 'meta.method.js',
-    scope: [
-      'meta.class-method.js entity.name.function.js',
-      'variable.function.constructor'
-    ],
-    settings: {
-      foreground: '#6182B8'
-    }
-  },
+
   {
     name: 'Attributes',
     scope: ['entity.other.attribute-name'],
@@ -332,16 +317,5 @@ module.exports = [
     settings: {
       fontStyle: 'underline'
     }
-  },
-  {
-    name: 'Decorators',
-    scope: [
-      'tag.decorator.js entity.name.tag.js',
-      'tag.decorator.js punctuation.definition.tag.js'
-    ],
-    settings: {
-      fontStyle: 'italic',
-      foreground: '#6182B8'
-    }
   }
 ]

src/colors.js

@@ -2,7 +2,6 @@ const vars = require('./var')
 
 module.exports = {
   focusBorder: vars.transparent,
-  'scrollbar.shadow': vars.transparent,
   'editorLink.activeForeground': vars.common,
   'selection.background': '#80CBC440',
   'progressBar.background': '#80CBC4',
@@ -29,8 +28,8 @@ module.exports = {
   'editorOverviewRuler.border': vars.white,
   'editorHoverWidget.background': vars.white,
   'editorHoverWidget.border': '#00000010',
-  'editorIndentGuide.background': vars.plain2,
-  'editorIndentGuide.activeBackground': vars.plain3,
+  'editorIndentGuide.background1': vars.plain2,
+  'editorIndentGuide.activeBackground1': vars.plain3,
   'editorGroupHeader.tabsBackground': vars.white,
   'editorGroup.border': vars.plain2,
   'editorGutter.modifiedBackground': '#6182B860',
@@ -88,12 +87,12 @@ module.exports = {
   'inputValidation.warningBorder': '#FFB62C50',
   'dropdown.background': vars.white,
   'dropdown.border': '#00000010',
-  'list.hoverForeground': vars.cyan1,
-  'list.hoverBackground': vars.plain1,
-  'list.activeSelectionBackground': vars.plain1,
-  'list.activeSelectionForeground': '#80CBC4',
+  'list.hoverForeground': vars.cyan2,
+  'list.hoverBackground': '#80CBC410',
+  'list.activeSelectionBackground': '#80CBC430',
+  'list.activeSelectionForeground': vars.cyan2,
+  'list.inactiveSelectionBackground': '#ccd7da50',
   'list.inactiveSelectionForeground': '#80CBC4',
-  'list.inactiveSelectionBackground': '#CCD7DA50',
   'list.focusBackground': '#90A4AE20',
   'list.focusForeground': vars.common,
   'list.highlightForeground': '#80CBC4',
@@ -113,16 +112,17 @@ module.exports = {
   'terminal.ansiBrightMagenta': vars.magenta1,
   'terminal.ansiBrightRed': vars.red1,
   'terminal.ansiBrightYellow': vars.yellow1,
-  'scrollbarSlider.background': vars.common + 20,
-  'scrollbarSlider.hoverBackground': vars.common + 10,
-  'scrollbarSlider.activeBackground': '#80CBC4',
+  'scrollbar.shadow': vars.plain2 + 50,
+  'scrollbarSlider.background': vars.cyan1 + 80,
+  'scrollbarSlider.hoverBackground': vars.cyan1 + 'aa',
+  'scrollbarSlider.activeBackground': vars.cyan1 + 'ee',
   'widget.shadow': vars.black + 20,
   'panel.border': vars.plain3,
   'panel.background': vars.plain1,
-  'panel.dropBackground': vars.common,
   'panelTitle.inactiveForeground': vars.common,
   'panelTitle.activeForeground': '#16967a',
   'panelTitle.activeBorder': '#3fc2a7',
+  'panelSectionHeader.background': vars.plain2,
   'diffEditor.insertedTextBackground': '#91B85915',
   'diffEditor.removedTextBackground': '#E5393520',
   'notifications.background': vars.white,
@@ -172,5 +172,7 @@ module.exports = {
   'settings.headerForeground': '#80CBC4',
   'settings.modifiedItemIndicator': '#80CBC4',
   'settings.checkboxBackground': vars.plain1,
-  'settings.checkboxForeground': vars.common
+  'settings.checkboxForeground': vars.common,
+  'editorCodeLens.foreground': '#baced1', //  旧版api
+  'git.blame.editorDecorationForeground': '#baced1' //新版api
 }

src/dart.js

@@ -1,12 +1,34 @@
 const vars = require('./var')
 
 module.exports = [
-  // {
-  //   name: 'dart type',
-  //   scope: ['storage.type.primitive.dart'],
-  //   settings: {
-  //     foreground: '#e5c07b',
-  //     fontStyle: 'bold italic'
-  //   }
-  // }
+  {
+    name: 'import path',
+    scope: ['meta.declaration.dart string.interpolated.single.dart'],
+    settings: {
+      fontStyle: 'underline',
+      foreground: vars.common
+    }
+  },
+
+  {
+    name: 'ts string express',
+    scope: [
+      'string.interpolated.double.dart string.interpolated.expression.dart',
+      'string.interpolated.single.dart string.interpolated.expression.dart'
+    ],
+    settings: {
+      fontStyle: '',
+      foreground: '#ff5370'
+    }
+  },
+  {
+    name: 'Variables',
+    scope: [
+      'string.interpolated.double.dart variable.parameter.dart',
+      'string.interpolated.single.dart variable.parameter.dart'
+    ],
+    settings: {
+      foreground: vars.common2
+    }
+  }
 ]

src/es.js

@@ -1,17 +1,71 @@
 const vars = require('./var')
 
 module.exports = [
+  {
+    name: 'import constant',
+    scope: ['meta.import variable.other.readwrite.alias'],
+    settings: {
+      foreground: vars.blue2
+    }
+  },
+  {
+    name: 'import path',
+    scope: ['meta.import string.quoted.single', 'meta.import string.quoted.double'],
+    settings: {
+      fontStyle: 'underline',
+      foreground: vars.common
+    }
+  },
+  {
+    name: 'import path',
+    scope: [
+      'meta.import string.quoted.single punctuation.definition.string.begin',
+      'meta.import string.quoted.single punctuation.definition.string.end',
+      'meta.import string.quoted.double punctuation.definition.string.begin',
+      'meta.import string.quoted.double punctuation.definition.string.end'
+    ],
+    settings: {
+      fontStyle: 'none'
+    }
+  },
+  {
+    name: 'Decorators',
+    scope: [
+      'tag.decorator.js entity.name.tag.js',
+      'tag.decorator.js punctuation.definition.tag.js'
+    ],
+    settings: {
+      fontStyle: 'italic',
+      foreground: '#6182B8'
+    }
+  },
+  {
+    name: 'meta.method.js',
+    scope: ['meta.class-method.js entity.name.function.js', 'variable.function.constructor'],
+    settings: {
+      foreground: '#6182B8'
+    }
+  },
+  {
+    name: 'entity.name.method.js',
+    scope: ['entity.name.method.js'],
+    settings: {
+      fontStyle: 'italic',
+      foreground: '#6182B8'
+    }
+  },
   {
     name: 'Class extends, build-in, dom',
     scope: [
-      'support.type.object.console.js',
-      'support.type.object.module.js',
-      'support.type.object.dom.js',
+      'support.type.object.console',
+      'support.type.object.module',
+      'support.type.object.dom',
       'support.constant.math',
-      'meta.class.extends.js variable.other.readwrite.js',
-      'meta.function-call.static.without-arguments.js variable.other.class.js',
-      'meta.function-call.static.with-arguments.js variable.other.class.js',
-      'meta.property.class.js variable.other.class.js'
+      'support.constant.json',
+      'meta.class.extends variable.other.readwrite',
+      'meta.function-call.static.without-arguments variable.other.class',
+      'meta.function-call.static.with-arguments variable.other.class',
+      'meta.property.class variable.other.class'
     ],
     settings: {
       fontStyle: 'bold italic',
@@ -42,9 +96,7 @@ module.exports = [
 
   {
     name: 'js/ts doc email',
-    scope: [
-      'comment.block.documentation constant.other.email.link.underline.jsdoc'
-    ],
+    scope: ['comment.block.documentation constant.other.email.link.underline.jsdoc'],
     settings: {
       fontStyle: 'italic underline'
     }
@@ -53,21 +105,47 @@ module.exports = [
   {
     name: 'ts string express',
     scope: [
-      'punctuation.definition.template-expression.begin.ts',
-      'punctuation.definition.template-expression.end.ts'
+      'punctuation.definition.template-expression.begin',
+      'punctuation.definition.template-expression.end'
     ],
     settings: {
       fontStyle: '',
       foreground: '#ff5370'
     }
   },
-
+  {
+    name: 'Punctuation',
+    scope: [
+      'meta.object.member meta.array.literal meta.brace.square',
+      'meta.object.member meta.arrow meta.brace.round',
+      'text.html.vue-html meta.brace.round',
+      'text.html.vue-html meta.directive.vue',
+      'string.template meta.template.expression meta.array.literal meta.brace.square',
+      'string.template meta.template.expression meta.brace.round',
+      'meta.tag.attributes punctuation.section.embedded.begin',
+      'meta.tag.attributes punctuation.section.embedded.end',
+      'meta.tag.without-attributes punctuation.section.embedded.begin',
+      'meta.tag.without-attributes punctuation.section.embedded.end',
+      'meta.type.annotation meta.brace.square'
+    ],
+    settings: {
+      foreground: vars.common
+    }
+  },
+  {
+    name: 'Variables',
+    scope: ['string.template meta.template.expression support.variable.property'],
+    settings: {
+      foreground: vars.common2
+    }
+  },
   {
     name: 'build-in function',
     scope: [
       'source.js support.function.node.js',
       'meta.group.braces.curly.js support.function',
       'meta.function-call.ts support.function.ts',
+      'meta.function-call.js support.function.js',
       'support.function.builtin.js'
     ],
     settings: {
@@ -122,12 +200,35 @@ module.exports = [
   {
     name: 'object keys',
     scope: [
-      'constant.other.object.key.js string.unquoted.label.js',
-      'constant.other.object.key.js string.quoted.label.js'
+      'constant.other.object.key string.unquoted.label',
+      'constant.other.object.key string.quoted.label',
+      'meta.object.member meta.object-literal.key',
+      'meta.object.member meta.object-literal.key string.quoted.double',
+      'meta.object.member meta.object-literal.key string.quoted.single',
+      'meta.object.member meta.object-literal.key constant.numeric.decimal',
+      'meta.field.declaration variable.object.property'
     ],
     settings: {
       fontStyle: 'italic bold',
       foreground: vars.common
     }
+  },
+  {
+    name: 'jsx Tag',
+    scope: [
+      'entity.name.tag support.class.component',
+      'text.html.vue-html support.class.component.html'
+    ],
+    settings: {
+      fontStyle: 'normal',
+      foreground: '#ff5370'
+    }
+  },
+  {
+    name: 'Tag Content String',
+    scope: ['meta.tag meta.tag.without-attributes meta.jsx.children', 'meta.tag meta.jsx.children'],
+    settings: {
+      foreground: '#546e7a'
+    }
   }
 ]

src/html.js

@@ -2,24 +2,34 @@ const vars = require('./var')
 
 module.exports = [
   {
-    name: 'HTML Attributes',
+    name: 'HTML Attributes, directive',
     scope: [
       'text.html.basic entity.other.attribute-name.html',
       'text.html.basic entity.other.attribute-name',
       'text.xhtml.basic entity.other.attribute-name.xhtml',
-      'text.xhtml.basic entity.other.attribute-name'
+      'text.xhtml.basic entity.other.attribute-name',
+      'text.html.derivative meta.attribute.unrecognized entity.other.attribute-name.html',
+      'text.html.vue-html meta.directive.vue entity.other.attribute-name.html'
     ],
     settings: {
-      fontStyle: 'italic',
       foreground: vars.yellow1
     }
   },
   {
-    name: 'CSS Class & ID',
+    name: 'link, a, img, script => path',
     scope: [
-      'entity.other.attribute-name.class',
-      'entity.other.attribute-name.id.css'
+      'meta.tag.metadata.script.start.html meta.attribute.src string.quoted.double',
+      'meta.tag.inline.a.start.html meta.attribute.href string.quoted.double',
+      'meta.tag.metadata.link.void.html meta.attribute.href string.quoted.double',
+      'meta.tag.object.img.void.html meta.attribute.src string.quoted.double'
     ],
+    settings: {
+      foreground: vars.common
+    }
+  },
+  {
+    name: 'CSS Class & ID',
+    scope: ['entity.other.attribute-name.class', 'entity.other.attribute-name.id.css'],
     settings: {
       foreground: vars.yellow1
     }
@@ -55,19 +65,12 @@ module.exports = [
       foreground: '#53c659'
     }
   },
+
   {
-    name: 'directive',
+    name: "directive's value, spec value",
     scope: [
-      'text.html.derivative meta.attribute.unrecognized entity.other.attribute-name.html'
-    ],
-    settings: {
-      foreground: vars.yellow1
-    }
-  },
-  {
-    name: "directive's value",
-    scope: [
-      'text.html.derivative meta.attribute.unrecognized string.quoted.double.html'
+      'text.html.derivative meta.attribute.unrecognized string.quoted.double.html',
+      'meta.tag.metadata.script.start.html meta.attribute.type.html string.quoted.double'
     ],
     settings: {
       foreground: vars.magenta1

themes/color-theme.json

@@ -3,7 +3,6 @@
   "type": "light",
   "colors": {
     "focusBorder": "#ffffff00",
-    "scrollbar.shadow": "#ffffff00",
     "editorLink.activeForeground": "#90a4ae",
     "selection.background": "#80CBC440",
     "progressBar.background": "#80CBC4",
@@ -30,8 +29,8 @@
     "editorOverviewRuler.border": "#ffffff",
     "editorHoverWidget.background": "#ffffff",
     "editorHoverWidget.border": "#00000010",
-    "editorIndentGuide.background": "#f2f5fc",
-    "editorIndentGuide.activeBackground": "#e8e9ed",
+    "editorIndentGuide.background1": "#f2f5fc",
+    "editorIndentGuide.activeBackground1": "#e8e9ed",
     "editorGroupHeader.tabsBackground": "#ffffff",
     "editorGroup.border": "#f2f5fc",
     "editorGutter.modifiedBackground": "#6182B860",
@@ -89,12 +88,12 @@
     "inputValidation.warningBorder": "#FFB62C50",
     "dropdown.background": "#ffffff",
     "dropdown.border": "#00000010",
-    "list.hoverForeground": "#3fc2a7",
-    "list.hoverBackground": "#f8f9fd",
-    "list.activeSelectionBackground": "#f8f9fd",
-    "list.activeSelectionForeground": "#80CBC4",
+    "list.hoverForeground": "#19b491",
+    "list.hoverBackground": "#80CBC410",
+    "list.activeSelectionBackground": "#80CBC430",
+    "list.activeSelectionForeground": "#19b491",
+    "list.inactiveSelectionBackground": "#ccd7da50",
     "list.inactiveSelectionForeground": "#80CBC4",
-    "list.inactiveSelectionBackground": "#CCD7DA50",
     "list.focusBackground": "#90A4AE20",
     "list.focusForeground": "#90a4ae",
     "list.highlightForeground": "#80CBC4",
@@ -114,16 +113,17 @@
     "terminal.ansiBrightMagenta": "#be7ee7",
     "terminal.ansiBrightRed": "#ff4628",
     "terminal.ansiBrightYellow": "#ffb62c",
-    "scrollbarSlider.background": "#90a4ae20",
-    "scrollbarSlider.hoverBackground": "#90a4ae10",
-    "scrollbarSlider.activeBackground": "#80CBC4",
+    "scrollbar.shadow": "#f2f5fc50",
+    "scrollbarSlider.background": "#3fc2a780",
+    "scrollbarSlider.hoverBackground": "#3fc2a7aa",
+    "scrollbarSlider.activeBackground": "#3fc2a7ee",
     "widget.shadow": "#00000020",
     "panel.border": "#e8e9ed",
     "panel.background": "#f8f9fd",
-    "panel.dropBackground": "#90a4ae",
     "panelTitle.inactiveForeground": "#90a4ae",
     "panelTitle.activeForeground": "#16967a",
     "panelTitle.activeBorder": "#3fc2a7",
+    "panelSectionHeader.background": "#f2f5fc",
     "diffEditor.insertedTextBackground": "#91B85915",
     "diffEditor.removedTextBackground": "#E5393520",
     "notifications.background": "#ffffff",
@@ -173,7 +173,9 @@
     "settings.headerForeground": "#80CBC4",
     "settings.modifiedItemIndicator": "#80CBC4",
     "settings.checkboxBackground": "#f8f9fd",
-    "settings.checkboxForeground": "#90a4ae"
+    "settings.checkboxForeground": "#90a4ae",
+    "editorCodeLens.foreground": "#baced1",
+    "git.blame.editorDecorationForeground": "#baced1"
   },
   "tokenColors": [
     {
@@ -203,7 +205,7 @@
       "scope": "invalid.deprecated",
       "settings": {
         "fontStyle": "italic",
-        "foreground": "#FFB62C"
+        "foreground": "#ffb62c"
       }
     },
     {
@@ -217,7 +219,7 @@
       "name": "Keyword, Storage",
       "scope": "keyword, storage.type, storage.modifier",
       "settings": {
-        "foreground": "#FF5370"
+        "foreground": "#ff5370"
       }
     },
     {
@@ -229,7 +231,7 @@
     },
     {
       "name": "Operator, Misc",
-      "scope": "keyword.control, meta.tag, punctuation.definition.tag, punctuation.separator.inheritance.php, punctuation.definition.tag.html, punctuation.definition.tag.begin.html, punctuation.definition.tag.end.html, punctuation.section.embedded, keyword.other.template, keyword.other.substitution",
+      "scope": "keyword.control, meta.tag, punctuation.accessor, punctuation.accessor.optional, punctuation.definition.tag, punctuation.separator.inheritance.php, punctuation.definition.tag.html, punctuation.definition.tag.begin.html, punctuation.definition.tag.end.html, punctuation.section.embedded, keyword.other.template, keyword.other.substitution",
       "settings": {
         "foreground": "#ff5370"
       }
@@ -250,7 +252,7 @@
     },
     {
       "name": "Function, Special Method, Block Level",
-      "scope": "entity.name.function, meta.function-call, variable.function, support.function, keyword.other.special-method, meta.block-level",
+      "scope": "entity.name.function, meta.function-call, variable.function, support.function.js, keyword.other.special-method, meta.block-level",
       "settings": {
         "foreground": "#0096ff"
       }
@@ -389,21 +391,6 @@
         "foreground": "#e53935"
       }
     },
-    {
-      "name": "entity.name.method.js",
-      "scope": "entity.name.method.js",
-      "settings": {
-        "fontStyle": "italic",
-        "foreground": "#6182B8"
-      }
-    },
-    {
-      "name": "meta.method.js",
-      "scope": "meta.class-method.js entity.name.function.js, variable.function.constructor",
-      "settings": {
-        "foreground": "#6182B8"
-      }
-    },
     {
       "name": "Attributes",
       "scope": "entity.other.attribute-name",
@@ -447,19 +434,17 @@
       }
     },
     {
-      "name": "Decorators",
-      "scope": "tag.decorator.js entity.name.tag.js, tag.decorator.js punctuation.definition.tag.js",
+      "name": "HTML Attributes, directive",
+      "scope": "text.html.basic entity.other.attribute-name.html, text.html.basic entity.other.attribute-name, text.xhtml.basic entity.other.attribute-name.xhtml, text.xhtml.basic entity.other.attribute-name, text.html.derivative meta.attribute.unrecognized entity.other.attribute-name.html, text.html.vue-html meta.directive.vue entity.other.attribute-name.html",
       "settings": {
-        "fontStyle": "italic",
-        "foreground": "#6182B8"
+        "foreground": "#ffb62c"
       }
     },
     {
-      "name": "HTML Attributes",
-      "scope": "text.html.basic entity.other.attribute-name.html, text.html.basic entity.other.attribute-name, text.xhtml.basic entity.other.attribute-name.xhtml, text.xhtml.basic entity.other.attribute-name",
+      "name": "link, a, img, script => path",
+      "scope": "meta.tag.metadata.script.start.html meta.attribute.src string.quoted.double, meta.tag.inline.a.start.html meta.attribute.href string.quoted.double, meta.tag.metadata.link.void.html meta.attribute.href string.quoted.double, meta.tag.object.img.void.html meta.attribute.src string.quoted.double",
       "settings": {
-        "fontStyle": "italic",
-        "foreground": "#ffb62c"
+        "foreground": "#90a4ae"
       }
     },
     {
@@ -492,15 +477,8 @@
       }
     },
     {
-      "name": "directive",
-      "scope": "text.html.derivative meta.attribute.unrecognized entity.other.attribute-name.html",
-      "settings": {
-        "foreground": "#ffb62c"
-      }
-    },
-    {
-      "name": "directive's value",
-      "scope": "text.html.derivative meta.attribute.unrecognized string.quoted.double.html",
+      "name": "directive's value, spec value",
+      "scope": "text.html.derivative meta.attribute.unrecognized string.quoted.double.html, meta.tag.metadata.script.start.html meta.attribute.type.html string.quoted.double",
       "settings": {
         "foreground": "#be7ee7"
       }
@@ -512,9 +490,54 @@
         "foreground": "#70acf7"
       }
     },
+    {
+      "name": "import constant",
+      "scope": "meta.import variable.other.readwrite.alias",
+      "settings": {
+        "foreground": "#0096ff"
+      }
+    },
+    {
+      "name": "import path",
+      "scope": "meta.import string.quoted.single, meta.import string.quoted.double",
+      "settings": {
+        "fontStyle": "underline",
+        "foreground": "#90a4ae"
+      }
+    },
+    {
+      "name": "import path",
+      "scope": "meta.import string.quoted.single punctuation.definition.string.begin, meta.import string.quoted.single punctuation.definition.string.end, meta.import string.quoted.double punctuation.definition.string.begin, meta.import string.quoted.double punctuation.definition.string.end",
+      "settings": {
+        "fontStyle": "none"
+      }
+    },
+    {
+      "name": "Decorators",
+      "scope": "tag.decorator.js entity.name.tag.js, tag.decorator.js punctuation.definition.tag.js",
+      "settings": {
+        "fontStyle": "italic",
+        "foreground": "#6182B8"
+      }
+    },
+    {
+      "name": "meta.method.js",
+      "scope": "meta.class-method.js entity.name.function.js, variable.function.constructor",
+      "settings": {
+        "foreground": "#6182B8"
+      }
+    },
+    {
+      "name": "entity.name.method.js",
+      "scope": "entity.name.method.js",
+      "settings": {
+        "fontStyle": "italic",
+        "foreground": "#6182B8"
+      }
+    },
     {
       "name": "Class extends, build-in, dom",
-      "scope": "support.type.object.console.js, support.type.object.module.js, support.type.object.dom.js, support.constant.math, meta.class.extends.js variable.other.readwrite.js, meta.function-call.static.without-arguments.js variable.other.class.js, meta.function-call.static.with-arguments.js variable.other.class.js, meta.property.class.js variable.other.class.js",
+      "scope": "support.type.object.console, support.type.object.module, support.type.object.dom, support.constant.math, support.constant.json, meta.class.extends variable.other.readwrite, meta.function-call.static.without-arguments variable.other.class, meta.function-call.static.with-arguments variable.other.class, meta.property.class variable.other.class",
       "settings": {
         "fontStyle": "bold italic",
         "foreground": "#ffb62c"
@@ -545,15 +568,29 @@
     },
     {
       "name": "ts string express",
-      "scope": "punctuation.definition.template-expression.begin.ts, punctuation.definition.template-expression.end.ts",
+      "scope": "punctuation.definition.template-expression.begin, punctuation.definition.template-expression.end",
       "settings": {
         "fontStyle": "",
         "foreground": "#ff5370"
       }
     },
+    {
+      "name": "Punctuation",
+      "scope": "meta.object.member meta.array.literal meta.brace.square, meta.object.member meta.arrow meta.brace.round, text.html.vue-html meta.brace.round, text.html.vue-html meta.directive.vue, string.template meta.template.expression meta.array.literal meta.brace.square, string.template meta.template.expression meta.brace.round, meta.tag.attributes punctuation.section.embedded.begin, meta.tag.attributes punctuation.section.embedded.end, meta.tag.without-attributes punctuation.section.embedded.begin, meta.tag.without-attributes punctuation.section.embedded.end, meta.type.annotation meta.brace.square",
+      "settings": {
+        "foreground": "#90a4ae"
+      }
+    },
+    {
+      "name": "Variables",
+      "scope": "string.template meta.template.expression support.variable.property",
+      "settings": {
+        "foreground": "#546e7a"
+      }
+    },
     {
       "name": "build-in function",
-      "scope": "source.js support.function.node.js, meta.group.braces.curly.js support.function, meta.function-call.ts support.function.ts, support.function.builtin.js",
+      "scope": "source.js support.function.node.js, meta.group.braces.curly.js support.function, meta.function-call.ts support.function.ts, meta.function-call.js support.function.js, support.function.builtin.js",
       "settings": {
         "fontStyle": "italic",
         "foreground": "#be7ee7"
@@ -584,12 +621,27 @@
     },
     {
       "name": "object keys",
-      "scope": "constant.other.object.key.js string.unquoted.label.js, constant.other.object.key.js string.quoted.label.js",
+      "scope": "constant.other.object.key string.unquoted.label, constant.other.object.key string.quoted.label, meta.object.member meta.object-literal.key, meta.object.member meta.object-literal.key string.quoted.double, meta.object.member meta.object-literal.key string.quoted.single, meta.object.member meta.object-literal.key constant.numeric.decimal, meta.field.declaration variable.object.property",
       "settings": {
         "fontStyle": "italic bold",
         "foreground": "#90a4ae"
       }
     },
+    {
+      "name": "jsx Tag",
+      "scope": "entity.name.tag support.class.component, text.html.vue-html support.class.component.html",
+      "settings": {
+        "fontStyle": "normal",
+        "foreground": "#ff5370"
+      }
+    },
+    {
+      "name": "Tag Content String",
+      "scope": "meta.tag meta.tag.without-attributes meta.jsx.children, meta.tag meta.jsx.children",
+      "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",
@@ -835,6 +887,29 @@
         "foreground": "#c7c8cb"
       }
     },
+    {
+      "name": "import path",
+      "scope": "meta.declaration.dart string.interpolated.single.dart",
+      "settings": {
+        "fontStyle": "underline",
+        "foreground": "#90a4ae"
+      }
+    },
+    {
+      "name": "ts string express",
+      "scope": "string.interpolated.double.dart string.interpolated.expression.dart, string.interpolated.single.dart string.interpolated.expression.dart",
+      "settings": {
+        "fontStyle": "",
+        "foreground": "#ff5370"
+      }
+    },
+    {
+      "name": "Variables",
+      "scope": "string.interpolated.double.dart variable.parameter.dart, string.interpolated.single.dart variable.parameter.dart",
+      "settings": {
+        "foreground": "#546e7a"
+      }
+    },
     {
       "name": "JSON Key - Level 0",
       "scope": "source.json meta.structure.dictionary.json support.type.property-name.json",