feat: go-to-def and find-references on control-flow keywords #17542
Conversation
rustbot
added
the
S-waiting-on-review
| @@ -153,6 +153,22 @@ impl NavigationTarget { | |||
| ) | |||
| } | |||
|
|
|||
| pub(crate) fn from_expr( | |||
There was a problem hiding this comment.
Hm actually I think this is the wrong way to go about this, let's construct these manually in the relevant modules and instead expose the orig_range_with_focus functions to the rest of the crate
There was a problem hiding this comment.
One thing to look out for is the turning FileRange into TextRange after upmapping. All of those need to verify that the file id of the FileRange is in fact the same as the file we are doing the feature stuff in, as include! has its input in a different file than where the call is. Generally speaking, dropping the file id of a FileRange yielded from upmapping without checks can easily cause issues
| }; | ||
| let focus_range = InFile::new(file_id, focus_token.text_range()) | ||
| .original_node_file_range_opt(db) | ||
| .map(|(frange, _)| frange.range); |
There was a problem hiding this comment.
Needs to filter by frange.file_id == nav.file_id
|
|
||
| InFile::new(file_id, text_range.unwrap()) | ||
| .original_node_file_range_opt(db) | ||
| .map(|(frange, _)| frange.range) |
There was a problem hiding this comment.
Needs to filer by frange.file_id == highlight_references::file_id (that is the file_id of the file the feature is running on)
Veykril
added
S-waiting-on-author
fix #17517.
This PR implements go-to-definition and find-references functionalities for control flow keywords, which is similar to the behaviors in the
highlight-relatedmodule. Besides, this PR also fixes some incorrect behaviors inhighlight-related.Changes
Support for go-to-definition on control flow keywords:
This PR introduces functionality allowing users to navigate to the definition of control flow keywords (
return,break,continue).Commit: 7ab3407..560c098.
Bug fixes and refactoring in highlight-related:
This PR adjusted the behavior of these keywords when they occur within
try_blocks. When encounter these keywords, the program should exit the outer function or loop which containing thetry_blocks, rather than thetry_blocksitself; while the?will cause the program to exittry_blocks.Commit: 6b7bb36.
Commit: 7e61f74.
preorder_exprincorrectly treatedtry_blocksas new contexts, thereby r-a will not continue to traverse innerreturnandbreak/continuestatements. To resolve this, a new functionpreorder_expr_with_ctx_checkerhas been added, allowing users to specify which expressions to skip.?in the context, r-a should skiptry_blockswhere the?insides just works fortry_blocks. But when search for thereturnkeyword, r-a should collect both thereturnkeywords inside and outside thetry_blocksWalkExpandedExprCtx(builder pattern). It offers the following improvements: customizable context skipping, maintenance of loop depth (forbreak/continue), and handling macro expansion during traversal.Support for find-references on control flow keywords:
This PR enables users to find all references to control flow keywords.
Commit: 2262ab7.