Skip to content

Commit

Permalink
Merge #3440
Browse files Browse the repository at this point in the history 
3440: Move search to ra_ide_db r=matklad a=matklad

bors r+
🤖

Co-authored-by: Aleksey Kladov <aleksey.kladov@gmail.com>
  • Loading branch information
@bors @matklad
bors[bot] and matklad authored Mar 4, 2020
2 parents 66ec6bd + 4f50a37 commit 02b0206
Show file tree
Hide file tree
Showing 9 changed files with 344 additions and 335 deletions.
2 changes: 1 addition & 1 deletion Cargo.lock
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 0 additions & 1 deletion crates/ra_ide/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@ join_to_string = "0.1.3"
log = "0.4.8"
rustc-hash = "1.1.0"
rand = { version = "0.7.3", features = ["small_rng"] }
once_cell = "1.3.1"

ra_syntax = { path = "../ra_syntax" }
ra_text_edit = { path = "../ra_text_edit" }
Expand Down
5 changes: 2 additions & 3 deletions crates/ra_ide/src/lib.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -68,9 +68,7 @@ pub use crate::{
folding_ranges::{Fold, FoldKind},
hover::HoverResult,
inlay_hints::{InlayHint, InlayKind},
references::{
Declaration, Reference, ReferenceAccess, ReferenceKind, ReferenceSearchResult, SearchScope,
},
references::{Declaration, Reference, ReferenceAccess, ReferenceKind, ReferenceSearchResult},
runnables::{Runnable, RunnableKind, TestId},
source_change::{FileSystemEdit, SourceChange, SourceFileEdit},
ssr::SsrError,
Expand All @@ -88,6 +86,7 @@ pub use ra_ide_db::{
feature_flags::FeatureFlags,
line_index::{LineCol, LineIndex},
line_index_utils::translate_offset_with_edit,
search::SearchScope,
symbol_index::Query,
RootDatabase,
};
Expand Down
204 changes: 19 additions & 185 deletions crates/ra_ide/src/references.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,28 +10,25 @@
//! resolved to the search element definition, we get a reference.
mod rename;
mod search_scope;

use hir::Semantics;
use once_cell::unsync::Lazy;
use ra_db::SourceDatabaseExt;
use ra_ide_db::{
defs::{classify_name, classify_name_ref, Definition},
search::SearchScope,
RootDatabase,
};
use ra_prof::profile;
use ra_syntax::{
algo::find_node_at_offset,
ast::{self, NameOwner},
match_ast, AstNode, SyntaxKind, SyntaxNode, TextRange, TextUnit, TokenAtOffset,
AstNode, SyntaxKind, SyntaxNode, TextRange, TokenAtOffset,
};
use test_utils::tested_by;

use crate::{display::TryToNav, FilePosition, FileRange, NavigationTarget, RangeInfo};

pub(crate) use self::rename::rename;

pub use self::search_scope::SearchScope;
pub use ra_ide_db::search::{Reference, ReferenceAccess, ReferenceKind};

#[derive(Debug, Clone)]
pub struct ReferenceSearchResult {
Expand All @@ -46,25 +43,6 @@ pub struct Declaration {
pub access: Option<ReferenceAccess>,
}

#[derive(Debug, Clone)]
pub struct Reference {
pub file_range: FileRange,
pub kind: ReferenceKind,
pub access: Option<ReferenceAccess>,
}

#[derive(Debug, Clone, PartialEq)]
pub enum ReferenceKind {
StructLiteral,
Other,
}

#[derive(Debug, Copy, Clone, PartialEq)]
pub enum ReferenceAccess {
Read,
Write,
}

impl ReferenceSearchResult {
pub fn declaration(&self) -> &Declaration {
&self.declaration
Expand Down Expand Up @@ -125,7 +103,8 @@ pub(crate) fn find_all_refs(

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

let references = find_refs_to_def(db, &def, search_scope)
let references = def
.find_usages(db, search_scope)
.into_iter()
.filter(|r| search_kind == ReferenceKind::Other || search_kind == r.kind)
.collect();
Expand All @@ -141,27 +120,6 @@ pub(crate) fn find_all_refs(
Some(RangeInfo::new(range, ReferenceSearchResult { declaration, references }))
}

pub(crate) fn find_refs_to_def(
db: &RootDatabase,
def: &Definition,
search_scope: Option<SearchScope>,
) -> Vec<Reference> {
let search_scope = {
let base = SearchScope::for_def(&def, db);
match search_scope {
None => base,
Some(scope) => base.intersection(&scope),
}
};

let name = match def.name(db) {
None => return Vec::new(),
Some(it) => it.to_string(),
};

process_definition(db, def, name, search_scope)
}

fn find_name(
sema: &Semantics<RootDatabase>,
syntax: &SyntaxNode,
Expand All @@ -179,72 +137,6 @@ fn find_name(
Some(RangeInfo::new(range, def))
}

fn process_definition(
db: &RootDatabase,
def: &Definition,
name: String,
scope: SearchScope,
) -> Vec<Reference> {
let _p = profile("process_definition");

let pat = name.as_str();
let mut refs = vec![];

for (file_id, search_range) in scope {
let text = db.file_text(file_id);
let search_range =
search_range.unwrap_or(TextRange::offset_len(0.into(), TextUnit::of_str(&text)));

let sema = Semantics::new(db);
let tree = Lazy::new(|| sema.parse(file_id).syntax().clone());

for (idx, _) in text.match_indices(pat) {
let offset = TextUnit::from_usize(idx);
if !search_range.contains_inclusive(offset) {
tested_by!(search_filters_by_range);
continue;
}

let name_ref =
if let Some(name_ref) = find_node_at_offset::<ast::NameRef>(&tree, offset) {
name_ref
} else {
// Handle macro token cases
let token = match tree.token_at_offset(offset) {
TokenAtOffset::None => continue,
TokenAtOffset::Single(t) => t,
TokenAtOffset::Between(_, t) => t,
};
let expanded = sema.descend_into_macros(token);
match ast::NameRef::cast(expanded.parent()) {
Some(name_ref) => name_ref,
_ => continue,
}
};

if let Some(d) = classify_name_ref(&sema, &name_ref) {
let d = d.definition();
if &d == def {
let kind =
if is_record_lit_name_ref(&name_ref) || is_call_expr_name_ref(&name_ref) {
ReferenceKind::StructLiteral
} else {
ReferenceKind::Other
};

let file_range = sema.original_range(name_ref.syntax());
refs.push(Reference {
file_range,
kind,
access: reference_access(&d, &name_ref),
});
}
}
}
}
refs
}

fn decl_access(def: &Definition, syntax: &SyntaxNode, range: TextRange) -> Option<ReferenceAccess> {
match def {
Definition::Local(_) | Definition::StructField(_) => {}
Expand All @@ -264,48 +156,6 @@ fn decl_access(def: &Definition, syntax: &SyntaxNode, range: TextRange) -> Optio
None
}

fn reference_access(def: &Definition, name_ref: &ast::NameRef) -> Option<ReferenceAccess> {
// Only Locals and Fields have accesses for now.
match def {
Definition::Local(_) | Definition::StructField(_) => {}
_ => return None,
};

let mode = name_ref.syntax().ancestors().find_map(|node| {
match_ast! {
match (node) {
ast::BinExpr(expr) => {
if expr.op_kind()?.is_assignment() {
// If the variable or field ends on the LHS's end then it's a Write (covers fields and locals).
// FIXME: This is not terribly accurate.
if let Some(lhs) = expr.lhs() {
if lhs.syntax().text_range().end() == name_ref.syntax().text_range().end() {
return Some(ReferenceAccess::Write);
}
}
}
Some(ReferenceAccess::Read)
},
_ => {None}
}
}
});

// Default Locals and Fields to read
mode.or(Some(ReferenceAccess::Read))
}

fn is_record_lit_name_ref(name_ref: &ast::NameRef) -> bool {
name_ref
.syntax()
.ancestors()
.find_map(ast::RecordLit::cast)
.and_then(|l| l.path())
.and_then(|p| p.segment())
.map(|p| p.name_ref().as_ref() == Some(name_ref))
.unwrap_or(false)
}

fn get_struct_def_name_for_struc_litetal_search(
syntax: &SyntaxNode,
position: FilePosition,
Expand All @@ -324,20 +174,6 @@ fn get_struct_def_name_for_struc_litetal_search(
None
}

fn is_call_expr_name_ref(name_ref: &ast::NameRef) -> bool {
name_ref
.syntax()
.ancestors()
.find_map(ast::CallExpr::cast)
.and_then(|c| match c.expr()? {
ast::Expr::PathExpr(p) => {
Some(p.path()?.segment()?.name_ref().as_ref() == Some(name_ref))
}
_ => None,
})
.unwrap_or(false)
}

#[cfg(test)]
mod tests {
use test_utils::covers;
Expand Down Expand Up @@ -451,7 +287,7 @@ mod tests {

#[test]
fn search_filters_by_range() {
covers!(search_filters_by_range);
covers!(ra_ide_db::search_filters_by_range);
let code = r#"
fn foo() {
let spam<|> = 92;
Expand Down Expand Up @@ -767,7 +603,10 @@ mod tests {
fn check_result(res: ReferenceSearchResult, expected_decl: &str, expected_refs: &[&str]) {
res.declaration().assert_match(expected_decl);
assert_eq!(res.references.len(), expected_refs.len());
res.references().iter().enumerate().for_each(|(i, r)| r.assert_match(expected_refs[i]));
res.references()
.iter()
.enumerate()
.for_each(|(i, r)| ref_assert_match(r, expected_refs[i]));
}

impl Declaration {
Expand All @@ -785,21 +624,16 @@ mod tests {
}
}

impl Reference {
fn debug_render(&self) -> String {
let mut s = format!(
"{:?} {:?} {:?}",
self.file_range.file_id, self.file_range.range, self.kind
);
if let Some(access) = self.access {
s.push_str(&format!(" {:?}", access));
}
s
fn ref_debug_render(r: &Reference) -> String {
let mut s = format!("{:?} {:?} {:?}", r.file_range.file_id, r.file_range.range, r.kind);
if let Some(access) = r.access {
s.push_str(&format!(" {:?}", access));
}
s
}

fn assert_match(&self, expected: &str) {
let actual = self.debug_render();
test_utils::assert_eq_text!(expected.trim(), actual.trim(),);
}
fn ref_assert_match(r: &Reference, expected: &str) {
let actual = ref_debug_render(r);
test_utils::assert_eq_text!(expected.trim(), actual.trim(),);
}
}
Loading

0 comments on commit 02b0206

Please sign in to comment.