neuwirth
/
pmacs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix(themes): single-lock epoch observation in the merge-classification unit 

Two theme.lock() calls inside one tuple expression self-deadlock:
the first guard lives to the end of the full expression, so the
second lock blocks the same thread forever. Observed as an 84-minute
hung lib suite; one lock per observation via a helper closure.

Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01VoiEyuPjoBhvwACf8HAnLB
This commit is contained in:
Levi Neuwirth 2026-07-14 19:00:17 +01:00
parent 62990cc099
commit c7fca92fe9
1 changed files with 12 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
src/lua_bindings/mod.rs
View File

@ -12267,14 +12267,19 @@ mod tests {
// committed and face_epoch iff any face key did — bare `ui`
// classifies as a face (Q#TH2, round 2 finding 3).
let theme = seeded_theme();
// One lock per observation: two `lock()` calls inside one
// tuple expression self-deadlock (the first guard outlives
// the second call).
let epochs = |theme: &crate::highlight::ThemeHandle| {
let th = theme.lock().expect("lock");
(th.syntax_epoch, th.face_epoch)
};
let face_only: Vec<mlua::Result<(String, Style)>> =
vec![Ok(("ui.modeline".to_owned(), Style::default()))];
commit_theme_entries(&theme, ThemeCommit::Merge, face_only.into_iter()).expect("commit");
assert_eq!(
(
theme.lock().expect("lock").syntax_epoch,
theme.lock().expect("lock").face_epoch
),
epochs(&theme),
(3, 6),
"face-only merge bumps face_epoch only"
);
@ -12282,36 +12287,19 @@ mod tests {
let bare_ui: Vec<mlua::Result<(String, Style)>> =
vec![Ok(("ui".to_owned(), Style::default()))];
commit_theme_entries(&theme, ThemeCommit::Merge, bare_ui.into_iter()).expect("commit");
assert_eq!(
(
theme.lock().expect("lock").syntax_epoch,
theme.lock().expect("lock").face_epoch
),
(3, 7),
"bare ui is a face key"
);
assert_eq!(epochs(&theme), (3, 7), "bare ui is a face key");
let mixed: Vec<mlua::Result<(String, Style)>> = vec![
Ok(("comment".to_owned(), Style::default())),
Ok(("ui.gutter".to_owned(), Style::default())),
];
commit_theme_entries(&theme, ThemeCommit::Merge, mixed.into_iter()).expect("commit");
assert_eq!(
(
theme.lock().expect("lock").syntax_epoch,
theme.lock().expect("lock").face_epoch
),
(4, 8),
"mixed merge bumps both"
);
assert_eq!(epochs(&theme), (4, 8), "mixed merge bumps both");
let empty: Vec<mlua::Result<(String, Style)>> = Vec::new();
commit_theme_entries(&theme, ThemeCommit::Merge, empty.into_iter()).expect("commit");
assert_eq!(
(
theme.lock().expect("lock").syntax_epoch,
theme.lock().expect("lock").face_epoch
),
epochs(&theme),
(4, 8),
"an empty merge commits nothing and bumps nothing"
);