bendns' repos / rust-analyzer
Unnamed repository; edit this file 'description' to name the repository.
Diffstat (limited to 'crates/ide-completion/src/tests/flyimport.rs')
-rw-r--r--crates/ide-completion/src/tests/flyimport.rs41
1 files changed, 23 insertions, 18 deletions
diff --git a/crates/ide-completion/src/tests/flyimport.rs b/crates/ide-completion/src/tests/flyimport.rs
index 27c91bc7c4..d78a373101 100644
--- a/crates/ide-completion/src/tests/flyimport.rs
+++ b/crates/ide-completion/src/tests/flyimport.rs
@@ -1,3 +1,4 @@
+use base_db::salsa;
use expect_test::{Expect, expect};
use crate::{
@@ -19,25 +20,29 @@ fn check_with_config(
let (ctx, analysis) = crate::context::CompletionContext::new(&db, position, &config).unwrap();
let mut acc = crate::completions::Completions::default();
- if let CompletionAnalysis::Name(NameContext { kind: NameKind::IdentPat(pat_ctx), .. }) =
- &analysis
- {
- crate::completions::flyimport::import_on_the_fly_pat(&mut acc, &ctx, pat_ctx);
- }
- if let CompletionAnalysis::NameRef(name_ref_ctx) = &analysis {
- match &name_ref_ctx.kind {
- NameRefKind::Path(path) => {
- crate::completions::flyimport::import_on_the_fly_path(&mut acc, &ctx, path);
- }
- NameRefKind::DotAccess(dot_access) => {
- crate::completions::flyimport::import_on_the_fly_dot(&mut acc, &ctx, dot_access);
- }
- NameRefKind::Pattern(pattern) => {
- crate::completions::flyimport::import_on_the_fly_pat(&mut acc, &ctx, pattern);
+ salsa::attach(ctx.db, || {
+ if let CompletionAnalysis::Name(NameContext { kind: NameKind::IdentPat(pat_ctx), .. }) =
+ &analysis
+ {
+ crate::completions::flyimport::import_on_the_fly_pat(&mut acc, &ctx, pat_ctx);
+ }
+ if let CompletionAnalysis::NameRef(name_ref_ctx) = &analysis {
+ match &name_ref_ctx.kind {
+ NameRefKind::Path(path) => {
+ crate::completions::flyimport::import_on_the_fly_path(&mut acc, &ctx, path);
+ }
+ NameRefKind::DotAccess(dot_access) => {
+ crate::completions::flyimport::import_on_the_fly_dot(
+ &mut acc, &ctx, dot_access,
+ );
+ }
+ NameRefKind::Pattern(pattern) => {
+ crate::completions::flyimport::import_on_the_fly_pat(&mut acc, &ctx, pattern);
+ }
+ _ => (),
}
- _ => (),
}
- }
+ });
expect.assert_eq(&super::render_completion_list(Vec::from(acc)));
}
@@ -114,7 +119,7 @@ fn main() {
}
"#,
r#"
-use dep::{some_module::{SecondStruct, ThirdStruct}, FirstStruct};
+use dep::{FirstStruct, some_module::{SecondStruct, ThirdStruct}};
fn main() {
ThirdStruct