Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 9 additions & 1 deletion crates/ra_ide/src/completion/complete_keyword.rs
Original file line number Diff line number Diff line change
Expand Up @@ -176,7 +176,10 @@ fn complete_return(
mod tests {
use expect::{expect, Expect};

use crate::completion::{test_utils::completion_list, CompletionKind};
use crate::completion::{
test_utils::{check_edit, completion_list},
CompletionKind,
};

fn check(ra_fixture: &str, expect: Expect) {
let actual = completion_list(ra_fixture, CompletionKind::Keyword);
Expand Down Expand Up @@ -312,6 +315,11 @@ mod tests {
kw while
"#]],
);
check_edit(
"else",
r#"fn quux() { if true { () } <|> }"#,
r#"fn quux() { if true { () } else {$0} }"#,
);
}

#[test]
Expand Down
13 changes: 13 additions & 0 deletions crates/ra_ide/src/completion/test_utils.rs
Original file line number Diff line number Diff line change
@@ -1,8 +1,10 @@
//! Runs completion for testing purposes.

use hir::Semantics;
use itertools::Itertools;
use ra_syntax::{AstNode, NodeOrToken, SyntaxElement};
use stdx::format_to;
use test_utils::assert_eq_text;

use crate::{
completion::{completion_item::CompletionKind, CompletionConfig},
Expand Down Expand Up @@ -54,6 +56,17 @@ pub(crate) fn completion_list_with_options(
.collect()
}

pub(crate) fn check_edit(what: &str, ra_fixture_before: &str, ra_fixture_after: &str) {
let (analysis, position) = analysis_and_position(ra_fixture_before);
let completions: Vec<CompletionItem> =
analysis.completions(&CompletionConfig::default(), position).unwrap().unwrap().into();
let (completion,) =
completions.into_iter().filter(|it| it.label() == what).collect_tuple().unwrap();
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)
}

pub(crate) fn check_pattern_is_applicable(code: &str, check: fn(SyntaxElement) -> bool) {
let (analysis, pos) = analysis_and_position(code);
analysis
Expand Down