From eb09d91b05f476c14c1d5aa4b2702c1cdf211aee Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=87=E5=A4=A9?= Date: Tue, 11 Dec 2018 15:33:30 +0800 Subject: [PATCH] update --- CHANGELOG.md | 2 +- README.md | 2 +- package.json | 2 +- src/base.js | 53 ++++++++++++++++++++++------------ src/es.js | 34 ++++++++++++++++++++++ themes/color-theme.json | 63 +++++++++++++++++++++++++++++++---------- 6 files changed, 120 insertions(+), 36 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 26f138f..4507adf 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,7 +1,7 @@ # 更新日志 -## [1.2.3] 2018-12-11 +## [1.3.0] 2018-12-11 - 优化js/ts的语法高亮 - 优化md的高亮 diff --git a/README.md b/README.md index 080ffcb..35fa158 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ # 米白色主题 > 米白色主题, vscode专用。包括UI和代码高亮, 都精心调整好对比度。优雅,耐看。 喜欢浅色系的童鞋, 不要错过。 -![截图](https://attach.cdn.doui.cc/one-plain.png) +![截图](https://attach.cdn.doui.cc/one-plain.png?t=20181211) ## 安装(Installation) diff --git a/package.json b/package.json index 4947e71..d38c268 100644 --- a/package.json +++ b/package.json @@ -3,7 +3,7 @@ "displayName": "米白色主题", "description": "🔥 米白色主题", "icon": "logo.png", - "version": "1.2.3", + "version": "1.3.0", "publisher": "yutent", "author": "Yutent [@yutent]", "engines": { diff --git a/src/base.js b/src/base.js index 9696faa..a91bb8e 100644 --- a/src/base.js +++ b/src/base.js @@ -6,7 +6,7 @@ module.exports = [ scope: ['comment', 'punctuation.definition.comment'], settings: { fontStyle: 'italic', - foreground: '#B6D5E0' + foreground: '#b6d5e0' } }, { @@ -79,16 +79,7 @@ module.exports = [ foreground: '#FF5370' } }, - { - name: 'Operator, Misc', - scope: [ - 'punctuation.definition.generic.begin.wxml', - 'punctuation.definition.generic.end.wxml' - ], - settings: { - foreground: '#f7820c' - } - }, + { name: 'Keyword Control', scope: ['keyword.control'], @@ -117,6 +108,39 @@ module.exports = [ foreground: vars.blue2 } }, + + { + name: 'regexp string', + scope: ['string.regexp'], + settings: { + fontStyle: '', + foreground: vars.common + } + }, + { + name: 'regexp sign', + scope: [ + 'string.regexp punctuation.definition.string.begin', + 'string.regexp punctuation.definition.string.end' + ], + settings: { + fontStyle: '', + foreground: vars.magenta2 + } + }, + { + name: 'regexp buils-in', + scope: [ + 'constant.other.character-class.regexp', + 'constant.other.character-class.escape.backslash.regexp', + 'constant.character.escape.backslash.regexp' + ], + settings: { + fontStyle: 'italic', + foreground: vars.blue2 + } + }, + { name: 'C-related Block Level Variables', scope: ['source.cpp meta.block variable.other'], @@ -303,13 +327,6 @@ module.exports = [ foreground: '#7C4DFF' } }, - { - name: 'Regular Expressions', - scope: ['string.regexp'], - settings: { - foreground: '#0099ff' - } - }, { name: 'Escape Characters', scope: ['constant.character.escape'], diff --git a/src/es.js b/src/es.js index 4908779..8c254d1 100644 --- a/src/es.js +++ b/src/es.js @@ -28,6 +28,40 @@ module.exports = [ } }, + { + name: 'js/ts doc', + scope: [ + 'comment.block.documentation entity.name.type.instance.jsdoc', + 'comment.block.documentation constant.other.email.link.underline.jsdoc' + ], + settings: { + fontStyle: 'italic', + foreground: '#b6d5e0' + } + }, + + { + name: 'js/ts doc email', + scope: [ + 'comment.block.documentation constant.other.email.link.underline.jsdoc' + ], + settings: { + fontStyle: 'italic underline' + } + }, + + { + name: 'ts string express', + scope: [ + 'punctuation.definition.template-expression.begin.ts', + 'punctuation.definition.template-expression.end.ts' + ], + settings: { + fontStyle: '', + foreground: '#ff5370' + } + }, + { name: 'build-in function', scope: [ diff --git a/themes/color-theme.json b/themes/color-theme.json index bcac65e..b4d1d92 100644 --- a/themes/color-theme.json +++ b/themes/color-theme.json @@ -180,7 +180,7 @@ "scope": "comment, punctuation.definition.comment", "settings": { "fontStyle": "italic", - "foreground": "#B6D5E0" + "foreground": "#b6d5e0" } }, { @@ -240,13 +240,6 @@ "foreground": "#FF5370" } }, - { - "name": "Operator, Misc", - "scope": "punctuation.definition.generic.begin.wxml, punctuation.definition.generic.end.wxml", - "settings": { - "foreground": "#f7820c" - } - }, { "name": "Keyword Control", "scope": "keyword.control", @@ -268,6 +261,30 @@ "foreground": "#0096ff" } }, + { + "name": "regexp string", + "scope": "string.regexp", + "settings": { + "fontStyle": "", + "foreground": "#90a4ae" + } + }, + { + "name": "regexp sign", + "scope": "string.regexp punctuation.definition.string.begin, string.regexp punctuation.definition.string.end", + "settings": { + "fontStyle": "", + "foreground": "#9437ff" + } + }, + { + "name": "regexp buils-in", + "scope": "constant.other.character-class.regexp, constant.other.character-class.escape.backslash.regexp, constant.character.escape.backslash.regexp", + "settings": { + "fontStyle": "italic", + "foreground": "#0096ff" + } + }, { "name": "C-related Block Level Variables", "scope": "source.cpp meta.block variable.other", @@ -421,13 +438,6 @@ "foreground": "#7C4DFF" } }, - { - "name": "Regular Expressions", - "scope": "string.regexp", - "settings": { - "foreground": "#0099ff" - } - }, { "name": "Escape Characters", "scope": "constant.character.escape", @@ -488,6 +498,29 @@ "foreground": "#ffb62c" } }, + { + "name": "js/ts doc", + "scope": "comment.block.documentation entity.name.type.instance.jsdoc, comment.block.documentation constant.other.email.link.underline.jsdoc", + "settings": { + "fontStyle": "italic", + "foreground": "#b6d5e0" + } + }, + { + "name": "js/ts doc email", + "scope": "comment.block.documentation constant.other.email.link.underline.jsdoc", + "settings": { + "fontStyle": "italic underline" + } + }, + { + "name": "ts string express", + "scope": "punctuation.definition.template-expression.begin.ts, punctuation.definition.template-expression.end.ts", + "settings": { + "fontStyle": "", + "foreground": "#ff5370" + } + }, { "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",