feat: Highlight exit points of async blocks #18152
Conversation
Async blocks act similar to async functions in that the await keywords are related, but also act like functions where the exit points are related.
rustbot
added
the
S-waiting-on-review
| @@ -281,99 +281,95 @@ fn highlight_references( | |||
| } | |||
| } | |||
|
|
|||
| // If `file_id` is None, | |||
| pub(crate) fn highlight_exit_points( | |||
| fn hl_exit_points( | |||
There was a problem hiding this comment.
It looks like a ton of stuff happened here, but nothing is actually changed and the function just moved out, so it can be called from highlight_yield_points. You can hide whitespace changes on the cog symbol above to make this easier on the eyes xD
|
Technically an async block is also a closure with captures, but I didn't quite feel comfortable enough to make that change (yet?) as my first meaningful contribution. |
We dont compute captures for async functions yet and that is no simple task (likely resolved by #16173 once thats finished) |
crates/ide/src/highlight_related.rs
Outdated
| // Async blocks act similar to closures. So we want to | ||
| // highlight their exit points too. | ||
| let exit_points = hl_exit_points(sema, block_expr.async_token(), block_expr.clone().into()); | ||
| merge_map(&mut res, exit_points); |
There was a problem hiding this comment.
Hmm, so the thing is, when the cursor is on async we only want to render the yield points, not exit points (this is useful for functions where you can get either depending on whether you put the cursor on the async or fn keyword). For async blocks you don't really have a simple way to get the exit points though so having it render both on async does make sense imo (but not when the cursor is on an `await).
So I would want to branch this by block_expr.async_token() == token to only trigger this if the cursor is on the async token of the block
There was a problem hiding this comment.
Sorry, it took a bit, but it should be good now.
Veykril
added
S-waiting-on-author
This ensures that when being on an `await` token, it still only highlights the yield points and not the exit points.
|
@bors r+ |
|
☀️ Test successful - checks-actions |
Async blocks act similar to async functions in that the await keywords are related, but also act like functions where the exit points are related.
Fixes #18147