fix: make goto_definition multi-token mapping aware
#10252
Merged
Conversation
This file contains hidden or 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
xffxff
changed the title
goto_definition multi-token mapping aware
Contributor
Author
|
@Veykril Please take a look. |
Veykril
reviewed
Sep 17, 2021
crates/ide/src/goto_definition.rs
Outdated
Comment on lines
43
to
65
| let navs = tokens | ||
| .clone() | ||
| .into_iter() | ||
| .filter_map(|token| { | ||
| let parent = token.parent()?; | ||
| if let Some(_) = ast::Comment::cast(token.clone()) { | ||
| let (attributes, def) = doc_attributes(&sema, &parent)?; | ||
| let (docs, doc_mapping) = attributes.docs_with_rangemap(db)?; | ||
| let (_, link, ns) = | ||
| extract_definitions_from_docs(&docs).into_iter().find(|&(range, ..)| { | ||
| doc_mapping.map(range).map_or(false, |InFile { file_id, value: range }| { | ||
| file_id == position.file_id.into() && range.contains(position.offset) | ||
| }) | ||
| })?; | ||
| let nav = resolve_doc_path_for_def(db, def, &link, ns)?.try_to_nav(db)?; | ||
| return Some(nav); | ||
| } | ||
| None | ||
| }) | ||
| .collect::<Vec<NavigationTarget>>(); | ||
| if navs.len() > 0 { | ||
| return Some(RangeInfo::new(original_token.text_range(), navs)); | ||
| } |
Member
There was a problem hiding this comment.
I just realized, this extra comment logic actually doesn't work for comments inside macros currently so instead of doing this you can just do this special comment handling once on the original token and if that fails just do the token descending as planned.
That should simplify things.
Contributor
Author
There was a problem hiding this comment.
I just realized, this extra comment logic actually doesn't work for comments inside macros currently
Do you mean this?
macro_rules! foo_macro {
($(#[$attr:meta])* $name:ident) => {
$(#[$attr])*
pub struct $name;
}
}
foo_macro!(
/// Doc comment for [`Foo$0`]
Foo
// ^^^
);
xffxff
force-pushed
the
goto_definition_multi_token
branch
from
5bb9949 to
227450f
Compare
Member
|
Yep, that was the case I meant 👍 |
12 tasks
Contributor
Member
|
changelog fix (first contribution) make goto_definition multi-token mapping aware |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
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.
Implement #10070 in
goto_definition