Rust: add block ids to canonical paths, making them "extended"

Author: Paolo Tranquilli

rust/extractor/src/generated/.generated.list

@@ -5,6 +5,7 @@ use crate::trap::{DiagnosticSeverity, TrapFile, TrapId};
 use crate::trap::{Label, TrapClass};
 use codeql_extractor::trap::{self};
 use log::Level;
+use ra_ap_base_db::salsa::InternKey;
 use ra_ap_base_db::CrateOrigin;
 use ra_ap_hir::db::ExpandDatabase;
 use ra_ap_hir::{Adt, ItemContainer, Module, Semantics, Type};
@@ -347,9 +348,9 @@ impl<'a> Translator<'a> {
     }
 
     fn canonical_path_from_hir_module(&self, item: Module) -> Option<String> {
-        if ModuleId::from(item).is_block_module() {
+        if let Some(block_id) = ModuleId::from(item).containing_block() {
             // this means this is a block module, i.e. a virtual module for a block scope
-            return None;
+            return Some(format!("{{{}}}", block_id.as_intern_id()));
         }
         if item.is_crate_root() {
             return Some("crate".into());
@@ -407,7 +408,7 @@ impl<'a> Translator<'a> {
             let path = self.canonical_path_from_hir(def)?;
             let origin = self.origin_from_hir(def);
             generated::Item::emit_crate_origin(label, origin, &mut self.trap.writer);
-            generated::Item::emit_canonical_path(label, path, &mut self.trap.writer);
+            generated::Item::emit_extended_canonical_path(label, path, &mut self.trap.writer);
             Some(())
         })();
     }

rust/extractor/src/generated/top.rs

@@ -1844,9 +1844,9 @@ infer_types(
 ;
 
 #keyset[id]
-item_canonical_paths(
+item_extended_canonical_paths(
   int id: @item ref,
-  string canonical_path: string ref
+  string extended_canonical_path: string ref
 );
 
 #keyset[id]

rust/extractor/src/translate/base.rs

@@ -10,15 +10,19 @@
 | canonical_paths.rs:17:9:17:20 | h | crate::canonical_paths::a::TraitWithBlanketImpl::h |
 | canonical_paths.rs:20:5:22:5 | Impl | None |
 | canonical_paths.rs:21:9:21:22 | h | <_ as crate::canonical_paths::a::TraitWithBlanketImpl>::h |
-| canonical_paths.rs:25:1:45:1 | Module | crate::canonical_paths::without |
-| canonical_paths.rs:26:5:44:5 | canonicals | crate::canonical_paths::without::canonicals |
-| canonical_paths.rs:27:9:27:27 | Struct | None |
-| canonical_paths.rs:29:9:31:9 | Trait | None |
-| canonical_paths.rs:30:13:30:24 | g | None |
+| canonical_paths.rs:25:1:53:1 | Module | crate::canonical_paths::without |
+| canonical_paths.rs:26:5:48:5 | canonicals | crate::canonical_paths::without::canonicals |
+| canonical_paths.rs:27:9:27:27 | Struct | {0}::OtherStruct |
+| canonical_paths.rs:29:9:31:9 | Trait | {0}::OtherTrait |
+| canonical_paths.rs:30:13:30:24 | g | {0}::OtherTrait::g |
 | canonical_paths.rs:33:9:35:9 | Impl | None |
-| canonical_paths.rs:34:13:34:26 | g | None |
+| canonical_paths.rs:34:13:34:26 | g | <{0}::OtherStruct as {0}::OtherTrait>::g |
 | canonical_paths.rs:37:9:39:9 | Impl | None |
-| canonical_paths.rs:38:13:38:26 | g | None |
+| canonical_paths.rs:38:13:38:26 | g | <crate::canonical_paths::a::Struct as {0}::OtherTrait>::g |
 | canonical_paths.rs:41:9:43:9 | Impl | None |
-| canonical_paths.rs:42:13:42:26 | f | None |
+| canonical_paths.rs:42:13:42:26 | f | <{0}::OtherStruct as crate::canonical_paths::a::Trait>::f |
+| canonical_paths.rs:45:9:47:9 | nested | {0}::nested |
+| canonical_paths.rs:46:13:46:31 | Struct | {1}::OtherStruct |
+| canonical_paths.rs:50:5:52:5 | other | crate::canonical_paths::without::other |
+| canonical_paths.rs:51:9:51:27 | Struct | {2}::OtherStruct |
 | lib.rs:1:1:1:20 | Module | crate::canonical_paths |

rust/ql/.generated.list

@@ -5,8 +5,8 @@ from Item i, string path
 where
   toBeTested(i) and
   (
-    path = i.getCanonicalPath()
+    path = i.getExtendedCanonicalPath()
     or
-    not i.hasCanonicalPath() and path = "None"
+    not i.hasExtendedCanonicalPath() and path = "None"
   )
 select i, path