diff options
author | Aleksey Kladov <[email protected]> | 2019-07-19 08:43:01 +0100 |
---|---|---|
committer | Aleksey Kladov <[email protected]> | 2019-07-19 11:16:25 +0100 |
commit | e2b28f5bb8043e92b10f6a40696131007fc9dfe2 (patch) | |
tree | c14306038e386d71ddc894d63415bf8e9a94f7e8 /crates/ra_hir/src/ty/tests.rs | |
parent | 7e02aa0efff228126ffc43e81e5e127e1b9e32dd (diff) |
migrate ra_hir to the new rowan
Diffstat (limited to 'crates/ra_hir/src/ty/tests.rs')
-rw-r--r-- | crates/ra_hir/src/ty/tests.rs | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/crates/ra_hir/src/ty/tests.rs b/crates/ra_hir/src/ty/tests.rs index 2410602a6..265740e54 100644 --- a/crates/ra_hir/src/ty/tests.rs +++ b/crates/ra_hir/src/ty/tests.rs | |||
@@ -3086,7 +3086,7 @@ fn type_at_pos(db: &MockDatabase, pos: FilePosition) -> String { | |||
3086 | let file = db.parse(pos.file_id).ok().unwrap(); | 3086 | let file = db.parse(pos.file_id).ok().unwrap(); |
3087 | let expr = algo::find_node_at_offset::<ast::Expr>(file.syntax(), pos.offset).unwrap(); | 3087 | let expr = algo::find_node_at_offset::<ast::Expr>(file.syntax(), pos.offset).unwrap(); |
3088 | let analyzer = SourceAnalyzer::new(db, pos.file_id, expr.syntax(), Some(pos.offset)); | 3088 | let analyzer = SourceAnalyzer::new(db, pos.file_id, expr.syntax(), Some(pos.offset)); |
3089 | let ty = analyzer.type_of(db, expr).unwrap(); | 3089 | let ty = analyzer.type_of(db, &expr).unwrap(); |
3090 | ty.display(db).to_string() | 3090 | ty.display(db).to_string() |
3091 | } | 3091 | } |
3092 | 3092 | ||
@@ -3126,7 +3126,7 @@ fn infer(content: &str) -> String { | |||
3126 | types.sort_by_key(|(ptr, _)| (ptr.range().start(), ptr.range().end())); | 3126 | types.sort_by_key(|(ptr, _)| (ptr.range().start(), ptr.range().end())); |
3127 | for (syntax_ptr, ty) in &types { | 3127 | for (syntax_ptr, ty) in &types { |
3128 | let node = syntax_ptr.to_node(source_file.syntax()); | 3128 | let node = syntax_ptr.to_node(source_file.syntax()); |
3129 | let (range, text) = if let Some(self_param) = ast::SelfParam::cast(node) { | 3129 | let (range, text) = if let Some(self_param) = ast::SelfParam::cast(node.clone()) { |
3130 | (self_param.self_kw_token().range(), "self".to_string()) | 3130 | (self_param.self_kw_token().range(), "self".to_string()) |
3131 | } else { | 3131 | } else { |
3132 | (syntax_ptr.range(), node.text().to_string().replace("\n", " ")) | 3132 | (syntax_ptr.range(), node.text().to_string().replace("\n", " ")) |
@@ -3137,7 +3137,7 @@ fn infer(content: &str) -> String { | |||
3137 | 3137 | ||
3138 | for node in source_file.syntax().descendants() { | 3138 | for node in source_file.syntax().descendants() { |
3139 | if node.kind() == FN_DEF || node.kind() == CONST_DEF || node.kind() == STATIC_DEF { | 3139 | if node.kind() == FN_DEF || node.kind() == CONST_DEF || node.kind() == STATIC_DEF { |
3140 | let analyzer = SourceAnalyzer::new(&db, file_id, node, None); | 3140 | let analyzer = SourceAnalyzer::new(&db, file_id, &node, None); |
3141 | infer_def(analyzer.inference_result(), analyzer.body_source_map()); | 3141 | infer_def(analyzer.inference_result(), analyzer.body_source_map()); |
3142 | } | 3142 | } |
3143 | } | 3143 | } |
@@ -3179,7 +3179,7 @@ fn typing_whitespace_inside_a_function_should_not_invalidate_types() { | |||
3179 | let node = | 3179 | let node = |
3180 | algo::find_token_at_offset(file.syntax(), pos.offset).right_biased().unwrap().parent(); | 3180 | algo::find_token_at_offset(file.syntax(), pos.offset).right_biased().unwrap().parent(); |
3181 | let events = db.log_executed(|| { | 3181 | let events = db.log_executed(|| { |
3182 | SourceAnalyzer::new(&db, pos.file_id, node, None); | 3182 | SourceAnalyzer::new(&db, pos.file_id, &node, None); |
3183 | }); | 3183 | }); |
3184 | assert!(format!("{:?}", events).contains("infer")) | 3184 | assert!(format!("{:?}", events).contains("infer")) |
3185 | } | 3185 | } |
@@ -3200,7 +3200,7 @@ fn typing_whitespace_inside_a_function_should_not_invalidate_types() { | |||
3200 | let node = | 3200 | let node = |
3201 | algo::find_token_at_offset(file.syntax(), pos.offset).right_biased().unwrap().parent(); | 3201 | algo::find_token_at_offset(file.syntax(), pos.offset).right_biased().unwrap().parent(); |
3202 | let events = db.log_executed(|| { | 3202 | let events = db.log_executed(|| { |
3203 | SourceAnalyzer::new(&db, pos.file_id, node, None); | 3203 | SourceAnalyzer::new(&db, pos.file_id, &node, None); |
3204 | }); | 3204 | }); |
3205 | assert!(!format!("{:?}", events).contains("infer"), "{:#?}", events) | 3205 | assert!(!format!("{:?}", events).contains("infer"), "{:#?}", events) |
3206 | } | 3206 | } |