Skip to content

Commit bf889bc

Browse files
bors[bot]Veykril
andauthored
Merge #7340
7340: Remove obsolete RangeInfo usage in references r=Veykril a=Veykril Didn't even realize these were only here for renaming as well! bors r+ Co-authored-by: Lukas Wirth <[email protected]>
2 parents 0791c8e + e31420f commit bf889bc

File tree

3 files changed

+20
-38
lines changed

3 files changed

+20
-38
lines changed

crates/ide/src/call_hierarchy.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ pub(crate) fn incoming_calls(db: &RootDatabase, position: FilePosition) -> Optio
4747

4848
let mut calls = CallLocations::default();
4949

50-
for (&file_id, references) in refs.info.references().iter() {
50+
for (&file_id, references) in refs.references().iter() {
5151
let file = sema.parse(file_id);
5252
let file = file.syntax();
5353
for reference in references {

crates/ide/src/lib.rs

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -369,9 +369,7 @@ impl Analysis {
369369
position: FilePosition,
370370
search_scope: Option<SearchScope>,
371371
) -> Cancelable<Option<ReferenceSearchResult>> {
372-
self.with_db(|db| {
373-
references::find_all_refs(&Semantics::new(db), position, search_scope).map(|it| it.info)
374-
})
372+
self.with_db(|db| references::find_all_refs(&Semantics::new(db), position, search_scope))
375373
}
376374

377375
/// Finds all methods and free functions for the file. Does not return tests!

crates/ide/src/references.rs

Lines changed: 18 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ use syntax::{
2525
AstNode, SyntaxNode, TextRange, TokenAtOffset, T,
2626
};
2727

28-
use crate::{display::TryToNav, FilePosition, FileRange, NavigationTarget, RangeInfo};
28+
use crate::{display::TryToNav, FilePosition, NavigationTarget};
2929

3030
#[derive(Debug, Clone)]
3131
pub struct ReferenceSearchResult {
@@ -41,14 +41,6 @@ pub struct Declaration {
4141
}
4242

4343
impl ReferenceSearchResult {
44-
pub fn declaration(&self) -> &Declaration {
45-
&self.declaration
46-
}
47-
48-
pub fn decl_target(&self) -> &NavigationTarget {
49-
&self.declaration.nav
50-
}
51-
5244
pub fn references(&self) -> &UsageSearchResult {
5345
&self.references
5446
}
@@ -87,7 +79,7 @@ pub(crate) fn find_all_refs(
8779
sema: &Semantics<RootDatabase>,
8880
position: FilePosition,
8981
search_scope: Option<SearchScope>,
90-
) -> Option<RangeInfo<ReferenceSearchResult>> {
82+
) -> Option<ReferenceSearchResult> {
9183
let _p = profile::span("find_all_refs");
9284
let syntax = sema.parse(position.file_id).syntax().clone();
9385

@@ -105,7 +97,7 @@ pub(crate) fn find_all_refs(
10597
)
10698
};
10799

108-
let RangeInfo { range, info: def } = find_name(&sema, &syntax, position, opt_name)?;
100+
let def = find_name(&sema, &syntax, position, opt_name)?;
109101

110102
let mut usages = def.usages(sema).set_scope(search_scope).all();
111103
usages
@@ -139,43 +131,35 @@ pub(crate) fn find_all_refs(
139131

140132
let declaration = Declaration { nav, kind, access: decl_access(&def, &syntax, decl_range) };
141133

142-
Some(RangeInfo::new(range, ReferenceSearchResult { declaration, references: usages }))
134+
Some(ReferenceSearchResult { declaration, references: usages })
143135
}
144136

145137
fn find_name(
146138
sema: &Semantics<RootDatabase>,
147139
syntax: &SyntaxNode,
148140
position: FilePosition,
149141
opt_name: Option<ast::Name>,
150-
) -> Option<RangeInfo<Definition>> {
151-
if let Some(name) = opt_name {
152-
let def = NameClass::classify(sema, &name)?.referenced_or_defined(sema.db);
153-
let FileRange { range, .. } = sema.original_range(name.syntax());
154-
return Some(RangeInfo::new(range, def));
155-
}
156-
157-
let (FileRange { range, .. }, def) = if let Some(lifetime) =
142+
) -> Option<Definition> {
143+
let def = if let Some(name) = opt_name {
144+
NameClass::classify(sema, &name)?.referenced_or_defined(sema.db)
145+
} else if let Some(lifetime) =
158146
sema.find_node_at_offset_with_descend::<ast::Lifetime>(&syntax, position.offset)
159147
{
160-
if let Some(def) = NameRefClass::classify_lifetime(sema, &lifetime)
161-
.map(|class| NameRefClass::referenced(class, sema.db))
148+
if let Some(def) =
149+
NameRefClass::classify_lifetime(sema, &lifetime).map(|class| class.referenced(sema.db))
162150
{
163-
(sema.original_range(lifetime.syntax()), def)
151+
def
164152
} else {
165-
(
166-
sema.original_range(lifetime.syntax()),
167-
NameClass::classify_lifetime(sema, &lifetime)?.referenced_or_defined(sema.db),
168-
)
153+
NameClass::classify_lifetime(sema, &lifetime)?.referenced_or_defined(sema.db)
169154
}
155+
} else if let Some(name_ref) =
156+
sema.find_node_at_offset_with_descend::<ast::NameRef>(&syntax, position.offset)
157+
{
158+
NameRefClass::classify(sema, &name_ref)?.referenced(sema.db)
170159
} else {
171-
let name_ref =
172-
sema.find_node_at_offset_with_descend::<ast::NameRef>(&syntax, position.offset)?;
173-
(
174-
sema.original_range(name_ref.syntax()),
175-
NameRefClass::classify(sema, &name_ref)?.referenced(sema.db),
176-
)
160+
return None;
177161
};
178-
Some(RangeInfo::new(range, def))
162+
Some(def)
179163
}
180164

181165
fn decl_access(def: &Definition, syntax: &SyntaxNode, range: TextRange) -> Option<ReferenceAccess> {

0 commit comments

Comments
 (0)