Unnamed repository; edit this file 'description' to name the repository.
Diffstat (limited to 'crates/ide_completion/src/completions/keyword.rs')
| -rw-r--r-- | crates/ide_completion/src/completions/keyword.rs | 295 |
1 files changed, 29 insertions, 266 deletions
diff --git a/crates/ide_completion/src/completions/keyword.rs b/crates/ide_completion/src/completions/keyword.rs index 31aabd98d3..4fd622f399 100644 --- a/crates/ide_completion/src/completions/keyword.rs +++ b/crates/ide_completion/src/completions/keyword.rs @@ -181,115 +181,15 @@ fn add_keyword(ctx: &CompletionContext, acc: &mut Completions, kw: &str, snippet mod tests { use expect_test::{expect, Expect}; - use crate::{ - tests::{check_edit, filtered_completion_list}, - CompletionKind, - }; + use crate::tests::{check_edit, completion_list}; fn check(ra_fixture: &str, expect: Expect) { - let actual = filtered_completion_list(ra_fixture, CompletionKind::Keyword); + let actual = completion_list(ra_fixture); expect.assert_eq(&actual) } #[test] - fn test_keywords_in_function() { - check( - r"fn quux() { $0 }", - expect![[r#" - kw unsafe - kw fn - kw const - kw type - kw impl - kw extern - kw use - kw trait - kw static - kw mod - kw match - kw while - kw while let - kw loop - kw if - kw if let - kw for - kw true - kw false - kw let - kw return - kw self - kw super - kw crate - "#]], - ); - } - - #[test] - fn test_keywords_inside_block() { - check( - r"fn quux() { if true { $0 } }", - expect![[r#" - kw unsafe - kw fn - kw const - kw type - kw impl - kw extern - kw use - kw trait - kw static - kw mod - kw match - kw while - kw while let - kw loop - kw if - kw if let - kw for - kw true - kw false - kw let - kw return - kw self - kw super - kw crate - "#]], - ); - } - - #[test] - fn test_keywords_after_if() { - check( - r#"fn quux() { if true { () } $0 }"#, - expect![[r#" - kw unsafe - kw fn - kw const - kw type - kw impl - kw extern - kw use - kw trait - kw static - kw mod - kw match - kw while - kw while let - kw loop - kw if - kw if let - kw for - kw true - kw false - kw let - kw else - kw else if - kw return - kw self - kw super - kw crate - "#]], - ); + fn test_else_edit_after_if() { check_edit( "else", r#"fn quux() { if true { () } $0 }"#, @@ -300,68 +200,6 @@ mod tests { } #[test] - fn test_keywords_in_match_arm() { - check( - r#" -fn quux() -> i32 { - match () { () => $0 } -} -"#, - expect![[r#" - kw unsafe - kw match - kw while - kw while let - kw loop - kw if - kw if let - kw for - kw true - kw false - kw return - kw self - kw super - kw crate - "#]], - ); - } - - #[test] - fn test_keywords_in_loop() { - check( - r"fn my() { loop { $0 } }", - expect![[r#" - kw unsafe - kw fn - kw const - kw type - kw impl - kw extern - kw use - kw trait - kw static - kw mod - kw match - kw while - kw while let - kw loop - kw if - kw if let - kw for - kw true - kw false - kw let - kw continue - kw break - kw return - kw self - kw super - kw crate - "#]], - ); - } - - #[test] fn test_keywords_after_unsafe_in_block_expr() { check( r"fn my_fn() { unsafe $0 }", @@ -369,39 +207,13 @@ fn quux() -> i32 { kw fn kw trait kw impl + sn pd + sn ppd "#]], ); } #[test] - fn no_keyword_completion_in_comments() { - cov_mark::check!(no_keyword_completion_in_comments); - check( - r#" -fn test() { - let x = 2; // A comment$0 -} -"#, - expect![[""]], - ); - check( - r#" -/* -Some multi-line comment$0 -*/ -"#, - expect![[""]], - ); - check( - r#" -/// Some doc comment -/// let test$0 = 1 -"#, - expect![[""]], - ); - } - - #[test] fn test_completion_await_impls_future() { check( r#" @@ -413,6 +225,18 @@ fn foo(a: A) { a.$0 } "#, expect![[r#" kw await expr.await + sn ref &expr + sn refm &mut expr + sn match match expr {} + sn box Box::new(expr) + sn ok Ok(expr) + sn err Err(expr) + sn some Some(expr) + sn dbg dbg!(expr) + sn dbgr dbg!(&expr) + sn call function(expr) + sn let let + sn letm let mut "#]], ); @@ -427,84 +251,23 @@ fn foo() { "#, expect![[r#" kw await expr.await + sn ref &expr + sn refm &mut expr + sn match match expr {} + sn box Box::new(expr) + sn ok Ok(expr) + sn err Err(expr) + sn some Some(expr) + sn dbg dbg!(expr) + sn dbgr dbg!(&expr) + sn call function(expr) + sn let let + sn letm let mut "#]], ) } #[test] - fn after_let() { - check( - r#"fn main() { let _ = $0 }"#, - expect![[r#" - kw unsafe - kw match - kw while - kw while let - kw loop - kw if - kw if let - kw for - kw true - kw false - kw return - kw self - kw super - kw crate - "#]], - ) - } - - #[test] - fn skip_struct_initializer() { - cov_mark::check!(no_keyword_completion_in_record_lit); - check( - r#" -struct Foo { - pub f: i32, -} -fn foo() { - Foo { - $0 - } -} -"#, - expect![[r#""#]], - ); - } - - #[test] - fn struct_initializer_field_expr() { - check( - r#" -struct Foo { - pub f: i32, -} -fn foo() { - Foo { - f: $0 - } -} -"#, - expect![[r#" - kw unsafe - kw match - kw while - kw while let - kw loop - kw if - kw if let - kw for - kw true - kw false - kw return - kw self - kw super - kw crate - "#]], - ); - } - - #[test] fn let_semi() { cov_mark::check!(let_semi); check_edit( |