Skip to content

Commit 26b4777

Browse files
Move hir_ty incremental test to its own file
1 parent a2940c4 commit 26b4777

File tree

2 files changed

+52
-44
lines changed

2 files changed

+52
-44
lines changed

crates/hir_ty/src/tests.rs

Lines changed: 1 addition & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ mod traits;
77
mod method_resolution;
88
mod macros;
99
mod display_source_code;
10+
mod incremental;
1011

1112
use std::{env, sync::Arc};
1213

@@ -317,50 +318,6 @@ fn ellipsize(mut text: String, max_len: usize) -> String {
317318
text
318319
}
319320

320-
#[test]
321-
fn typing_whitespace_inside_a_function_should_not_invalidate_types() {
322-
let (mut db, pos) = TestDB::with_position(
323-
"
324-
//- /lib.rs
325-
fn foo() -> i32 {
326-
$01 + 1
327-
}
328-
",
329-
);
330-
{
331-
let events = db.log_executed(|| {
332-
let module = db.module_for_file(pos.file_id);
333-
let crate_def_map = module.def_map(&db);
334-
visit_module(&db, &crate_def_map, module.local_id, &mut |def| {
335-
db.infer(def);
336-
});
337-
});
338-
assert!(format!("{:?}", events).contains("infer"))
339-
}
340-
341-
let new_text = "
342-
fn foo() -> i32 {
343-
1
344-
+
345-
1
346-
}
347-
"
348-
.to_string();
349-
350-
db.set_file_text(pos.file_id, Arc::new(new_text));
351-
352-
{
353-
let events = db.log_executed(|| {
354-
let module = db.module_for_file(pos.file_id);
355-
let crate_def_map = module.def_map(&db);
356-
visit_module(&db, &crate_def_map, module.local_id, &mut |def| {
357-
db.infer(def);
358-
});
359-
});
360-
assert!(!format!("{:?}", events).contains("infer"), "{:#?}", events)
361-
}
362-
}
363-
364321
fn check_infer(ra_fixture: &str, expect: Expect) {
365322
let mut actual = infer(ra_fixture);
366323
actual.push('\n');
Lines changed: 51 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,51 @@
1+
use std::sync::Arc;
2+
3+
use base_db::{fixture::WithFixture, SourceDatabaseExt};
4+
5+
use crate::{db::HirDatabase, test_db::TestDB};
6+
7+
use super::visit_module;
8+
9+
#[test]
10+
fn typing_whitespace_inside_a_function_should_not_invalidate_types() {
11+
let (mut db, pos) = TestDB::with_position(
12+
"
13+
//- /lib.rs
14+
fn foo() -> i32 {
15+
$01 + 1
16+
}
17+
",
18+
);
19+
{
20+
let events = db.log_executed(|| {
21+
let module = db.module_for_file(pos.file_id);
22+
let crate_def_map = module.def_map(&db);
23+
visit_module(&db, &crate_def_map, module.local_id, &mut |def| {
24+
db.infer(def);
25+
});
26+
});
27+
assert!(format!("{:?}", events).contains("infer"))
28+
}
29+
30+
let new_text = "
31+
fn foo() -> i32 {
32+
1
33+
+
34+
1
35+
}
36+
"
37+
.to_string();
38+
39+
db.set_file_text(pos.file_id, Arc::new(new_text));
40+
41+
{
42+
let events = db.log_executed(|| {
43+
let module = db.module_for_file(pos.file_id);
44+
let crate_def_map = module.def_map(&db);
45+
visit_module(&db, &crate_def_map, module.local_id, &mut |def| {
46+
db.infer(def);
47+
});
48+
});
49+
assert!(!format!("{:?}", events).contains("infer"), "{:#?}", events)
50+
}
51+
}

0 commit comments

Comments
 (0)