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

Simplify

Browse source
This commit is contained in:
Aleksey Kladov 2018-10-24 16:36:28 +03:00
parent 44c8ddf885
commit 8ada1a2689
2 changed files with 4 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

6
crates/ra_analysis/src/imp.rs
View file

@ -207,7 +207,7 @@ impl AnalysisImpl {
let syntax = file.syntax();
if let Some(name_ref) = find_node_at_offset::<ast::NameRef>(syntax, offset) {
// First try to resolve the symbol locally
return if let Some((name, range)) = resolve_local_name(&file, offset, name_ref) {
return if let Some((name, range)) = resolve_local_name(name_ref) {
let mut vec = vec![];
vec.push((
file_id,
@ -262,7 +262,7 @@ impl AnalysisImpl {
if let Some(name_ref) = find_node_at_offset::<ast::NameRef>(syntax, offset) {
// We are only handing local references for now
if let Some(resolved) = resolve_local_name(&file, offset, name_ref) {
if let Some(resolved) = resolve_local_name(name_ref) {
ret.push((file_id, resolved.1));
@ -270,7 +270,7 @@ impl AnalysisImpl {
let refs : Vec<_> = fn_def.syntax().descendants()
.filter_map(ast::NameRef::cast)
.filter(|n: &ast::NameRef| resolve_local_name(&file, n.syntax().range().start(), *n) == Some(resolved.clone()))
.filter(|&n: &ast::NameRef| resolve_local_name(n) == Some(resolved.clone()))
.collect();
for r in refs {