diff options
author | Steffen Lyngbaek <[email protected]> | 2020-03-18 23:15:32 +0000 |
---|---|---|
committer | Steffen Lyngbaek <[email protected]> | 2020-03-19 21:12:00 +0000 |
commit | eb51abdc646e11b8c23fee83b6f052d3dde87985 (patch) | |
tree | 1459c46b52fa33545a1ba5854cea6fdf053255cd /crates/ra_ide/src/completion/complete_pattern.rs | |
parent | 6941a7faba49b3927df3106b70b780857d1bab17 (diff) |
Fixes to more accurately give complete_scope completions
- Exclude const, static, functions form is_pat_binding_and_path
(there might be more?)
- Add a check to filter out Record Fields
- Fix tests
Diffstat (limited to 'crates/ra_ide/src/completion/complete_pattern.rs')
-rw-r--r-- | crates/ra_ide/src/completion/complete_pattern.rs | 28 |
1 files changed, 28 insertions, 0 deletions
diff --git a/crates/ra_ide/src/completion/complete_pattern.rs b/crates/ra_ide/src/completion/complete_pattern.rs index cb84bb934..e8e676a4c 100644 --- a/crates/ra_ide/src/completion/complete_pattern.rs +++ b/crates/ra_ide/src/completion/complete_pattern.rs | |||
@@ -56,6 +56,20 @@ mod tests { | |||
56 | assert_debug_snapshot!(completions, @r###" | 56 | assert_debug_snapshot!(completions, @r###" |
57 | [ | 57 | [ |
58 | CompletionItem { | 58 | CompletionItem { |
59 | label: "Bar", | ||
60 | source_range: [246; 246), | ||
61 | delete: [246; 246), | ||
62 | insert: "Bar", | ||
63 | kind: Struct, | ||
64 | }, | ||
65 | CompletionItem { | ||
66 | label: "E", | ||
67 | source_range: [246; 246), | ||
68 | delete: [246; 246), | ||
69 | insert: "E", | ||
70 | kind: Enum, | ||
71 | }, | ||
72 | CompletionItem { | ||
59 | label: "E", | 73 | label: "E", |
60 | source_range: [246; 246), | 74 | source_range: [246; 246), |
61 | delete: [246; 246), | 75 | delete: [246; 246), |
@@ -70,6 +84,13 @@ mod tests { | |||
70 | kind: EnumVariant, | 84 | kind: EnumVariant, |
71 | }, | 85 | }, |
72 | CompletionItem { | 86 | CompletionItem { |
87 | label: "X", | ||
88 | source_range: [246; 246), | ||
89 | delete: [246; 246), | ||
90 | insert: "X", | ||
91 | kind: EnumVariant, | ||
92 | }, | ||
93 | CompletionItem { | ||
73 | label: "Z", | 94 | label: "Z", |
74 | source_range: [246; 246), | 95 | source_range: [246; 246), |
75 | delete: [246; 246), | 96 | delete: [246; 246), |
@@ -83,6 +104,13 @@ mod tests { | |||
83 | insert: "m", | 104 | insert: "m", |
84 | kind: Module, | 105 | kind: Module, |
85 | }, | 106 | }, |
107 | CompletionItem { | ||
108 | label: "m", | ||
109 | source_range: [246; 246), | ||
110 | delete: [246; 246), | ||
111 | insert: "m", | ||
112 | kind: Module, | ||
113 | }, | ||
86 | ] | 114 | ] |
87 | "###); | 115 | "###); |
88 | } | 116 | } |