mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Re-export standard semantic token types and mods

Browse Source
This commit is contained in:
Lukas Wirth 2022-08-23 18:06:32 +02:00
parent 8dcf4c70c4
commit 715e3fc119
2 changed files with 133 additions and 105 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

186
crates/rust-analyzer/src/semantic_tokens.rs
View File

@ -8,102 +8,130 @@
}; };
macro_rules! define_semantic_token_types { macro_rules! define_semantic_token_types {
($(($ident:ident, $string:literal)),*$(,)?) => { (
$(pub(crate) const $ident: SemanticTokenType = SemanticTokenType::new($string);)* standard {
$($standard:ident),*$(,)?
}
custom {
$(($custom:ident, $string:literal)),*$(,)?
}
) => {
$(pub(crate) const $standard: SemanticTokenType = SemanticTokenType::$standard;)*
$(pub(crate) const $custom: SemanticTokenType = SemanticTokenType::new($string);)*
pub(crate) const SUPPORTED_TYPES: &[SemanticTokenType] = &[ pub(crate) const SUPPORTED_TYPES: &[SemanticTokenType] = &[
SemanticTokenType::CLASS, $(SemanticTokenType::$standard,)*
SemanticTokenType::COMMENT, $($custom),*
SemanticTokenType::ENUM_MEMBER,
SemanticTokenType::ENUM,
SemanticTokenType::FUNCTION,
SemanticTokenType::INTERFACE,
SemanticTokenType::KEYWORD,
SemanticTokenType::MACRO,
SemanticTokenType::METHOD,
SemanticTokenType::NAMESPACE,
SemanticTokenType::NUMBER,
SemanticTokenType::OPERATOR,
SemanticTokenType::PARAMETER,
SemanticTokenType::PROPERTY,
SemanticTokenType::REGEXP,
SemanticTokenType::STRING,
SemanticTokenType::STRUCT,
SemanticTokenType::TYPE_PARAMETER,
SemanticTokenType::TYPE,
SemanticTokenType::VARIABLE,
SemanticTokenType::DECORATOR,
$($ident),*
]; ];
}; };
} }
define_semantic_token_types![ define_semantic_token_types![
(ANGLE, "angle"), standard {
(ARITHMETIC, "arithmetic"), COMMENT,
(ATTRIBUTE_BRACKET, "attributeBracket"), DECORATOR,
(BITWISE, "bitwise"), ENUM_MEMBER,
(BOOLEAN, "boolean"), ENUM,
(BRACE, "brace"), FUNCTION,
(BRACKET, "bracket"), INTERFACE,
(BUILTIN_ATTRIBUTE, "builtinAttribute"), KEYWORD,
(BUILTIN_TYPE, "builtinType"), MACRO,
(CHAR, "character"), METHOD,
(COLON, "colon"), NAMESPACE,
(COMMA, "comma"), NUMBER,
(COMPARISON, "comparison"), OPERATOR,
(CONST_PARAMETER, "constParameter"), PARAMETER,
(DERIVE, "derive"), PROPERTY,
(DERIVE_HELPER, "deriveHelper"), STRING,
(DOT, "dot"), STRUCT,
(ESCAPE_SEQUENCE, "escapeSequence"), TYPE_PARAMETER,
(FORMAT_SPECIFIER, "formatSpecifier"), VARIABLE,
(GENERIC, "generic"), }
(LABEL, "label"),
(LIFETIME, "lifetime"), custom {
(LOGICAL, "logical"), (ANGLE, "angle"),
(MACRO_BANG, "macroBang"), (ARITHMETIC, "arithmetic"),
(PARENTHESIS, "parenthesis"), (ATTRIBUTE, "attribute"),
(PUNCTUATION, "punctuation"), (ATTRIBUTE_BRACKET, "attributeBracket"),
(SELF_KEYWORD, "selfKeyword"), (BITWISE, "bitwise"),
(SELF_TYPE_KEYWORD, "selfTypeKeyword"), (BOOLEAN, "boolean"),
(SEMICOLON, "semicolon"), (BRACE, "brace"),
(TYPE_ALIAS, "typeAlias"), (BRACKET, "bracket"),
(TOOL_MODULE, "toolModule"), (BUILTIN_ATTRIBUTE, "builtinAttribute"),
(UNION, "union"), (BUILTIN_TYPE, "builtinType"),
(UNRESOLVED_REFERENCE, "unresolvedReference"), (CHAR, "character"),
(COLON, "colon"),
(COMMA, "comma"),
(COMPARISON, "comparison"),
(CONST_PARAMETER, "constParameter"),
(DERIVE, "derive"),
(DERIVE_HELPER, "deriveHelper"),
(DOT, "dot"),
(ESCAPE_SEQUENCE, "escapeSequence"),
(FORMAT_SPECIFIER, "formatSpecifier"),
(GENERIC, "generic"),
(LABEL, "label"),
(LIFETIME, "lifetime"),
(LOGICAL, "logical"),
(MACRO_BANG, "macroBang"),
(PARENTHESIS, "parenthesis"),
(PUNCTUATION, "punctuation"),
(SELF_KEYWORD, "selfKeyword"),
(SELF_TYPE_KEYWORD, "selfTypeKeyword"),
(SEMICOLON, "semicolon"),
(TYPE_ALIAS, "typeAlias"),
(TOOL_MODULE, "toolModule"),
(UNION, "union"),
(UNRESOLVED_REFERENCE, "unresolvedReference"),
}
]; ];
macro_rules! define_semantic_token_modifiers { macro_rules! define_semantic_token_modifiers {
($(($ident:ident, $string:literal)),*$(,)?) => { (
$(pub(crate) const $ident: SemanticTokenModifier = SemanticTokenModifier::new($string);)* standard {
$($standard:ident),*$(,)?
}
custom {
$(($custom:ident, $string:literal)),*$(,)?
}
) => {
$(pub(crate) const $standard: SemanticTokenModifier = SemanticTokenModifier::$standard;)*
$(pub(crate) const $custom: SemanticTokenModifier = SemanticTokenModifier::new($string);)*
pub(crate) const SUPPORTED_MODIFIERS: &[SemanticTokenModifier] = &[ pub(crate) const SUPPORTED_MODIFIERS: &[SemanticTokenModifier] = &[
SemanticTokenModifier::DOCUMENTATION, $(SemanticTokenModifier::$standard,)*
SemanticTokenModifier::DECLARATION, $($custom),*
SemanticTokenModifier::STATIC,
SemanticTokenModifier::DEFAULT_LIBRARY,
$($ident),*
]; ];
}; };
} }
define_semantic_token_modifiers![ define_semantic_token_modifiers![
(ASYNC, "async"), standard {
(ATTRIBUTE_MODIFIER, "attribute"), DOCUMENTATION,
(CALLABLE, "callable"), DECLARATION,
(CONSTANT, "constant"), STATIC,
(CONSUMING, "consuming"), DEFAULT_LIBRARY,
(CONTROL_FLOW, "controlFlow"), }
(CRATE_ROOT, "crateRoot"), custom {
(INJECTED, "injected"), (ASYNC, "async"),
(INTRA_DOC_LINK, "intraDocLink"), (ATTRIBUTE_MODIFIER, "attribute"),
(LIBRARY, "library"), (CALLABLE, "callable"),
(MUTABLE, "mutable"), (CONSTANT, "constant"),
(PUBLIC, "public"), (CONSUMING, "consuming"),
(REFERENCE, "reference"), (CONTROL_FLOW, "controlFlow"),
(TRAIT_MODIFIER, "trait"), (CRATE_ROOT, "crateRoot"),
(UNSAFE, "unsafe"), (INJECTED, "injected"),
(INTRA_DOC_LINK, "intraDocLink"),
(LIBRARY, "library"),
(MUTABLE, "mutable"),
(PUBLIC, "public"),
(REFERENCE, "reference"),
(TRAIT_MODIFIER, "trait"),
(UNSAFE, "unsafe"),
}
]; ];
#[derive(Default)] #[derive(Default)]

