starred/tty7
1
0
Fork 0
mirror of https://github.com/l0ng-ai/tty7.git synced 2026-10-06 08:02:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(themes): accept integer colour components in .itermcolors files (#1059)

Browse Source 
* fix(themes): accept integer colour components in .itermcolors files

iTerm2 and plistlib write exact 0 and 1 as <integer>, which the loader
rejected, dropping the whole theme.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>

* docs(changelog): drop the Unreleased entry; the release notes carry it

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>

---------

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
This commit is contained in:
Adam Hitchcock
2026-10-01 15:17:01 +08:00
committed by GitHub
co-authored by Claude Opus 5.5
parent b63a4ebbe0
commit ac5f20dfa7
1 changed files with 34 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ui/presets.rs
+34 -1
View File
@@ -1188,7 +1188,11 @@ fn load_iterm_theme(path: &std::path::Path) -> Result<Theme, String> {
let color = |key: &str| -> Option<u32> {
let c = dict.get(key)?.as_dictionary()?;
let comp = |k: &str| -> Option<u32> {
let f = c.get(k)?.as_real()?;
// iTerm2 and plistlib write exact 0 and 1 as `<integer>`.
let v = c.get(k)?;
let f = v
.as_real()
.or_else(|| v.as_signed_integer().map(|i| i as f64))?;
Some((f.clamp(0.0, 1.0) * 255.0).round() as u32)
};
Some(
@@ -2584,6 +2588,35 @@ ansi:
assert_eq!(img.opacity, 0.4);
}
#[test]
fn iterm_theme_accepts_integer_components_and_no_alpha() {
let entry = |key: String, r: &str| {
format!(
"<key>{key}</key><dict><key>Red Component</key>{r}\
<key>Green Component</key><real>0.5</real>\
<key>Blue Component</key><integer>0</integer></dict>"
)
};
let mut body: String = (0..16)
.map(|i| entry(format!("Ansi {i} Color"), "<integer>1</integer>"))
.collect();
body += &entry("Background Color".into(), "<integer>0</integer>");
body += &entry("Foreground Color".into(), "<real>1.0</real>");
let xml = format!(
"<?xml version=\"1.0\" encoding=\"UTF-8\"?>\
<plist version=\"1.0\"><dict>{body}</dict></plist>"
);
let path =
std::env::temp_dir().join(format!("tty7-int-{}.itermcolors", std::process::id()));
std::fs::write(&path, xml).unwrap();
let theme = load_iterm_theme(&path);
let _ = std::fs::remove_file(&path);
let theme = theme.unwrap();
assert_eq!(theme.ansi16[2], (0xff, 0x80, 0x00));
assert_eq!(theme.background_color(), 0x008000);
assert_eq!(theme.foreground, 0xff8000);
}
#[test]
fn id_and_name_titlecases_the_stem() {
let (id, name) = id_and_name(std::path::Path::new("/x/solarized_dark.yaml"));