Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
158 changes: 157 additions & 1 deletion Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 4 additions & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ salsa = { workspace = true}
codegen-sdk-typescript = { workspace = true}
env_logger = { workspace = true }
log = { workspace = true }
codegen-sdk-resolution = { workspace = true}
sysinfo = "0.33.1"
rkyv.workspace = true
[features]
Expand Down Expand Up @@ -57,7 +58,7 @@ members = [
"languages/codegen-sdk-yaml",
"languages/codegen-sdk-toml",
"languages/codegen-sdk-ts_query",
"languages/codegen-sdk-typescript",
"languages/codegen-sdk-typescript", "codegen-sdk-resolution",
]
resolver = "2"
[workspace.dependencies]
Expand Down Expand Up @@ -88,6 +89,7 @@ mockall = "0.13.1"
codegen-sdk-common = { path = "codegen-sdk-common" }
codegen-sdk-cst = { path = "codegen-sdk-cst"}
codegen-sdk-ast = { path = "codegen-sdk-ast" }
codegen-sdk-resolution = { path = "codegen-sdk-resolution" }
codegen-sdk-cst-generator = { path = "codegen-sdk-cst-generator" }
codegen-sdk-ast-generator = { path = "codegen-sdk-ast-generator" }
codegen-sdk-ts_query = { path = "languages/codegen-sdk-ts_query" }
Expand Down Expand Up @@ -117,6 +119,7 @@ subenum = {git = "https://github.com/mrenow/subenum", branch = "main"}
indicatif-log-bridge = "0.2.3"
indicatif = { version = "0.17.11", features = ["rayon"] }
crossbeam-channel = "0.5.11"
rstest = "0.25.0"
[profile.dev]
# codegen-backend = "cranelift"
split-debuginfo = "unpacked"
Expand Down
1 change: 1 addition & 0 deletions codegen-sdk-analyzer/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ salsa = { workspace = true }
codegen-sdk-common = { workspace = true }
codegen-sdk-ast = { workspace = true }
codegen-sdk-cst = { workspace = true }
codegen-sdk-resolution = { workspace = true }
codegen-sdk-python = { workspace = true, optional = true}
codegen-sdk-typescript = { workspace = true, optional = true}
codegen-sdk-tsx = { workspace = true, optional = true}
Expand Down
40 changes: 23 additions & 17 deletions codegen-sdk-analyzer/src/codebase.rs
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ use anyhow::Context;
use codegen_sdk_ast::Input;
#[cfg(feature = "serialization")]
use codegen_sdk_common::serialization::Cache;
use codegen_sdk_resolution::CodebaseContext;
use discovery::FilesToParse;
use notify_debouncer_mini::DebounceEventResult;
use salsa::Setter;
Expand Down Expand Up @@ -60,25 +61,11 @@ impl Codebase {
}
Ok(())
}
pub fn get_file(&self, path: PathBuf) -> Option<&ParsedFile<'_>> {
let file = self.db.files.get(&path);
if let Some(file) = file {
return parse_file(&self.db, file.clone()).file(&self.db).as_ref();
}
None
}

fn discover(&self) -> FilesToParse {
discovery::collect_files(&self.db, &self.root)
}
pub fn files(&self) -> Vec<&ParsedFile<'_>> {
let mut files = Vec::new();
for file in self.discover().files(&self.db) {
if let Some(file) = self.get_file(file.path(&self.db)) {
files.push(file);
}
}
files
}

pub fn errors(&self) -> Vec<()> {
let mut errors = Vec::new();
for file in self.discover().files(&self.db) {
Expand All @@ -97,7 +84,26 @@ impl Codebase {
files,
)
}
pub fn db(&self) -> &CodegenDatabase {
}
impl CodebaseContext for Codebase {
type File<'a> = ParsedFile<'a>;
fn files<'a>(&'a self) -> Vec<&'a Self::File<'a>> {
let mut files = Vec::new();
for file in self.discover().files(&self.db) {
if let Some(file) = self.get_file(file.path(&self.db)) {
files.push(file);
}
}
files
}
fn db(&self) -> &dyn salsa::Database {
&self.db
}
fn get_file<'a>(&'a self, path: PathBuf) -> Option<&'a Self::File<'a>> {
let file = self.db.files.get(&path);
if let Some(file) = file {
return parse_file(&self.db, file.clone()).file(&self.db).as_ref();
}
None
}
}
Loading