language-servers/rust-analyzer
1
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer.git synced 2025-10-28 10:39:45 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

When renaming a parameter to self, change callers to use method call syntax

Browse source
This commit is contained in:
Chayim Refael Friedman 2025-07-31 23:33:38 +03:00
parent 68e7ec90bf
commit 74ecb1e788
11 changed files with 186 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

2
crates/ide-db/src/lib.rs
View file

@ -244,7 +244,7 @@ pub trait LineIndexDatabase: base_db::RootQueryDb {
fn line_index(db: &dyn LineIndexDatabase, file_id: FileId) -> Arc<LineIndex> {
let text = db.file_text(file_id).text(db);
Arc::new(LineIndex::new(&text))
Arc::new(LineIndex::new(text))
}
#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash, PartialOrd, Ord)]

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

@ -487,9 +487,9 @@ impl<'a> FindUsages<'a> {
scope.entries.iter().map(|(&file_id, &search_range)| {
let text = db.file_text(file_id.file_id(db)).text(db);
let search_range =
search_range.unwrap_or_else(|| TextRange::up_to(TextSize::of(&*text)));
search_range.unwrap_or_else(|| TextRange::up_to(TextSize::of(&**text)));
(text, file_id, search_range)
(text.clone(), file_id, search_range)
})
}
@ -854,14 +854,7 @@ impl<'a> FindUsages<'a> {
&finder,
name,
is_possibly_self.into_iter().map(|position| {
(
self.sema
.db
.file_text(position.file_id.file_id(self.sema.db))
.text(self.sema.db),
position.file_id,
position.range,
)
(position.file_text(self.sema.db).clone(), position.file_id, position.range)
}),
|path, name_position| {
let has_self = path
@ -1067,12 +1060,12 @@ impl<'a> FindUsages<'a> {
let file_text = sema.db.file_text(file_id.file_id(self.sema.db));
let text = file_text.text(sema.db);
let search_range =
search_range.unwrap_or_else(|| TextRange::up_to(TextSize::of(&*text)));
search_range.unwrap_or_else(|| TextRange::up_to(TextSize::of(&**text)));
let tree = LazyCell::new(|| sema.parse(file_id).syntax().clone());
let finder = &Finder::new("self");
for offset in Self::match_indices(&text, finder, search_range) {
for offset in Self::match_indices(text, finder, search_range) {
for name_ref in Self::find_nodes(sema, "self", file_id, &tree, offset)
.filter_map(ast::NameRef::cast)
{