智障微软1.6.8

.gitignore

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

.vscodeignore

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

CHANGELOG.md

@@ -1,5 +1,13 @@
 # 更新日志
 
+## [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字符串模板中的着色

README.md

@@ -1,16 +1,14 @@
-<<<<<<< HEAD
-# 米白色主题(Theme) 自用版
-> 自用版, 弱化了php的高亮。因为没法区分`.php文件`和`.phtml文件`, 所以单独分了个自用版。
->> `其他人请使用普通版`
-=======
 # 米白色主题(Theme)
 > 米白色主题, vscode专用。包括UI和代码高亮, 都精心调整好对比度。优雅,耐看。 喜欢浅色系的童鞋, 不要错过。
 >> 目前主题精心适配 `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)
+[![Version](https://img.shields.io/visual-studio-marketplace/v/yutent.one-plain)](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)
+[![Rating](https://img.shields.io/visual-studio-marketplace/r/yutent.one-plain)](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)
+[![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)
+
+
 
 ## 截图预览
 ![截图](./demo.jpg)
@@ -23,5 +21,4 @@
 
 ## 问题(Issue)
 > 有任何问题,或建议, 都可以到[GitHub](https://github.com/yutent/one-plain.git) 提出。
->>>>>>> master
 

build.js

@@ -26,7 +26,7 @@ for (let it of tokenColors) {
 }
 
 const theme = {
-  name: '米白色主题@自用',
+  name: '米白色主题',
   type: 'light',
   colors,
   tokenColors

data/logs/error.log

@@ -1,59 +0,0 @@
-/Volumes/extends/www/project/one-plain/src/es.js:105
-      'string.template.js meta.template.expression.js meta.array.literal.js meta.brace.square.js',
-      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-SyntaxError: Unexpected string
-    at wrapSafe (internal/modules/cjs/loader.js:915:16)
-    at Module._compile (internal/modules/cjs/loader.js:963:27)
-    at Object.Module._extensions..js (internal/modules/cjs/loader.js:1027:10)
-    at Module.load (internal/modules/cjs/loader.js:863:32)
-    at Function.Module._load (internal/modules/cjs/loader.js:708:14)
-    at Module.require (internal/modules/cjs/loader.js:887:19)
-    at require (internal/modules/cjs/helpers.js:74:18)
-    at Object.<anonymous> (/Volumes/extends/www/project/one-plain/build.js:14:12)
-    at Module._compile (internal/modules/cjs/loader.js:999:30)
-    at Object.Module._extensions..js (internal/modules/cjs/loader.js:1027:10)
-/Volumes/extends/www/project/one-plain/src/es.js:20
-      'meta.import.ts string.quoted.double.ts'
-      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-SyntaxError: Unexpected string
-    at wrapSafe (internal/modules/cjs/loader.js:915:16)
-    at Module._compile (internal/modules/cjs/loader.js:963:27)
-    at Object.Module._extensions..js (internal/modules/cjs/loader.js:1027:10)
-    at Module.load (internal/modules/cjs/loader.js:863:32)
-    at Function.Module._load (internal/modules/cjs/loader.js:708:14)
-    at Module.require (internal/modules/cjs/loader.js:887:19)
-    at require (internal/modules/cjs/helpers.js:74:18)
-    at Object.<anonymous> (/Volumes/extends/www/project/one-plain/build.js:14:12)
-    at Module._compile (internal/modules/cjs/loader.js:999:30)
-    at Object.Module._extensions..js (internal/modules/cjs/loader.js:1027:10)
-/Volumes/extends/www/project/one-plain/src/es.js:20
-      'meta.import.ts string.quoted.double.ts'
-      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-SyntaxError: Unexpected string
-    at wrapSafe (internal/modules/cjs/loader.js:915:16)
-    at Module._compile (internal/modules/cjs/loader.js:963:27)
-    at Object.Module._extensions..js (internal/modules/cjs/loader.js:1027:10)
-    at Module.load (internal/modules/cjs/loader.js:863:32)
-    at Function.Module._load (internal/modules/cjs/loader.js:708:14)
-    at Module.require (internal/modules/cjs/loader.js:887:19)
-    at require (internal/modules/cjs/helpers.js:74:18)
-    at Object.<anonymous> (/Volumes/extends/www/project/one-plain/build.js:14:12)
-    at Module._compile (internal/modules/cjs/loader.js:999:30)
-    at Object.Module._extensions..js (internal/modules/cjs/loader.js:1027:10)
-readline.js:228
-    input.on('data', ondata);
-          ^
-
-TypeError: Cannot read property 'on' of undefined
-    at new Interface (readline.js:228:11)
-    at Object.createInterface (readline.js:92:10)
-    at Object.<anonymous> (/Volumes/extends/www/project/one-plain/build.js:37:10)
-    at Module._compile (internal/modules/cjs/loader.js:999:30)
-    at Object.Module._extensions..js (internal/modules/cjs/loader.js:1027:10)
-    at Module.load (internal/modules/cjs/loader.js:863:32)
-    at Function.Module._load (internal/modules/cjs/loader.js:708:14)
-    at Function.executeUserEntryPoint [as runMain] (internal/modules/run_main.js:60:12)
-    at internal/main/run_main_module.js:17:47

data/logs/out.log

@@ -1,33 +0,0 @@
-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...
-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

@@ -1,15 +1,17 @@
 {
-  "name": "one-plain-at-own",
+  "name": "one-plain",
-  "displayName": "one plain@own",
+  "displayName": "one plain",
-  "description": "🔥 米白色主题@自用",
+  "description": "🔥 米白色主题",
   "icon": "logo.png",
-  "version": "1.6.2",
+  "version": "1.6.8",
   "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/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,7 +58,8 @@ module.exports = [
     scope: [
       'keyword.control',
       'meta.tag',
-      'punctuation.accessor.js',
+      'punctuation.accessor',
+      'punctuation.accessor.optional',
       'punctuation.definition.tag',
       'punctuation.separator.inheritance.php',
       'punctuation.definition.tag.html',

src/dart.js

@@ -1,12 +1,34 @@
 const vars = require('./var')
 
 module.exports = [
-  // {
+  {
-  //   name: 'dart type',
+    name: 'import path',
-  //   scope: ['storage.type.primitive.dart'],
+    scope: ['meta.declaration.dart string.interpolated.single.dart'],
-  //   settings: {
+    settings: {
-  //     foreground: '#e5c07b',
+      fontStyle: 'underline',
-  //     fontStyle: 'bold italic'
+      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

@@ -3,22 +3,14 @@ const vars = require('./var')
 module.exports = [
   {
     name: 'import constant',
-    scope: [
+    scope: ['meta.import variable.other.readwrite.alias'],
-      'meta.import.js variable.other.readwrite.alias.js',
-      'meta.import.ts variable.other.readwrite.alias.ts'
-    ],
     settings: {
       foreground: vars.blue2
     }
   },
   {
     name: 'import path',
-    scope: [
+    scope: ['meta.import string.quoted.single', 'meta.import string.quoted.double'],
-      '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'
-    ],
     settings: {
       fontStyle: 'underline',
       foreground: vars.common
@@ -27,14 +19,10 @@ module.exports = [
   {
     name: 'import path',
     scope: [
-      'meta.import.js string.quoted.single.js punctuation.definition.string.begin.js',
+      'meta.import string.quoted.single punctuation.definition.string.begin',
-      'meta.import.js string.quoted.double.js punctuation.definition.string.begin.js',
+      'meta.import string.quoted.single punctuation.definition.string.end',
-      'meta.import.js string.quoted.single.js punctuation.definition.string.end.js',
+      'meta.import string.quoted.double punctuation.definition.string.begin',
-      'meta.import.js string.quoted.double.js punctuation.definition.string.end.js',
+      'meta.import string.quoted.double punctuation.definition.string.end'
-      'meta.import.ts string.quoted.single.ts punctuation.definition.string.begin.ts',
-      'meta.import.ts string.quoted.double.ts punctuation.definition.string.begin.ts',
-      'meta.import.ts string.quoted.single.ts punctuation.definition.string.end.ts',
-      'meta.import.ts string.quoted.double.ts punctuation.definition.string.end.ts'
     ],
     settings: {
       fontStyle: 'none'
@@ -69,15 +57,15 @@ module.exports = [
   {
     name: 'Class extends, build-in, dom',
     scope: [
-      'support.type.object.console.js',
+      'support.type.object.console',
-      'support.type.object.module.js',
+      'support.type.object.module',
-      'support.type.object.dom.js',
+      'support.type.object.dom',
       'support.constant.math',
       'support.constant.json',
-      'meta.class.extends.js variable.other.readwrite.js',
+      'meta.class.extends variable.other.readwrite',
-      'meta.function-call.static.without-arguments.js variable.other.class.js',
+      'meta.function-call.static.without-arguments variable.other.class',
-      'meta.function-call.static.with-arguments.js variable.other.class.js',
+      'meta.function-call.static.with-arguments variable.other.class',
-      'meta.property.class.js variable.other.class.js'
+      'meta.property.class variable.other.class'
     ],
     settings: {
       fontStyle: 'bold italic',
@@ -117,10 +105,8 @@ module.exports = [
   {
     name: 'ts string express',
     scope: [
-      'punctuation.definition.template-expression.begin.ts',
+      'punctuation.definition.template-expression.begin',
-      'punctuation.definition.template-expression.end.ts',
+      'punctuation.definition.template-expression.end'
-      'punctuation.definition.template-expression.begin.js',
-      'punctuation.definition.template-expression.end.js'
     ],
     settings: {
       fontStyle: '',
@@ -130,12 +116,17 @@ module.exports = [
   {
     name: 'Punctuation',
     scope: [
-      'meta.object.member.js meta.array.literal.js meta.brace.square.js',
+      'meta.object.member meta.array.literal meta.brace.square',
-      'meta.object.member.js meta.arrow.js meta.brace.round.js',
+      'meta.object.member meta.arrow meta.brace.round',
-      'string.template.js meta.template.expression.js meta.array.literal.js meta.brace.square.js',
+      'text.html.vue-html meta.brace.round',
-      'string.template.js meta.template.expression.js meta.brace.round.js',
+      'text.html.vue-html meta.directive.vue',
-      'string.template.ts meta.template.expression.ts meta.array.literal.ts meta.brace.square.ts',
+      'string.template meta.template.expression meta.array.literal meta.brace.square',
-      'string.template.ts meta.template.expression.ts meta.brace.round.ts'
+      '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
@@ -143,10 +134,7 @@ module.exports = [
   },
   {
     name: 'Variables',
-    scope: [
+    scope: ['string.template meta.template.expression support.variable.property'],
-      'string.template.js meta.template.expression.js support.variable.property.js',
-      'string.template.ts meta.template.expression.ts support.variable.property.ts'
-    ],
     settings: {
       foreground: vars.common2
     }
@@ -212,16 +200,35 @@ module.exports = [
   {
     name: 'object keys',
     scope: [
-      'constant.other.object.key.js string.unquoted.label.js',
+      'constant.other.object.key string.unquoted.label',
-      'constant.other.object.key.js string.quoted.label.js',
+      'constant.other.object.key string.quoted.label',
-      'meta.object.member.js meta.object-literal.key.js string.quoted.double.js',
+      'meta.object.member meta.object-literal.key',
-      'meta.object.member.js meta.object-literal.key.js string.quoted.single.js',
+      'meta.object.member meta.object-literal.key string.quoted.double',
-      'meta.object.member.js meta.object-literal.key.js constant.numeric.decimal.js',
+      'meta.object.member meta.object-literal.key string.quoted.single',
-      'meta.objectliteral.js meta.object.member.js meta.object-literal.key.js'
+      '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',
+      'meta.tag.metadata.script.start.html meta.attribute.src string.quoted.double',
-      'entity.other.attribute-name.id.css'
+      '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'
+      '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.yellow1
-    }
-  },
-  {
-    name: "directive's value",
-    scope: [
-      'text.html.derivative meta.attribute.unrecognized string.quoted.double.html'
     ],
     settings: {
       foreground: vars.magenta1

src/php.js

@@ -2,64 +2,167 @@ const vars = require('./var')
 
 module.exports = [
   {
-    name: 'Class name php',
+    name: 'PHP Constants',
     scope: [
-      'support.function.construct.php',
+      'constant.other.php',
-      'variable.other.php',
+      'support.constant.ext.php',
-      'keyword.operator.logical.php',
+      'support.constant.std.php,support.constant.core.php',
-      'punctuation.definition.variable.php',
+      'support.constant.parser-token.php',
-      'string.quoted.single.php',
+      'constant'
-      'constant.numeric.decimal.php',
+    ],
-      'support.function.array.php',
+    settings: {
-      'support.function.mbstring.php',
+      foreground: '#ffb62c'
+    }
+  },
+  {
+    name: 'Class name php',
+    scope: 'variable.other.class.php',
+    settings: {
+      foreground: '#e06c75'
+    }
+  },
 
-      'variable.other.global.safer.php',
+  // 变量
-      'support.function.datetime.php'
+  {
+    name: 'php dollar sign',
+    scope: ['punctuation.definition.variable.php'],
+    settings: {
+      foreground: vars.common2
+    }
+  },
+
+  //  $this
+  {
+    name: 'php dollar sign',
+    scope: [
+      'variable.language.this.php',
+      'variable.language.this.php punctuation.definition.variable.php'
     ],
     settings: {
-      foreground: '#a7beca',
+      foreground: vars.red1
-      fontStyle: 'italic'
+    }
+  },
+
+  {
+    name: 'php build in function',
+    scope: ['meta.function-call.php support.function'],
+    settings: {
+      fontStyle: 'italic',
+      foreground: vars.magenta1
+    }
+  },
+
+  {
+    name: 'php heredoc/nowdoc',
+    scope: 'keyword.operator.heredoc.php,keyword.operator.nowdoc.php',
+    settings: {
+      foreground: '#c678dd'
     }
   },
   {
-    name: 'Class name php',
+    name: 'php goto',
-    scope: [
+    scope: 'entity.name.goto-label.php,support.other.php',
-      'punctuation.section.embedded.begin.php',
-      'punctuation.section.embedded.end.php',
-      'punctuation.terminator.statement.php',
-      'punctuation.definition.begin.bracket.round.php',
-      'punctuation.definition.end.bracket.round.php',
-      'punctuation.definition.arguments.begin.bracket.round.php',
-      'punctuation.definition.arguments.end.bracket.round.php',
-      'punctuation.terminator.expression.php',
-      'punctuation.section.array.begin.php',
-      'punctuation.section.array.end.php',
-      'punctuation.definition.string.begin.php',
-      'punctuation.definition.string.end.php',
-      'keyword.control.if.php',
-      'keyword.control.elseif.php',
-      'keyword.control.endif.php',
-      'keyword.control.foreach.php',
-      'keyword.control.endforeach.php',
-      'keyword.control.import.include.php'
-    ],
     settings: {
-      foreground: vars.grey1,
+      foreground: '#61AFEF'
-      fontStyle: 'italic'
     }
   },
   {
-    name: 'Class name php',
+    name: 'php logical/bitwise operator',
+    scope:
+      'keyword.operator.logical.php,keyword.operator.bitwise.php,keyword.operator.arithmetic.php',
+    settings: {
+      foreground: '#56b6c2'
+    }
+  },
+  {
+    name: 'php regexp operator',
+    scope: 'keyword.operator.regexp.php',
+    settings: {
+      foreground: '#c678dd'
+    }
+  },
+  {
+    name: 'php comparison',
+    scope: 'keyword.operator.comparison.php',
+    settings: {
+      foreground: '#56b6c2'
+    }
+  },
+
+  {
+    name: 'php instanceof',
+    scope: 'keyword.operator.type.php',
+    settings: {
+      foreground: '#c678dd'
+    }
+  },
+
+  {
+    name: 'php illegal.non-null-typehinted',
+    scope: 'invalid.illegal.non-null-typehinted.php',
+    settings: {
+      foreground: '#f44747'
+    }
+  },
+  {
+    name: 'php types',
     scope: [
-      'keyword.operator.comparison.php',
+      [
-      'keyword.operator.ternary.php',
+        'storage.type.php',
-      'keyword.operator.assignment.php',
+        'meta.other.type.phpdoc.php',
-      'keyword.operator.string.php',
+        'keyword.other.type.php',
-      'keyword.operator.key.php'
+        'keyword.other.array.phpdoc.php'
+      ]
     ],
     settings: {
-      foreground: vars.plain3,
+      foreground: '#ffb62c',
-      fontStyle: 'italic'
+      fontStyle: 'bold italic'
+    }
+  },
+  {
+    name: 'php call-function',
+    scope: [
+      'meta.function-call.php',
+      'meta.function-call.object.php',
+      'meta.function-call.static.php'
+    ],
+    settings: {
+      foreground: '#61AFEF'
+    }
+  },
+  {
+    name: 'laravel blade tag',
+    scope: [
+      'text.html.laravel-blade',
+      'source.php.embedded.line.html',
+      'entity.name.tag.laravel-blade'
+    ],
+    settings: {
+      foreground: '#c678dd'
+    }
+  },
+  {
+    name: 'laravel blade @',
+    scope: [
+      'text.html.laravel-blade',
+      'source.php.embedded.line.html',
+      'support.constant.laravel-blade'
+    ],
+    settings: {
+      foreground: '#c678dd'
+    }
+  },
+  {
+    name: 'use statement for other classes',
+    scope: [
+      'support.other.namespace.use.php',
+      'support.other.namespace.use-as.php',
+      'support.other.namespace.php',
+      'entity.other.alias.php',
+      'meta.interface.php'
+    ],
+    settings: {
+      foreground: '#E5C07B'
     }
   }
 ]

themes/color-theme.json

@@ -1,5 +1,5 @@
 {
-  "name": "米白色主题@自用",
+  "name": "米白色主题",
   "type": "light",
   "colors": {
     "focusBorder": "#ffffff00",
@@ -203,7 +203,7 @@
       "scope": "invalid.deprecated",
       "settings": {
         "fontStyle": "italic",
-        "foreground": "#FFB62C"
+        "foreground": "#ffb62c"
       }
     },
     {
@@ -217,7 +217,7 @@
       "name": "Keyword, Storage",
       "scope": "keyword, storage.type, storage.modifier",
       "settings": {
-        "foreground": "#FF5370"
+        "foreground": "#ff5370"
       }
     },
     {
@@ -229,7 +229,7 @@
     },
     {
       "name": "Operator, Misc",
-      "scope": "keyword.control, meta.tag, punctuation.accessor.js, 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"
       }
@@ -432,13 +432,19 @@
       }
     },
     {
-      "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",
+      "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": "#ffb62c"
       }
     },
+    {
+      "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": {
+        "foreground": "#90a4ae"
+      }
+    },
     {
       "name": "CSS Class & ID",
       "scope": "entity.other.attribute-name.class, entity.other.attribute-name.id.css",
@@ -469,15 +475,8 @@
       }
     },
     {
-      "name": "directive",
+      "name": "directive's value, spec value",
-      "scope": "text.html.derivative meta.attribute.unrecognized entity.other.attribute-name.html",
+      "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": "#ffb62c"
-      }
-    },
-    {
-      "name": "directive's value",
-      "scope": "text.html.derivative meta.attribute.unrecognized string.quoted.double.html",
       "settings": {
         "foreground": "#be7ee7"
       }
@@ -491,14 +490,14 @@
     },
     {
       "name": "import constant",
-      "scope": "meta.import.js variable.other.readwrite.alias.js, meta.import.ts variable.other.readwrite.alias.ts",
+      "scope": "meta.import variable.other.readwrite.alias",
       "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 string.quoted.single, meta.import string.quoted.double",
       "settings": {
         "fontStyle": "underline",
         "foreground": "#90a4ae"
@@ -506,7 +505,7 @@
     },
     {
       "name": "import path",
-      "scope": "meta.import.js string.quoted.single.js punctuation.definition.string.begin.js, meta.import.js string.quoted.double.js punctuation.definition.string.begin.js, meta.import.js string.quoted.single.js punctuation.definition.string.end.js, meta.import.js string.quoted.double.js punctuation.definition.string.end.js, meta.import.ts string.quoted.single.ts punctuation.definition.string.begin.ts, meta.import.ts string.quoted.double.ts punctuation.definition.string.begin.ts, meta.import.ts string.quoted.single.ts punctuation.definition.string.end.ts, meta.import.ts string.quoted.double.ts punctuation.definition.string.end.ts",
+      "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"
       }
@@ -536,7 +535,7 @@
     },
     {
       "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, support.constant.json, 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"
@@ -567,7 +566,7 @@
     },
     {
       "name": "ts string express",
-      "scope": "punctuation.definition.template-expression.begin.ts, punctuation.definition.template-expression.end.ts, punctuation.definition.template-expression.begin.js, punctuation.definition.template-expression.end.js",
+      "scope": "punctuation.definition.template-expression.begin, punctuation.definition.template-expression.end",
       "settings": {
         "fontStyle": "",
         "foreground": "#ff5370"
@@ -575,14 +574,14 @@
     },
     {
       "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 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.js meta.template.expression.js support.variable.property.js, string.template.ts meta.template.expression.ts support.variable.property.ts",
+      "scope": "string.template meta.template.expression support.variable.property",
       "settings": {
         "foreground": "#546e7a"
       }
@@ -620,34 +619,146 @@
     },
     {
       "name": "object keys",
-      "scope": "constant.other.object.key.js string.unquoted.label.js, constant.other.object.key.js string.quoted.label.js, meta.object.member.js meta.object-literal.key.js string.quoted.double.js, meta.object.member.js meta.object-literal.key.js string.quoted.single.js, meta.object.member.js meta.object-literal.key.js constant.numeric.decimal.js, meta.objectliteral.js meta.object.member.js meta.object-literal.key.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": "Class name php",
+      "name": "jsx Tag",
-      "scope": "support.function.construct.php, variable.other.php, keyword.operator.logical.php, punctuation.definition.variable.php, string.quoted.single.php, constant.numeric.decimal.php, support.function.array.php, support.function.mbstring.php, variable.other.global.safer.php, support.function.datetime.php",
+      "scope": "entity.name.tag support.class.component, text.html.vue-html support.class.component.html",
       "settings": {
-        "foreground": "#a7beca",
+        "fontStyle": "normal",
-        "fontStyle": "italic"
+        "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",
+      "settings": {
+        "foreground": "#ffb62c"
       }
     },
     {
       "name": "Class name php",
-      "scope": "punctuation.section.embedded.begin.php, punctuation.section.embedded.end.php, punctuation.terminator.statement.php, punctuation.definition.begin.bracket.round.php, punctuation.definition.end.bracket.round.php, punctuation.definition.arguments.begin.bracket.round.php, punctuation.definition.arguments.end.bracket.round.php, punctuation.terminator.expression.php, punctuation.section.array.begin.php, punctuation.section.array.end.php, punctuation.definition.string.begin.php, punctuation.definition.string.end.php, keyword.control.if.php, keyword.control.elseif.php, keyword.control.endif.php, keyword.control.foreach.php, keyword.control.endforeach.php, keyword.control.import.include.php",
+      "scope": "variable.other.class.php",
       "settings": {
-        "foreground": "#c7c8cb",
+        "foreground": "#e06c75"
-        "fontStyle": "italic"
       }
     },
     {
-      "name": "Class name php",
+      "name": "php dollar sign",
-      "scope": "keyword.operator.comparison.php, keyword.operator.ternary.php, keyword.operator.assignment.php, keyword.operator.string.php, keyword.operator.key.php",
+      "scope": "punctuation.definition.variable.php",
       "settings": {
-        "foreground": "#e8e9ed",
+        "foreground": "#546e7a"
-        "fontStyle": "italic"
+      }
+    },
+    {
+      "name": "php dollar sign",
+      "scope": "variable.language.this.php, variable.language.this.php punctuation.definition.variable.php",
+      "settings": {
+        "foreground": "#ff4628"
+      }
+    },
+    {
+      "name": "php build in function",
+      "scope": "meta.function-call.php support.function",
+      "settings": {
+        "fontStyle": "italic",
+        "foreground": "#be7ee7"
+      }
+    },
+    {
+      "name": "php heredoc/nowdoc",
+      "scope": "keyword.operator.heredoc.php,keyword.operator.nowdoc.php",
+      "settings": {
+        "foreground": "#c678dd"
+      }
+    },
+    {
+      "name": "php goto",
+      "scope": "entity.name.goto-label.php,support.other.php",
+      "settings": {
+        "foreground": "#61AFEF"
+      }
+    },
+    {
+      "name": "php logical/bitwise operator",
+      "scope": "keyword.operator.logical.php,keyword.operator.bitwise.php,keyword.operator.arithmetic.php",
+      "settings": {
+        "foreground": "#56b6c2"
+      }
+    },
+    {
+      "name": "php regexp operator",
+      "scope": "keyword.operator.regexp.php",
+      "settings": {
+        "foreground": "#c678dd"
+      }
+    },
+    {
+      "name": "php comparison",
+      "scope": "keyword.operator.comparison.php",
+      "settings": {
+        "foreground": "#56b6c2"
+      }
+    },
+    {
+      "name": "php instanceof",
+      "scope": "keyword.operator.type.php",
+      "settings": {
+        "foreground": "#c678dd"
+      }
+    },
+    {
+      "name": "php illegal.non-null-typehinted",
+      "scope": "invalid.illegal.non-null-typehinted.php",
+      "settings": {
+        "foreground": "#f44747"
+      }
+    },
+    {
+      "name": "php types",
+      "scope": "storage.type.php,meta.other.type.phpdoc.php,keyword.other.type.php,keyword.other.array.phpdoc.php",
+      "settings": {
+        "foreground": "#ffb62c",
+        "fontStyle": "bold italic"
+      }
+    },
+    {
+      "name": "php call-function",
+      "scope": "meta.function-call.php, meta.function-call.object.php, meta.function-call.static.php",
+      "settings": {
+        "foreground": "#61AFEF"
+      }
+    },
+    {
+      "name": "laravel blade tag",
+      "scope": "text.html.laravel-blade, source.php.embedded.line.html, entity.name.tag.laravel-blade",
+      "settings": {
+        "foreground": "#c678dd"
+      }
+    },
+    {
+      "name": "laravel blade @",
+      "scope": "text.html.laravel-blade, source.php.embedded.line.html, support.constant.laravel-blade",
+      "settings": {
+        "foreground": "#c678dd"
+      }
+    },
+    {
+      "name": "use statement for other classes",
+      "scope": "support.other.namespace.use.php, support.other.namespace.use-as.php, support.other.namespace.php, entity.other.alias.php, meta.interface.php",
+      "settings": {
+        "foreground": "#E5C07B"
       }
     },
     {
@@ -774,6 +885,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",