diff options
author | bors[bot] <26634292+bors[bot]@users.noreply.github.com> | 2021-05-30 16:13:29 +0100 |
---|---|---|
committer | GitHub <[email protected]> | 2021-05-30 16:13:29 +0100 |
commit | f1d163ba51b7a06e2e34ea2b27c4c948a0ff2320 (patch) | |
tree | e9cc4ba6c478988c19f359e0bd06f18fac3e24cf | |
parent | f41b68637a10fe0ebc56575d4acb6010dc94cc64 (diff) | |
parent | c5cd25d7556a24653e7b88272565663037be7420 (diff) |
Merge #9064
9064: Fix incorrect prefer_inner calls on some attribute completions r=Veykril a=Veykril
bors r+
Co-authored-by: Lukas Wirth <[email protected]>
-rw-r--r-- | crates/ide_completion/src/completions/attribute.rs | 37 |
1 files changed, 31 insertions, 6 deletions
diff --git a/crates/ide_completion/src/completions/attribute.rs b/crates/ide_completion/src/completions/attribute.rs index 13d5b90c9..76d926157 100644 --- a/crates/ide_completion/src/completions/attribute.rs +++ b/crates/ide_completion/src/completions/attribute.rs | |||
@@ -219,8 +219,7 @@ const ATTRIBUTES: &[AttrCompletion] = &[ | |||
219 | ), | 219 | ), |
220 | attr("feature(…)", Some("feature"), Some("feature(${0:flag})")).prefer_inner(), | 220 | attr("feature(…)", Some("feature"), Some("feature(${0:flag})")).prefer_inner(), |
221 | attr("forbid(…)", Some("forbid"), Some("forbid(${0:lint})")), | 221 | attr("forbid(…)", Some("forbid"), Some("forbid(${0:lint})")), |
222 | // FIXME: resolve through macro resolution? | 222 | attr("global_allocator", None, None), |
223 | attr("global_allocator", None, None).prefer_inner(), | ||
224 | attr(r#"ignore = "…""#, Some("ignore"), Some(r#"ignore = "${0:reason}""#)), | 223 | attr(r#"ignore = "…""#, Some("ignore"), Some(r#"ignore = "${0:reason}""#)), |
225 | attr("inline", Some("inline"), Some("inline")), | 224 | attr("inline", Some("inline"), Some("inline")), |
226 | attr("link", None, None), | 225 | attr("link", None, None), |
@@ -239,7 +238,7 @@ const ATTRIBUTES: &[AttrCompletion] = &[ | |||
239 | attr("no_mangle", None, None), | 238 | attr("no_mangle", None, None), |
240 | attr("no_std", None, None).prefer_inner(), | 239 | attr("no_std", None, None).prefer_inner(), |
241 | attr("non_exhaustive", None, None), | 240 | attr("non_exhaustive", None, None), |
242 | attr("panic_handler", None, None).prefer_inner(), | 241 | attr("panic_handler", None, None), |
243 | attr(r#"path = "…""#, Some("path"), Some(r#"path ="${0:path}""#)), | 242 | attr(r#"path = "…""#, Some("path"), Some(r#"path ="${0:path}""#)), |
244 | attr("proc_macro", None, None), | 243 | attr("proc_macro", None, None), |
245 | attr("proc_macro_attribute", None, None), | 244 | attr("proc_macro_attribute", None, None), |
@@ -609,6 +608,7 @@ mod tests { | |||
609 | at export_name = "…" | 608 | at export_name = "…" |
610 | at link_name = "…" | 609 | at link_name = "…" |
611 | at link_section = "…" | 610 | at link_section = "…" |
611 | at global_allocator | ||
612 | at used | 612 | at used |
613 | "#]], | 613 | "#]], |
614 | ); | 614 | ); |
@@ -732,9 +732,9 @@ mod tests { | |||
732 | } | 732 | } |
733 | 733 | ||
734 | #[test] | 734 | #[test] |
735 | fn complete_attribute_on_expr() { | 735 | fn complete_attribute_on_fn() { |
736 | check( | 736 | check( |
737 | r#"fn main() { #[$0] foo() }"#, | 737 | r#"#[$0] fn main() {}"#, |
738 | expect![[r#" | 738 | expect![[r#" |
739 | at allow(…) | 739 | at allow(…) |
740 | at cfg(…) | 740 | at cfg(…) |
@@ -742,10 +742,35 @@ mod tests { | |||
742 | at deny(…) | 742 | at deny(…) |
743 | at forbid(…) | 743 | at forbid(…) |
744 | at warn(…) | 744 | at warn(…) |
745 | at deprecated | ||
746 | at doc = "…" | ||
747 | at doc(hidden) | ||
748 | at doc(alias = "…") | ||
749 | at must_use | ||
750 | at no_mangle | ||
751 | at export_name = "…" | ||
752 | at link_name = "…" | ||
753 | at link_section = "…" | ||
754 | at cold | ||
755 | at ignore = "…" | ||
756 | at inline | ||
757 | at must_use | ||
758 | at panic_handler | ||
759 | at proc_macro | ||
760 | at proc_macro_derive(…) | ||
761 | at proc_macro_attribute | ||
762 | at should_panic | ||
763 | at target_feature = "…" | ||
764 | at test | ||
765 | at track_caller | ||
745 | "#]], | 766 | "#]], |
746 | ); | 767 | ); |
768 | } | ||
769 | |||
770 | #[test] | ||
771 | fn complete_attribute_on_expr() { | ||
747 | check( | 772 | check( |
748 | r#"fn main() { #[$0] foo(); }"#, | 773 | r#"fn main() { #[$0] foo() }"#, |
749 | expect![[r#" | 774 | expect![[r#" |
750 | at allow(…) | 775 | at allow(…) |
751 | at cfg(…) | 776 | at cfg(…) |