diff options
author | bors[bot] <26634292+bors[bot]@users.noreply.github.com> | 2020-04-07 12:23:03 +0100 |
---|---|---|
committer | GitHub <[email protected]> | 2020-04-07 12:23:03 +0100 |
commit | b7e5d94bda362ffc21174a79aa0be113c3288e1e (patch) | |
tree | 8714a87675b4c93c97cbc3e9d84b6a3534ccfa59 /crates/ra_ide/src/completion | |
parent | 79b48a9e776b8fef31f2ea597258ee2c36566bb7 (diff) | |
parent | 021556043425d7b11800532bc06e5d49514c1347 (diff) |
Merge #3876
3876: Better naming for scope completion r=matklad a=matklad
bors r+
🤖
Co-authored-by: Aleksey Kladov <[email protected]>
Diffstat (limited to 'crates/ra_ide/src/completion')
-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 |
2 files changed, 2 insertions, 2 deletions
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 | } |