about summary refs log tree commit diff
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2024-07-30 06:35:28 +0000
committerbors <bors@rust-lang.org>2024-07-30 06:35:28 +0000
commitcd266e043327f96ddce14f6c5737c3ce320c8ccc (patch)
tree8e61d1f81faf58609d881b4725575963671a559d
parent5fa145eab97324623e10da7100f2c18bfc8f5326 (diff)
parent13c095aaf1b6008d8e4a032008b9fcd6e79a0df5 (diff)
downloadrust-cd266e043327f96ddce14f6c5737c3ce320c8ccc.tar.gz
rust-cd266e043327f96ddce14f6c5737c3ce320c8ccc.zip
Auto merge of #17742 - Veykril:wrong-retries, r=Veykril
fix: Fix incorrect retrying of inlay hint requests
-rw-r--r--src/tools/rust-analyzer/crates/rust-analyzer/src/main_loop.rs7
1 files changed, 3 insertions, 4 deletions
diff --git a/src/tools/rust-analyzer/crates/rust-analyzer/src/main_loop.rs b/src/tools/rust-analyzer/crates/rust-analyzer/src/main_loop.rs
index 58d73611c63..9c820749ece 100644
--- a/src/tools/rust-analyzer/crates/rust-analyzer/src/main_loop.rs
+++ b/src/tools/rust-analyzer/crates/rust-analyzer/src/main_loop.rs
@@ -1053,11 +1053,10 @@ impl GlobalState {
             .on::<NO_RETRY, lsp_request::GotoDeclaration>(handlers::handle_goto_declaration)
             .on::<NO_RETRY, lsp_request::GotoImplementation>(handlers::handle_goto_implementation)
             .on::<NO_RETRY, lsp_request::GotoTypeDefinition>(handlers::handle_goto_type_definition)
-            // FIXME: This should not be tried as it contains offsets that can get outdated!
-            .on::<RETRY, lsp_request::InlayHintRequest>(handlers::handle_inlay_hints)
-            .on::<RETRY, lsp_request::InlayHintResolveRequest>(handlers::handle_inlay_hints_resolve)
+            .on::<NO_RETRY, lsp_request::InlayHintRequest>(handlers::handle_inlay_hints)
+            .on::<NO_RETRY, lsp_request::InlayHintResolveRequest>(handlers::handle_inlay_hints_resolve)
             .on::<NO_RETRY, lsp_request::CodeLensRequest>(handlers::handle_code_lens)
-            .on::<RETRY, lsp_request::CodeLensResolve>(handlers::handle_code_lens_resolve)
+            .on::<NO_RETRY, lsp_request::CodeLensResolve>(handlers::handle_code_lens_resolve)
             .on::<NO_RETRY, lsp_request::PrepareRenameRequest>(handlers::handle_prepare_rename)
             .on::<NO_RETRY, lsp_request::Rename>(handlers::handle_rename)
             .on::<NO_RETRY, lsp_request::References>(handlers::handle_references)