mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge #3400

Browse Source 
3400: Don't fail loudly if the old highlighting breaks r=matklad a=matklad



bors r+
🤖

Co-authored-by: Aleksey Kladov <aleksey.kladov@gmail.com>
This commit is contained in:
bors[bot] 2020-03-02 13:47:07 +00:00 committed by GitHub
commit d29c4a2df5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
editors/code/src/highlighting.ts
View File

@ -159,7 +159,9 @@ function initDecorations(): Map<string, vscode.TextEditorDecorationType> {
const theme = ColorTheme.load();
const res = new Map();
TAG_TO_SCOPES.forEach((scopes, tag) => {
if (!scopes) throw `unmapped tag: ${tag}`;
// We are going to axe this soon, so don't try to detect unknown tags.
// Users should switch to the new semantic tokens implementation.
if (!scopes) return;
const rule = theme.lookup(scopes);
const decor = createDecorationFromTextmate(rule);
res.set(tag, decor);
@ -211,7 +213,7 @@ const TAG_TO_SCOPES = new Map<string, string[]>([
["macro", ["entity.name.macro"]],
["variable", ["variable"]],
["variable.mut", ["variable", "meta.mutable"]],
["variable.mutable", ["variable", "meta.mutable"]],
["type", ["entity.name.type"]],
["type.builtin", ["entity.name.type", "support.type.primitive"]],
@ -221,10 +223,10 @@ const TAG_TO_SCOPES = new Map<string, string[]>([
["literal.byte", ["constant.character.byte"]],
["literal.char", ["constant.character.rust"]],
["literal.numeric", ["constant.numeric"]],
["numeric_literal", ["constant.numeric"]],
["comment", ["comment"]],
["string", ["string.quoted"]],
["string_literal", ["string.quoted"]],
["attribute", ["meta.attribute.rust"]],
["keyword", ["keyword"]],