Mirrors/rust-analyzer
2
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer synced 2024-12-26 13:03:31 +00:00
Code Issues Projects Releases Packages Wiki Activity

Color constants

Browse source
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
Show stats Download patch file Download diff file Expand all files Collapse all files

4
crates/rust-analyzer/src/conv.rs
View file

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

2
crates/rust-analyzer/src/semantic_tokens.rs
View file

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

9
editors/code/package.json
View file

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