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 From 55f3ca2b7442761593e172e094a69660f4993b74 Mon Sep 17 00:00:00 2001 From: Jonas Schievink Date: Fri, 28 May 2021 00:46:05 +0200 Subject: Test that `ItemTree` works as intended --- crates/hir_def/src/nameres/tests/incremental.rs | 74 ++++++++++++++++++++++++- 1 file changed, 73 insertions(+), 1 deletion(-) diff --git a/crates/hir_def/src/nameres/tests/incremental.rs b/crates/hir_def/src/nameres/tests/incremental.rs index d884a6eb4..7bf152e26 100644 --- a/crates/hir_def/src/nameres/tests/incremental.rs +++ b/crates/hir_def/src/nameres/tests/incremental.rs @@ -1,6 +1,8 @@ use std::sync::Arc; -use base_db::SourceDatabaseExt; +use base_db::{salsa::SweepStrategy, SourceDatabaseExt}; + +use crate::{AdtId, ModuleDefId}; use super::*; @@ -163,3 +165,73 @@ m!(Z); assert_eq!(n_reparsed_macros, 0); } } + +#[test] +fn item_tree_prevents_reparsing() { + // The `ItemTree` is used by both name resolution and the various queries in `adt.rs` and + // `data.rs`. After computing the `ItemTree` and deleting the parse tree, we should be able to + // run those other queries without triggering a reparse. + + let (db, pos) = TestDB::with_position( + r#" +pub struct S; +pub union U {} +pub enum E { + Variant, +} +pub fn f(_: S) { $0 } +pub trait Tr {} +impl Tr for () {} +pub const C: u8 = 0; +pub static ST: u8 = 0; +pub type Ty = (); +"#, + ); + let krate = db.test_crate(); + { + let events = db.log_executed(|| { + db.file_item_tree(pos.file_id.into()); + }); + let n_calculated_item_trees = events.iter().filter(|it| it.contains("item_tree")).count(); + assert_eq!(n_calculated_item_trees, 1); + let n_parsed_files = events.iter().filter(|it| it.contains("parse(")).count(); + assert_eq!(n_parsed_files, 1); + } + + // Delete the parse tree. + let sweep = SweepStrategy::default().discard_values().sweep_all_revisions(); + base_db::ParseQuery.in_db(&db).sweep(sweep); + + { + let events = db.log_executed(|| { + let crate_def_map = db.crate_def_map(krate); + let (_, module_data) = crate_def_map.modules.iter().last().unwrap(); + assert_eq!(module_data.scope.resolutions().count(), 8); + assert_eq!(module_data.scope.impls().count(), 1); + + for imp in module_data.scope.impls() { + db.impl_data(imp); + } + + for (_, res) in module_data.scope.resolutions() { + match res.values.or(res.types).unwrap().0 { + ModuleDefId::FunctionId(f) => drop(db.function_data(f)), + ModuleDefId::AdtId(adt) => match adt { + AdtId::StructId(it) => drop(db.struct_data(it)), + AdtId::UnionId(it) => drop(db.union_data(it)), + AdtId::EnumId(it) => drop(db.enum_data(it)), + }, + ModuleDefId::ConstId(it) => drop(db.const_data(it)), + ModuleDefId::StaticId(it) => drop(db.static_data(it)), + ModuleDefId::TraitId(it) => drop(db.trait_data(it)), + ModuleDefId::TypeAliasId(it) => drop(db.type_alias_data(it)), + ModuleDefId::EnumVariantId(_) + | ModuleDefId::ModuleId(_) + | ModuleDefId::BuiltinType(_) => unreachable!(), + } + } + }); + let n_reparsed_files = events.iter().filter(|it| it.contains("parse(")).count(); + assert_eq!(n_reparsed_files, 0); + } +} -- cgit v1.2.3