Mirrors/rust-analyzer
2
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer synced 2024-12-27 05:23:24 +00:00
Code Issues Projects Releases Packages Wiki Activity

Use ThemeColor and add support for light themes

Browse source
This commit is contained in:
Laurențiu Nicola 2019-05-21 14:04:54 +03:00
parent eabfe3902f
commit 9ade271a67
3 changed files with 152 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
crates/ra_ide_api/src/syntax_highlighting.rs
View file

@ -1,6 +1,6 @@
use rustc_hash::FxHashSet; use rustc_hash::FxHashSet;
use ra_syntax::{ast, AstNode, TextRange, Direction, SyntaxKind::*, SyntaxElement, T}; use ra_syntax::{ast, AstNode, TextRange, Direction, SyntaxKind, SyntaxKind::*, SyntaxElement, T};
use ra_db::SourceDatabase; use ra_db::SourceDatabase;
use crate::{FileId, db::RootDatabase}; use crate::{FileId, db::RootDatabase};
@ -11,6 +11,14 @@ pub struct HighlightedRange {
pub tag: &'static str, pub tag: &'static str,
} }
fn is_control_keyword(kind: SyntaxKind) -> bool {
match kind {
FOR_KW | LOOP_KW | WHILE_KW | CONTINUE_KW | BREAK_KW | IF_KW | ELSE_KW | MATCH_KW
| RETURN_KW => true,
_ => false,
}
}
pub(crate) fn highlight(db: &RootDatabase, file_id: FileId) -> Vec<HighlightedRange> { pub(crate) fn highlight(db: &RootDatabase, file_id: FileId) -> Vec<HighlightedRange> {
let source_file = db.parse(file_id); let source_file = db.parse(file_id);
@ -29,6 +37,8 @@ pub(crate) fn highlight(db: &RootDatabase, file_id: FileId) -> Vec<HighlightedRa
NAME => "function", NAME => "function",
INT_NUMBER | FLOAT_NUMBER | CHAR | BYTE => "literal", INT_NUMBER | FLOAT_NUMBER | CHAR | BYTE => "literal",
LIFETIME => "parameter", LIFETIME => "parameter",
UNSAFE_KW => "unsafe",
k if is_control_keyword(k) => "control",
k if k.is_keyword() => "keyword", k if k.is_keyword() => "keyword",
_ => { _ => {
if let Some(macro_call) = node.as_node().and_then(ast::MacroCall::cast) { if let Some(macro_call) = node.as_node().and_then(ast::MacroCall::cast) {

119
editors/code/package.json
View file

@ -268,6 +268,125 @@
}, },
"pattern": "$rustc" "pattern": "$rustc"
} }
],
"colors": [
{
"id": "ralsp.background",
"description": "Background color",
"defaults": {
"dark": "#3F3F3F",
"light": "#001080",
"highContrast": "#000000"
}
},
{
"id": "ralsp.comment",
"description": "Color for comments",
"defaults": {
"dark": "#7F9F7F",
"light": "#008000",
"highContrast": "#7CA668"
}
},
{
"id": "ralsp.string",
"description": "Color for strings",
"defaults": {
"dark": "#CC9393",
"light": "#A31515",
"highContrast": "#CE9178"
}
},
{
"id": "ralsp.unsafe",
"description": "Color for unsafe",
"defaults": {
"dark": "#FF3030",
"light": "#FF1010",
"highContrast": "#FF1010"
}
},
{
"id": "ralsp.keyword",
"description": "Color for keywords",
"defaults": {
"dark": "#F0DFAF",
"light": "#0000FF",
"highContrast": "#569CD6"
}
},
{
"id": "ralsp.control",
"description": "Color for control keywords",
"defaults": {
"dark": "#CF20FB",
"light": "#AF00DB",
"highContrast": "#C586C0"
}
},
{
"id": "ralsp.function",
"description": "Color for functions",
"defaults": {
"dark": "#93E0E3",
"light": "#795E26",
"highContrast": "#DCDCAA"
}
},
{
"id": "ralsp.parameter",
"description": "Color for parameters",
"defaults": {
"dark": "#94BFF3",
"light": "#001080",
"highContrast": "#9CDCFE"
}
},
{
"id": "ralsp.builtin",
"description": "Color for builtins",
"defaults": {
"dark": "#DD6718",
"light": "#DD6718",
"highContrast": "#DD6718"
}
},
{
"id": "ralsp.text",
"description": "Color for text",
"defaults": {
"dark": "#DCDCCC",
"light": "#000000",
"highContrast": "#FFFFFF"
}
},
{
"id": "ralsp.attribute",
"description": "Color for attributes",
"defaults": {
"dark": "#BFEBBF",
"light": "#1F4B1F",
"highContrast": "#108010"
}
},
{
"id": "ralsp.literal",
"description": "Color for literals",
"defaults": {
"dark": "#DFAF8F",
"light": "#09885A",
"highContrast": "#B5CEA8"
}
},
{
"id": "ralsp.macro",
"description": "Color for DFAF8F",
"defaults": {
"dark": "#BFEBBF",
"light": "#DD6718",
"highContrast": "#ED7718"
}
}
] ]
} }
} }

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

@ -13,23 +13,32 @@ export class Highlighter {
string, string,
vscode.TextEditorDecorationType vscode.TextEditorDecorationType
> { > {
const decor = (color: string) => const colorContrib = (
vscode.window.createTextEditorDecorationType({ color }); tag: string
): [string, vscode.TextEditorDecorationType] => {
const color = new vscode.ThemeColor('ralsp.' + tag);
const decor = vscode.window.createTextEditorDecorationType({
color
});
return [tag, decor];
};
const decorations: Iterable< const decorations: Iterable<
[string, vscode.TextEditorDecorationType] [string, vscode.TextEditorDecorationType]
> = [ > = [
['background', decor('#3F3F3F')], colorContrib('background'),
['comment', decor('#7F9F7F')], colorContrib('comment'),
['string', decor('#CC9393')], colorContrib('string'),
['keyword', decor('#F0DFAF')], colorContrib('unsafe'),
['function', decor('#93E0E3')], colorContrib('keyword'),
['parameter', decor('#94BFF3')], colorContrib('control'),
['builtin', decor('#DD6718')], colorContrib('function'),
['text', decor('#DCDCCC')], colorContrib('parameter'),
['attribute', decor('#BFEBBF')], colorContrib('builtin'),
['literal', decor('#DFAF8F')], colorContrib('text'),
['macro', decor('#DFAF8F')] colorContrib('attribute'),
colorContrib('literal'),
colorContrib('macro')
]; ];
return new Map<string, vscode.TextEditorDecorationType>(decorations); return new Map<string, vscode.TextEditorDecorationType>(decorations);