Mirrors/rust-analyzer
2
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer synced 2024-12-27 13:33:31 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge #2276

Browse source 
2276: Source-ify name_definition r=matklad a=matklad



Co-authored-by: Aleksey Kladov <aleksey.kladov@gmail.com>
This commit is contained in:
bors[bot] 2019-11-16 13:50:34 +00:00 committed by GitHub
commit 786cae520a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 41 additions and 41 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

50
crates/ra_ide_api/src/goto_definition.rs
View file

@ -1,6 +1,7 @@
//! FIXME: write short doc here //! FIXME: write short doc here
use ra_db::{FileId, SourceDatabase}; use hir::Source;
use ra_db::SourceDatabase;
use ra_syntax::{ use ra_syntax::{
algo::find_node_at_offset, algo::find_node_at_offset,
ast::{self, DocCommentsOwner}, ast::{self, DocCommentsOwner},
@ -21,11 +22,12 @@ pub(crate) fn goto_definition(
let parse = db.parse(position.file_id); let parse = db.parse(position.file_id);
let syntax = parse.tree().syntax().clone(); let syntax = parse.tree().syntax().clone();
if let Some(name_ref) = find_node_at_offset::<ast::NameRef>(&syntax, position.offset) { if let Some(name_ref) = find_node_at_offset::<ast::NameRef>(&syntax, position.offset) {
let navs = reference_definition(db, position.file_id, &name_ref).to_vec(); let navs =
reference_definition(db, Source::new(position.file_id.into(), &name_ref)).to_vec();
return Some(RangeInfo::new(name_ref.syntax().text_range(), navs.to_vec())); return Some(RangeInfo::new(name_ref.syntax().text_range(), navs.to_vec()));
} }
if let Some(name) = find_node_at_offset::<ast::Name>(&syntax, position.offset) { if let Some(name) = find_node_at_offset::<ast::Name>(&syntax, position.offset) {
let navs = name_definition(db, position.file_id, &name)?; let navs = name_definition(db, Source::new(position.file_id.into(), &name))?;
return Some(RangeInfo::new(name.syntax().text_range(), navs)); return Some(RangeInfo::new(name.syntax().text_range(), navs));
} }
None None
@ -49,12 +51,11 @@ impl ReferenceResult {
pub(crate) fn reference_definition( pub(crate) fn reference_definition(
db: &RootDatabase, db: &RootDatabase,
file_id: FileId, name_ref: Source<&ast::NameRef>,
name_ref: &ast::NameRef,
) -> ReferenceResult { ) -> ReferenceResult {
use self::ReferenceResult::*; use self::ReferenceResult::*;
let name_kind = classify_name_ref(db, file_id, &name_ref).map(|d| d.kind); let name_kind = classify_name_ref(db, name_ref).map(|d| d.kind);
match name_kind { match name_kind {
Some(Macro(mac)) => return Exact(mac.to_nav(db)), Some(Macro(mac)) => return Exact(mac.to_nav(db)),
Some(Field(field)) => return Exact(field.to_nav(db)), Some(Field(field)) => return Exact(field.to_nav(db)),
@ -76,7 +77,7 @@ pub(crate) fn reference_definition(
}; };
// Fallback index based approach: // Fallback index based approach:
let navs = crate::symbol_index::index_resolve(db, name_ref) let navs = crate::symbol_index::index_resolve(db, name_ref.ast)
.into_iter() .into_iter()
.map(|s| s.to_nav(db)) .map(|s| s.to_nav(db))
.collect(); .collect();
@ -85,14 +86,13 @@ pub(crate) fn reference_definition(
pub(crate) fn name_definition( pub(crate) fn name_definition(
db: &RootDatabase, db: &RootDatabase,
file_id: FileId, name: Source<&ast::Name>,
name: &ast::Name,
) -> Option<Vec<NavigationTarget>> { ) -> Option<Vec<NavigationTarget>> {
let parent = name.syntax().parent()?; let parent = name.ast.syntax().parent()?;
if let Some(module) = ast::Module::cast(parent.clone()) { if let Some(module) = ast::Module::cast(parent.clone()) {
if module.has_semi() { if module.has_semi() {
let src = hir::Source { file_id: file_id.into(), ast: module }; let src = name.with_ast(module);
if let Some(child_module) = hir::Module::from_declaration(db, src) { if let Some(child_module) = hir::Module::from_declaration(db, src) {
let nav = child_module.to_nav(db); let nav = child_module.to_nav(db);
return Some(vec![nav]); return Some(vec![nav]);
@ -100,20 +100,20 @@ pub(crate) fn name_definition(
} }
} }
if let Some(nav) = named_target(db, file_id, &parent) { if let Some(nav) = named_target(db, name.with_ast(&parent)) {
return Some(vec![nav]); return Some(vec![nav]);
} }
None None
} }
fn named_target(db: &RootDatabase, file_id: FileId, node: &SyntaxNode) -> Option<NavigationTarget> { fn named_target(db: &RootDatabase, node: Source<&SyntaxNode>) -> Option<NavigationTarget> {
match_ast! { match_ast! {
match node { match (node.ast) {
ast::StructDef(it) => { ast::StructDef(it) => {
Some(NavigationTarget::from_named( Some(NavigationTarget::from_named(
db, db,
file_id.into(), node.file_id,
&it, &it,
it.doc_comment_text(), it.doc_comment_text(),
it.short_label(), it.short_label(),
@ -122,7 +122,7 @@ fn named_target(db: &RootDatabase, file_id: FileId, node: &SyntaxNode) -> Option
ast::EnumDef(it) => { ast::EnumDef(it) => {
Some(NavigationTarget::from_named( Some(NavigationTarget::from_named(
db, db,
file_id.into(), node.file_id,
&it, &it,
it.doc_comment_text(), it.doc_comment_text(),
it.short_label(), it.short_label(),
@ -131,7 +131,7 @@ fn named_target(db: &RootDatabase, file_id: FileId, node: &SyntaxNode) -> Option
ast::EnumVariant(it) => { ast::EnumVariant(it) => {
Some(NavigationTarget::from_named( Some(NavigationTarget::from_named(
db, db,
file_id.into(), node.file_id,
&it, &it,
it.doc_comment_text(), it.doc_comment_text(),
it.short_label(), it.short_label(),
@ -140,7 +140,7 @@ fn named_target(db: &RootDatabase, file_id: FileId, node: &SyntaxNode) -> Option
ast::FnDef(it) => { ast::FnDef(it) => {
Some(NavigationTarget::from_named( Some(NavigationTarget::from_named(
db, db,
file_id.into(), node.file_id,
&it, &it,
it.doc_comment_text(), it.doc_comment_text(),
it.short_label(), it.short_label(),
@ -149,7 +149,7 @@ fn named_target(db: &RootDatabase, file_id: FileId, node: &SyntaxNode) -> Option
ast::TypeAliasDef(it) => { ast::TypeAliasDef(it) => {
Some(NavigationTarget::from_named( Some(NavigationTarget::from_named(
db, db,
file_id.into(), node.file_id,
&it, &it,
it.doc_comment_text(), it.doc_comment_text(),
it.short_label(), it.short_label(),
@ -158,7 +158,7 @@ fn named_target(db: &RootDatabase, file_id: FileId, node: &SyntaxNode) -> Option
ast::ConstDef(it) => { ast::ConstDef(it) => {
Some(NavigationTarget::from_named( Some(NavigationTarget::from_named(
db, db,
file_id.into(), node.file_id,
&it, &it,
it.doc_comment_text(), it.doc_comment_text(),
it.short_label(), it.short_label(),
@ -167,7 +167,7 @@ fn named_target(db: &RootDatabase, file_id: FileId, node: &SyntaxNode) -> Option
ast::StaticDef(it) => { ast::StaticDef(it) => {
Some(NavigationTarget::from_named( Some(NavigationTarget::from_named(
db, db,
file_id.into(), node.file_id,
&it, &it,
it.doc_comment_text(), it.doc_comment_text(),
it.short_label(), it.short_label(),
@ -176,7 +176,7 @@ fn named_target(db: &RootDatabase, file_id: FileId, node: &SyntaxNode) -> Option
ast::TraitDef(it) => { ast::TraitDef(it) => {
Some(NavigationTarget::from_named( Some(NavigationTarget::from_named(
db, db,
file_id.into(), node.file_id,
&it, &it,
it.doc_comment_text(), it.doc_comment_text(),
it.short_label(), it.short_label(),
@ -185,7 +185,7 @@ fn named_target(db: &RootDatabase, file_id: FileId, node: &SyntaxNode) -> Option
ast::RecordFieldDef(it) => { ast::RecordFieldDef(it) => {
Some(NavigationTarget::from_named( Some(NavigationTarget::from_named(
db, db,
file_id.into(), node.file_id,
&it, &it,
it.doc_comment_text(), it.doc_comment_text(),
it.short_label(), it.short_label(),
@ -194,7 +194,7 @@ fn named_target(db: &RootDatabase, file_id: FileId, node: &SyntaxNode) -> Option
ast::Module(it) => { ast::Module(it) => {
Some(NavigationTarget::from_named( Some(NavigationTarget::from_named(
db, db,
file_id.into(), node.file_id,
&it, &it,
it.doc_comment_text(), it.doc_comment_text(),
it.short_label(), it.short_label(),
@ -203,7 +203,7 @@ fn named_target(db: &RootDatabase, file_id: FileId, node: &SyntaxNode) -> Option
ast::MacroCall(it) => { ast::MacroCall(it) => {
Some(NavigationTarget::from_named( Some(NavigationTarget::from_named(
db, db,
file_id.into(), node.file_id,
&it, &it,
it.doc_comment_text(), it.doc_comment_text(),
None, None,

5
crates/ra_ide_api/src/hover.rs
View file

@ -1,6 +1,6 @@
//! FIXME: write short doc here //! FIXME: write short doc here
use hir::{Adt, HasSource, HirDisplay}; use hir::{Adt, HasSource, HirDisplay, Source};
use ra_db::SourceDatabase; use ra_db::SourceDatabase;
use ra_syntax::{ use ra_syntax::{
algo::{ancestors_at_offset, find_covering_element, find_node_at_offset}, algo::{ancestors_at_offset, find_covering_element, find_node_at_offset},
@ -171,7 +171,8 @@ pub(crate) fn hover(db: &RootDatabase, position: FilePosition) -> Option<RangeIn
find_node_at_offset::<ast::NameRef>(file.syntax(), position.offset) find_node_at_offset::<ast::NameRef>(file.syntax(), position.offset)
{ {
let mut no_fallback = false; let mut no_fallback = false;
if let Some(name_kind) = classify_name_ref(db, position.file_id, &name_ref).map(|d| d.kind) if let Some(name_kind) =
classify_name_ref(db, Source::new(position.file_id.into(), &name_ref)).map(|d| d.kind)
{ {
res.extend(hover_text_from_name_kind(db, name_kind, &mut no_fallback)) res.extend(hover_text_from_name_kind(db, name_kind, &mut no_fallback))
} }

5
crates/ra_ide_api/src/references.rs
View file

@ -14,6 +14,7 @@ mod name_definition;
mod rename; mod rename;
mod search_scope; mod search_scope;
use hir::Source;
use once_cell::unsync::Lazy; use once_cell::unsync::Lazy;
use ra_db::{SourceDatabase, SourceDatabaseExt}; use ra_db::{SourceDatabase, SourceDatabaseExt};
use ra_prof::profile; use ra_prof::profile;
@ -114,7 +115,7 @@ fn find_name<'a>(
return Some(RangeInfo::new(range, (name.text().to_string(), def))); return Some(RangeInfo::new(range, (name.text().to_string(), def)));
} }
let name_ref = find_node_at_offset::<ast::NameRef>(&syntax, position.offset)?; let name_ref = find_node_at_offset::<ast::NameRef>(&syntax, position.offset)?;
let def = classify_name_ref(db, position.file_id, &name_ref)?; let def = classify_name_ref(db, Source::new(position.file_id.into(), &name_ref))?;
let range = name_ref.syntax().text_range(); let range = name_ref.syntax().text_range();
Some(RangeInfo::new(range, (name_ref.text().to_string(), def))) Some(RangeInfo::new(range, (name_ref.text().to_string(), def)))
} }
@ -146,7 +147,7 @@ fn process_definition(
continue; continue;
} }
} }
if let Some(d) = classify_name_ref(db, file_id, &name_ref) { if let Some(d) = classify_name_ref(db, Source::new(file_id.into(), &name_ref)) {
if d == def { if d == def {
refs.push(FileRange { file_id, range }); refs.push(FileRange { file_id, range });
} }

17
crates/ra_ide_api/src/references/classify.rs
View file

@ -123,14 +123,12 @@ pub(crate) fn classify_name(
pub(crate) fn classify_name_ref( pub(crate) fn classify_name_ref(
db: &RootDatabase, db: &RootDatabase,
file_id: FileId, name_ref: Source<&ast::NameRef>,
name_ref: &ast::NameRef,
) -> Option<NameDefinition> { ) -> Option<NameDefinition> {
let _p = profile("classify_name_ref"); let _p = profile("classify_name_ref");
let parent = name_ref.syntax().parent()?; let parent = name_ref.ast.syntax().parent()?;
let analyzer = let analyzer = SourceAnalyzer::new(db, name_ref.map(|it| it.syntax()), None);
SourceAnalyzer::new(db, hir::Source::new(file_id.into(), name_ref.syntax()), None);
if let Some(method_call) = ast::MethodCallExpr::cast(parent.clone()) { if let Some(method_call) = ast::MethodCallExpr::cast(parent.clone()) {
tested_by!(goto_definition_works_for_methods); tested_by!(goto_definition_works_for_methods);
@ -150,17 +148,16 @@ pub(crate) fn classify_name_ref(
tested_by!(goto_definition_works_for_record_fields); tested_by!(goto_definition_works_for_record_fields);
if let Some(record_lit) = record_field.syntax().ancestors().find_map(ast::RecordLit::cast) { if let Some(record_lit) = record_field.syntax().ancestors().find_map(ast::RecordLit::cast) {
let variant_def = analyzer.resolve_record_literal(&record_lit)?; let variant_def = analyzer.resolve_record_literal(&record_lit)?;
let hir_path = Path::from_name_ref(name_ref); let hir_path = Path::from_name_ref(name_ref.ast);
let hir_name = hir_path.as_ident()?; let hir_name = hir_path.as_ident()?;
let field = variant_def.field(db, hir_name)?; let field = variant_def.field(db, hir_name)?;
return Some(from_struct_field(db, field)); return Some(from_struct_field(db, field));
} }
} }
let file_id = file_id.into(); let ast = ModuleSource::from_child_node(db, name_ref.with_ast(&parent));
let ast = ModuleSource::from_child_node(db, Source::new(file_id, &parent));
// FIXME: find correct container and visibility for each case // FIXME: find correct container and visibility for each case
let container = Module::from_definition(db, Source { file_id, ast })?; let container = Module::from_definition(db, name_ref.with_ast(ast))?;
let visibility = None; let visibility = None;
if let Some(macro_call) = parent.ancestors().find_map(ast::MacroCall::cast) { if let Some(macro_call) = parent.ancestors().find_map(ast::MacroCall::cast) {
@ -171,7 +168,7 @@ pub(crate) fn classify_name_ref(
} }
} }
let path = name_ref.syntax().ancestors().find_map(ast::Path::cast)?; let path = name_ref.ast.syntax().ancestors().find_map(ast::Path::cast)?;
let resolved = analyzer.resolve_path(db, &path)?; let resolved = analyzer.resolve_path(db, &path)?;
match resolved { match resolved {
PathResolution::Def(def) => Some(from_module_def(db, def, Some(container))), PathResolution::Def(def) => Some(from_module_def(db, def, Some(container))),

5
crates/ra_ide_api/src/syntax_highlighting.rs
View file

@ -2,7 +2,7 @@
use rustc_hash::{FxHashMap, FxHashSet}; use rustc_hash::{FxHashMap, FxHashSet};
use hir::{Mutability, Name}; use hir::{Mutability, Name, Source};
use ra_db::SourceDatabase; use ra_db::SourceDatabase;
use ra_prof::profile; use ra_prof::profile;
use ra_syntax::{ast, AstNode, Direction, SyntaxElement, SyntaxKind, SyntaxKind::*, TextRange, T}; use ra_syntax::{ast, AstNode, Direction, SyntaxElement, SyntaxKind, SyntaxKind::*, TextRange, T};
@ -80,7 +80,8 @@ pub(crate) fn highlight(db: &RootDatabase, file_id: FileId) -> Vec<HighlightedRa
} }
let name_ref = node.as_node().cloned().and_then(ast::NameRef::cast).unwrap(); let name_ref = node.as_node().cloned().and_then(ast::NameRef::cast).unwrap();
let name_kind = classify_name_ref(db, file_id, &name_ref).map(|d| d.kind); let name_kind =
classify_name_ref(db, Source::new(file_id.into(), &name_ref)).map(|d| d.kind);
if let Some(Local(local)) = &name_kind { if let Some(Local(local)) = &name_kind {
if let Some(name) = local.name(db) { if let Some(name) = local.name(db) {