aboutsummaryrefslogtreecommitdiff
path: root/crates/ra_hir
diff options
context:
space:
mode:
Diffstat (limited to 'crates/ra_hir')
-rw-r--r--crates/ra_hir/src/expr.rs2
-rw-r--r--crates/ra_hir/src/expr/scope.rs2
-rw-r--r--crates/ra_hir/src/source_binder.rs2
-rw-r--r--crates/ra_hir/src/ty/tests.rs2
4 files changed, 4 insertions, 4 deletions
diff --git a/crates/ra_hir/src/expr.rs b/crates/ra_hir/src/expr.rs
index 7e3e0a07d..4dcea19a9 100644
--- a/crates/ra_hir/src/expr.rs
+++ b/crates/ra_hir/src/expr.rs
@@ -851,7 +851,7 @@ where
851 let file_id = call_id.as_file(MacroFileKind::Expr); 851 let file_id = call_id.as_file(MacroFileKind::Expr);
852 if let Some(node) = self.db.parse_or_expand(file_id) { 852 if let Some(node) = self.db.parse_or_expand(file_id) {
853 if let Some(expr) = ast::Expr::cast(node) { 853 if let Some(expr) = ast::Expr::cast(node) {
854 log::debug!("macro expansion {}", expr.syntax().debug_dump()); 854 log::debug!("macro expansion {:#?}", expr.syntax());
855 let old_file_id = 855 let old_file_id =
856 std::mem::replace(&mut self.current_file_id, file_id); 856 std::mem::replace(&mut self.current_file_id, file_id);
857 let id = self.collect_expr(expr); 857 let id = self.collect_expr(expr);
diff --git a/crates/ra_hir/src/expr/scope.rs b/crates/ra_hir/src/expr/scope.rs
index 6589b782c..79e1857f9 100644
--- a/crates/ra_hir/src/expr/scope.rs
+++ b/crates/ra_hir/src/expr/scope.rs
@@ -296,7 +296,7 @@ mod tests {
296 let local_name_entry = analyzer.resolve_local_name(&name_ref).unwrap(); 296 let local_name_entry = analyzer.resolve_local_name(&name_ref).unwrap();
297 let local_name = 297 let local_name =
298 local_name_entry.ptr().either(|it| it.syntax_node_ptr(), |it| it.syntax_node_ptr()); 298 local_name_entry.ptr().either(|it| it.syntax_node_ptr(), |it| it.syntax_node_ptr());
299 assert_eq!(local_name.range(), expected_name.syntax().range()); 299 assert_eq!(local_name.range(), expected_name.syntax().text_range());
300 } 300 }
301 301
302 #[test] 302 #[test]
diff --git a/crates/ra_hir/src/source_binder.rs b/crates/ra_hir/src/source_binder.rs
index df67d2c39..4c173a4f7 100644
--- a/crates/ra_hir/src/source_binder.rs
+++ b/crates/ra_hir/src/source_binder.rs
@@ -361,7 +361,7 @@ impl SourceAnalyzer {
361 }) 361 })
362 .map(|name_ref| ReferenceDescriptor { 362 .map(|name_ref| ReferenceDescriptor {
363 name: name_ref.text().to_string(), 363 name: name_ref.text().to_string(),
364 range: name_ref.syntax().range(), 364 range: name_ref.syntax().text_range(),
365 }) 365 })
366 .collect() 366 .collect()
367 } 367 }
diff --git a/crates/ra_hir/src/ty/tests.rs b/crates/ra_hir/src/ty/tests.rs
index d4bfcb888..706500484 100644
--- a/crates/ra_hir/src/ty/tests.rs
+++ b/crates/ra_hir/src/ty/tests.rs
@@ -3162,7 +3162,7 @@ fn infer(content: &str) -> String {
3162 for (syntax_ptr, ty) in &types { 3162 for (syntax_ptr, ty) in &types {
3163 let node = syntax_ptr.to_node(source_file.syntax()); 3163 let node = syntax_ptr.to_node(source_file.syntax());
3164 let (range, text) = if let Some(self_param) = ast::SelfParam::cast(node.clone()) { 3164 let (range, text) = if let Some(self_param) = ast::SelfParam::cast(node.clone()) {
3165 (self_param.self_kw_token().range(), "self".to_string()) 3165 (self_param.self_kw_token().text_range(), "self".to_string())
3166 } else { 3166 } else {
3167 (syntax_ptr.range(), node.text().to_string().replace("\n", " ")) 3167 (syntax_ptr.range(), node.text().to_string().replace("\n", " "))
3168 }; 3168 };