user0/rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge #9302

Browse source 
9302: internal: Add builtin derives to attribute completion fixtures r=Veykril a=Veykril

bors R+

Co-authored-by: Lukas Wirth <lukastw97@gmail.com>
This commit is contained in:
bors[bot] 2021-06-16 17:28:13 +00:00 • committed by GitHub
commit f38770cd26
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 67 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

74
crates/ide_completion/src/completions/attribute/derive.rs
View file

@ -31,6 +31,8 @@ pub(super) fn complete_derive(
let lookup = components.join(", ");
let label = components.iter().rev().join(", ");
(label, Some(lookup))
} else if existing_derives.contains(&derive) {
continue;
} else {
(derive, None)
};
@ -83,7 +85,31 @@ mod tests {
use crate::{test_utils::completion_list, CompletionKind};
fn check(ra_fixture: &str, expect: Expect) {
let actual = completion_list(ra_fixture, CompletionKind::Attribute);
let builtin_derives = r#"
#[rustc_builtin_macro]
pub macro Clone {}
#[rustc_builtin_macro]
pub macro Copy {}
#[rustc_builtin_macro]
pub macro Default {}
#[rustc_builtin_macro]
pub macro Debug {}
#[rustc_builtin_macro]
pub macro Hash {}
#[rustc_builtin_macro]
pub macro PartialEq {}
#[rustc_builtin_macro]
pub macro Eq {}
#[rustc_builtin_macro]
pub macro PartialOrd {}
#[rustc_builtin_macro]
pub macro Ord {}
"#;
let actual = completion_list(
&format!("{} {}", builtin_derives, ra_fixture),
CompletionKind::Attribute,
);
expect.assert_eq(&actual);
}
@ -94,19 +120,53 @@ mod tests {
#[test]
fn empty_derive() {
// FIXME: Add build-in derives to fixture.
check(r#"#[derive($0)] struct Test;"#, expect![[r#""#]]);
check(
r#"#[derive($0)] struct Test;"#,
expect![[r#"
at PartialEq
at Default
at PartialEq, Eq
at PartialEq, Eq, PartialOrd, Ord
at Clone, Copy
at Debug
at Clone
at Hash
at PartialEq, PartialOrd
"#]],
);
}
#[test]
fn derive_with_input() {
// FIXME: Add build-in derives to fixture.
check(r#"#[derive(serde::Serialize, PartialEq, $0)] struct Test;"#, expect![[r#""#]])
check(
r#"#[derive(serde::Serialize, PartialEq, $0)] struct Test;"#,
expect![[r#"
at Default
at Eq
at Eq, PartialOrd, Ord
at Clone, Copy
at Debug
at Clone
at Hash
at PartialOrd
"#]],
)
}
#[test]
fn derive_with_input2() {
// FIXME: Add build-in derives to fixture.
check(r#"#[derive($0 serde::Serialize, PartialEq)] struct Test;"#, expect![[r#""#]])
check(
r#"#[derive($0 serde::Serialize, PartialEq)] struct Test;"#,
expect![[r#"
at Default
at Eq
at Eq, PartialOrd, Ord
at Clone, Copy
at Debug
at Clone
at Hash
at PartialOrd
"#]],
)
}
}