diff options
author | Veetaha <[email protected]> | 2020-08-08 19:53:38 +0100 |
---|---|---|
committer | Veetaha <[email protected]> | 2020-08-08 19:53:38 +0100 |
commit | e43811c1645f78818d5d7fe0054b54a462145847 (patch) | |
tree | 43c7e67da3e783af3f06033478d306a2cfc99490 /crates | |
parent | a69f19a6a5899bdfb6fc498371650bf54263deff (diff) |
Fix no inlay hints / unresolved tokens until manual edit
No we return ContentModified during the workspace loading. This signifies the language
client to retry the operation (i.e. the client will
continue polling the server while it returns ContentModified).
I believe that there might be cases of overly big projects where the backoff
logic we have setup in `sendRequestWithRetry` (which we use for inlay hints)
might bail too early (currently the largest retry standby time is 10 seconds).
However, I've tried on one of my project with 500+ dependencies and it is still enough.
Diffstat (limited to 'crates')
-rw-r--r-- | crates/rust-analyzer/src/main_loop.rs | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/crates/rust-analyzer/src/main_loop.rs b/crates/rust-analyzer/src/main_loop.rs index ceddb2b05..d69f7941d 100644 --- a/crates/rust-analyzer/src/main_loop.rs +++ b/crates/rust-analyzer/src/main_loop.rs | |||
@@ -337,6 +337,16 @@ impl GlobalState { | |||
337 | fn on_request(&mut self, request_received: Instant, req: Request) -> Result<()> { | 337 | fn on_request(&mut self, request_received: Instant, req: Request) -> Result<()> { |
338 | self.register_request(&req, request_received); | 338 | self.register_request(&req, request_received); |
339 | 339 | ||
340 | if self.status == Status::Loading { | ||
341 | self.respond(lsp_server::Response::new_err( | ||
342 | req.id, | ||
343 | // FIXME: i32 should impl From<ErrorCode> (from() guarantees lossless conversion) | ||
344 | lsp_server::ErrorCode::ContentModified as i32, | ||
345 | "Rust Analyzer is still loading...".to_owned(), | ||
346 | )); | ||
347 | return Ok(()); | ||
348 | } | ||
349 | |||
340 | RequestDispatcher { req: Some(req), global_state: self } | 350 | RequestDispatcher { req: Some(req), global_state: self } |
341 | .on_sync::<lsp_ext::ReloadWorkspace>(|s, ()| Ok(s.fetch_workspaces()))? | 351 | .on_sync::<lsp_ext::ReloadWorkspace>(|s, ()| Ok(s.fetch_workspaces()))? |
342 | .on_sync::<lsp_ext::JoinLines>(|s, p| handlers::handle_join_lines(s.snapshot(), p))? | 352 | .on_sync::<lsp_ext::JoinLines>(|s, p| handlers::handle_join_lines(s.snapshot(), p))? |