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

Ensure that semantic tokens are single-line

Browse Source
This commit is contained in:
Aleksey Kladov
2020-02-27 14:54:31 +01:00
parent 57f0d6cba3
commit 8ed7e751b6
2 changed files with 52 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
crates/rust-analyzer/src/main_loop/handlers.rs
View File

@@ -1078,13 +1078,20 @@ pub fn handle_semantic_tokens(
let _p = profile("handle_semantic_tokens");
let file_id = params.text_document.try_conv_with(&world)?;
let text = world.analysis().file_text(file_id)?;
let line_index = world.analysis().file_line_index(file_id)?;
let mut builder = SemanticTokensBuilder::default();
for highlight_range in world.analysis().highlight(file_id)?.into_iter() {
let (token_type, token_modifiers) = highlight_range.highlight.conv();
builder.push(highlight_range.range.conv_with(&line_index), token_type, token_modifiers);
let (token_index, modifier_bitset) = highlight_range.highlight.conv();
for mut range in line_index.lines(highlight_range.range) {
if text[range].ends_with('\n') {
range = TextRange::from_to(range.start(), range.end() - TextUnit::of_char('\n'));
}
let range = range.conv_with(&line_index);
builder.push(range, token_index, modifier_bitset);
}
}
let tokens = SemanticTokens { data: builder.build(), ..Default::default() };