From 9f9b38bdb47f6301fc01287fbe8dc1256c44fe08 Mon Sep 17 00:00:00 2001 From: Aleksey Kladov Date: Fri, 3 Jul 2020 23:13:22 +0200 Subject: Cleanup presentation tests --- crates/ra_ide/src/completion/test_utils.rs | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) (limited to 'crates/ra_ide/src/completion/test_utils.rs') diff --git a/crates/ra_ide/src/completion/test_utils.rs b/crates/ra_ide/src/completion/test_utils.rs index 9c036eac7..f25190241 100644 --- a/crates/ra_ide/src/completion/test_utils.rs +++ b/crates/ra_ide/src/completion/test_utils.rs @@ -3,7 +3,7 @@ use hir::Semantics; use itertools::Itertools; use ra_syntax::{AstNode, NodeOrToken, SyntaxElement}; -use stdx::format_to; +use stdx::{format_to, trim_indent}; use test_utils::assert_eq_text; use crate::{ @@ -57,14 +57,18 @@ pub(crate) fn completion_list_with_options( } pub(crate) fn check_edit(what: &str, ra_fixture_before: &str, ra_fixture_after: &str) { + let ra_fixture_after = trim_indent(ra_fixture_after); let (analysis, position) = analysis_and_position(ra_fixture_before); let completions: Vec = analysis.completions(&CompletionConfig::default(), position).unwrap().unwrap().into(); - let (completion,) = - completions.into_iter().filter(|it| it.label() == what).collect_tuple().unwrap(); + let (completion,) = completions + .iter() + .filter(|it| it.lookup() == what) + .collect_tuple() + .unwrap_or_else(|| panic!("can't find {:?} completion in {:#?}", what, completions)); let mut actual = analysis.file_text(position.file_id).unwrap().to_string(); completion.text_edit().apply(&mut actual); - assert_eq_text!(ra_fixture_after, &actual) + assert_eq_text!(&ra_fixture_after, &actual) } pub(crate) fn check_pattern_is_applicable(code: &str, check: fn(SyntaxElement) -> bool) { -- cgit v1.2.3