language-servers/rust-analyzer
1
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer.git synced 2025-09-26 20:09:19 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

fix: Fix lens location "above_whole_item" breaking lenses

Browse source
This commit is contained in:
Lukas Wirth 2023-09-13 22:01:04 +02:00
parent affe5a7315
commit 712e67cf11
3 changed files with 16 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

4
crates/ide-db/src/search.rs
View file

@ -6,7 +6,7 @@
use std::mem; use std::mem;
use base_db::{FileId, FileRange, SourceDatabase, SourceDatabaseExt}; use base_db::{salsa::Database, FileId, FileRange, SourceDatabase, SourceDatabaseExt};
use hir::{ use hir::{
AsAssocItem, DefWithBody, HasAttrs, HasSource, InFile, ModuleSource, Semantics, Visibility, AsAssocItem, DefWithBody, HasAttrs, HasSource, InFile, ModuleSource, Semantics, Visibility,
}; };
@ -470,6 +470,7 @@ impl<'a> FindUsages<'a> {
}; };
for (text, file_id, search_range) in scope_files(sema, &search_scope) { for (text, file_id, search_range) in scope_files(sema, &search_scope) {
self.sema.db.unwind_if_cancelled();
let tree = Lazy::new(move || sema.parse(file_id).syntax().clone()); let tree = Lazy::new(move || sema.parse(file_id).syntax().clone());
// Search for occurrences of the items name // Search for occurrences of the items name
@ -506,6 +507,7 @@ impl<'a> FindUsages<'a> {
let finder = &Finder::new("super"); let finder = &Finder::new("super");
for (text, file_id, search_range) in scope_files(sema, &scope) { for (text, file_id, search_range) in scope_files(sema, &scope) {
self.sema.db.unwind_if_cancelled();
let tree = Lazy::new(move || sema.parse(file_id).syntax().clone()); let tree = Lazy::new(move || sema.parse(file_id).syntax().clone());
for offset in match_indices(&text, finder, search_range) { for offset in match_indices(&text, finder, search_range) {

3
crates/ide/src/annotations.rs
View file

@ -94,10 +94,9 @@ pub(crate) fn annotations(
enum_ enum_
.variants(db) .variants(db)
.into_iter() .into_iter()
.map(|variant| { .filter_map(|variant| {
variant.source(db).and_then(|node| name_range(db, node, file_id)) variant.source(db).and_then(|node| name_range(db, node, file_id))
}) })
.flatten()
.for_each(|range| { .for_each(|range| {
let (annotation_range, target_position) = mk_ranges(range); let (annotation_range, target_position) = mk_ranges(range);
annotations.push(Annotation { annotations.push(Annotation {

27
crates/rust-analyzer/src/lsp/to_proto.rs
View file

@ -1358,17 +1358,18 @@ pub(crate) fn code_lens(
}) })
} }
} }
AnnotationKind::HasImpls { pos: file_range, data } => { AnnotationKind::HasImpls { pos, data } => {
if !client_commands_config.show_reference { if !client_commands_config.show_reference {
return Ok(()); return Ok(());
} }
let line_index = snap.file_line_index(file_range.file_id)?; let line_index = snap.file_line_index(pos.file_id)?;
let annotation_range = range(&line_index, annotation.range); let annotation_range = range(&line_index, annotation.range);
let url = url(snap, file_range.file_id); let url = url(snap, pos.file_id);
let pos = position(&line_index, pos.offset);
let id = lsp_types::TextDocumentIdentifier { uri: url.clone() }; let id = lsp_types::TextDocumentIdentifier { uri: url.clone() };
let doc_pos = lsp_types::TextDocumentPositionParams::new(id, annotation_range.start); let doc_pos = lsp_types::TextDocumentPositionParams::new(id, pos);
let goto_params = lsp_types::request::GotoImplementationParams { let goto_params = lsp_types::request::GotoImplementationParams {
text_document_position_params: doc_pos, text_document_position_params: doc_pos,
@ -1391,7 +1392,7 @@ pub(crate) fn code_lens(
command::show_references( command::show_references(
implementation_title(locations.len()), implementation_title(locations.len()),
&url, &url,
annotation_range.start, pos,
locations, locations,
) )
}); });
@ -1411,28 +1412,24 @@ pub(crate) fn code_lens(
})(), })(),
}) })
} }
AnnotationKind::HasReferences { pos: file_range, data } => { AnnotationKind::HasReferences { pos, data } => {
if !client_commands_config.show_reference { if !client_commands_config.show_reference {
return Ok(()); return Ok(());
} }
let line_index = snap.file_line_index(file_range.file_id)?; let line_index = snap.file_line_index(pos.file_id)?;
let annotation_range = range(&line_index, annotation.range); let annotation_range = range(&line_index, annotation.range);
let url = url(snap, file_range.file_id); let url = url(snap, pos.file_id);
let pos = position(&line_index, pos.offset);
let id = lsp_types::TextDocumentIdentifier { uri: url.clone() }; let id = lsp_types::TextDocumentIdentifier { uri: url.clone() };
let doc_pos = lsp_types::TextDocumentPositionParams::new(id, annotation_range.start); let doc_pos = lsp_types::TextDocumentPositionParams::new(id, pos);
let command = data.map(|ranges| { let command = data.map(|ranges| {
let locations: Vec<lsp_types::Location> = let locations: Vec<lsp_types::Location> =
ranges.into_iter().filter_map(|range| location(snap, range).ok()).collect(); ranges.into_iter().filter_map(|range| location(snap, range).ok()).collect();
command::show_references( command::show_references(reference_title(locations.len()), &url, pos, locations)
reference_title(locations.len()),
&url,
annotation_range.start,
locations,
)
}); });
acc.push(lsp_types::CodeLens { acc.push(lsp_types::CodeLens {