Merge #6719

6719: Use items can also have doc comments r=matklad a=Veykril

Prior to this change modules show more docs than they have cause they inherit the docs from documented use items inside of them.

Co-authored-by: Lukas Wirth <[email protected]>

Author: bors[bot]

crates/ide/src/folding_ranges.rs

@@ -83,7 +83,6 @@ pub(crate) fn folding_ranges(file: &SourceFile) -> Vec<Fold> {
 fn fold_kind(kind: SyntaxKind) -> Option<FoldKind> {
     match kind {
         COMMENT => Some(FoldKind::Comment),
-        USE => Some(FoldKind::Imports),
         ARG_LIST | PARAM_LIST => Some(FoldKind::ArgList),
         ASSOC_ITEM_LIST
         | RECORD_FIELD_LIST
@@ -258,11 +257,11 @@ fn main() <fold block>{
     fn test_fold_imports() {
         check(
             r#"
-<fold imports>use std::<fold block>{
+use std::<fold block>{
     str,
     vec,
     io as iop
-}</fold>;</fold>
+}</fold>;
 
 fn main() <fold block>{
 }</fold>"#,
@@ -306,9 +305,9 @@ use std::io as iop;</fold>
 <fold imports>use std::mem;
 use std::f64;</fold>
 
-use std::collections::HashMap;
+<fold imports>use std::collections::HashMap;
 // Some random comment
-use std::collections::VecDeque;
+use std::collections::VecDeque;</fold>
 
 fn main() <fold block>{
 }</fold>"#,
@@ -326,10 +325,10 @@ use std::io as iop;</fold>
 <fold imports>use std::mem;
 use std::f64;</fold>
 
-<fold imports>use std::collections::<fold block>{
+use std::collections::<fold block>{
     HashMap,
     VecDeque,
-}</fold>;</fold>
+}</fold>;
 // Some random comment
 
 fn main() <fold block>{

crates/syntax/src/ast/node_ext.rs

@@ -477,3 +477,4 @@ impl ast::DocCommentsOwner for ast::Const {}
 impl ast::DocCommentsOwner for ast::TypeAlias {}
 impl ast::DocCommentsOwner for ast::Impl {}
 impl ast::DocCommentsOwner for ast::MacroCall {}
+impl ast::DocCommentsOwner for ast::Use {}

crates/syntax/src/parsing/text_tree_sink.rs

@@ -148,7 +148,7 @@ fn n_attached_trivias<'a>(
 ) -> usize {
     match kind {
         MACRO_CALL | CONST | TYPE_ALIAS | STRUCT | ENUM | VARIANT | FN | TRAIT | MODULE
-        | RECORD_FIELD | STATIC => {
+        | RECORD_FIELD | STATIC | USE => {
             let mut res = 0;
             let mut trivias = trivias.enumerate().peekable();
 

crates/syntax/test_data/parser/inline/ok/0002_use_tree_list.rast

@@ -49,9 +49,9 @@ [email protected]
         [email protected] "}"
     [email protected] ";"
   [email protected] " "
-  COMMENT@59..97 "// Rust 2018 (with a  ..."
-  [email protected] "\n"
-  [email protected]
+  USE@59..121
+    [email protected] "// Rust 2018 (with a  ..."
+    [email protected] "\n"
     [email protected] "use"
     [email protected] " "
     [email protected]
@@ -75,9 +75,9 @@ [email protected]
         [email protected] "}"
     [email protected] ";"
   [email protected] " "
-  COMMENT@122..134 "// Rust 2015"
-  [email protected] "\n"
-  [email protected]
+  USE@122..166
+    [email protected] "// Rust 2015"
+    [email protected] "\n"
     [email protected] "use"
     [email protected] " "
     [email protected]
@@ -102,9 +102,9 @@ [email protected]
         [email protected] "}"
     [email protected] ";"
   [email protected] " "
-  COMMENT@167..179 "// Rust 2015"
-  [email protected] "\n"
-  [email protected]
+  USE@167..205
+    [email protected] "// Rust 2015"
+    [email protected] "\n"
     [email protected] "use"
     [email protected] " "
     [email protected]

crates/syntax/test_data/parser/inline/ok/0110_use_path.rast

@@ -10,9 +10,9 @@ [email protected]
             [email protected] "crate_name"
     [email protected] ";"
   [email protected] " "
-  COMMENT@18..45 "// Rust 2018 - All fl ..."
-  [email protected] "\n"
-  [email protected]
+  USE@18..61
+    [email protected] "// Rust 2018 - All fl ..."
+    [email protected] "\n"
     [email protected] "use"
     [email protected] " "
     [email protected]
@@ -22,9 +22,9 @@ [email protected]
             [email protected] "crate_name"
     [email protected] ";"
   [email protected] " "
-  COMMENT@62..91 "// Rust 2018 - Anchor ..."
-  [email protected] "\n"
-  [email protected]
+  USE@62..124
+    [email protected] "// Rust 2018 - Anchor ..."
+    [email protected] "\n"
     [email protected] "use"
     [email protected] " "
     [email protected]