From 41510f437e87e013f2015bed1a964163c6d3f1ff Mon Sep 17 00:00:00 2001 From: Aleksey Kladov Date: Mon, 17 May 2021 18:37:06 +0300 Subject: minor: adjust config name --- crates/rust-analyzer/src/handlers.rs | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'crates/rust-analyzer/src/handlers.rs') diff --git a/crates/rust-analyzer/src/handlers.rs b/crates/rust-analyzer/src/handlers.rs index 85e45337c..8fe97fd7c 100644 --- a/crates/rust-analyzer/src/handlers.rs +++ b/crates/rust-analyzer/src/handlers.rs @@ -1394,9 +1394,9 @@ pub(crate) fn handle_semantic_tokens_full( let line_index = snap.file_line_index(file_id)?; let highlights = snap.analysis.highlight(file_id)?; - let semantic_strings = snap.config.semantic_strings(); + let highlight_strings = snap.config.highlighting_strings(); let semantic_tokens = - to_proto::semantic_tokens(&text, &line_index, highlights, semantic_strings); + to_proto::semantic_tokens(&text, &line_index, highlights, highlight_strings); // Unconditionally cache the tokens snap.semantic_tokens_cache.lock().insert(params.text_document.uri, semantic_tokens.clone()); @@ -1415,9 +1415,9 @@ pub(crate) fn handle_semantic_tokens_full_delta( let line_index = snap.file_line_index(file_id)?; let highlights = snap.analysis.highlight(file_id)?; - let semantic_strings = snap.config.semantic_strings(); + let highlight_strings = snap.config.highlighting_strings(); let semantic_tokens = - to_proto::semantic_tokens(&text, &line_index, highlights, semantic_strings); + to_proto::semantic_tokens(&text, &line_index, highlights, highlight_strings); let mut cache = snap.semantic_tokens_cache.lock(); let cached_tokens = cache.entry(params.text_document.uri).or_default(); @@ -1446,9 +1446,9 @@ pub(crate) fn handle_semantic_tokens_range( let line_index = snap.file_line_index(frange.file_id)?; let highlights = snap.analysis.highlight_range(frange)?; - let semantic_strings = snap.config.semantic_strings(); + let highlight_strings = snap.config.highlighting_strings(); let semantic_tokens = - to_proto::semantic_tokens(&text, &line_index, highlights, semantic_strings); + to_proto::semantic_tokens(&text, &line_index, highlights, highlight_strings); Ok(Some(semantic_tokens.into())) } -- cgit v1.2.3