language-servers/rust-analyzer
1
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer.git synced 2025-09-27 20:42:04 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

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
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 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 crate::{FileId, db::RootDatabase};
@ -11,6 +11,14 @@ pub struct HighlightedRange {
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> {
let source_file = db.parse(file_id);
@ -29,6 +37,8 @@ pub(crate) fn highlight(db: &RootDatabase, file_id: FileId) -> Vec<HighlightedRa
NAME => "function",
INT_NUMBER | FLOAT_NUMBER | CHAR | BYTE => "literal",
LIFETIME => "parameter",
UNSAFE_KW => "unsafe",
k if is_control_keyword(k) => "control",
k if k.is_keyword() => "keyword",
_ => {
if let Some(macro_call) = node.as_node().and_then(ast::MacroCall::cast) {