Add helpers to obtain CrateId of the CompilationUnit (#1970)

**Stack**:
- #1921
- #1913
- #1970 ⬅


⚠️ *Part of a stack created by [spr](https://github.com/ejoffe/spr). Do
not merge manually using the UI - doing so may have unexpected results.*

Author: integraledelebesgue

scarb/src/compiler/compilation_unit.rs

@@ -1,6 +1,7 @@
 use anyhow::{ensure, Result};
 use cairo_lang_filesystem::cfg::CfgSet;
-use cairo_lang_filesystem::db::CrateIdentifier;
+use cairo_lang_filesystem::db::{CrateIdentifier, FilesGroup};
+use cairo_lang_filesystem::ids::{CrateId, CrateLongId};
 use itertools::Itertools;
 use serde::{Deserialize, Serialize};
 use smol_str::SmolStr;
@@ -95,6 +96,16 @@ pub struct CompilationUnitComponent {
     pub dependencies: Vec<CompilationUnitDependency>,
 }
 
+impl CompilationUnitComponent {
+    /// Returns a [`CrateId`] of a crate associated with the [`CompilationUnitComponent`].
+    pub fn crate_id(&self, db: &dyn FilesGroup) -> CrateId {
+        db.intern_crate(CrateLongId::Real {
+            name: self.cairo_package_name(),
+            discriminator: self.id.to_discriminator(),
+        })
+    }
+}
+
 /// The kind of the compilation unit dependency.
 #[derive(Clone, Eq, PartialEq, Ord, PartialOrd, Hash, Debug)]
 pub enum CompilationUnitDependency {

scarb/src/compiler/db.rs

@@ -12,9 +12,8 @@ use cairo_lang_defs::db::DefsGroup;
 use cairo_lang_defs::ids::ModuleId;
 use cairo_lang_defs::plugin::MacroPlugin;
 use cairo_lang_filesystem::db::{
-    AsFilesGroupMut, CrateIdentifier, CrateSettings, DependencySettings, FilesGroup, FilesGroupEx,
+    AsFilesGroupMut, CrateIdentifier, CrateSettings, DependencySettings, FilesGroupEx,
 };
-use cairo_lang_filesystem::ids::CrateLongId;
 use cairo_lang_semantic::plugin::PluginSuite;
 use cairo_lang_utils::ordered_hash_map::OrderedHashMap;
 use smol_str::SmolStr;
@@ -102,11 +101,8 @@ fn inject_virtual_wrapper_lib(db: &mut RootDatabase, unit: &CairoCompilationUnit
         .collect();
 
     for component in components {
-        let name = component.cairo_package_name();
-        let crate_id = db.intern_crate(CrateLongId::Real {
-            name,
-            discriminator: component.id.to_discriminator(),
-        });
+        let crate_id = component.crate_id(db);
+
         let file_stems = component
             .targets
             .iter()

scarb/src/compiler/helpers.rs

@@ -9,7 +9,7 @@ use cairo_lang_compiler::diagnostics::DiagnosticsReporter;
 use cairo_lang_compiler::CompilerConfig;
 use cairo_lang_diagnostics::{FormattedDiagnosticEntry, Severity};
 use cairo_lang_filesystem::db::FilesGroup;
-use cairo_lang_filesystem::ids::{CrateId, CrateLongId};
+use cairo_lang_filesystem::ids::CrateId;
 use itertools::Itertools;
 use serde::Serialize;
 use std::io::{BufWriter, Write};
@@ -117,11 +117,7 @@ impl From<cairo_lang_lowering::utils::InliningStrategy> for InliningStrategy {
 
 pub fn collect_main_crate_ids(unit: &CairoCompilationUnit, db: &RootDatabase) -> Vec<CrateId> {
     let main_component = unit.main_component();
-    let name = main_component.cairo_package_name();
-    vec![db.intern_crate(CrateLongId::Real {
-        discriminator: main_component.id.to_discriminator(),
-        name,
-    })]
+    vec![main_component.crate_id(db)]
 }
 
 pub fn write_json(

scarb/src/ops/expand.rs

@@ -9,8 +9,6 @@ use cairo_lang_defs::db::DefsGroup;
 use cairo_lang_defs::ids::{LanguageElementId, ModuleId, ModuleItemId};
 use cairo_lang_defs::patcher::PatchBuilder;
 use cairo_lang_diagnostics::ToOption;
-use cairo_lang_filesystem::db::FilesGroup;
-use cairo_lang_filesystem::ids::CrateLongId;
 use cairo_lang_formatter::{CairoFormatter, FormatOutcome, FormatterConfig};
 use cairo_lang_parser::db::ParserGroup;
 use cairo_lang_syntax::node::helpers::UsePathEx;
@@ -170,11 +168,7 @@ fn do_expand(
 ) -> Result<()> {
     let ScarbDatabase { db, .. } =
         build_scarb_root_database(compilation_unit, ws, Default::default())?;
-    let name = compilation_unit.main_component().cairo_package_name();
-    let main_crate_id = db.intern_crate(CrateLongId::Real {
-        name,
-        discriminator: compilation_unit.main_component().id.to_discriminator(),
-    });
+    let main_crate_id = compilation_unit.main_component().crate_id(&db);
     let mut compiler_config = build_compiler_config(&db, compilation_unit, &[main_crate_id], ws);
     // Report diagnostics, but do not fail.
     let _ = compiler_config.diagnostics_reporter.check(&db);

scarb/src/ops/lint.rs

@@ -12,8 +12,6 @@ use anyhow::anyhow;
 use anyhow::Result;
 use cairo_lang_defs::db::DefsGroup;
 use cairo_lang_diagnostics::Diagnostics;
-use cairo_lang_filesystem::db::FilesGroup;
-use cairo_lang_filesystem::ids::CrateLongId;
 use cairo_lang_semantic::diagnostic::SemanticDiagnosticKind;
 use cairo_lang_semantic::{db::SemanticGroup, SemanticDiagnostic};
 use cairo_lang_utils::Upcast;
@@ -25,7 +23,6 @@ use cairo_lint_core::{
 use itertools::Itertools;
 use scarb_ui::components::Status;
 use serde::Deserialize;
-use smol_str::SmolStr;
 
 use crate::core::{Package, Workspace};
 
@@ -150,11 +147,7 @@ pub fn lint(opts: LintOptions, ws: &Workspace<'_>) -> Result<()> {
                         build_scarb_root_database(compilation_unit, ws, additional_plugins)?;
 
                     let main_component = compilation_unit.main_component();
-
-                    let crate_id = db.intern_crate(CrateLongId::Real {
-                        name: SmolStr::new(main_component.target_name()),
-                        discriminator: main_component.id.to_discriminator(),
-                    });
+                    let crate_id = main_component.crate_id(&db);
 
                     let diags: Vec<Diagnostics<SemanticDiagnostic>> = db
                         .crate_modules(crate_id)