mirror of
https://github.com/rust-lang/rust-analyzer.git
synced 2025-09-27 04:19:13 +00:00
Fix annotations not resolving when lens location is set to whole item
This commit is contained in:
Lukas Wirth
parent
b16b0413dc
commit
3cd57c425a
5 changed files with 199 additions and 130 deletions
|
|
@ -8,13 +8,15 @@ use ide_db::{
|
|||
use syntax::{ast::HasName, AstNode, TextRange};
|
||||
|
||||
use crate::{
|
||||
fn_references::find_all_methods,
|
||||
annotations::fn_references::find_all_methods,
|
||||
goto_implementation::goto_implementation,
|
||||
references::find_all_refs,
|
||||
runnables::{runnables, Runnable},
|
||||
NavigationTarget, RunnableKind,
|
||||
};
|
||||
|
||||
mod fn_references;
|
||||
|
||||
// Feature: Annotations
|
||||
//
|
||||
// Provides user with annotations above items for looking up references or impl blocks
|
||||
|
|
@ -30,8 +32,8 @@ pub struct Annotation {
|
|||
#[derive(Debug)]
|
||||
pub enum AnnotationKind {
|
||||
Runnable(Runnable),
|
||||
HasImpls { file_id: FileId, data: Option<Vec<NavigationTarget>> },
|
||||
HasReferences { file_id: FileId, data: Option<Vec<FileRange>> },
|
||||
HasImpls { pos: FilePosition, data: Option<Vec<NavigationTarget>> },
|
||||
HasReferences { pos: FilePosition, data: Option<Vec<FileRange>> },
|
||||
}
|
||||
|
||||
pub struct AnnotationConfig {
|
||||
|
|
@ -68,13 +70,23 @@ pub(crate) fn annotations(
|
|||
}
|
||||
}
|
||||
|
||||
let mk_ranges = |(range, focus): (_, Option<_>)| {
|
||||
let cmd_target: TextRange = focus.unwrap_or(range);
|
||||
let annotation_range = match config.location {
|
||||
AnnotationLocation::AboveName => cmd_target,
|
||||
AnnotationLocation::AboveWholeItem => range,
|
||||
};
|
||||
let target_pos = FilePosition { file_id, offset: cmd_target.start() };
|
||||
(annotation_range, target_pos)
|
||||
};
|
||||
|
||||
visit_file_defs(&Semantics::new(db), file_id, &mut |def| {
|
||||
let range = match def {
|
||||
Definition::Const(konst) if config.annotate_references => {
|
||||
konst.source(db).and_then(|node| name_range(db, config, node, file_id))
|
||||
konst.source(db).and_then(|node| name_range(db, node, file_id))
|
||||
}
|
||||
Definition::Trait(trait_) if config.annotate_references || config.annotate_impls => {
|
||||
trait_.source(db).and_then(|node| name_range(db, config, node, file_id))
|
||||
trait_.source(db).and_then(|node| name_range(db, node, file_id))
|
||||
}
|
||||
Definition::Adt(adt) => match adt {
|
||||
hir::Adt::Enum(enum_) => {
|
||||
|
|
@ -83,27 +95,29 @@ pub(crate) fn annotations(
|
|||
.variants(db)
|
||||
.into_iter()
|
||||
.map(|variant| {
|
||||
variant
|
||||
.source(db)
|
||||
.and_then(|node| name_range(db, config, node, file_id))
|
||||
variant.source(db).and_then(|node| name_range(db, node, file_id))
|
||||
})
|
||||
.flatten()
|
||||
.for_each(|range| {
|
||||
let (annotation_range, target_position) = mk_ranges(range);
|
||||
annotations.push(Annotation {
|
||||
range,
|
||||
kind: AnnotationKind::HasReferences { file_id, data: None },
|
||||
range: annotation_range,
|
||||
kind: AnnotationKind::HasReferences {
|
||||
pos: target_position,
|
||||
data: None,
|
||||
},
|
||||
})
|
||||
})
|
||||
}
|
||||
if config.annotate_references || config.annotate_impls {
|
||||
enum_.source(db).and_then(|node| name_range(db, config, node, file_id))
|
||||
enum_.source(db).and_then(|node| name_range(db, node, file_id))
|
||||
} else {
|
||||
None
|
||||
}
|
||||
}
|
||||
_ => {
|
||||
if config.annotate_references || config.annotate_impls {
|
||||
adt.source(db).and_then(|node| name_range(db, config, node, file_id))
|
||||
adt.source(db).and_then(|node| name_range(db, node, file_id))
|
||||
} else {
|
||||
None
|
||||
}
|
||||
|
|
@ -116,33 +130,32 @@ pub(crate) fn annotations(
|
|||
Some(range) => range,
|
||||
None => return,
|
||||
};
|
||||
|
||||
let (annotation_range, target_pos) = mk_ranges(range);
|
||||
if config.annotate_impls && !matches!(def, Definition::Const(_)) {
|
||||
annotations
|
||||
.push(Annotation { range, kind: AnnotationKind::HasImpls { file_id, data: None } });
|
||||
annotations.push(Annotation {
|
||||
range: annotation_range,
|
||||
kind: AnnotationKind::HasImpls { pos: target_pos, data: None },
|
||||
});
|
||||
}
|
||||
|
||||
if config.annotate_references {
|
||||
annotations.push(Annotation {
|
||||
range,
|
||||
kind: AnnotationKind::HasReferences { file_id, data: None },
|
||||
range: annotation_range,
|
||||
kind: AnnotationKind::HasReferences { pos: target_pos, data: None },
|
||||
});
|
||||
}
|
||||
|
||||
fn name_range<T: HasName>(
|
||||
db: &RootDatabase,
|
||||
config: &AnnotationConfig,
|
||||
node: InFile<T>,
|
||||
source_file_id: FileId,
|
||||
) -> Option<TextRange> {
|
||||
) -> Option<(TextRange, Option<TextRange>)> {
|
||||
if let Some(InFile { file_id, value }) = node.original_ast_node(db) {
|
||||
if file_id == source_file_id.into() {
|
||||
return match config.location {
|
||||
AnnotationLocation::AboveName => {
|
||||
value.name().map(|name| name.syntax().text_range())
|
||||
}
|
||||
AnnotationLocation::AboveWholeItem => Some(value.syntax().text_range()),
|
||||
};
|
||||
return Some((
|
||||
value.syntax().text_range(),
|
||||
value.name().map(|name| name.syntax().text_range()),
|
||||
));
|
||||
}
|
||||
}
|
||||
None
|
||||
|
|
@ -150,12 +163,13 @@ pub(crate) fn annotations(
|
|||
});
|
||||
|
||||
if config.annotate_method_references {
|
||||
annotations.extend(find_all_methods(db, file_id).into_iter().map(
|
||||
|FileRange { file_id, range }| Annotation {
|
||||
range,
|
||||
kind: AnnotationKind::HasReferences { file_id, data: None },
|
||||
},
|
||||
));
|
||||
annotations.extend(find_all_methods(db, file_id).into_iter().map(|range| {
|
||||
let (annotation_range, target_range) = mk_ranges(range);
|
||||
Annotation {
|
||||
range: annotation_range,
|
||||
kind: AnnotationKind::HasReferences { pos: target_range, data: None },
|
||||
}
|
||||
}));
|
||||
}
|
||||
|
||||
annotations
|
||||
|
|
@ -163,18 +177,11 @@ pub(crate) fn annotations(
|
|||
|
||||
pub(crate) fn resolve_annotation(db: &RootDatabase, mut annotation: Annotation) -> Annotation {
|
||||
match annotation.kind {
|
||||
AnnotationKind::HasImpls { file_id, ref mut data } => {
|
||||
*data =
|
||||
goto_implementation(db, FilePosition { file_id, offset: annotation.range.start() })
|
||||
.map(|range| range.info);
|
||||
AnnotationKind::HasImpls { pos, ref mut data } => {
|
||||
*data = goto_implementation(db, pos).map(|range| range.info);
|
||||
}
|
||||
AnnotationKind::HasReferences { file_id, ref mut data } => {
|
||||
*data = find_all_refs(
|
||||
&Semantics::new(db),
|
||||
FilePosition { file_id, offset: annotation.range.start() },
|
||||
None,
|
||||
)
|
||||
.map(|result| {
|
||||
AnnotationKind::HasReferences { pos, ref mut data } => {
|
||||
*data = find_all_refs(&Semantics::new(db), pos, None).map(|result| {
|
||||
result
|
||||
.into_iter()
|
||||
.flat_map(|res| res.references)
|
||||
|
|
@ -268,9 +275,12 @@ fn main() {
|
|||
Annotation {
|
||||
range: 6..10,
|
||||
kind: HasReferences {
|
||||
file_id: FileId(
|
||||
0,
|
||||
),
|
||||
pos: FilePosition {
|
||||
file_id: FileId(
|
||||
0,
|
||||
),
|
||||
offset: 6,
|
||||
},
|
||||
data: Some(
|
||||
[
|
||||
FileRange {
|
||||
|
|
@ -286,9 +296,12 @@ fn main() {
|
|||
Annotation {
|
||||
range: 30..36,
|
||||
kind: HasReferences {
|
||||
file_id: FileId(
|
||||
0,
|
||||
),
|
||||
pos: FilePosition {
|
||||
file_id: FileId(
|
||||
0,
|
||||
),
|
||||
offset: 30,
|
||||
},
|
||||
data: Some(
|
||||
[],
|
||||
),
|
||||
|
|
@ -297,9 +310,12 @@ fn main() {
|
|||
Annotation {
|
||||
range: 53..57,
|
||||
kind: HasReferences {
|
||||
file_id: FileId(
|
||||
0,
|
||||
),
|
||||
pos: FilePosition {
|
||||
file_id: FileId(
|
||||
0,
|
||||
),
|
||||
offset: 53,
|
||||
},
|
||||
data: Some(
|
||||
[],
|
||||
),
|
||||
|
|
@ -344,9 +360,12 @@ fn main() {
|
|||
Annotation {
|
||||
range: 7..11,
|
||||
kind: HasImpls {
|
||||
file_id: FileId(
|
||||
0,
|
||||
),
|
||||
pos: FilePosition {
|
||||
file_id: FileId(
|
||||
0,
|
||||
),
|
||||
offset: 7,
|
||||
},
|
||||
data: Some(
|
||||
[],
|
||||
),
|
||||
|
|
@ -355,9 +374,12 @@ fn main() {
|
|||
Annotation {
|
||||
range: 7..11,
|
||||
kind: HasReferences {
|
||||
file_id: FileId(
|
||||
0,
|
||||
),
|
||||
pos: FilePosition {
|
||||
file_id: FileId(
|
||||
0,
|
||||
),
|
||||
offset: 7,
|
||||
},
|
||||
data: Some(
|
||||
[
|
||||
FileRange {
|
||||
|
|
@ -373,9 +395,12 @@ fn main() {
|
|||
Annotation {
|
||||
range: 17..21,
|
||||
kind: HasReferences {
|
||||
file_id: FileId(
|
||||
0,
|
||||
),
|
||||
pos: FilePosition {
|
||||
file_id: FileId(
|
||||
0,
|
||||
),
|
||||
offset: 17,
|
||||
},
|
||||
data: Some(
|
||||
[],
|
||||
),
|
||||
|
|
@ -424,9 +449,12 @@ fn main() {
|
|||
Annotation {
|
||||
range: 7..11,
|
||||
kind: HasImpls {
|
||||
file_id: FileId(
|
||||
0,
|
||||
),
|
||||
pos: FilePosition {
|
||||
file_id: FileId(
|
||||
0,
|
||||
),
|
||||
offset: 7,
|
||||
},
|
||||
data: Some(
|
||||
[
|
||||
NavigationTarget {
|
||||
|
|
@ -445,9 +473,12 @@ fn main() {
|
|||
Annotation {
|
||||
range: 7..11,
|
||||
kind: HasReferences {
|
||||
file_id: FileId(
|
||||
0,
|
||||
),
|
||||
pos: FilePosition {
|
||||
file_id: FileId(
|
||||
0,
|
||||
),
|
||||
offset: 7,
|
||||
},
|
||||
data: Some(
|
||||
[
|
||||
FileRange {
|
||||
|
|
@ -469,9 +500,12 @@ fn main() {
|
|||
Annotation {
|
||||
range: 20..31,
|
||||
kind: HasImpls {
|
||||
file_id: FileId(
|
||||
0,
|
||||
),
|
||||
pos: FilePosition {
|
||||
file_id: FileId(
|
||||
0,
|
||||
),
|
||||
offset: 20,
|
||||
},
|
||||
data: Some(
|
||||
[
|
||||
NavigationTarget {
|
||||
|
|
@ -490,9 +524,12 @@ fn main() {
|
|||
Annotation {
|
||||
range: 20..31,
|
||||
kind: HasReferences {
|
||||
file_id: FileId(
|
||||
0,
|
||||
),
|
||||
pos: FilePosition {
|
||||
file_id: FileId(
|
||||
0,
|
||||
),
|
||||
offset: 20,
|
||||
},
|
||||
data: Some(
|
||||
[
|
||||
FileRange {
|
||||
|
|
@ -508,9 +545,12 @@ fn main() {
|
|||
Annotation {
|
||||
range: 69..73,
|
||||
kind: HasReferences {
|
||||
file_id: FileId(
|
||||
0,
|
||||
),
|
||||
pos: FilePosition {
|
||||
file_id: FileId(
|
||||
0,
|
||||
),
|
||||
offset: 69,
|
||||
},
|
||||
data: Some(
|
||||
[],
|
||||
),
|
||||
|
|
@ -551,9 +591,12 @@ fn main() {}
|
|||
Annotation {
|
||||
range: 3..7,
|
||||
kind: HasReferences {
|
||||
file_id: FileId(
|
||||
0,
|
||||
),
|
||||
pos: FilePosition {
|
||||
file_id: FileId(
|
||||
0,
|
||||
),
|
||||
offset: 3,
|
||||
},
|
||||
data: Some(
|
||||
[],
|
||||
),
|
||||
|
|
@ -602,9 +645,12 @@ fn main() {
|
|||
Annotation {
|
||||
range: 7..11,
|
||||
kind: HasImpls {
|
||||
file_id: FileId(
|
||||
0,
|
||||
),
|
||||
pos: FilePosition {
|
||||
file_id: FileId(
|
||||
0,
|
||||
),
|
||||
offset: 7,
|
||||
},
|
||||
data: Some(
|
||||
[
|
||||
NavigationTarget {
|
||||
|
|
@ -623,9 +669,12 @@ fn main() {
|
|||
Annotation {
|
||||
range: 7..11,
|
||||
kind: HasReferences {
|
||||
file_id: FileId(
|
||||
0,
|
||||
),
|
||||
pos: FilePosition {
|
||||
file_id: FileId(
|
||||
0,
|
||||
),
|
||||
offset: 7,
|
||||
},
|
||||
data: Some(
|
||||
[
|
||||
FileRange {
|
||||
|
|
@ -647,9 +696,12 @@ fn main() {
|
|||
Annotation {
|
||||
range: 33..44,
|
||||
kind: HasReferences {
|
||||
file_id: FileId(
|
||||
0,
|
||||
),
|
||||
pos: FilePosition {
|
||||
file_id: FileId(
|
||||
0,
|
||||
),
|
||||
offset: 33,
|
||||
},
|
||||
data: Some(
|
||||
[
|
||||
FileRange {
|
||||
|
|
@ -665,9 +717,12 @@ fn main() {
|
|||
Annotation {
|
||||
range: 61..65,
|
||||
kind: HasReferences {
|
||||
file_id: FileId(
|
||||
0,
|
||||
),
|
||||
pos: FilePosition {
|
||||
file_id: FileId(
|
||||
0,
|
||||
),
|
||||
offset: 61,
|
||||
},
|
||||
data: Some(
|
||||
[],
|
||||
),
|
||||
|
|
@ -761,9 +816,12 @@ mod tests {
|
|||
Annotation {
|
||||
range: 3..7,
|
||||
kind: HasReferences {
|
||||
file_id: FileId(
|
||||
0,
|
||||
),
|
||||
pos: FilePosition {
|
||||
file_id: FileId(
|
||||
0,
|
||||
),
|
||||
offset: 3,
|
||||
},
|
||||
data: Some(
|
||||
[],
|
||||
),
|
||||
|
|
@ -821,9 +879,12 @@ struct Foo;
|
|||
Annotation {
|
||||
range: 0..71,
|
||||
kind: HasImpls {
|
||||
file_id: FileId(
|
||||
0,
|
||||
),
|
||||
pos: FilePosition {
|
||||
file_id: FileId(
|
||||
0,
|
||||
),
|
||||
offset: 67,
|
||||
},
|
||||
data: Some(
|
||||
[],
|
||||
),
|
||||
|
|
@ -832,10 +893,15 @@ struct Foo;
|
|||
Annotation {
|
||||
range: 0..71,
|
||||
kind: HasReferences {
|
||||
file_id: FileId(
|
||||
0,
|
||||
pos: FilePosition {
|
||||
file_id: FileId(
|
||||
0,
|
||||
),
|
||||
offset: 67,
|
||||
},
|
||||
data: Some(
|
||||
[],
|
||||
),
|
||||
data: None,
|
||||
},
|
||||
},
|
||||
]
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue