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

move nav to a separate file

Browse source
This commit is contained in:
Aleksey Kladov 2019-01-11 13:01:35 +03:00
parent f848aa97ab
commit 2aa125251e
2 changed files with 88 additions and 73 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

75
crates/ra_ide_api/src/lib.rs
View file

@ -22,6 +22,7 @@ mod db;
mod imp;
pub mod mock_analysis;
mod symbol_index;
mod navigation_target;
mod completion;
mod runnables;
@ -33,8 +34,7 @@ mod syntax_highlighting;
use std::{fmt, sync::Arc};
use hir::{Def, ModuleSource, Name};
use ra_syntax::{SmolStr, SourceFile, TreePtr, SyntaxKind, SyntaxNode, TextRange, TextUnit, AstNode};
use ra_syntax::{SmolStr, SourceFile, TreePtr, SyntaxKind, TextRange, TextUnit};
use ra_text_edit::TextEdit;
use ra_db::{SyntaxDatabase, FilesDatabase, LocalSyntaxPtr, BaseDatabase};
use rayon::prelude::*;
@ -259,77 +259,6 @@ pub struct NavigationTarget {
}
impl NavigationTarget {
fn from_symbol(symbol: FileSymbol) -> NavigationTarget {
NavigationTarget {
file_id: symbol.file_id,
name: symbol.name.clone(),
kind: symbol.ptr.kind(),
range: symbol.ptr.range(),
ptr: Some(symbol.ptr.clone()),
}
}
fn from_syntax(name: Option<Name>, file_id: FileId, node: &SyntaxNode) -> NavigationTarget {
NavigationTarget {
file_id,
name: name.map(|n| n.to_string().into()).unwrap_or("".into()),
kind: node.kind(),
range: node.range(),
ptr: Some(LocalSyntaxPtr::new(node)),
}
}
// TODO once Def::Item is gone, this should be able to always return a NavigationTarget
fn from_def(db: &db::RootDatabase, def: Def) -> Cancelable<Option<NavigationTarget>> {
Ok(match def {
Def::Struct(s) => {
let (file_id, node) = s.source(db)?;
Some(NavigationTarget::from_syntax(
s.name(db)?,
file_id.original_file(db),
node.syntax(),
))
}
Def::Enum(e) => {
let (file_id, node) = e.source(db)?;
Some(NavigationTarget::from_syntax(
e.name(db)?,
file_id.original_file(db),
node.syntax(),
))
}
Def::EnumVariant(ev) => {
let (file_id, node) = ev.source(db)?;
Some(NavigationTarget::from_syntax(
ev.name(db)?,
file_id.original_file(db),
node.syntax(),
))
}
Def::Function(f) => {
let (file_id, node) = f.source(db)?;
let name = f.signature(db).name().clone();
Some(NavigationTarget::from_syntax(
Some(name),
file_id.original_file(db),
node.syntax(),
))
}
Def::Module(m) => {
let (file_id, source) = m.definition_source(db)?;
let name = m.name(db)?;
match source {
ModuleSource::SourceFile(node) => {
Some(NavigationTarget::from_syntax(name, file_id, node.syntax()))
}
ModuleSource::Module(node) => {
Some(NavigationTarget::from_syntax(name, file_id, node.syntax()))
}
}
}
Def::Item => None,
})
}
pub fn name(&self) -> &SmolStr {
&self.name
}

86
crates/ra_ide_api/src/navigation_target.rs Normal file
View file

@ -0,0 +1,86 @@
use ra_db::{FileId, LocalSyntaxPtr, Cancelable};
use ra_syntax::{SyntaxNode, AstNode};
use hir::{Name, Def, ModuleSource};
use crate::{
NavigationTarget,
FileSymbol,
db::RootDatabase,
};
impl NavigationTarget {
pub(crate) fn from_symbol(symbol: FileSymbol) -> NavigationTarget {
NavigationTarget {
file_id: symbol.file_id,
name: symbol.name.clone(),
kind: symbol.ptr.kind(),
range: symbol.ptr.range(),
ptr: Some(symbol.ptr.clone()),
}
}
pub(crate) fn from_syntax(
name: Option<Name>,
file_id: FileId,
node: &SyntaxNode,
) -> NavigationTarget {
NavigationTarget {
file_id,
name: name.map(|n| n.to_string().into()).unwrap_or("".into()),
kind: node.kind(),
range: node.range(),
ptr: Some(LocalSyntaxPtr::new(node)),
}
}
// TODO once Def::Item is gone, this should be able to always return a NavigationTarget
pub(crate) fn from_def(db: &RootDatabase, def: Def) -> Cancelable<Option<NavigationTarget>> {
Ok(match def {
Def::Struct(s) => {
let (file_id, node) = s.source(db)?;
Some(NavigationTarget::from_syntax(
s.name(db)?,
file_id.original_file(db),
node.syntax(),
))
}
Def::Enum(e) => {
let (file_id, node) = e.source(db)?;
Some(NavigationTarget::from_syntax(
e.name(db)?,
file_id.original_file(db),
node.syntax(),
))
}
Def::EnumVariant(ev) => {
let (file_id, node) = ev.source(db)?;
Some(NavigationTarget::from_syntax(
ev.name(db)?,
file_id.original_file(db),
node.syntax(),
))
}
Def::Function(f) => {
let (file_id, node) = f.source(db)?;
let name = f.signature(db).name().clone();
Some(NavigationTarget::from_syntax(
Some(name),
file_id.original_file(db),
node.syntax(),
))
}
Def::Module(m) => {
let (file_id, source) = m.definition_source(db)?;
let name = m.name(db)?;
match source {
ModuleSource::SourceFile(node) => {
Some(NavigationTarget::from_syntax(name, file_id, node.syntax()))
}
ModuleSource::Module(node) => {
Some(NavigationTarget::from_syntax(name, file_id, node.syntax()))
}
}
}
Def::Item => None,
})
}
}