language-servers/rust-analyzer
1
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer.git synced 2025-10-02 06:41:48 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Improved compatibility with themes

Browse source
This commit is contained in:
eaglgenes101 2020-02-20 12:40:12 -05:00
parent 4e288c64ff
commit 358b9d685f
2 changed files with 10 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

8
editors/code/src/color_theme.ts
View file

@ -83,8 +83,12 @@ function loadThemeNamed(themeName: string): ColorTheme {
res.mergeFrom(loadThemeFile(themePath));
}
const customizations: any = vscode.workspace.getConfiguration('editor').get('tokenColorCustomizations');
res.mergeFrom(ColorTheme.fromRules(customizations?.textMateRules ?? []));
const global_customizations: any = vscode.workspace.getConfiguration('editor').get('tokenColorCustomizations');
res.mergeFrom(ColorTheme.fromRules(global_customizations?.textMateRules ?? []));
const theme_customizations: any = vscode.workspace.getConfiguration('editor.tokenColorCustomizations').get(`[${themeName}]`);
res.mergeFrom(ColorTheme.fromRules(theme_customizations?.textMateRules ?? []));
return res;
}

8
editors/code/src/highlighting.ts
View file

@ -233,16 +233,16 @@ const TAG_TO_SCOPES = new Map<string, string[]>([
["type", ["entity.name.type"]],
["type.builtin", ["entity.name.type", "support.type.primitive"]],
["type.self", ["entity.name.type.parameter.self"]],
["type.param", ["entity.name.type.parameter"]],
["type.lifetime", ["entity.name.type.lifetime"]],
["type.param", ["entity.name.type.parameter", "entity.name.type.param.rust"]],
["type.lifetime", ["entity.name.type.lifetime", "entity.name.lifetime.rust"]],
["literal.byte", ["constant.character.byte"]],
["literal.char", ["constant.character"]],
["literal.char", ["constant.character.rust"]],
["literal.numeric", ["constant.numeric"]],
["comment", ["comment"]],
["string", ["string.quoted"]],
["attribute", ["meta.attribute"]],
["attribute", ["meta.attribute.rust"]],
["keyword", ["keyword"]],
["keyword.unsafe", ["keyword.other.unsafe"]],