Rust: add file for root modules of crates

Author: aibaars

rust/extractor/src/crate_graph.rs

@@ -6,6 +6,7 @@ use chalk_ir::IntTy;
 use chalk_ir::Scalar;
 use chalk_ir::UintTy;
 use chalk_ir::{FloatTy, Safety};
+use codeql_extractor::trap::Location;
 use itertools::Itertools;
 use ra_ap_base_db::CrateGraph;
 use ra_ap_base_db::CrateId;
@@ -85,6 +86,22 @@ pub fn extract_crate_graph(trap_provider: &trap::TrapFileProvider, db: &RootData
                 DefMap::ROOT,
                 &mut trap,
             );
+            let file_label = trap.emit_file(root_module_file).as_untyped();
+            let location_label = codeql_extractor::extractor::location_label(
+                &mut trap.writer,
+                Location {
+                    file_label,
+                    start_line: 0,
+                    start_column: 0,
+                    end_line: 0,
+                    end_column: 0,
+                },
+            );
+            trap.writer.add_tuple(
+                "locatable_locations",
+                vec![module.into(), location_label.into()],
+            );
+
             let element = generated::Crate {
                 id: trap::TrapId::Key(format!("{}:{hash}", root_module_file.display())),
                 name: krate

rust/ql/lib/codeql/files/FileSystem.qll

@@ -55,7 +55,8 @@ class File extends Container, Impl::File {
         |
           node.getFile() = this and
           line = [/*loc.getStartLine(), */ loc.getEndLine()] and // ignore start locations for now as we're getting them wrong for things with a comment attached
-          not loc instanceof EmptyLocation
+          not loc instanceof EmptyLocation and
+          line > 0
         )
       )
   }

rust/ql/test/extractor-tests/crate_graph/modules.expected

@@ -18,7 +18,8 @@
 #-----| impl AsString for ...::X { ... }
 #-----|  -> fn as_string
 
-#-----| mod crate
+lib.rs:
+#    1| mod crate
 #-----|  -> mod module
 
 #-----| mod module