From eeb8b9e236796da8734ba81a49164864497f7226 Mon Sep 17 00:00:00 2001
From: Mikhail Rakhmanov <rakhmanov.m@gmail.com>
Date: Sat, 13 Jun 2020 01:21:48 +0200
Subject: Fix tests and remove unused methods

---
 crates/ra_ide/src/completion/complete_keyword.rs | 8 ++++----
 crates/ra_ide/src/completion/patterns.rs         | 2 ++
 crates/ra_ide/src/completion/test_utils.rs       | 9 ---------
 3 files changed, 6 insertions(+), 13 deletions(-)

(limited to 'crates')

diff --git a/crates/ra_ide/src/completion/complete_keyword.rs b/crates/ra_ide/src/completion/complete_keyword.rs
index 79432113c..025097e49 100644
--- a/crates/ra_ide/src/completion/complete_keyword.rs
+++ b/crates/ra_ide/src/completion/complete_keyword.rs
@@ -159,6 +159,9 @@ pub(super) fn complete_expr_keyword(acc: &mut Completions, ctx: &CompletionConte
     add_keyword(ctx, acc, "break", "break", ctx.in_loop_body && !ctx.can_be_stmt);
     add_keyword(ctx, acc, "pub", "pub ", ctx.is_new_item && !ctx.has_trait_parent);
 
+    if !ctx.is_trivial_path {
+        return;
+    }
     let fn_def = match &ctx.function_syntax {
         Some(it) => it,
         None => return,
@@ -182,10 +185,7 @@ fn complete_return(
 
 #[cfg(test)]
 mod tests {
-    use crate::completion::{
-        test_utils::get_completions,
-        CompletionKind,
-    };
+    use crate::completion::{test_utils::get_completions, CompletionKind};
     use insta::assert_debug_snapshot;
 
     fn get_keyword_completions(code: &str) -> Vec<String> {
diff --git a/crates/ra_ide/src/completion/patterns.rs b/crates/ra_ide/src/completion/patterns.rs
index bc37196d5..464032cb4 100644
--- a/crates/ra_ide/src/completion/patterns.rs
+++ b/crates/ra_ide/src/completion/patterns.rs
@@ -1,3 +1,5 @@
+//! Patterns telling us certain facts about current syntax element, they are used in completion context
+
 use ra_syntax::{
     algo::non_trivia_sibling,
     ast::{self, LoopBodyOwner},
diff --git a/crates/ra_ide/src/completion/test_utils.rs b/crates/ra_ide/src/completion/test_utils.rs
index c660de7b1..8b838a0a5 100644
--- a/crates/ra_ide/src/completion/test_utils.rs
+++ b/crates/ra_ide/src/completion/test_utils.rs
@@ -38,15 +38,6 @@ fn get_all_completion_items(code: &str, options: &CompletionConfig) -> Vec<Compl
     analysis.completions(options, position).unwrap().unwrap().into()
 }
 
-pub(crate) fn get_all_completions(code: &str, options: &CompletionConfig) -> Vec<String> {
-    let mut kind_completions = get_all_completion_items(code, options);
-    kind_completions.sort_by_key(|c| c.label().to_owned());
-    kind_completions
-        .into_iter()
-        .map(|it| format!("{} {}", it.kind().unwrap().tag(), it.label()))
-        .collect()
-}
-
 pub(crate) fn get_completions_with_options(
     code: &str,
     kind: CompletionKind,
-- 
cgit v1.2.3