Rust: Preserve documentation comment extraction

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>

Copilot-Session: a04d83d9-ceea-4109-8ce1-f420585125d4

Author: paldepind

rust/extractor/src/translate/base.rs

@@ -351,9 +351,14 @@ impl<'db> Translator<'db> {
         children: SyntaxElementChildren,
     ) {
         for child in children {
-            if let NodeOrToken::Token(token) = child
-                && token.kind() == SyntaxKind::COMMENT
-            {
+            let token = match child {
+                NodeOrToken::Token(token) if token.kind() == SyntaxKind::COMMENT => Some(token),
+                NodeOrToken::Node(node) if node.kind() == SyntaxKind::DOC_COMMENT => {
+                    node.first_token()
+                }
+                _ => None,
+            };
+            if let Some(token) = token {
                 let label = self.trap.emit(generated::Comment {
                     id: TrapId::Star,
                     parent: parent_label,

rust/ql/.generated.list

@@ -17,6 +17,7 @@ module Impl {
    * ```rust
    * // this is a comment
    * /// This is a doc comment
+   * fn documented() {}
    * ```
    */
   class Comment extends Generated::Comment {

rust/ql/lib/codeql/rust/elements/Comment.qll

@@ -104,7 +104,7 @@ main.rs:
 #-----| Crate(proc_macro@0.0.0)
 #-----| core -> Crate(core@0.0.0)
 #-----| std -> Crate(std@0.0.0)
-#-----| rustc_literal_escaper -> Crate(rustc_literal_escaper@0.0.7)
+#-----| rustc_literal_escaper -> Crate(rustc_literal_escaper@0.0.8)
 
 #-----| Crate(rand@0.9.2)
 #-----| rand_core -> Crate(rand_core@0.9.3)
@@ -117,7 +117,7 @@ main.rs:
 #-----| Crate(rustc_demangle@0.1.27)
 #-----| core -> Crate(core@0.0.0)
 
-#-----| Crate(rustc_literal_escaper@0.0.7)
+#-----| Crate(rustc_literal_escaper@0.0.8)
 #-----| core -> Crate(core@0.0.0)
 
 #-----| Crate(std@0.0.0)

rust/ql/lib/codeql/rust/elements/internal/CommentImpl.qll

@@ -1,7 +1,7 @@
 | comments.rs:1:1:3:2 | /**...*/ | getParent: | comments.rs:1:1:9:1 | fn foo | getText: | /** \n* A doc comment\n*/ |
 | comments.rs:6:17:6:34 | //... | getParent: | comments.rs:6:17:8:16 | fn nested | getText: | // print some text |
 | comments.rs:7:3:7:31 | ///... | getParent: | comments.rs:6:17:8:16 | fn nested | getText: | /// This is a nested function |
-| gen_comment.rs:1:1:1:36 | //... | getParent: | gen_comment.rs:1:1:7:2 | SourceFile | getText: | // generated by codegen, do not edit |
-| gen_comment.rs:4:5:4:30 | //... | getParent: | gen_comment.rs:3:25:7:1 | StmtList | getText: | // A comment. For example: |
-| gen_comment.rs:5:5:5:24 | //... | getParent: | gen_comment.rs:3:25:7:1 | StmtList | getText: | // this is a comment |
-| gen_comment.rs:6:5:6:29 | ///... | getParent: | gen_comment.rs:3:25:7:1 | StmtList | getText: | /// This is a doc comment |
+| gen_comment.rs:1:1:1:36 | //... | getParent: | gen_comment.rs:1:1:8:2 | SourceFile | getText: | // generated by codegen, do not edit |
+| gen_comment.rs:4:5:4:30 | //... | getParent: | gen_comment.rs:4:5:7:22 | fn documented | getText: | // A comment. For example: |
+| gen_comment.rs:5:5:5:24 | //... | getParent: | gen_comment.rs:4:5:7:22 | fn documented | getText: | // this is a comment |
+| gen_comment.rs:6:5:6:29 | ///... | getParent: | gen_comment.rs:4:5:7:22 | fn documented | getText: | /// This is a doc comment |