diff options
-rw-r--r-- | crates/ra_ide/src/completion.rs | 8 | ||||
-rw-r--r-- | crates/ra_ide/src/completion/complete_qualified_path.rs (renamed from crates/ra_ide/src/completion/complete_path.rs) | 2 | ||||
-rw-r--r-- | crates/ra_ide/src/completion/complete_unqualified_path.rs (renamed from crates/ra_ide/src/completion/complete_scope.rs) | 2 |
3 files changed, 6 insertions, 6 deletions
diff --git a/crates/ra_ide/src/completion.rs b/crates/ra_ide/src/completion.rs index 93157bbba..4a1a2a04a 100644 --- a/crates/ra_ide/src/completion.rs +++ b/crates/ra_ide/src/completion.rs | |||
@@ -10,8 +10,8 @@ mod complete_pattern; | |||
10 | mod complete_fn_param; | 10 | mod complete_fn_param; |
11 | mod complete_keyword; | 11 | mod complete_keyword; |
12 | mod complete_snippet; | 12 | mod complete_snippet; |
13 | mod complete_path; | 13 | mod complete_qualified_path; |
14 | mod complete_scope; | 14 | mod complete_unqualified_path; |
15 | mod complete_postfix; | 15 | mod complete_postfix; |
16 | mod complete_macro_in_item_position; | 16 | mod complete_macro_in_item_position; |
17 | mod complete_trait_impl; | 17 | mod complete_trait_impl; |
@@ -85,8 +85,8 @@ pub(crate) fn completions( | |||
85 | complete_keyword::complete_use_tree_keyword(&mut acc, &ctx); | 85 | complete_keyword::complete_use_tree_keyword(&mut acc, &ctx); |
86 | complete_snippet::complete_expr_snippet(&mut acc, &ctx); | 86 | complete_snippet::complete_expr_snippet(&mut acc, &ctx); |
87 | complete_snippet::complete_item_snippet(&mut acc, &ctx); | 87 | complete_snippet::complete_item_snippet(&mut acc, &ctx); |
88 | complete_path::complete_path(&mut acc, &ctx); | 88 | complete_qualified_path::complete_qualified_path(&mut acc, &ctx); |
89 | complete_scope::complete_scope(&mut acc, &ctx); | 89 | complete_unqualified_path::complete_unqualified_path(&mut acc, &ctx); |
90 | complete_dot::complete_dot(&mut acc, &ctx); | 90 | complete_dot::complete_dot(&mut acc, &ctx); |
91 | complete_record::complete_record(&mut acc, &ctx); | 91 | complete_record::complete_record(&mut acc, &ctx); |
92 | complete_pattern::complete_pattern(&mut acc, &ctx); | 92 | complete_pattern::complete_pattern(&mut acc, &ctx); |
diff --git a/crates/ra_ide/src/completion/complete_path.rs b/crates/ra_ide/src/completion/complete_qualified_path.rs index 3ed2ae2b6..d98523406 100644 --- a/crates/ra_ide/src/completion/complete_path.rs +++ b/crates/ra_ide/src/completion/complete_qualified_path.rs | |||
@@ -6,7 +6,7 @@ use test_utils::tested_by; | |||
6 | 6 | ||
7 | use crate::completion::{CompletionContext, Completions}; | 7 | use crate::completion::{CompletionContext, Completions}; |
8 | 8 | ||
9 | pub(super) fn complete_path(acc: &mut Completions, ctx: &CompletionContext) { | 9 | pub(super) fn complete_qualified_path(acc: &mut Completions, ctx: &CompletionContext) { |
10 | let path = match &ctx.path_prefix { | 10 | let path = match &ctx.path_prefix { |
11 | Some(path) => path.clone(), | 11 | Some(path) => path.clone(), |
12 | _ => return, | 12 | _ => return, |
diff --git a/crates/ra_ide/src/completion/complete_scope.rs b/crates/ra_ide/src/completion/complete_unqualified_path.rs index 665597e4c..efde9bf73 100644 --- a/crates/ra_ide/src/completion/complete_scope.rs +++ b/crates/ra_ide/src/completion/complete_unqualified_path.rs | |||
@@ -2,7 +2,7 @@ | |||
2 | 2 | ||
3 | use crate::completion::{CompletionContext, Completions}; | 3 | use crate::completion::{CompletionContext, Completions}; |
4 | 4 | ||
5 | pub(super) fn complete_scope(acc: &mut Completions, ctx: &CompletionContext) { | 5 | pub(super) fn complete_unqualified_path(acc: &mut Completions, ctx: &CompletionContext) { |
6 | if !(ctx.is_trivial_path && !ctx.is_pat_binding_or_const) { | 6 | if !(ctx.is_trivial_path && !ctx.is_pat_binding_or_const) { |
7 | return; | 7 | return; |
8 | } | 8 | } |