Skip to content

fix: nondeterministic generation, cache invalidation, and whitespace churn #41

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
hazre wants to merge 6 commits into
base: develop
Choose a base branch
from
Open

fix: nondeterministic generation, cache invalidation, and whitespace churn #41

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
48446c9
fix: stabilize analyzer traversal and path filtering
hazre Apr 11, 2026
ce71280
fix: stabilize cache hashing and regeneration invalidation
hazre Apr 12, 2026
29bffec
fix: sort generator inputs before rendering
hazre Apr 12, 2026
a566357
fix: normalize generated output formatting
hazre Apr 12, 2026
414a5fa
fix: cover metadata changes and stabilize test helpers
hazre Apr 12, 2026
645ac94
fix: satisfy clippy in generator tests
hazre Apr 14, 2026
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
90 changes: 56 additions & 34 deletions src/analysis/ast_cache.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
use std::collections::HashMap;
use std::path::PathBuf;
use std::path::{Path, PathBuf};
use syn::File as SynFile;
use walkdir::WalkDir;

Expand Down Expand Up @@ -33,6 +33,15 @@ impl AstCache {
}
}

fn should_skip_path(path: &Path) -> bool {
path.components().any(|component| {
component
.as_os_str()
.to_str()
.is_some_and(|part| part == "target" || part == ".git")
})
}

