adds hover support from the engine #3
Conversation
|
this is now rebased on the other pull request and shouldn't be merged first |
src/main.rs
Outdated
| use typst::ide::{tooltip, Tooltip}; | ||
| use typst::syntax::LinkedNode; | ||
| use typst::World; |
| async fn hover(&self, params: HoverParams) -> Result<Option<Hover>> { | ||
| let world = self.world.read().await; | ||
| let world = world.as_ref().unwrap(); | ||
| let source = world.main(); |
There was a problem hiding this comment.
We should get the current document from params; the current main thing is a hack and will eventually be removed.
There was a problem hiding this comment.
I think I forgot how my own hack works; this being hard to do is why main exists. This is actually fine.
astrale-sharp
force-pushed
the
hovering
branch
4 times, most recently
from
dadbbdf to
bce8f98
Compare
|
Okay, could be ready to go, let me know! |
src/main.rs
Outdated
|
|
||
| let cursor = get_cursor_for_position(params.text_document_position_params.position, source); | ||
|
|
||
| if let Some(cursor) = cursor { |
There was a problem hiding this comment.
I'm just dreaming of chain if let tbh
There was a problem hiding this comment.
I could use if_chain! if you'd like !
There was a problem hiding this comment.
alternatively you could do
let Some(cursor) = cursor else { return Ok(None) };
let Some(tooltip) = tooltip(world, &[], source, cursor) else { return Ok(None) };
let Some(lk) = lk else { return Ok(None) };I personally don't really like if_chain because they sometimes mess with rust-analyzers ability to go to definition and autocomplete.
There was a problem hiding this comment.
@astrale-sharp can you implement something like @jakobhellermann's idea here? It will keep the code from getting too deeply nested.
|
this works pretty well, I tried rebased on your branch but it shows little moves, that's annoying. I'm a bit stuck on what to rebase on what. |
src/main.rs
Outdated
|
|
||
| let cursor = get_cursor_for_position(params.text_document_position_params.position, source); | ||
|
|
||
| if let Some(cursor) = cursor { |
There was a problem hiding this comment.
@astrale-sharp can you implement something like @jakobhellermann's idea here? It will keep the code from getting too deeply nested.
astrale-sharp
force-pushed
the
hovering
branch
4 times, most recently
from
9b806d9 to
9defdfc
Compare
|
This was such a pain to rebase and I have no idea why but it's finally done (I ended up copy pasting from your master branch) I love that last change you made me do, I didn't know we could do that ! It should be ready to go, |
There was a problem hiding this comment.
Looks great now, and this should be a useful feature; thank you!
The difficulty rebasing is probably because a) there have been a lot of changes from all the PRs recently, and b) I mangled the git history in an attempt to merge them all quickly (so sorry about that). Future rebases will hopefully be easier.
adds hovering support, some repetition with my last pull request that I can factor out once it is merged, I can also rebase after you pulled