Merge branch 'master' into @own

README.md

@@ -1,3 +1,8 @@
+<<<<<<< HEAD
+# 米白色主题(Theme) 自用版
+> 自用版, 弱化了php的高亮。因为没法区分`.php文件`和`.phtml文件`, 所以单独分了个自用版。
+>> `其他人请使用普通版`
+=======
 # 米白色主题(Theme)
 > 米白色主题, vscode专用。包括UI和代码高亮, 都精心调整好对比度。优雅,耐看。 喜欢浅色系的童鞋, 不要错过。
 >> 目前主题精心适配 `ts,js,scss,css,html,php,md,json`等语言的高亮, 其他语言适配, 如发现有不正常的高亮可以到[GitHub](https://github.com/yutent/one-plain.git)反馈, 我会第一时间适配。
@@ -18,4 +23,5 @@
 
 ## 问题(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

package.json

@@ -1,7 +1,7 @@
 {
-  "name": "one-plain",
+  "name": "one-plain-at-own",
-  "displayName": "one plain",
+  "displayName": "one plain@own",
-  "description": "🔥 米白色主题",
+  "description": "🔥 米白色主题@自用",
   "icon": "logo.png",
   "version": "1.6.2",
   "publisher": "yutent",

src/php.js

@@ -2,167 +2,64 @@ const vars = require('./var')
 
 module.exports = [
   {
-    name: 'PHP Constants',
+    name: 'Class name php',
     scope: [
-      'constant.other.php',
+      'support.function.construct.php',
-      'support.constant.ext.php',
+      'variable.other.php',
-      'support.constant.std.php,support.constant.core.php',
+      'keyword.operator.logical.php',
-      'support.constant.parser-token.php',
+      'punctuation.definition.variable.php',
-      'constant'
+      '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'
     ],
     settings: {
-      foreground: '#ffb62c'
+      foreground: '#a7beca',
+      fontStyle: 'italic'
     }
   },
   {
     name: 'Class name php',
-    scope: 'variable.other.class.php',
-    settings: {
-      foreground: '#e06c75'
-    }
-  },
-
-  // 变量
-  {
-    name: 'php dollar sign',
-    scope: ['punctuation.definition.variable.php'],
-    settings: {
-      foreground: vars.common2
-    }
-  },
-
-  //  $this
-  {
-    name: 'php dollar sign',
     scope: [
-      'variable.language.this.php',
+      'punctuation.section.embedded.begin.php',
-      'variable.language.this.php punctuation.definition.variable.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.red1
+      foreground: vars.grey1,
-    }
+      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: 'php goto',
+    name: 'Class name php',
-    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: [
-      [
+      'keyword.operator.comparison.php',
-        'storage.type.php',
+      'keyword.operator.ternary.php',
-        'meta.other.type.phpdoc.php',
+      'keyword.operator.assignment.php',
-        'keyword.other.type.php',
+      'keyword.operator.string.php',
-        'keyword.other.array.phpdoc.php'
+      'keyword.operator.key.php'
-      ]
     ],
     settings: {
-      foreground: '#ffb62c',
+      foreground: vars.plain3,
-      fontStyle: 'bold italic'
+      fontStyle: '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",
@@ -627,124 +627,27 @@
       }
     },
     {
-      "name": "PHP Constants",
+      "name": "Class name php",
-      "scope": "constant.other.php, support.constant.ext.php, support.constant.std.php,support.constant.core.php, support.constant.parser-token.php, constant",
+      "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",
       "settings": {
-        "foreground": "#ffb62c"
+        "foreground": "#a7beca",
+        "fontStyle": "italic"
       }
     },
     {
       "name": "Class name php",
-      "scope": "variable.other.class.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",
       "settings": {
-        "foreground": "#e06c75"
+        "foreground": "#c7c8cb",
+        "fontStyle": "italic"
       }
     },
     {
-      "name": "php dollar sign",
+      "name": "Class name php",
-      "scope": "punctuation.definition.variable.php",
+      "scope": "keyword.operator.comparison.php, keyword.operator.ternary.php, keyword.operator.assignment.php, keyword.operator.string.php, keyword.operator.key.php",
       "settings": {
-        "foreground": "#546e7a"
+        "foreground": "#e8e9ed",
-      }
+        "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"
       }
     },
     {