From 582f99d293359b6276813c4433db36c6e790152e Mon Sep 17 00:00:00 2001 From: Lukas Wirth Date: Fri, 6 May 2022 13:11:50 +0200 Subject: [PATCH] internal: Improve completion tests by checking that the offset is included in the source_range of items --- crates/ide-completion/src/item.rs | 2 +- crates/ide-completion/src/tests.rs | 12 +++++++++++- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/crates/ide-completion/src/item.rs b/crates/ide-completion/src/item.rs index fe1ad2bf82..140e5b600b 100644 --- a/crates/ide-completion/src/item.rs +++ b/crates/ide-completion/src/item.rs @@ -26,7 +26,7 @@ pub struct CompletionItem { /// It should be used primarily for UI, but we also use this to convert /// generic TextEdit into LSP's completion edit (see conv.rs). /// - /// `source_range` must contain the completion offset. `insert_text` should + /// `source_range` must contain the completion offset. `text_edit` should /// start with what `source_range` points to, or VSCode will filter out the /// completion silently. source_range: TextRange, diff --git a/crates/ide-completion/src/tests.rs b/crates/ide-completion/src/tests.rs index 8d9d1bc4b9..72b7a5584a 100644 --- a/crates/ide-completion/src/tests.rs +++ b/crates/ide-completion/src/tests.rs @@ -214,7 +214,17 @@ pub(crate) fn check_pattern_is_applicable(code: &str, check: impl FnOnce(SyntaxE pub(crate) fn get_all_items(config: CompletionConfig, code: &str) -> Vec { let (db, position) = position(code); - crate::completions(&db, &config, position).map_or_else(Vec::default, Into::into) + let res = crate::completions(&db, &config, position).map_or_else(Vec::default, Into::into); + // validate + res.iter().for_each(|it| { + let sr = it.source_range(); + assert!( + sr.contains_inclusive(position.offset), + "source range {sr:?} does not contain the offset {:?} of the completion request: {it:?}", + position.offset + ); + }); + res } #[test]