/// Parse and cache all Rust files in the given project path
pub fn parse_and_cache_all_files(
&mut self,
Expand All @@ -47,14 +56,11 @@ impl AstCache {
let entry = entry?;
let path = entry.path();

if path.is_file() && path.extension().is_some_and(|ext| ext == "rs") {
// Skip target directory and other build artifacts
if path.to_string_lossy().contains("/target/")
|| path.to_string_lossy().contains("/.git/")
{
continue;
}
if Self::should_skip_path(path) {
continue;
}

if path.is_file() && path.extension().is_some_and(|ext| ext == "rs") {
if verbose {
println!("📄 Parsing file: {}", path.display());
}
Expand Down Expand Up @@ -145,22 +151,33 @@ mod tests {
use super::*;
use std::fs;
use std::io::Write;
use std::sync::atomic::{AtomicU64, Ordering};
use std::sync::{Arc, Mutex};
use std::thread;

static TEMP_DIR_COUNTER: AtomicU64 = AtomicU64::new(0);

fn temp_dir() -> String {
use std::time::{SystemTime, UNIX_EPOCH};
let timestamp = SystemTime::now()
.duration_since(UNIX_EPOCH)
.unwrap()
.as_nanos();
format!("./test_ast_cache_{}_{}", std::process::id(), timestamp)
let counter = TEMP_DIR_COUNTER.fetch_add(1, Ordering::Relaxed);
format!(
"./test_ast_cache_{}_{}_{}",
std::process::id(),
timestamp,
counter
)
}

fn cleanup_dir(dir: &str) {
let _ = fs::remove_dir_all(dir);
fn cleanup_dir(dir: impl AsRef<Path>) {
let _ = fs::remove_dir_all(dir.as_ref());
}

fn create_rust_file(dir: &str, name: &str, content: &str) -> PathBuf {
let path = PathBuf::from(format!("{}/{}", dir, name));
fn create_rust_file(dir: impl AsRef<Path>, name: &str, content: &str) -> PathBuf {
let path = dir.as_ref().join(name);
if let Some(parent) = path.parent() {
fs::create_dir_all(parent).unwrap();
}
Expand All @@ -169,6 +186,30 @@ mod tests {
path
}

#[test]
fn test_temp_dir_helper_is_unique_under_concurrency() {
let seen = Arc::new(Mutex::new(std::collections::HashSet::new()));
let mut handles = Vec::new();

for _ in 0..32 {
let seen = Arc::clone(&seen);
handles.push(thread::spawn(move || {
for _ in 0..1000 {
let dir = temp_dir();
let mut guard = seen.lock().unwrap();
assert!(
guard.insert(dir),
"temp_dir helper returned a duplicate path"
);
}
}));
}

for handle in handles {
handle.join().unwrap();
}
}

mod parsed_file {
use super::*;

Expand Down Expand Up @@ -213,29 +254,25 @@ mod tests {
#[test]
fn test_parse_and_cache_single_file() {
let dir = temp_dir();
fs::create_dir_all(&dir).unwrap();
let path = create_rust_file(&dir, "test.rs", "fn main() {}");

let mut cache = AstCache::new();
let result = cache.parse_and_cache_file(&path);
assert!(result.is_ok());
assert_eq!(cache.len(), 1);
assert!(cache.contains(&path));

cleanup_dir(&dir);
}

#[test]
fn test_parse_invalid_syntax_errors() {
let dir = temp_dir();
fs::create_dir_all(&dir).unwrap();
let path = create_rust_file(&dir, "invalid.rs", "fn main( {");

let mut cache = AstCache::new();
let result = cache.parse_and_cache_file(&path);
assert!(result.is_err());
assert_eq!(cache.len(), 0);

cleanup_dir(&dir);
}

Expand All @@ -254,7 +291,6 @@ mod tests {
#[test]
fn test_parse_and_cache_all_files() {
let dir = temp_dir();
fs::create_dir_all(&dir).unwrap();

create_rust_file(&dir, "lib.rs", "pub fn hello() {}");
create_rust_file(&dir, "main.rs", "fn main() {}");
Expand All @@ -264,14 +300,13 @@ mod tests {
let result = cache.parse_and_cache_all_files(&dir, false);
assert!(result.is_ok());
assert_eq!(cache.len(), 3);

cleanup_dir(&dir);
}

#[test]
fn test_parse_skips_target_directory() {
let dir = temp_dir();
fs::create_dir_all(format!("{}/target", dir)).unwrap();
fs::create_dir_all(Path::new(&dir).join("target")).unwrap();

create_rust_file(&dir, "lib.rs", "pub fn hello() {}");
create_rust_file(&dir, "target/debug.rs", "fn debug() {}");
Expand All @@ -281,14 +316,13 @@ mod tests {

// Should only have lib.rs, not target/debug.rs
assert_eq!(cache.len(), 1);

cleanup_dir(&dir);
}

#[test]
fn test_parse_skips_git_directory() {
let dir = temp_dir();
fs::create_dir_all(format!("{}/.git", dir)).unwrap();
fs::create_dir_all(Path::new(&dir).join(".git")).unwrap();

create_rust_file(&dir, "lib.rs", "pub fn hello() {}");
create_rust_file(&dir, ".git/hooks.rs", "fn hook() {}");
Expand All @@ -297,14 +331,12 @@ mod tests {
cache.parse_and_cache_all_files(&dir, false).unwrap();

assert_eq!(cache.len(), 1);

cleanup_dir(&dir);
}

#[test]
fn test_parse_continues_on_syntax_error() {
let dir = temp_dir();
fs::create_dir_all(&dir).unwrap();

create_rust_file(&dir, "valid.rs", "fn main() {}");
create_rust_file(&dir, "invalid.rs", "fn main( {");
Expand All @@ -315,21 +347,18 @@ mod tests {
assert!(result.is_ok());
// Should have 2 valid files, skip the invalid one
assert_eq!(cache.len(), 2);

cleanup_dir(&dir);
}

#[test]
fn test_parse_with_verbose_output() {
let dir = temp_dir();
fs::create_dir_all(&dir).unwrap();
create_rust_file(&dir, "lib.rs", "pub fn hello() {}");

let mut cache = AstCache::new();
// Just verify it doesn't panic with verbose=true
let result = cache.parse_and_cache_all_files(&dir, true);
assert!(result.is_ok());

cleanup_dir(&dir);
}
}
Expand Down Expand Up @@ -474,42 +503,36 @@ mod tests {
let result = cache.parse_and_cache_all_files(&dir, false);
assert!(result.is_ok());
assert_eq!(cache.len(), 0);

cleanup_dir(&dir);
}

#[test]
fn test_directory_with_only_non_rust_files() {
let dir = temp_dir();
fs::create_dir_all(&dir).unwrap();
create_rust_file(&dir, "readme.txt", "Hello");
create_rust_file(&dir, "config.json", "{}");

let mut cache = AstCache::new();
cache.parse_and_cache_all_files(&dir, false).unwrap();
assert_eq!(cache.len(), 0);

cleanup_dir(&dir);
}

#[test]
fn test_parse_empty_rust_file() {
let dir = temp_dir();
fs::create_dir_all(&dir).unwrap();
let path = create_rust_file(&dir, "empty.rs", "");

let mut cache = AstCache::new();
let result = cache.parse_and_cache_file(&path);
assert!(result.is_ok());
assert_eq!(cache.len(), 1);

cleanup_dir(&dir);
}

#[test]
fn test_cache_same_file_twice() {
let dir = temp_dir();
fs::create_dir_all(&dir).unwrap();
let path = create_rust_file(&dir, "test.rs", "fn main() {}");

let mut cache = AstCache::new();
Expand All @@ -518,7 +541,6 @@ mod tests {

// Should still be 1 (overwritten)
assert_eq!(cache.len(), 1);

cleanup_dir(&dir);
}
}
Expand Down
Loading