aboutsummaryrefslogtreecommitdiff
path: root/crates/ra_ide_api/src/display
diff options
context:
space:
mode:
Diffstat (limited to 'crates/ra_ide_api/src/display')
-rw-r--r--crates/ra_ide_api/src/display/navigation_target.rs6
-rw-r--r--crates/ra_ide_api/src/display/structure.rs8
2 files changed, 7 insertions, 7 deletions
diff --git a/crates/ra_ide_api/src/display/navigation_target.rs b/crates/ra_ide_api/src/display/navigation_target.rs
index 8aff5f2cd..84fabdb9e 100644
--- a/crates/ra_ide_api/src/display/navigation_target.rs
+++ b/crates/ra_ide_api/src/display/navigation_target.rs
@@ -233,7 +233,7 @@ impl NavigationTarget {
233 233
234 pub(crate) fn from_macro_def(db: &RootDatabase, macro_call: hir::MacroDef) -> NavigationTarget { 234 pub(crate) fn from_macro_def(db: &RootDatabase, macro_call: hir::MacroDef) -> NavigationTarget {
235 let src = macro_call.source(db); 235 let src = macro_call.source(db);
236 log::debug!("nav target {}", src.ast.syntax().debug_dump()); 236 log::debug!("nav target {:#?}", src.ast.syntax());
237 NavigationTarget::from_named( 237 NavigationTarget::from_named(
238 src.file_id.original_file(db), 238 src.file_id.original_file(db),
239 &src.ast, 239 &src.ast,
@@ -275,7 +275,7 @@ impl NavigationTarget {
275 ) -> NavigationTarget { 275 ) -> NavigationTarget {
276 //FIXME: use `_` instead of empty string 276 //FIXME: use `_` instead of empty string
277 let name = node.name().map(|it| it.text().clone()).unwrap_or_default(); 277 let name = node.name().map(|it| it.text().clone()).unwrap_or_default();
278 let focus_range = node.name().map(|it| it.syntax().range()); 278 let focus_range = node.name().map(|it| it.syntax().text_range());
279 NavigationTarget::from_syntax(file_id, name, focus_range, node.syntax(), docs, description) 279 NavigationTarget::from_syntax(file_id, name, focus_range, node.syntax(), docs, description)
280 } 280 }
281 281
@@ -291,7 +291,7 @@ impl NavigationTarget {
291 file_id, 291 file_id,
292 name, 292 name,
293 kind: node.kind(), 293 kind: node.kind(),
294 full_range: node.range(), 294 full_range: node.text_range(),
295 focus_range, 295 focus_range,
296 // ptr: Some(LocalSyntaxPtr::new(node)), 296 // ptr: Some(LocalSyntaxPtr::new(node)),
297 container_name: None, 297 container_name: None,
diff --git a/crates/ra_ide_api/src/display/structure.rs b/crates/ra_ide_api/src/display/structure.rs
index 0b1a8b6e6..2ba10b2ef 100644
--- a/crates/ra_ide_api/src/display/structure.rs
+++ b/crates/ra_ide_api/src/display/structure.rs
@@ -73,8 +73,8 @@ fn structure_node(node: &SyntaxNode) -> Option<StructureNode> {
73 Some(StructureNode { 73 Some(StructureNode {
74 parent: None, 74 parent: None,
75 label: name.text().to_string(), 75 label: name.text().to_string(),
76 navigation_range: name.syntax().range(), 76 navigation_range: name.syntax().text_range(),
77 node_range: node.syntax().range(), 77 node_range: node.syntax().text_range(),
78 kind: node.syntax().kind(), 78 kind: node.syntax().kind(),
79 detail, 79 detail,
80 deprecated: node.attrs().filter_map(|x| x.as_named()).any(|x| x == "deprecated"), 80 deprecated: node.attrs().filter_map(|x| x.as_named()).any(|x| x == "deprecated"),
@@ -140,8 +140,8 @@ fn structure_node(node: &SyntaxNode) -> Option<StructureNode> {
140 let node = StructureNode { 140 let node = StructureNode {
141 parent: None, 141 parent: None,
142 label, 142 label,
143 navigation_range: target_type.syntax().range(), 143 navigation_range: target_type.syntax().text_range(),
144 node_range: im.syntax().range(), 144 node_range: im.syntax().text_range(),
145 kind: im.syntax().kind(), 145 kind: im.syntax().kind(),
146 detail: None, 146 detail: None,
147 deprecated: false, 147 deprecated: false,