From 00a615b819ee0bc565148415f0b9fcb947dfc006 Mon Sep 17 00:00:00 2001 From: Ariel Davis Date: Wed, 29 Sep 2021 21:55:15 -0700 Subject: [PATCH] Add pub(super) along with pub(crate) and pub as a completion keyword --- crates/ide_completion/src/completions/keyword.rs | 1 + crates/ide_completion/src/tests/item.rs | 3 +++ crates/ide_completion/src/tests/item_list.rs | 6 ++++++ crates/ide_completion/src/tests/type_pos.rs | 1 + 4 files changed, 11 insertions(+) diff --git a/crates/ide_completion/src/completions/keyword.rs b/crates/ide_completion/src/completions/keyword.rs index 9a4cd8628a..31aabd98d3 100644 --- a/crates/ide_completion/src/completions/keyword.rs +++ b/crates/ide_completion/src/completions/keyword.rs @@ -64,6 +64,7 @@ pub(crate) fn complete_expr_keyword(acc: &mut Completions, ctx: &CompletionConte && (expects_item || ctx.expects_non_trait_assoc_item() || ctx.expect_field()) { add_keyword("pub(crate)", "pub(crate)"); + add_keyword("pub(super)", "pub(super)"); add_keyword("pub", "pub"); } diff --git a/crates/ide_completion/src/tests/item.rs b/crates/ide_completion/src/tests/item.rs index e77082ebb8..d94fab2f5f 100644 --- a/crates/ide_completion/src/tests/item.rs +++ b/crates/ide_completion/src/tests/item.rs @@ -87,6 +87,7 @@ fn after_struct_name() { r"struct Struct $0", expect![[r##" kw pub(crate) + kw pub(super) kw pub kw unsafe kw fn @@ -120,6 +121,7 @@ fn after_fn_name() { r"fn func() $0", expect![[r##" kw pub(crate) + kw pub(super) kw pub kw unsafe kw fn @@ -157,6 +159,7 @@ struct Foo { "#, expect![[r#" kw pub(crate) + kw pub(super) kw pub "#]], ) diff --git a/crates/ide_completion/src/tests/item_list.rs b/crates/ide_completion/src/tests/item_list.rs index f355d37afc..4c76963054 100644 --- a/crates/ide_completion/src/tests/item_list.rs +++ b/crates/ide_completion/src/tests/item_list.rs @@ -14,6 +14,7 @@ fn in_mod_item_list() { r#"mod tests { $0 }"#, expect![[r##" kw pub(crate) + kw pub(super) kw pub kw unsafe kw fn @@ -45,6 +46,7 @@ fn in_source_file_item_list() { r#"$0"#, expect![[r##" kw pub(crate) + kw pub(super) kw pub kw unsafe kw fn @@ -77,6 +79,7 @@ fn in_item_list_after_attr() { r#"#[attr] $0"#, expect![[r#" kw pub(crate) + kw pub(super) kw pub kw unsafe kw fn @@ -161,6 +164,7 @@ fn in_impl_assoc_item_list() { r#"impl Struct { $0 }"#, expect![[r##" kw pub(crate) + kw pub(super) kw pub kw unsafe kw fn @@ -181,6 +185,7 @@ fn in_impl_assoc_item_list_after_attr() { r#"impl Struct { #[attr] $0 }"#, expect![[r#" kw pub(crate) + kw pub(super) kw pub kw unsafe kw fn @@ -230,6 +235,7 @@ impl Test for () { "#, expect![[r##" kw pub(crate) + kw pub(super) kw pub kw unsafe kw fn diff --git a/crates/ide_completion/src/tests/type_pos.rs b/crates/ide_completion/src/tests/type_pos.rs index b6cf8945e2..a03f1e7ff8 100644 --- a/crates/ide_completion/src/tests/type_pos.rs +++ b/crates/ide_completion/src/tests/type_pos.rs @@ -44,6 +44,7 @@ struct Foo<'lt, T, const C: usize>(f$0); "#, expect![[r##" kw pub(crate) + kw pub(super) kw pub kw self kw super