52
crates/rust-analyzer/src/to_proto.rs
View File

@ -558,64 +558,64 @@ fn semantic_token_type_and_modifiers(
let mut mods = semantic_tokens::ModifierSet::default(); let mut mods = semantic_tokens::ModifierSet::default();
let type_ = match highlight.tag { let type_ = match highlight.tag {
HlTag::Symbol(symbol) => match symbol { HlTag::Symbol(symbol) => match symbol {
SymbolKind::Attribute => lsp_types::SemanticTokenType::DECORATOR, SymbolKind::Attribute => semantic_tokens::DECORATOR,
SymbolKind::Derive => semantic_tokens::DERIVE, SymbolKind::Derive => semantic_tokens::DERIVE,
SymbolKind::DeriveHelper => semantic_tokens::DERIVE_HELPER, SymbolKind::DeriveHelper => semantic_tokens::DERIVE_HELPER,
SymbolKind::Module => lsp_types::SemanticTokenType::NAMESPACE, SymbolKind::Module => semantic_tokens::NAMESPACE,
SymbolKind::Impl => semantic_tokens::TYPE_ALIAS, SymbolKind::Impl => semantic_tokens::TYPE_ALIAS,
SymbolKind::Field => lsp_types::SemanticTokenType::PROPERTY, SymbolKind::Field => semantic_tokens::PROPERTY,
SymbolKind::TypeParam => lsp_types::SemanticTokenType::TYPE_PARAMETER, SymbolKind::TypeParam => semantic_tokens::TYPE_PARAMETER,
SymbolKind::ConstParam => semantic_tokens::CONST_PARAMETER, SymbolKind::ConstParam => semantic_tokens::CONST_PARAMETER,
SymbolKind::LifetimeParam => semantic_tokens::LIFETIME, SymbolKind::LifetimeParam => semantic_tokens::LIFETIME,
SymbolKind::Label => semantic_tokens::LABEL, SymbolKind::Label => semantic_tokens::LABEL,
SymbolKind::ValueParam => lsp_types::SemanticTokenType::PARAMETER, SymbolKind::ValueParam => semantic_tokens::PARAMETER,
SymbolKind::SelfParam => semantic_tokens::SELF_KEYWORD, SymbolKind::SelfParam => semantic_tokens::SELF_KEYWORD,
SymbolKind::SelfType => semantic_tokens::SELF_TYPE_KEYWORD, SymbolKind::SelfType => semantic_tokens::SELF_TYPE_KEYWORD,
SymbolKind::Local => lsp_types::SemanticTokenType::VARIABLE, SymbolKind::Local => semantic_tokens::VARIABLE,
SymbolKind::Function => { SymbolKind::Function => {
if highlight.mods.contains(HlMod::Associated) { if highlight.mods.contains(HlMod::Associated) {
lsp_types::SemanticTokenType::METHOD semantic_tokens::METHOD
} else { } else {
lsp_types::SemanticTokenType::FUNCTION semantic_tokens::FUNCTION
} }
} }
SymbolKind::Const => { SymbolKind::Const => {
mods |= semantic_tokens::CONSTANT; mods |= semantic_tokens::CONSTANT;
mods |= lsp_types::SemanticTokenModifier::STATIC; mods |= semantic_tokens::STATIC;
lsp_types::SemanticTokenType::VARIABLE semantic_tokens::VARIABLE
} }
SymbolKind::Static => { SymbolKind::Static => {
mods |= lsp_types::SemanticTokenModifier::STATIC; mods |= semantic_tokens::STATIC;
lsp_types::SemanticTokenType::VARIABLE semantic_tokens::VARIABLE
} }
SymbolKind::Struct => lsp_types::SemanticTokenType::STRUCT, SymbolKind::Struct => semantic_tokens::STRUCT,
SymbolKind::Enum => lsp_types::SemanticTokenType::ENUM, SymbolKind::Enum => semantic_tokens::ENUM,
SymbolKind::Variant => lsp_types::SemanticTokenType::ENUM_MEMBER, SymbolKind::Variant => semantic_tokens::ENUM_MEMBER,
SymbolKind::Union => semantic_tokens::UNION, SymbolKind::Union => semantic_tokens::UNION,
SymbolKind::TypeAlias => semantic_tokens::TYPE_ALIAS, SymbolKind::TypeAlias => semantic_tokens::TYPE_ALIAS,
SymbolKind::Trait => lsp_types::SemanticTokenType::INTERFACE, SymbolKind::Trait => semantic_tokens::INTERFACE,
SymbolKind::Macro => lsp_types::SemanticTokenType::MACRO, SymbolKind::Macro => semantic_tokens::MACRO,
SymbolKind::BuiltinAttr => semantic_tokens::BUILTIN_ATTRIBUTE, SymbolKind::BuiltinAttr => semantic_tokens::BUILTIN_ATTRIBUTE,
SymbolKind::ToolModule => semantic_tokens::TOOL_MODULE, SymbolKind::ToolModule => semantic_tokens::TOOL_MODULE,
}, },
HlTag::AttributeBracket => semantic_tokens::ATTRIBUTE_BRACKET, HlTag::AttributeBracket => semantic_tokens::ATTRIBUTE_BRACKET,
HlTag::BoolLiteral => semantic_tokens::BOOLEAN, HlTag::BoolLiteral => semantic_tokens::BOOLEAN,
HlTag::BuiltinType => semantic_tokens::BUILTIN_TYPE, HlTag::BuiltinType => semantic_tokens::BUILTIN_TYPE,
HlTag::ByteLiteral | HlTag::NumericLiteral => lsp_types::SemanticTokenType::NUMBER, HlTag::ByteLiteral | HlTag::NumericLiteral => semantic_tokens::NUMBER,
HlTag::CharLiteral => semantic_tokens::CHAR, HlTag::CharLiteral => semantic_tokens::CHAR,
HlTag::Comment => lsp_types::SemanticTokenType::COMMENT, HlTag::Comment => semantic_tokens::COMMENT,
HlTag::EscapeSequence => semantic_tokens::ESCAPE_SEQUENCE, HlTag::EscapeSequence => semantic_tokens::ESCAPE_SEQUENCE,
HlTag::FormatSpecifier => semantic_tokens::FORMAT_SPECIFIER, HlTag::FormatSpecifier => semantic_tokens::FORMAT_SPECIFIER,
HlTag::Keyword => lsp_types::SemanticTokenType::KEYWORD, HlTag::Keyword => semantic_tokens::KEYWORD,
HlTag::None => semantic_tokens::GENERIC, HlTag::None => semantic_tokens::GENERIC,
HlTag::Operator(op) => match op { HlTag::Operator(op) => match op {
HlOperator::Bitwise => semantic_tokens::BITWISE, HlOperator::Bitwise => semantic_tokens::BITWISE,
HlOperator::Arithmetic => semantic_tokens::ARITHMETIC, HlOperator::Arithmetic => semantic_tokens::ARITHMETIC,
HlOperator::Logical => semantic_tokens::LOGICAL, HlOperator::Logical => semantic_tokens::LOGICAL,
HlOperator::Comparison => semantic_tokens::COMPARISON, HlOperator::Comparison => semantic_tokens::COMPARISON,
HlOperator::Other => lsp_types::SemanticTokenType::OPERATOR, HlOperator::Other => semantic_tokens::OPERATOR,
}, },
HlTag::StringLiteral => lsp_types::SemanticTokenType::STRING, HlTag::StringLiteral => semantic_tokens::STRING,
HlTag::UnresolvedReference => semantic_tokens::UNRESOLVED_REFERENCE, HlTag::UnresolvedReference => semantic_tokens::UNRESOLVED_REFERENCE,
HlTag::Punctuation(punct) => match punct { HlTag::Punctuation(punct) => match punct {
HlPunct::Bracket => semantic_tokens::BRACKET, HlPunct::Bracket => semantic_tokens::BRACKET,
@ -640,16 +640,16 @@ fn semantic_token_type_and_modifiers(
HlMod::Consuming => semantic_tokens::CONSUMING, HlMod::Consuming => semantic_tokens::CONSUMING,
HlMod::ControlFlow => semantic_tokens::CONTROL_FLOW, HlMod::ControlFlow => semantic_tokens::CONTROL_FLOW,
HlMod::CrateRoot => semantic_tokens::CRATE_ROOT, HlMod::CrateRoot => semantic_tokens::CRATE_ROOT,
HlMod::DefaultLibrary => lsp_types::SemanticTokenModifier::DEFAULT_LIBRARY, HlMod::DefaultLibrary => semantic_tokens::DEFAULT_LIBRARY,
HlMod::Definition => lsp_types::SemanticTokenModifier::DECLARATION, HlMod::Definition => semantic_tokens::DECLARATION,
HlMod::Documentation => lsp_types::SemanticTokenModifier::DOCUMENTATION, HlMod::Documentation => semantic_tokens::DOCUMENTATION,
HlMod::Injected => semantic_tokens::INJECTED, HlMod::Injected => semantic_tokens::INJECTED,
HlMod::IntraDocLink => semantic_tokens::INTRA_DOC_LINK, HlMod::IntraDocLink => semantic_tokens::INTRA_DOC_LINK,
HlMod::Library => semantic_tokens::LIBRARY, HlMod::Library => semantic_tokens::LIBRARY,
HlMod::Mutable => semantic_tokens::MUTABLE, HlMod::Mutable => semantic_tokens::MUTABLE,
HlMod::Public => semantic_tokens::PUBLIC, HlMod::Public => semantic_tokens::PUBLIC,
HlMod::Reference => semantic_tokens::REFERENCE, HlMod::Reference => semantic_tokens::REFERENCE,
HlMod::Static => lsp_types::SemanticTokenModifier::STATIC, HlMod::Static => semantic_tokens::STATIC,
HlMod::Trait => semantic_tokens::TRAIT_MODIFIER, HlMod::Trait => semantic_tokens::TRAIT_MODIFIER,
HlMod::Unsafe => semantic_tokens::UNSAFE, HlMod::Unsafe => semantic_tokens::UNSAFE,
}; };