diff options
| author | bors <bors@rust-lang.org> | 2023-09-08 10:35:23 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2023-09-08 10:35:23 +0000 |
| commit | b67606c4e27e626f84ee86651616462b7dfaa4c8 (patch) | |
| tree | 6203fa734e9b3134561c6b34bdc9f44c19c0186d | |
| parent | 548d2f08e08685461ee8e1e35b8837370a51e4f6 (diff) | |
| parent | 62d189702c7a14bfd17384f8000a0dcb1ce7fe6b (diff) | |
| download | rust-b67606c4e27e626f84ee86651616462b7dfaa4c8.tar.gz rust-b67606c4e27e626f84ee86651616462b7dfaa4c8.zip | |
Auto merge of #15529 - SomeoneToIgnore:less-inlay-hint-refreshes, r=Veykril
Do not send inlay hint refresh requests on file edits See https://github.com/rust-lang/rust-analyzer/issues/13369#issuecomment-1695306870 Editor itself is able to invalidate hints after edits, and /refresh was sent after editor reports changes to the language server. This forces the editor to either query & invalidate the hints twice after every edit, or wait for /refresh to come before querying the hints. Both options are rather useless, so instead, send a request on server startup only: client editors do not know when the server actually starts up, this will help to query the initial hints after editor was open and the server was still starting up.
| -rw-r--r-- | crates/rust-analyzer/src/global_state.rs | 2 | ||||
| -rw-r--r-- | crates/rust-analyzer/src/main_loop.rs | 8 |
2 files changed, 8 insertions, 2 deletions
diff --git a/crates/rust-analyzer/src/global_state.rs b/crates/rust-analyzer/src/global_state.rs index 8b6b461856e..e5d8438d80d 100644 --- a/crates/rust-analyzer/src/global_state.rs +++ b/crates/rust-analyzer/src/global_state.rs @@ -69,6 +69,7 @@ pub(crate) struct GlobalState { // status pub(crate) shutdown_requested: bool, + pub(crate) send_hint_refresh_query: bool, pub(crate) last_reported_status: Option<lsp_ext::ServerStatusParams>, // proc macros @@ -180,6 +181,7 @@ impl GlobalState { mem_docs: MemDocs::default(), semantic_tokens_cache: Arc::new(Default::default()), shutdown_requested: false, + send_hint_refresh_query: false, last_reported_status: None, source_root_config: SourceRootConfig::default(), config_errors: Default::default(), diff --git a/crates/rust-analyzer/src/main_loop.rs b/crates/rust-analyzer/src/main_loop.rs index da4bef730b3..cdf41c955d2 100644 --- a/crates/rust-analyzer/src/main_loop.rs +++ b/crates/rust-analyzer/src/main_loop.rs @@ -320,8 +320,11 @@ impl GlobalState { } // Refresh inlay hints if the client supports it. - if self.config.inlay_hints_refresh() { + if (self.send_hint_refresh_query || self.proc_macro_changed) + && self.config.inlay_hints_refresh() + { self.send_request::<lsp_types::request::InlayHintRefreshRequest>((), |_, _| ()); + self.send_hint_refresh_query = false; } } @@ -538,6 +541,7 @@ impl GlobalState { } self.switch_workspaces("fetched build data".to_string()); + self.send_hint_refresh_query = true; (Some(Progress::End), None) } @@ -554,7 +558,7 @@ impl GlobalState { ProcMacroProgress::End(proc_macro_load_result) => { self.fetch_proc_macros_queue.op_completed(true); self.set_proc_macros(proc_macro_load_result); - + self.send_hint_refresh_query = true; (Some(Progress::End), None) } }; |
