rust-lang/rust
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Add ra_ide_api::expand

Browse Source 
This module should handle all tricky bits with mapping macro-expanded
HirFileId to original files the user actually can see in the editor
This commit is contained in:
Aleksey Kladov
2019-11-18 14:23:24 +03:00
parent 6d8ca870b3
commit 9fcd98e956
4 changed files with 69 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

54
crates/ra_ide_api/src/display/navigation_target.rs
View File

@@ -9,8 +9,9 @@ use ra_syntax::{
SyntaxNode, TextRange,
};
use crate::{db::RootDatabase, expand::original_range, FileSymbol};
use super::short_label::ShortLabel;
use crate::{db::RootDatabase, FileSymbol};
/// `NavigationTarget` represents and element in the editor's UI which you can
/// click on to navigate to a particular piece of code.
@@ -79,13 +80,12 @@ impl NavigationTarget {
pub(crate) fn from_module_to_decl(db: &RootDatabase, module: hir::Module) -> NavigationTarget {
let name = module.name(db).map(|it| it.to_string().into()).unwrap_or_default();
if let Some(src) = module.declaration_source(db) {
let (file_id, text_range) =
find_range_from_node(db, src.as_ref().map(|it| it.syntax()));
let frange = original_range(db, src.as_ref().map(|it| it.syntax()));
return NavigationTarget::from_syntax(
file_id,
frange.file_id,
name,
None,
text_range,
frange.range,
src.ast.syntax(),
src.ast.doc_comment_text(),
src.ast.short_label(),
@@ -149,14 +149,14 @@ impl NavigationTarget {
//FIXME: use `_` instead of empty string
let name = node.name().map(|it| it.text().clone()).unwrap_or_default();
let focus_range =
node.name().map(|it| find_range_from_node(db, Source::new(file_id, it.syntax())).1);
let (file_id, full_range) = find_range_from_node(db, Source::new(file_id, node.syntax()));
node.name().map(|it| original_range(db, Source::new(file_id, it.syntax())).range);
let frange = original_range(db, Source::new(file_id, node.syntax()));
NavigationTarget::from_syntax(
file_id,
frange.file_id,
name,
focus_range,
full_range,
frange.range,
node.syntax(),
docs,
description,
@@ -234,26 +234,26 @@ impl ToNav for hir::Module {
let name = self.name(db).map(|it| it.to_string().into()).unwrap_or_default();
match &src.ast {
ModuleSource::SourceFile(node) => {
let (file_id, text_range) = find_range_from_node(db, src.with_ast(node.syntax()));
let frange = original_range(db, src.with_ast(node.syntax()));
NavigationTarget::from_syntax(
file_id,
frange.file_id,
name,
None,
text_range,
frange.range,
node.syntax(),
None,
None,
)
}
ModuleSource::Module(node) => {
let (file_id, text_range) = find_range_from_node(db, src.with_ast(node.syntax()));
let frange = original_range(db, src.with_ast(node.syntax()));
NavigationTarget::from_syntax(
file_id,
frange.file_id,
name,
None,
text_range,
frange.range,
node.syntax(),
node.doc_comment_text(),
node.short_label(),
@@ -266,13 +266,13 @@ impl ToNav for hir::Module {
impl ToNav for hir::ImplBlock {
fn to_nav(&self, db: &RootDatabase) -> NavigationTarget {
let src = self.source(db);
let (file_id, text_range) = find_range_from_node(db, src.as_ref().map(|it| it.syntax()));
let frange = original_range(db, src.as_ref().map(|it| it.syntax()));
NavigationTarget::from_syntax(
file_id,
frange.file_id,
"impl".into(),
None,
text_range,
frange.range,
src.ast.syntax(),
None,
None,
@@ -293,12 +293,12 @@ impl ToNav for hir::StructField {
it.short_label(),
),
FieldSource::Pos(it) => {
let (file_id, text_range) = find_range_from_node(db, src.with_ast(it.syntax()));
let frange = original_range(db, src.with_ast(it.syntax()));
NavigationTarget::from_syntax(
file_id,
frange.file_id,
"".into(),
None,
text_range,
frange.range,
it.syntax(),
None,
None,
@@ -362,18 +362,6 @@ impl ToNav for hir::Local {
}
}
fn find_range_from_node(db: &RootDatabase, node: Source<&SyntaxNode>) -> (FileId, TextRange) {
let text_range = node.ast.text_range();
let (file_id, text_range) = node
.file_id
.expansion_info(db)
.and_then(|expansion_info| expansion_info.find_range(text_range))
.unwrap_or((node.file_id, text_range));
// FIXME: handle recursive macro generated macro
(file_id.original_file(db), text_range)
}
pub(crate) fn docs_from_symbol(db: &RootDatabase, symbol: &FileSymbol) -> Option<String> {
let parse = db.parse(symbol.file_id);
let node = symbol.ptr.to_node(parse.tree().syntax());