Skip to content

fix: add multi-token mapping support to hovers #10233

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom
Merged
merged 2 commits into from
Sep 15, 2021
Merged

fix: add multi-token mapping support to hovers #10233

merged 2 commits into from
Sep 15, 2021

Conversation

@spookyvision
Copy link
Contributor

@spookyvision spookyvision commented Sep 14, 2021 •
edited
Loading

implement #10070 in hover

Veykril
Veykril reviewed Sep 14, 2021
View reviewed changes
@Veykril
Copy link
Member

Veykril commented Sep 14, 2021

Turns out making hover more resilient for this is a bit trickier, but supporting this on a basic level should be fine for the time being I'd say.

Another nit I just realized, the type hover fallback shouldn't be included here by default I feel like as this might become a bit messy with some macros to read the hover of. That is, only if we do not get any hover info for any of the descended tokens we want to show the fallback, otherwise just ignore a descended token if it doesn't resolve to anything. Doesn't need to be addressed in this PR now though as this might be a bit annoying to do, might be good to add a note/fixme for that still.

@spookyvision
Copy link
Contributor Author

spookyvision commented Sep 15, 2021

Another nit I just realized, the type hover fallback shouldn't be included here by default I feel like as this might become a bit messy with some macros to read the hover of. That is, only if we do not get any hover info for any of the descended tokens we want to show the fallback, otherwise just ignore a descended token if it doesn't resolve to anything. Doesn't need to be addressed in this PR now though as this might be a bit annoying to do, might be good to add a note/fixme for that still.

(the PR has been updated to address this)

@spookyvision spookyvision marked this pull request as ready for review September 15, 2021 10:46
Veykril
Veykril reviewed Sep 15, 2021
View reviewed changes
@Veykril
Copy link
Member

Veykril commented Sep 15, 2021

Also side note, we disallow merge commits, hence the failing tests.

@spookyvision
Copy link
Contributor Author

spookyvision commented Sep 15, 2021

Also side note, we disallow merge commits, hence the failing tests.

good to know! I'll rebase once all other issues with this PR are resolved.

Veykril
Veykril reviewed Sep 15, 2021
View reviewed changes
Anatol Ulrich added 2 commits September 15, 2021 18:04
# This is a combination of 3 commits.
b251a30 
# This is the 1st commit message:

add multi-token mappings for hover

# The commit message rust-lang#2 will be skipped:

# make fallback an Option instead of vec

# The commit message rust-lang#3 will be skipped:

# fix indentation
add multi-token mappings for hover
45090e4
@Veykril
Copy link
Member

Veykril commented Sep 15, 2021

Looks good to me now, thanks!
bors r+

@bors
Copy link
Contributor

bors bot commented Sep 15, 2021

Build succeeded:

@bors bors bot merged commit 4c9eef7 into rust-lang:master Sep 15, 2021
@Veykril Veykril mentioned this pull request Sep 16, 2021
Closed
12 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@Veykril Veykril Veykril left review comments

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

2 participants

@spookyvision @Veykril