squiid/rust
1
0
Fork 0
Code Issues Pull requests Projects Activity

Source-ify name_definition

Browse source
This commit is contained in:
Aleksey Kladov 2019-11-16 13:50:04 +03:00
parent 272af56a5c
commit 3b7cf9226d
1 changed files with 19 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1,7 +1,7 @@
//! FIXME: write short doc here //! FIXME: write short doc here
use hir::Source; use hir::Source;
use ra_db::{FileId, SourceDatabase}; 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},
@ -27,7 +27,7 @@ pub(crate) fn goto_definition(
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
@ -86,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]);
@ -101,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(),
@ -123,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(),
@ -132,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(),
@ -141,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(),
@ -150,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(),
@ -159,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(),
@ -168,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(),
@ -177,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(),
@ -186,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(),
@ -195,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(),
@ -204,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,