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

Address PR comments

Browse Source
This commit is contained in:
Jeremy Kolb
2020-08-05 21:35:35 -04:00
parent fcfd7cb1e3
commit 195111d769
4 changed files with 12 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
crates/rust-analyzer/src/handlers.rs
View File

@@ -1187,10 +1187,7 @@ pub(crate) fn handle_semantic_tokens(
let semantic_tokens = to_proto::semantic_tokens(&text, &line_index, highlights);
// Unconditionally cache the tokens
snap.semantic_tokens_cache
.lock()
.unwrap()
.insert(params.text_document.uri, semantic_tokens.clone());
snap.semantic_tokens_cache.lock().insert(params.text_document.uri, semantic_tokens.clone());
Ok(Some(semantic_tokens.into()))
}
@@ -1209,7 +1206,7 @@ pub(crate) fn handle_semantic_tokens_edits(
let semantic_tokens = to_proto::semantic_tokens(&text, &line_index, highlights);
let mut cache = snap.semantic_tokens_cache.lock().unwrap();
let mut cache = snap.semantic_tokens_cache.lock();
let cached_tokens = cache.entry(params.text_document.uri).or_default();
if let Some(prev_id) = &cached_tokens.result_id {