Mirrors/rust-analyzer
2
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer synced 2024-11-15 17:28:09 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix bitset ops

Browse source
This commit is contained in:
Aleksey Kladov 2020-02-26 18:09:49 +01:00
parent 6ea633c494
commit 2a2d289e5f
1 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -343,7 +343,7 @@ impl Conv for HighlightTag {
} }
HighlightTag::LITERAL_STRING => SemanticTokenType::STRING, HighlightTag::LITERAL_STRING => SemanticTokenType::STRING,
HighlightTag::LITERAL_ATTRIBUTE => SemanticTokenType::KEYWORD, HighlightTag::LITERAL_ATTRIBUTE => "attribute".into(),
HighlightTag::KEYWORD => SemanticTokenType::KEYWORD, HighlightTag::KEYWORD => SemanticTokenType::KEYWORD,
HighlightTag::KEYWORD_UNSAFE => SemanticTokenType::KEYWORD, HighlightTag::KEYWORD_UNSAFE => SemanticTokenType::KEYWORD,
@ -363,10 +363,11 @@ impl Conv for (SemanticTokenType, Vec<SemanticTokenModifier>) {
semantic_tokens::supported_token_types().iter().position(|it| *it == self.0).unwrap(); semantic_tokens::supported_token_types().iter().position(|it| *it == self.0).unwrap();
let mut token_modifier_bitset = 0; let mut token_modifier_bitset = 0;
for modifier in self.1.iter() { for modifier in self.1.iter() {
token_modifier_bitset |= semantic_tokens::supported_token_modifiers() let modifier_index = semantic_tokens::supported_token_modifiers()
.iter() .iter()
.position(|it| it == modifier) .position(|it| it == modifier)
.unwrap(); .unwrap();
token_modifier_bitset |= 1 << modifier_index;
} }
(token_index as u32, token_modifier_bitset as u32) (token_index as u32, token_modifier_bitset as u32)