hl-valdemar/tinty-wrapper
1
0
Fork 0
Code Issues Pull Requests Actions Packages Releases Wiki Activity

feat: include Conjure palette appearance

Browse Source
This commit is contained in:
hl-valdemar
2026-10-22 16:49:08 +02:00
parent b42e789f29
commit 92200c76ec
3 changed files with 58 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
main_test.go
+51 -3
View File
@@ -138,6 +138,7 @@ func TestApplyAppsUsesTinted8Semantics(t *testing.T) {
"black-normal": {Hex: "#000000"}, "black-bright": {Hex: "#111111"},
"gray-dim": {Hex: "#222222"}, "gray-normal": {Hex: "#333333"}, "gray-bright": {Hex: "#444444"},
"white-normal": {Hex: "#eeeeee"}, "white-bright": {Hex: "#ffffff"},
"black-dim": {Hex: "#111111"}, "white-dim": {Hex: "#dddddd"},
"red-normal": {Hex: "#aa0000"}, "orange-normal": {Hex: "#bb5500"},
"yellow-normal": {Hex: "#aaaa00"}, "green-normal": {Hex: "#00aa00"},
"cyan-normal": {Hex: "#00aaaa"}, "blue-normal": {Hex: "#0000aa"},
@@ -211,11 +212,15 @@ esac
t.Fatalf("Zed theme was not renamed:\n%s", zedOutput)
}
var conjure struct {
Colors map[string]string `json:"colors"`
Variant string `json:"variant"`
Colors map[string]string `json:"colors"`
}
if err := json.Unmarshal([]byte(readFile(t, filepath.Join(filepath.Dir(conjureConfig), "theme.json"))), &conjure); err != nil {
t.Fatal(err)
}
if conjure.Variant != "dark" {
t.Fatalf("Conjure variant = %q, want dark", conjure.Variant)
}
expected := map[string]string{
"background": "#010101", "text": "#fefefe", "secondaryText": "#444444",
"accent": "#123456", "glow": "#aa0000", "keyBackground": "#111111", "error": "#aa0000",
@@ -231,6 +236,33 @@ esac
if readFile(t, conjureConfig) != userConfig {
t.Fatal("Conjure user configuration changed")
}
scheme.Variant = "light"
expected["secondaryText"] = "#222222"
expected["keyBackground"] = "#dddddd"
data, err = json.Marshal([]tintyScheme{scheme})
if err != nil {
t.Fatal(err)
}
if err := os.WriteFile(listPath, data, 0o644); err != nil {
t.Fatal(err)
}
if err := applyApps(zed); err != nil {
t.Fatal(err)
}
if err := json.Unmarshal([]byte(readFile(t, filepath.Join(filepath.Dir(conjureConfig), "theme.json"))), &conjure); err != nil {
t.Fatal(err)
}
if conjure.Variant != "light" {
t.Fatalf("Conjure variant = %q, want light", conjure.Variant)
}
for key, value := range expected {
if conjure.Colors[key] != value {
t.Errorf("light Conjure %s = %q, want %q", key, conjure.Colors[key], value)
}
}
if readFile(t, conjureConfig) != userConfig {
t.Fatal("Conjure user configuration changed")
}
}
func TestBase16SemanticFallback(t *testing.T) {
@@ -277,7 +309,7 @@ func TestConjureThemeFallbacks(t *testing.T) {
if err != nil {
t.Fatal(err)
}
if err := writeConjureTheme(colors, nil); err != nil {
if err := writeConjureTheme("dark", colors, nil); err != nil {
t.Fatal(err)
}
var theme struct {
@@ -308,13 +340,29 @@ func TestConjureThemeRejectsInvalidColors(t *testing.T) {
"base00": "#000000", "base01": "#111111", "base04": "#444444",
"base05": "#555555", "base08": "#880000", "base0D": value,
}
if err := writeConjureTheme(colors, nil); err == nil {
if err := writeConjureTheme("dark", colors, nil); err == nil {
t.Fatalf("accepted invalid accent %q", value)
}
})
}
}
func TestConjureThemeRejectsInvalidVariants(t *testing.T) {
t.Setenv("HOME", t.TempDir())
t.Setenv("XDG_CONFIG_HOME", "")
colors := map[string]string{
"base00": "#000000", "base01": "#111111", "base04": "#444444",
"base05": "#555555", "base08": "#880000", "base0D": "#0000dd",
}
for _, variant := range []string{"", "auto", "Light", "DARK"} {
t.Run(variant, func(t *testing.T) {
if err := writeConjureTheme(variant, colors, nil); err == nil {
t.Fatalf("accepted invalid variant %q", variant)
}
})
}
}
func writeExecutable(t *testing.T, path, content string) {
t.Helper()
if err := os.WriteFile(path, []byte(content), 0o755); err != nil {