Mirrors/rust
1
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2026-06-02 06:28:20 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge #3774

Browse Source 
3774: Simplify SemanticTokensBuilder build method r=matklad a=kjeremy

This matches the next stable vscode api

Co-authored-by: kjeremy <kjeremy@gmail.com>
This commit is contained in:
bors[bot]
2020-03-30 16:38:53 +00:00
committed by GitHub
parent 671926ac93 d4c317320d
commit 159393745e
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
crates/rust-analyzer/src/main_loop/handlers.rs
+3 -3
View File
@@ -14,7 +14,7 @@
CodeAction, CodeActionResponse, CodeLens, Command, CompletionItem, Diagnostic,
DocumentFormattingParams, DocumentHighlight, DocumentSymbol, FoldingRange, FoldingRangeParams,
Hover, HoverContents, Location, MarkupContent, MarkupKind, Position, PrepareRenameResponse,
Range, RenameParams, SemanticTokens, SemanticTokensParams, SemanticTokensRangeParams,
Range, RenameParams, SemanticTokensParams, SemanticTokensRangeParams,
SemanticTokensRangeResult, SemanticTokensResult, SymbolInformation, TextDocumentIdentifier,
TextEdit, WorkspaceEdit,
};
@@ -1145,7 +1145,7 @@ pub fn handle_semantic_tokens(
}
}
let tokens = SemanticTokens { data: builder.build(), ..Default::default() };
let tokens = builder.build();
Ok(Some(tokens.into()))
}
@@ -1166,7 +1166,7 @@ pub fn handle_semantic_tokens_range(
builder.push(highlight_range.range.conv_with(&line_index), token_type, token_modifiers);
}
let tokens = SemanticTokens { data: builder.build(), ..Default::default() };
let tokens = builder.build();
Ok(Some(tokens.into()))
}
crates/rust-analyzer/src/semantic_tokens.rs
+3 -3
View File
@@ -2,7 +2,7 @@
use std::ops;
use lsp_types::{Range, SemanticToken, SemanticTokenModifier, SemanticTokenType};
use lsp_types::{Range, SemanticToken, SemanticTokenModifier, SemanticTokenType, SemanticTokens};
pub(crate) const ATTRIBUTE: SemanticTokenType = SemanticTokenType::new("attribute");
pub(crate) const BUILTIN_TYPE: SemanticTokenType = SemanticTokenType::new("builtinType");
@@ -109,8 +109,8 @@ pub fn push(&mut self, range: Range, token_index: u32, modifier_bitset: u32) {
self.prev_char = range.start.character as u32;
}
pub fn build(self) -> Vec<SemanticToken> {
self.data
pub fn build(self) -> SemanticTokens {
SemanticTokens { result_id: None, data: self.data }
}
}