Yehowshua/ZIm
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Remove stale cancelled inlay hints workaround

Browse source
This commit is contained in:
Kirill Bulatov 2023-06-22 22:11:10 +03:00
parent 96a34ad0ee
commit 316e19ce94
2 changed files with 5 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

24
crates/project/src/project.rs
View file

@ -4934,7 +4934,7 @@ impl Project {
buffer_handle: ModelHandle<Buffer>,
range: Range<T>,
cx: &mut ModelContext<Self>,
) -> Task<Result<Option<Vec<InlayHint>>>> {
) -> Task<Result<Vec<InlayHint>>> {
let buffer = buffer_handle.read(cx);
let range = buffer.anchor_before(range.start)..buffer.anchor_before(range.end);
let range_start = range.start;
@ -4952,11 +4952,7 @@ impl Project {
})
.await
.context("waiting for inlay hint request range edits")?;
match lsp_request_task.await {
Ok(hints) => Ok(Some(hints)),
Err(e) if is_content_modified_error(&e) => Ok(None),
Err(other_e) => Err(other_e).context("inlay hints LSP request"),
}
lsp_request_task.await.context("inlay hints LSP request")
})
} else if let Some(project_id) = self.remote_id() {
let client = self.client.clone();
@ -4981,13 +4977,7 @@ impl Project {
)
.await;
match hints_request_result {
Ok(hints) => Ok(Some(hints)),
Err(e) if is_content_modified_error(&e) => Ok(None),
Err(other_err) => {
Err(other_err).context("inlay hints proto response conversion")
}
}
hints_request_result.context("inlay hints proto response conversion")
})
} else {
Task::ready(Err(anyhow!("project does not have a remote id")))
@ -6779,8 +6769,7 @@ impl Project {
project.inlay_hints(buffer, start..end, cx)
})
.await
.context("inlay hints fetch")?
.unwrap_or_default();
.context("inlay hints fetch")?;
Ok(this.update(&mut cx, |project, cx| {
InlayHints::response_to_proto(buffer_hints, project, sender_id, &buffer_version, cx)
@ -7855,8 +7844,3 @@ async fn wait_for_loading_buffer(
receiver.next().await;
}
}
// TODO kb what are better ways?
fn is_content_modified_error(error: &anyhow::Error) -> bool {
format!("{error:#}").contains("content modified")
}