diff options
Diffstat (limited to 'crates/ra_assists/src/lib.rs')
-rw-r--r-- | crates/ra_assists/src/lib.rs | 46 |
1 files changed, 14 insertions, 32 deletions
diff --git a/crates/ra_assists/src/lib.rs b/crates/ra_assists/src/lib.rs index d476088a2..7b08e8fd7 100644 --- a/crates/ra_assists/src/lib.rs +++ b/crates/ra_assists/src/lib.rs | |||
@@ -19,8 +19,8 @@ use ra_ide_db::RootDatabase; | |||
19 | use ra_syntax::{TextRange, TextUnit}; | 19 | use ra_syntax::{TextRange, TextUnit}; |
20 | use ra_text_edit::TextEdit; | 20 | use ra_text_edit::TextEdit; |
21 | 21 | ||
22 | pub(crate) use crate::assist_ctx::{Assist, AssistCtx}; | 22 | pub(crate) use crate::assist_ctx::{Assist, AssistCtx, AssistHandler}; |
23 | pub use crate::assists::add_import::auto_import_text_edit; | 23 | pub use crate::handlers::add_import::auto_import_text_edit; |
24 | 24 | ||
25 | /// Unique identifier of the assist, should not be shown to the user | 25 | /// Unique identifier of the assist, should not be shown to the user |
26 | /// directly. | 26 | /// directly. |
@@ -72,7 +72,7 @@ impl ResolvedAssist { | |||
72 | /// returned, without actual edits. | 72 | /// returned, without actual edits. |
73 | pub fn unresolved_assists(db: &RootDatabase, range: FileRange) -> Vec<AssistLabel> { | 73 | pub fn unresolved_assists(db: &RootDatabase, range: FileRange) -> Vec<AssistLabel> { |
74 | let ctx = AssistCtx::new(db, range, false); | 74 | let ctx = AssistCtx::new(db, range, false); |
75 | assists::all() | 75 | handlers::all() |
76 | .iter() | 76 | .iter() |
77 | .filter_map(|f| f(ctx.clone())) | 77 | .filter_map(|f| f(ctx.clone())) |
78 | .map(|a| match a { | 78 | .map(|a| match a { |
@@ -88,7 +88,7 @@ pub fn unresolved_assists(db: &RootDatabase, range: FileRange) -> Vec<AssistLabe | |||
88 | /// computed. | 88 | /// computed. |
89 | pub fn resolved_assists(db: &RootDatabase, range: FileRange) -> Vec<ResolvedAssist> { | 89 | pub fn resolved_assists(db: &RootDatabase, range: FileRange) -> Vec<ResolvedAssist> { |
90 | let ctx = AssistCtx::new(db, range, true); | 90 | let ctx = AssistCtx::new(db, range, true); |
91 | let mut a = assists::all() | 91 | let mut a = handlers::all() |
92 | .iter() | 92 | .iter() |
93 | .filter_map(|f| f(ctx.clone())) | 93 | .filter_map(|f| f(ctx.clone())) |
94 | .map(|a| match a { | 94 | .map(|a| match a { |
@@ -109,8 +109,8 @@ fn sort_assists(assists: &mut [ResolvedAssist]) { | |||
109 | }); | 109 | }); |
110 | } | 110 | } |
111 | 111 | ||
112 | mod assists { | 112 | mod handlers { |
113 | use crate::{Assist, AssistCtx}; | 113 | use crate::AssistHandler; |
114 | 114 | ||
115 | mod add_derive; | 115 | mod add_derive; |
116 | mod add_explicit_type; | 116 | mod add_explicit_type; |
@@ -138,7 +138,7 @@ mod assists { | |||
138 | mod move_bounds; | 138 | mod move_bounds; |
139 | mod early_return; | 139 | mod early_return; |
140 | 140 | ||
141 | pub(crate) fn all() -> &'static [fn(AssistCtx) -> Option<Assist>] { | 141 | pub(crate) fn all() -> &'static [AssistHandler] { |
142 | &[ | 142 | &[ |
143 | add_derive::add_derive, | 143 | add_derive::add_derive, |
144 | add_explicit_type::add_explicit_type, | 144 | add_explicit_type::add_explicit_type, |
@@ -183,7 +183,7 @@ mod helpers { | |||
183 | use ra_syntax::TextRange; | 183 | use ra_syntax::TextRange; |
184 | use test_utils::{add_cursor, assert_eq_text, extract_offset, extract_range}; | 184 | use test_utils::{add_cursor, assert_eq_text, extract_offset, extract_range}; |
185 | 185 | ||
186 | use crate::{Assist, AssistCtx}; | 186 | use crate::{Assist, AssistCtx, AssistHandler}; |
187 | 187 | ||
188 | pub(crate) fn with_single_file(text: &str) -> (RootDatabase, FileId) { | 188 | pub(crate) fn with_single_file(text: &str) -> (RootDatabase, FileId) { |
189 | let (mut db, file_id) = RootDatabase::with_single_file(text); | 189 | let (mut db, file_id) = RootDatabase::with_single_file(text); |
@@ -194,7 +194,7 @@ mod helpers { | |||
194 | (db, file_id) | 194 | (db, file_id) |
195 | } | 195 | } |
196 | 196 | ||
197 | pub(crate) fn check_assist(assist: fn(AssistCtx) -> Option<Assist>, before: &str, after: &str) { | 197 | pub(crate) fn check_assist(assist: AssistHandler, before: &str, after: &str) { |
198 | let (before_cursor_pos, before) = extract_offset(before); | 198 | let (before_cursor_pos, before) = extract_offset(before); |
199 | let (db, file_id) = with_single_file(&before); | 199 | let (db, file_id) = with_single_file(&before); |
200 | let frange = | 200 | let frange = |
@@ -218,11 +218,7 @@ mod helpers { | |||
218 | assert_eq_text!(after, &actual); | 218 | assert_eq_text!(after, &actual); |
219 | } | 219 | } |
220 | 220 | ||
221 | pub(crate) fn check_assist_range( | 221 | pub(crate) fn check_assist_range(assist: AssistHandler, before: &str, after: &str) { |
222 | assist: fn(AssistCtx) -> Option<Assist>, | ||
223 | before: &str, | ||
224 | after: &str, | ||
225 | ) { | ||
226 | let (range, before) = extract_range(before); | 222 | let (range, before) = extract_range(before); |
227 | let (db, file_id) = with_single_file(&before); | 223 | let (db, file_id) = with_single_file(&before); |
228 | let frange = FileRange { file_id, range }; | 224 | let frange = FileRange { file_id, range }; |
@@ -240,11 +236,7 @@ mod helpers { | |||
240 | assert_eq_text!(after, &actual); | 236 | assert_eq_text!(after, &actual); |
241 | } | 237 | } |
242 | 238 | ||
243 | pub(crate) fn check_assist_target( | 239 | pub(crate) fn check_assist_target(assist: AssistHandler, before: &str, target: &str) { |
244 | assist: fn(AssistCtx) -> Option<Assist>, | ||
245 | before: &str, | ||
246 | target: &str, | ||
247 | ) { | ||
248 | let (before_cursor_pos, before) = extract_offset(before); | 240 | let (before_cursor_pos, before) = extract_offset(before); |
249 | let (db, file_id) = with_single_file(&before); | 241 | let (db, file_id) = with_single_file(&before); |
250 | let frange = | 242 | let frange = |
@@ -260,11 +252,7 @@ mod helpers { | |||
260 | assert_eq_text!(&before[range.start().to_usize()..range.end().to_usize()], target); | 252 | assert_eq_text!(&before[range.start().to_usize()..range.end().to_usize()], target); |
261 | } | 253 | } |
262 | 254 | ||
263 | pub(crate) fn check_assist_range_target( | 255 | pub(crate) fn check_assist_range_target(assist: AssistHandler, before: &str, target: &str) { |
264 | assist: fn(AssistCtx) -> Option<Assist>, | ||
265 | before: &str, | ||
266 | target: &str, | ||
267 | ) { | ||
268 | let (range, before) = extract_range(before); | 256 | let (range, before) = extract_range(before); |
269 | let (db, file_id) = with_single_file(&before); | 257 | let (db, file_id) = with_single_file(&before); |
270 | let frange = FileRange { file_id, range }; | 258 | let frange = FileRange { file_id, range }; |
@@ -279,10 +267,7 @@ mod helpers { | |||
279 | assert_eq_text!(&before[range.start().to_usize()..range.end().to_usize()], target); | 267 | assert_eq_text!(&before[range.start().to_usize()..range.end().to_usize()], target); |
280 | } | 268 | } |
281 | 269 | ||
282 | pub(crate) fn check_assist_not_applicable( | 270 | pub(crate) fn check_assist_not_applicable(assist: AssistHandler, before: &str) { |
283 | assist: fn(AssistCtx) -> Option<Assist>, | ||
284 | before: &str, | ||
285 | ) { | ||
286 | let (before_cursor_pos, before) = extract_offset(before); | 271 | let (before_cursor_pos, before) = extract_offset(before); |
287 | let (db, file_id) = with_single_file(&before); | 272 | let (db, file_id) = with_single_file(&before); |
288 | let frange = | 273 | let frange = |
@@ -291,10 +276,7 @@ mod helpers { | |||
291 | assert!(assist.is_none()); | 276 | assert!(assist.is_none()); |
292 | } | 277 | } |
293 | 278 | ||
294 | pub(crate) fn check_assist_range_not_applicable( | 279 | pub(crate) fn check_assist_range_not_applicable(assist: AssistHandler, before: &str) { |
295 | assist: fn(AssistCtx) -> Option<Assist>, | ||
296 | before: &str, | ||
297 | ) { | ||
298 | let (range, before) = extract_range(before); | 280 | let (range, before) = extract_range(before); |
299 | let (db, file_id) = with_single_file(&before); | 281 | let (db, file_id) = with_single_file(&before); |
300 | let frange = FileRange { file_id, range }; | 282 | let frange = FileRange { file_id, range }; |