Extend the symbol range to include the rhs #1887
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
yannham
approved these changes
Apr 11, 2024
lsp/nls/src/requests/symbols.rs
Outdated
| .annotation | ||
| .contracts | ||
| .iter() | ||
| .chain(field.metadata.annotation.typ.as_ref()) |
There was a problem hiding this comment.
There's an iter() method on TypeAnnotation that is returning the type chained with the contracts as an iterator.
lsp/nls/src/requests/symbols.rs
Outdated
| .map(|pos| pos.end.to_usize()) | ||
| .max() | ||
| { | ||
| last_pos = last_pos.max(last_ty_pos); |
There was a problem hiding this comment.
I don't know if it's useful to reduce boilerplate, but there's a fuse() method on RawSpan, which returns the smallest enclosing span that contains both spans given as arguments.
There was a problem hiding this comment.
That did turn out nicer, thanks!
| @@ -9,6 +9,8 @@ let func = fun x => 1 in | |||
| type_checked_block = { | |||
| inner_name = { name = "value" }, | |||
| } : _, | |||
| annotated | String, | |||
| docced | doc "The symbol range doesn't current include docs", | |||
There was a problem hiding this comment.
Suggested change
| docced | doc "The symbol range doesn't current include docs", | |
| docced | doc "The symbol range doesn't currently include docs", |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fixes #1886.
The symbols response has two ranges: the "selection range" is just the position of the symbol name, but the "range" is supposed to include the "body" of the symbol. VSCode uses this range for the breadcrumb bar: it shows the symbols in the bar when your cursor is in that symbol's body. Previously, we were just reporting the position of the symbol name for both ranges.