refactor(workspace): extract model types (#297)

Author: hongjr03

Cargo.toml

@@ -59,6 +59,7 @@ project-model = { path = "./crates/project-model/", version = "0.0.0" }
 syntax = { path = "./crates/syntax/", version = "0.0.0" }
 utils = { path = "./crates/utils", version = "0.0.0" }
 vfs = { path = "./crates/vfs", version = "0.0.0" }
+workspace-model = { path = "./crates/workspace-model/", version = "0.0.0" }
 slang = { path = "./crates/slang", version = "0.0.1" }
 parking_lot = "0.12.1"
 

crates/hir/Cargo.toml

@@ -19,3 +19,4 @@ tracing.workspace = true
 triomphe.workspace = true
 utils.workspace = true
 vfs.workspace = true
+workspace-model.workspace = true

crates/hir/src/base_db/project.rs

@@ -1,127 +1 @@
-use triomphe::Arc;
-use utils::{line_index::TextRange, paths::AbsPathBuf};
-
-use crate::base_db::source_root::SourceRootId;
-
-#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash)]
-pub struct CompilationProfileId(pub u32);
-
-#[derive(Debug, Clone, PartialEq, Eq, Default)]
-pub struct PreprocessConfig {
-    pub predefines: Vec<Predefine>,
-    pub include_dirs: Vec<AbsPathBuf>,
-}
-
-impl PreprocessConfig {
-    pub fn with_predefine_strings(
-        predefines: impl IntoIterator<Item = impl Into<String>>,
-        include_dirs: Vec<AbsPathBuf>,
-    ) -> Self {
-        Self {
-            predefines: predefines.into_iter().map(|predefine| Predefine::new(predefine)).collect(),
-            include_dirs,
-        }
-    }
-
-    pub fn include_dir_strings(&self) -> Vec<String> {
-        self.include_dirs.iter().map(ToString::to_string).collect()
-    }
-
-    pub fn predefine_strings(&self) -> Vec<String> {
-        self.predefines.iter().map(|predefine| predefine.definition.clone()).collect()
-    }
-}
-
-#[derive(Debug, Clone, PartialEq, Eq)]
-pub struct Predefine {
-    pub definition: String,
-    pub source: Option<PredefineSource>,
-}
-
-impl Predefine {
-    pub fn new(definition: impl Into<String>) -> Self {
-        Self { definition: definition.into(), source: None }
-    }
-
-    pub fn with_source(definition: impl Into<String>, source: PredefineSource) -> Self {
-        Self { definition: definition.into(), source: Some(source) }
-    }
-
-    pub fn as_str(&self) -> &str {
-        self.definition.as_str()
-    }
-}
-
-impl From<String> for Predefine {
-    fn from(value: String) -> Self {
-        Predefine::new(value)
-    }
-}
-
-impl From<&str> for Predefine {
-    fn from(value: &str) -> Self {
-        Predefine::new(value)
-    }
-}
-
-#[derive(Debug, Clone, PartialEq, Eq)]
-pub struct PredefineSource {
-    pub path: AbsPathBuf,
-    pub range: TextRange,
-}
-
-#[derive(Debug, Clone, PartialEq, Eq)]
-pub struct CompilationProfile {
-    pub source_roots: Vec<SourceRootId>,
-    pub top_modules: Vec<String>,
-    pub preprocess: PreprocessConfig,
-}
-
-#[derive(Debug, Clone, PartialEq, Eq, Default)]
-pub struct ProjectConfig {
-    root_profiles: Vec<Option<CompilationProfileId>>,
-    profiles: Vec<CompilationProfile>,
-}
-
-impl ProjectConfig {
-    pub fn new(
-        root_profiles: Vec<Option<CompilationProfileId>>,
-        profiles: Vec<CompilationProfile>,
-    ) -> Self {
-        Self { root_profiles, profiles }
-    }
-
-    pub fn profile_for_root(&self, root_id: SourceRootId) -> Option<CompilationProfileId> {
-        self.root_profiles.get(root_id.0 as usize).copied().flatten()
-    }
-
-    pub fn profile(&self, profile_id: CompilationProfileId) -> Option<&CompilationProfile> {
-        self.profiles.get(profile_id.0 as usize)
-    }
-
-    pub fn root_profile_count(&self) -> usize {
-        self.root_profiles.len()
-    }
-
-    pub fn has_compilation_profiles(&self) -> bool {
-        !self.profiles.is_empty()
-    }
-
-    pub fn profile_ids(&self) -> Vec<CompilationProfileId> {
-        (0..self.profiles.len())
-            .map(|idx| CompilationProfileId(u32::try_from(idx).unwrap_or(u32::MAX)))
-            .collect()
-    }
-
-    pub fn preprocess_for_profile(
-        &self,
-        profile_id: Option<CompilationProfileId>,
-    ) -> PreprocessConfig {
-        profile_id
-            .and_then(|profile_id| self.profile(profile_id))
-            .map(|profile| profile.preprocess.clone())
-            .unwrap_or_default()
-    }
-}
-
-pub type SharedProjectConfig = Arc<ProjectConfig>;
+pub use workspace_model::project::*;

crates/hir/src/base_db/source_db.rs

@@ -5,7 +5,7 @@ use syntax::{
 };
 use triomphe::Arc;
 use utils::{line_index::TextSize, path_identity::PathIdentityIndex};
-use vfs::{FileId, VfsPath, anchored_path::AnchoredPath};
+use vfs::{FileId, anchored_path::AnchoredPath};
 
 use crate::base_db::{
     compilation_plan::{self, CompilationPlan},
@@ -16,6 +16,8 @@ use crate::base_db::{
 
 mod preproc;
 
+pub use workspace_model::source_db::SourceFileKind;
+
 pub(crate) use self::preproc::workspace_preproc_model_file_ids;
 pub use self::preproc::{
     MappedSourcePreprocModel, PreprocManifestSource, PreprocSourceMap, PreprocSourceMapError,
@@ -63,40 +65,6 @@ pub trait SourceDb: FileLoader + std::fmt::Debug {
     fn project_config(&self) -> Arc<ProjectConfig>;
 }
 
-#[derive(Debug, Clone, Copy, PartialEq, Eq, Default)]
-pub enum SourceFileKind {
-    #[default]
-    SystemVerilog,
-    IncludeHeader,
-    LibraryMap,
-    ProjectManifest,
-}
-
-impl SourceFileKind {
-    pub fn from_path(path: &VfsPath) -> Self {
-        match path.name_and_extension() {
-            Some((name, Some(ext))) if name == "vide" && ext.eq_ignore_ascii_case("toml") => {
-                Self::ProjectManifest
-            }
-            Some((_, Some(ext))) if ext.eq_ignore_ascii_case("map") => Self::LibraryMap,
-            Some((_, Some(ext)))
-                if ["vh", "svh", "svi"].iter().any(|header| ext.eq_ignore_ascii_case(header)) =>
-            {
-                Self::IncludeHeader
-            }
-            _ => Self::SystemVerilog,
-        }
-    }
-
-    pub(crate) fn is_semantic_compilation_unit(self) -> bool {
-        matches!(self, Self::SystemVerilog | Self::LibraryMap)
-    }
-
-    fn is_slang_parse_unit(self) -> bool {
-        matches!(self, Self::SystemVerilog | Self::LibraryMap)
-    }
-}
-
 fn parse_src(db: &dyn SourceDb, file_id: FileId) -> SyntaxTree {
     let _span = tracing::info_span!("slang.parse_src", ?file_id).entered();
     let text = db.file_text(file_id);