rust-lang/rust
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Better fn signature

Browse Source
This commit is contained in:
Aleksey Kladov
2020-05-10 19:14:02 +02:00
parent bd8422643a
commit a78e1573b1
1 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -235,8 +235,10 @@ pub(crate) fn semantic_tokens(
let mut builder = semantic_tokens::SemanticTokensBuilder::default(); let mut builder = semantic_tokens::SemanticTokensBuilder::default();
for highlight_range in highlights { for highlight_range in highlights {
let (token_index, modifier_bitset) = let (type_, mods) = semantic_token_type_and_modifiers(highlight_range.highlight);
token_type_index_modifiers_bitself(highlight_range.highlight); let token_index = semantic_tokens::type_index(type_);
let modifier_bitset = mods.0;
for mut text_range in line_index.lines(highlight_range.range) { for mut text_range in line_index.lines(highlight_range.range) {
if text[text_range].ends_with('\n') { if text[text_range].ends_with('\n') {
text_range = text_range =
@@ -250,7 +252,9 @@ pub(crate) fn semantic_tokens(
builder.build() builder.build()
} }
fn token_type_index_modifiers_bitself(highlight: Highlight) -> (u32, u32) { fn semantic_token_type_and_modifiers(
highlight: Highlight,
) -> (lsp_types::SemanticTokenType, semantic_tokens::ModifierSet) {
let mut mods = semantic_tokens::ModifierSet::default(); let mut mods = semantic_tokens::ModifierSet::default();
let type_ = match highlight.tag { let type_ = match highlight.tag {
HighlightTag::Struct => lsp_types::SemanticTokenType::STRUCT, HighlightTag::Struct => lsp_types::SemanticTokenType::STRUCT,
@@ -300,7 +304,7 @@ fn token_type_index_modifiers_bitself(highlight: Highlight) -> (u32, u32) {
mods |= modifier; mods |= modifier;
} }
(semantic_tokens::type_index(type_), mods.0) (type_, mods)
} }
pub(crate) fn folding_range( pub(crate) fn folding_range(