diff options
author | bors[bot] <26634292+bors[bot]@users.noreply.github.com> | 2020-12-18 16:29:12 +0000 |
---|---|---|
committer | GitHub <[email protected]> | 2020-12-18 16:29:12 +0000 |
commit | 8be3f25b0bf77b547ba83c3eb9689a40d212a55b (patch) | |
tree | c29c3a31ea9e046d2767dfc189e0ab77b8ffdafe /crates/ide/src/runnables.rs | |
parent | 03c177af89efcc238053b59069eda2c1c6772622 (diff) | |
parent | 55ba353b39db1e9d850f1df943ab6a16e7c15838 (diff) |
Merge #6930
6930: Don't expose SyntaxKind from IDE API r=matklad a=matklad
bors r+
🤖
Co-authored-by: Aleksey Kladov <[email protected]>
Diffstat (limited to 'crates/ide/src/runnables.rs')
-rw-r--r-- | crates/ide/src/runnables.rs | 52 |
1 files changed, 28 insertions, 24 deletions
diff --git a/crates/ide/src/runnables.rs b/crates/ide/src/runnables.rs index 2f465c195..600e93b6a 100644 --- a/crates/ide/src/runnables.rs +++ b/crates/ide/src/runnables.rs | |||
@@ -12,7 +12,7 @@ use syntax::{ | |||
12 | 12 | ||
13 | use crate::{ | 13 | use crate::{ |
14 | display::{ToNav, TryToNav}, | 14 | display::{ToNav, TryToNav}, |
15 | FileId, NavigationTarget, | 15 | FileId, NavigationTarget, SymbolKind, |
16 | }; | 16 | }; |
17 | 17 | ||
18 | #[derive(Debug, Clone)] | 18 | #[derive(Debug, Clone)] |
@@ -137,7 +137,11 @@ fn runnable_fn(sema: &Semantics<RootDatabase>, func: ast::Fn, file_id: FileId) - | |||
137 | } | 137 | } |
138 | }; | 138 | }; |
139 | 139 | ||
140 | let nav = NavigationTarget::from_named(sema.db, InFile::new(file_id.into(), &func)); | 140 | let nav = NavigationTarget::from_named( |
141 | sema.db, | ||
142 | InFile::new(file_id.into(), &func), | ||
143 | SymbolKind::Function, | ||
144 | ); | ||
141 | let cfg = def.attrs(sema.db).cfg(); | 145 | let cfg = def.attrs(sema.db).cfg(); |
142 | Some(Runnable { nav, kind, cfg }) | 146 | Some(Runnable { nav, kind, cfg }) |
143 | } | 147 | } |
@@ -204,7 +208,7 @@ fn module_def_doctest(sema: &Semantics<RootDatabase>, def: hir::ModuleDef) -> Op | |||
204 | nav.focus_range = None; | 208 | nav.focus_range = None; |
205 | nav.description = None; | 209 | nav.description = None; |
206 | nav.docs = None; | 210 | nav.docs = None; |
207 | nav.kind = syntax::SyntaxKind::COMMENT; | 211 | nav.kind = SymbolKind::DocTest; |
208 | let res = Runnable { nav, kind: RunnableKind::DocTest { test_id }, cfg: attrs.cfg() }; | 212 | let res = Runnable { nav, kind: RunnableKind::DocTest { test_id }, cfg: attrs.cfg() }; |
209 | Some(res) | 213 | Some(res) |
210 | } | 214 | } |
@@ -352,7 +356,7 @@ fn bench() {} | |||
352 | 4..8, | 356 | 4..8, |
353 | ), | 357 | ), |
354 | name: "main", | 358 | name: "main", |
355 | kind: FN, | 359 | kind: Function, |
356 | container_name: None, | 360 | container_name: None, |
357 | description: None, | 361 | description: None, |
358 | docs: None, | 362 | docs: None, |
@@ -370,7 +374,7 @@ fn bench() {} | |||
370 | 26..34, | 374 | 26..34, |
371 | ), | 375 | ), |
372 | name: "test_foo", | 376 | name: "test_foo", |
373 | kind: FN, | 377 | kind: Function, |
374 | container_name: None, | 378 | container_name: None, |
375 | description: None, | 379 | description: None, |
376 | docs: None, | 380 | docs: None, |
@@ -395,7 +399,7 @@ fn bench() {} | |||
395 | 62..70, | 399 | 62..70, |
396 | ), | 400 | ), |
397 | name: "test_foo", | 401 | name: "test_foo", |
398 | kind: FN, | 402 | kind: Function, |
399 | container_name: None, | 403 | container_name: None, |
400 | description: None, | 404 | description: None, |
401 | docs: None, | 405 | docs: None, |
@@ -420,7 +424,7 @@ fn bench() {} | |||
420 | 89..94, | 424 | 89..94, |
421 | ), | 425 | ), |
422 | name: "bench", | 426 | name: "bench", |
423 | kind: FN, | 427 | kind: Function, |
424 | container_name: None, | 428 | container_name: None, |
425 | description: None, | 429 | description: None, |
426 | docs: None, | 430 | docs: None, |
@@ -517,7 +521,7 @@ struct StructWithRunnable(String); | |||
517 | 4..8, | 521 | 4..8, |
518 | ), | 522 | ), |
519 | name: "main", | 523 | name: "main", |
520 | kind: FN, | 524 | kind: Function, |
521 | container_name: None, | 525 | container_name: None, |
522 | description: None, | 526 | description: None, |
523 | docs: None, | 527 | docs: None, |
@@ -533,7 +537,7 @@ struct StructWithRunnable(String); | |||
533 | full_range: 15..74, | 537 | full_range: 15..74, |
534 | focus_range: None, | 538 | focus_range: None, |
535 | name: "should_have_runnable", | 539 | name: "should_have_runnable", |
536 | kind: COMMENT, | 540 | kind: DocTest, |
537 | container_name: None, | 541 | container_name: None, |
538 | description: None, | 542 | description: None, |
539 | docs: None, | 543 | docs: None, |
@@ -553,7 +557,7 @@ struct StructWithRunnable(String); | |||
553 | full_range: 76..148, | 557 | full_range: 76..148, |
554 | focus_range: None, | 558 | focus_range: None, |
555 | name: "should_have_runnable_1", | 559 | name: "should_have_runnable_1", |
556 | kind: COMMENT, | 560 | kind: DocTest, |
557 | container_name: None, | 561 | container_name: None, |
558 | description: None, | 562 | description: None, |
559 | docs: None, | 563 | docs: None, |
@@ -573,7 +577,7 @@ struct StructWithRunnable(String); | |||
573 | full_range: 150..254, | 577 | full_range: 150..254, |
574 | focus_range: None, | 578 | focus_range: None, |
575 | name: "should_have_runnable_2", | 579 | name: "should_have_runnable_2", |
576 | kind: COMMENT, | 580 | kind: DocTest, |
577 | container_name: None, | 581 | container_name: None, |
578 | description: None, | 582 | description: None, |
579 | docs: None, | 583 | docs: None, |
@@ -593,7 +597,7 @@ struct StructWithRunnable(String); | |||
593 | full_range: 756..821, | 597 | full_range: 756..821, |
594 | focus_range: None, | 598 | focus_range: None, |
595 | name: "StructWithRunnable", | 599 | name: "StructWithRunnable", |
596 | kind: COMMENT, | 600 | kind: DocTest, |
597 | container_name: None, | 601 | container_name: None, |
598 | description: None, | 602 | description: None, |
599 | docs: None, | 603 | docs: None, |
@@ -639,7 +643,7 @@ impl Data { | |||
639 | 4..8, | 643 | 4..8, |
640 | ), | 644 | ), |
641 | name: "main", | 645 | name: "main", |
642 | kind: FN, | 646 | kind: Function, |
643 | container_name: None, | 647 | container_name: None, |
644 | description: None, | 648 | description: None, |
645 | docs: None, | 649 | docs: None, |
@@ -655,7 +659,7 @@ impl Data { | |||
655 | full_range: 44..98, | 659 | full_range: 44..98, |
656 | focus_range: None, | 660 | focus_range: None, |
657 | name: "foo", | 661 | name: "foo", |
658 | kind: COMMENT, | 662 | kind: DocTest, |
659 | container_name: None, | 663 | container_name: None, |
660 | description: None, | 664 | description: None, |
661 | docs: None, | 665 | docs: None, |
@@ -696,7 +700,7 @@ mod test_mod { | |||
696 | 5..13, | 700 | 5..13, |
697 | ), | 701 | ), |
698 | name: "test_mod", | 702 | name: "test_mod", |
699 | kind: MODULE, | 703 | kind: Module, |
700 | container_name: None, | 704 | container_name: None, |
701 | description: None, | 705 | description: None, |
702 | docs: None, | 706 | docs: None, |
@@ -716,7 +720,7 @@ mod test_mod { | |||
716 | 35..44, | 720 | 35..44, |
717 | ), | 721 | ), |
718 | name: "test_foo1", | 722 | name: "test_foo1", |
719 | kind: FN, | 723 | kind: Function, |
720 | container_name: None, | 724 | container_name: None, |
721 | description: None, | 725 | description: None, |
722 | docs: None, | 726 | docs: None, |
@@ -776,7 +780,7 @@ mod root_tests { | |||
776 | 26..40, | 780 | 26..40, |
777 | ), | 781 | ), |
778 | name: "nested_tests_0", | 782 | name: "nested_tests_0", |
779 | kind: MODULE, | 783 | kind: Module, |
780 | container_name: None, | 784 | container_name: None, |
781 | description: None, | 785 | description: None, |
782 | docs: None, | 786 | docs: None, |
@@ -796,7 +800,7 @@ mod root_tests { | |||
796 | 55..69, | 800 | 55..69, |
797 | ), | 801 | ), |
798 | name: "nested_tests_1", | 802 | name: "nested_tests_1", |
799 | kind: MODULE, | 803 | kind: Module, |
800 | container_name: None, | 804 | container_name: None, |
801 | description: None, | 805 | description: None, |
802 | docs: None, | 806 | docs: None, |
@@ -816,7 +820,7 @@ mod root_tests { | |||
816 | 107..121, | 820 | 107..121, |
817 | ), | 821 | ), |
818 | name: "nested_test_11", | 822 | name: "nested_test_11", |
819 | kind: FN, | 823 | kind: Function, |
820 | container_name: None, | 824 | container_name: None, |
821 | description: None, | 825 | description: None, |
822 | docs: None, | 826 | docs: None, |
@@ -841,7 +845,7 @@ mod root_tests { | |||
841 | 163..177, | 845 | 163..177, |
842 | ), | 846 | ), |
843 | name: "nested_test_12", | 847 | name: "nested_test_12", |
844 | kind: FN, | 848 | kind: Function, |
845 | container_name: None, | 849 | container_name: None, |
846 | description: None, | 850 | description: None, |
847 | docs: None, | 851 | docs: None, |
@@ -866,7 +870,7 @@ mod root_tests { | |||
866 | 206..220, | 870 | 206..220, |
867 | ), | 871 | ), |
868 | name: "nested_tests_2", | 872 | name: "nested_tests_2", |
869 | kind: MODULE, | 873 | kind: Module, |
870 | container_name: None, | 874 | container_name: None, |
871 | description: None, | 875 | description: None, |
872 | docs: None, | 876 | docs: None, |
@@ -886,7 +890,7 @@ mod root_tests { | |||
886 | 258..271, | 890 | 258..271, |
887 | ), | 891 | ), |
888 | name: "nested_test_2", | 892 | name: "nested_test_2", |
889 | kind: FN, | 893 | kind: Function, |
890 | container_name: None, | 894 | container_name: None, |
891 | description: None, | 895 | description: None, |
892 | docs: None, | 896 | docs: None, |
@@ -929,7 +933,7 @@ fn test_foo1() {} | |||
929 | 36..45, | 933 | 36..45, |
930 | ), | 934 | ), |
931 | name: "test_foo1", | 935 | name: "test_foo1", |
932 | kind: FN, | 936 | kind: Function, |
933 | container_name: None, | 937 | container_name: None, |
934 | description: None, | 938 | description: None, |
935 | docs: None, | 939 | docs: None, |
@@ -979,7 +983,7 @@ fn test_foo1() {} | |||
979 | 58..67, | 983 | 58..67, |
980 | ), | 984 | ), |
981 | name: "test_foo1", | 985 | name: "test_foo1", |
982 | kind: FN, | 986 | kind: Function, |
983 | container_name: None, | 987 | container_name: None, |
984 | description: None, | 988 | description: None, |
985 | docs: None, | 989 | docs: None, |