]> git.lizzy.rs Git - rust.git/commitdiff
Small helpers
authorKirill Bulatov <mail4score@gmail.com>
Mon, 4 Jan 2021 20:01:35 +0000 (22:01 +0200)
committerKirill Bulatov <mail4score@gmail.com>
Mon, 4 Jan 2021 20:01:35 +0000 (22:01 +0200)
crates/completion/src/completions/unqualified_path.rs
crates/hir_def/src/import_map.rs

index f376ded57bdc48333962fe4b771f9434d10c757c..2f41a3f96dc8db7b64122adcf16df77250567878 100644 (file)
@@ -124,8 +124,8 @@ fn complete_enum_variants(acc: &mut Completions, ctx: &CompletionContext, ty: &T
 // Note that having this flag set to `true` does not guarantee that the feature is enabled: your client needs to have the corredponding
 // capability enabled.
 fn fuzzy_completion(acc: &mut Completions, ctx: &CompletionContext) -> Option<()> {
-    let _p = profile::span("fuzzy_completion");
     let potential_import_name = ctx.token.to_string();
+    let _p = profile::span("fuzzy_completion").detail(|| potential_import_name.clone());
 
     if potential_import_name.len() < 2 {
         return None;
index 1325a93d1382965ab5045d428718e8772272b2d0..59206cab8cb996769647ea6414ab97faa303fdb9 100644 (file)
@@ -8,6 +8,7 @@
 use indexmap::{map::Entry, IndexMap};
 use itertools::Itertools;
 use rustc_hash::{FxHashSet, FxHasher};
+use test_utils::mark;
 
 use crate::{
     db::DefDatabase, item_scope::ItemInNs, visibility::Visibility, AssocItemId, ModuleDefId,
@@ -185,6 +186,7 @@ fn collect_trait_assoc_items(
         is_type_in_ns: bool,
         original_import_info: &ImportInfo,
     ) {
+        mark::hit!(type_aliases_ignored);
         for (assoc_item_name, item) in &db.trait_data(tr).items {
             let module_def_id = match item {
                 AssocItemId::FunctionId(f) => ModuleDefId::from(*f),
@@ -442,6 +444,7 @@ fn item_import_kind(item: ItemInNs) -> Option<ImportKind> {
 mod tests {
     use base_db::{fixture::WithFixture, SourceDatabase, Upcast};
     use expect_test::{expect, Expect};
+    use test_utils::mark;
 
     use crate::{test_db::TestDB, AssocContainerId, Lookup};
 
@@ -779,6 +782,7 @@ macro_rules! Thing {  // m
 
     #[test]
     fn fuzzy_import_trait_and_assoc_items() {
+        mark::check!(type_aliases_ignored);
         let ra_fixture = r#"
         //- /main.rs crate:main deps:dep
         //- /dep.rs crate:dep