From 26b4777e1fce193e0842b7a1c9b85f08eb3ae2d7 Mon Sep 17 00:00:00 2001 From: Jonas Schievink Date: Thu, 27 May 2021 20:21:52 +0200 Subject: Move hir_ty incremental test to its own file --- crates/hir_ty/src/tests.rs | 45 +----------------------------- crates/hir_ty/src/tests/incremental.rs | 51 ++++++++++++++++++++++++++++++++++ 2 files changed, 52 insertions(+), 44 deletions(-) create mode 100644 crates/hir_ty/src/tests/incremental.rs diff --git a/crates/hir_ty/src/tests.rs b/crates/hir_ty/src/tests.rs index cc819373c..9d726b024 100644 --- a/crates/hir_ty/src/tests.rs +++ b/crates/hir_ty/src/tests.rs @@ -7,6 +7,7 @@ mod traits; mod method_resolution; mod macros; mod display_source_code; +mod incremental; use std::{env, sync::Arc}; @@ -317,50 +318,6 @@ fn ellipsize(mut text: String, max_len: usize) -> String { text } -#[test] -fn typing_whitespace_inside_a_function_should_not_invalidate_types() { - let (mut db, pos) = TestDB::with_position( - " - //- /lib.rs - fn foo() -> i32 { - $01 + 1 - } - ", - ); - { - let events = db.log_executed(|| { - let module = db.module_for_file(pos.file_id); - let crate_def_map = module.def_map(&db); - visit_module(&db, &crate_def_map, module.local_id, &mut |def| { - db.infer(def); - }); - }); - assert!(format!("{:?}", events).contains("infer")) - } - - let new_text = " - fn foo() -> i32 { - 1 - + - 1 - } - " - .to_string(); - - db.set_file_text(pos.file_id, Arc::new(new_text)); - - { - let events = db.log_executed(|| { - let module = db.module_for_file(pos.file_id); - let crate_def_map = module.def_map(&db); - visit_module(&db, &crate_def_map, module.local_id, &mut |def| { - db.infer(def); - }); - }); - assert!(!format!("{:?}", events).contains("infer"), "{:#?}", events) - } -} - fn check_infer(ra_fixture: &str, expect: Expect) { let mut actual = infer(ra_fixture); actual.push('\n'); diff --git a/crates/hir_ty/src/tests/incremental.rs b/crates/hir_ty/src/tests/incremental.rs new file mode 100644 index 000000000..3e08e83e8 --- /dev/null +++ b/crates/hir_ty/src/tests/incremental.rs @@ -0,0 +1,51 @@ +use std::sync::Arc; + +use base_db::{fixture::WithFixture, SourceDatabaseExt}; + +use crate::{db::HirDatabase, test_db::TestDB}; + +use super::visit_module; + +#[test] +fn typing_whitespace_inside_a_function_should_not_invalidate_types() { + let (mut db, pos) = TestDB::with_position( + " + //- /lib.rs + fn foo() -> i32 { + $01 + 1 + } + ", + ); + { + let events = db.log_executed(|| { + let module = db.module_for_file(pos.file_id); + let crate_def_map = module.def_map(&db); + visit_module(&db, &crate_def_map, module.local_id, &mut |def| { + db.infer(def); + }); + }); + assert!(format!("{:?}", events).contains("infer")) + } + + let new_text = " + fn foo() -> i32 { + 1 + + + 1 + } + " + .to_string(); + + db.set_file_text(pos.file_id, Arc::new(new_text)); + + { + let events = db.log_executed(|| { + let module = db.module_for_file(pos.file_id); + let crate_def_map = module.def_map(&db); + visit_module(&db, &crate_def_map, module.local_id, &mut |def| { + db.infer(def); + }); + }); + assert!(!format!("{:?}", events).contains("infer"), "{:#?}", events) + } +} -- cgit v1.2.3