diff options
Diffstat (limited to 'crates/ra_ide_api/src/completion/complete_scope.rs')
-rw-r--r-- | crates/ra_ide_api/src/completion/complete_scope.rs | 154 |
1 files changed, 81 insertions, 73 deletions
diff --git a/crates/ra_ide_api/src/completion/complete_scope.rs b/crates/ra_ide_api/src/completion/complete_scope.rs index 38a6c3d37..84826cdcc 100644 --- a/crates/ra_ide_api/src/completion/complete_scope.rs +++ b/crates/ra_ide_api/src/completion/complete_scope.rs | |||
@@ -290,22 +290,24 @@ mod tests { | |||
290 | } | 290 | } |
291 | " | 291 | " |
292 | ), | 292 | ), |
293 | @r###"[ | 293 | @r###" |
294 | CompletionItem { | 294 | [ |
295 | label: "T", | 295 | CompletionItem { |
296 | source_range: [54; 54), | 296 | label: "T", |
297 | delete: [54; 54), | 297 | source_range: [54; 54), |
298 | insert: "T", | 298 | delete: [54; 54), |
299 | kind: TypeParam, | 299 | insert: "T", |
300 | }, | 300 | kind: TypeParam, |
301 | CompletionItem { | 301 | }, |
302 | label: "X", | 302 | CompletionItem { |
303 | source_range: [54; 54), | 303 | label: "X", |
304 | delete: [54; 54), | 304 | source_range: [54; 54), |
305 | insert: "X", | 305 | delete: [54; 54), |
306 | kind: Struct, | 306 | insert: "X<$0>", |
307 | }, | 307 | kind: Struct, |
308 | ]"### | 308 | }, |
309 | ] | ||
310 | "### | ||
309 | ); | 311 | ); |
310 | } | 312 | } |
311 | 313 | ||
@@ -319,22 +321,24 @@ mod tests { | |||
319 | } | 321 | } |
320 | " | 322 | " |
321 | ), | 323 | ), |
322 | @r###"[ | 324 | @r###" |
323 | CompletionItem { | 325 | [ |
324 | label: "Self", | 326 | CompletionItem { |
325 | source_range: [48; 48), | 327 | label: "Self", |
326 | delete: [48; 48), | 328 | source_range: [48; 48), |
327 | insert: "Self", | 329 | delete: [48; 48), |
328 | kind: TypeParam, | 330 | insert: "Self", |
329 | }, | 331 | kind: TypeParam, |
330 | CompletionItem { | 332 | }, |
331 | label: "X", | 333 | CompletionItem { |
332 | source_range: [48; 48), | 334 | label: "X", |
333 | delete: [48; 48), | 335 | source_range: [48; 48), |
334 | insert: "X", | 336 | delete: [48; 48), |
335 | kind: Enum, | 337 | insert: "X", |
336 | }, | 338 | kind: Enum, |
337 | ]"### | 339 | }, |
340 | ] | ||
341 | "### | ||
338 | ); | 342 | ); |
339 | } | 343 | } |
340 | 344 | ||
@@ -442,23 +446,25 @@ mod tests { | |||
442 | fn x() -> <|> | 446 | fn x() -> <|> |
443 | " | 447 | " |
444 | ), | 448 | ), |
445 | @r###"[ | 449 | @r###" |
446 | CompletionItem { | 450 | [ |
447 | label: "Foo", | 451 | CompletionItem { |
448 | source_range: [55; 55), | 452 | label: "Foo", |
449 | delete: [55; 55), | 453 | source_range: [55; 55), |
450 | insert: "Foo", | 454 | delete: [55; 55), |
451 | kind: Struct, | 455 | insert: "Foo", |
452 | }, | 456 | kind: Struct, |
453 | CompletionItem { | 457 | }, |
454 | label: "x", | 458 | CompletionItem { |
455 | source_range: [55; 55), | 459 | label: "x", |
456 | delete: [55; 55), | 460 | source_range: [55; 55), |
457 | insert: "x()$0", | 461 | delete: [55; 55), |
458 | kind: Function, | 462 | insert: "x()$0", |
459 | detail: "fn x()", | 463 | kind: Function, |
460 | }, | 464 | detail: "fn x()", |
461 | ]"### | 465 | }, |
466 | ] | ||
467 | "### | ||
462 | ); | 468 | ); |
463 | } | 469 | } |
464 | 470 | ||
@@ -538,30 +544,32 @@ mod tests { | |||
538 | } | 544 | } |
539 | " | 545 | " |
540 | ), | 546 | ), |
541 | @r#"[ | 547 | @r###" |
542 | CompletionItem { | 548 | [ |
543 | label: "Option", | 549 | CompletionItem { |
544 | source_range: [18; 18), | 550 | label: "Option", |
545 | delete: [18; 18), | 551 | source_range: [18; 18), |
546 | insert: "Option", | 552 | delete: [18; 18), |
547 | kind: Struct, | 553 | insert: "Option", |
548 | }, | 554 | kind: Struct, |
549 | CompletionItem { | 555 | }, |
550 | label: "foo", | 556 | CompletionItem { |
551 | source_range: [18; 18), | 557 | label: "foo", |
552 | delete: [18; 18), | 558 | source_range: [18; 18), |
553 | insert: "foo()$0", | 559 | delete: [18; 18), |
554 | kind: Function, | 560 | insert: "foo()$0", |
555 | detail: "fn foo()", | 561 | kind: Function, |
556 | }, | 562 | detail: "fn foo()", |
557 | CompletionItem { | 563 | }, |
558 | label: "std", | 564 | CompletionItem { |
559 | source_range: [18; 18), | 565 | label: "std", |
560 | delete: [18; 18), | 566 | source_range: [18; 18), |
561 | insert: "std", | 567 | delete: [18; 18), |
562 | kind: Module, | 568 | insert: "std", |
563 | }, | 569 | kind: Module, |
564 | ]"# | 570 | }, |
571 | ] | ||
572 | "### | ||
565 | ); | 573 | ); |
566 | } | 574 | } |
567 | 575 | ||