diff --git a/CHANGELOG.md b/CHANGELOG.md index 6321972..18117b3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,10 @@ # 更新日志 +## [1.2.1] 2018-12-06 +- 修复js对象的key的高亮 + + ## [1.2.0] 2018-12-06 - 优化ts/js/md/php的代码高亮 diff --git a/package.json b/package.json index 913df90..6919671 100644 --- a/package.json +++ b/package.json @@ -3,7 +3,7 @@ "displayName": "米白色主题", "description": "🔥 米白色主题", "icon": "logo.png", - "version": "1.2.0", + "version": "1.2.1", "publisher": "yutent", "author": "Yutent [@yutent]", "engines": { diff --git a/src/es.js b/src/es.js index 59e5223..3cd36fe 100644 --- a/src/es.js +++ b/src/es.js @@ -1,22 +1,12 @@ const vars = require('./var') module.exports = [ - { - name: 'ES7 Bind Operator', - scope: ['source.js constant.other.object.key.js string.unquoted.label.js'], - settings: { - fontStyle: 'italic', - foreground: '#E53935' - } - }, - { name: 'Class extends, console', scope: [ 'support.type.object.console.js', 'support.type.object.module.js', 'support.constant.math', - // 'support.type.object.module', 'meta.class.extends.js > variable.other.readwrite.js' ], settings: { @@ -75,5 +65,17 @@ module.exports = [ foreground: '#e5c07b', fontStyle: 'bold' } + }, + + { + name: 'object keys', + scope: [ + 'constant.other.object.key.js string.unquoted.label.js', + 'constant.other.object.key.js string.quoted.label.js' + ], + settings: { + fontStyle: 'italic bold', + foreground: vars.common + } } ] diff --git a/src/plaintext.js b/src/plaintext.js index 9fd0ff8..c0c933f 100644 --- a/src/plaintext.js +++ b/src/plaintext.js @@ -133,7 +133,7 @@ module.exports = [ name: 'order list & unorder list', scope: ['markup.list'], settings: { - foreground: vars.dark2, + foreground: vars.dark1, fontStyle: 'bold' } }, diff --git a/themes/color-theme.json b/themes/color-theme.json index 552b332..f875d85 100644 --- a/themes/color-theme.json +++ b/themes/color-theme.json @@ -472,14 +472,6 @@ "foreground": "#6182B8" } }, - { - "name": "ES7 Bind Operator", - "scope": "source.js constant.other.object.key.js string.unquoted.label.js", - "settings": { - "fontStyle": "italic", - "foreground": "#E53935" - } - }, { "name": "Class extends, console", "scope": "support.type.object.console.js, support.type.object.module.js, support.constant.math, meta.class.extends.js > variable.other.readwrite.js", @@ -519,6 +511,14 @@ "fontStyle": "bold" } }, + { + "name": "object keys", + "scope": "constant.other.object.key.js string.unquoted.label.js, constant.other.object.key.js string.quoted.label.js", + "settings": { + "fontStyle": "italic bold", + "foreground": "#90a4ae" + } + }, { "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", @@ -736,7 +736,7 @@ "name": "order list & unorder list", "scope": "markup.list", "settings": { - "foreground": "#35373b", + "foreground": "#75797b", "fontStyle": "bold" } },