Color constants

This commit is contained in:
Aleksey Kladov 2020-02-26 23:16:57 +01:00
parent 9784ab9f39
commit a8e68ff814
3 changed files with 13 additions and 2 deletions

View file

@ -20,7 +20,7 @@ use ra_vfs::LineEndings;
use crate::{
req,
semantic_tokens::{self, ModifierSet, BUILTIN, CONTROL, MUTABLE, UNSAFE},
semantic_tokens::{self, ModifierSet, BUILTIN, CONSTANT, CONTROL, MUTABLE, UNSAFE},
world::WorldSnapshot,
Result,
};
@ -322,7 +322,7 @@ impl Conv for Highlight {
HighlightTag::Constant => {
mods |= SemanticTokenModifier::STATIC;
mods |= SemanticTokenModifier::READONLY;
SemanticTokenType::VARIABLE
CONSTANT
}
HighlightTag::Macro => SemanticTokenType::MACRO,
HighlightTag::Variable => SemanticTokenType::VARIABLE,

View file

@ -5,6 +5,7 @@ use std::ops;
use lsp_types::{Range, SemanticToken, SemanticTokenModifier, SemanticTokenType};
pub(crate) const ATTRIBUTE: SemanticTokenType = SemanticTokenType::new("attribute");
pub(crate) const CONSTANT: SemanticTokenType = SemanticTokenType::new("constant");
pub(crate) const MUTABLE: SemanticTokenModifier = SemanticTokenModifier::new("mutable");
pub(crate) const UNSAFE: SemanticTokenModifier = SemanticTokenModifier::new("unsafe");
@ -33,6 +34,7 @@ pub(crate) const SUPPORTED_TYPES: &[SemanticTokenType] = &[
SemanticTokenType::PARAMETER,
SemanticTokenType::LABEL,
ATTRIBUTE,
CONSTANT,
];
pub(crate) const SUPPORTED_MODIFIERS: &[SemanticTokenModifier] = &[

View file

@ -383,6 +383,9 @@
"semanticTokenTypes": [
{
"id": "attribute"
},
{
"id": "constant"
}
],
"semanticTokenModifiers": [
@ -411,6 +414,12 @@
"highContrast": {
"fontStyle": "underline"
}
},
{
"selector": "constant",
"scope": [
"entity.name.constant"
]
}
]
}