Applied-Software/ghostty
5
0
Fork 0
mirror of https://github.com/ghostty-org/ghostty.git synced 2025-04-21 00:48:36 +03:00
Code Issues Packages Projects Releases Wiki Activity

Allow whitespace in ColorList values (#5925)

Browse Source 
The following formats are now all valid:

```zig
macos-icon-screen-color = #00FF00,#FF1000,#00FFFF
macos-icon-screen-color = #00FF00, #FF1000, #00FFFF
macos-icon-screen-color = #00FF00 ,#FF1000 ,#00FFFF
macos-icon-screen-color =  #00FF00 , #FF1000  , #00FFFF
```

Fixes #5918
This commit is contained in:
Mitchell Hashimoto
2025-02-22 12:18:54 -08:00
committed by GitHub
parent 726ac36612 1b6b029e0d
commit e307f1a373
1 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/config/Config.zig
View File

@ -4354,7 +4354,9 @@ pub const ColorList = struct {
count += 1; count += 1;
if (count > 64) return error.InvalidValue; if (count > 64) return error.InvalidValue;
const color = try Color.parseCLI(raw); // Trim whitespace from each color value
const trimmed = std.mem.trim(u8, raw, " \t");
const color = try Color.parseCLI(trimmed);
try self.colors.append(alloc, color); try self.colors.append(alloc, color);
try self.colors_c.append(alloc, color.cval()); try self.colors_c.append(alloc, color.cval());
} }
@ -4423,6 +4425,14 @@ pub const ColorList = struct {
try p.parseCLI(alloc, "black,white"); try p.parseCLI(alloc, "black,white");
try testing.expectEqual(2, p.colors.items.len); try testing.expectEqual(2, p.colors.items.len);
// Test whitespace handling
try p.parseCLI(alloc, "black, white"); // space after comma
try testing.expectEqual(2, p.colors.items.len);
try p.parseCLI(alloc, "black , white"); // spaces around comma
try testing.expectEqual(2, p.colors.items.len);
try p.parseCLI(alloc, " black , white "); // extra spaces at ends
try testing.expectEqual(2, p.colors.items.len);
// Error cases // Error cases
try testing.expectError(error.ValueRequired, p.parseCLI(alloc, null)); try testing.expectError(error.ValueRequired, p.parseCLI(alloc, null));
try testing.expectError(error.InvalidValue, p.parseCLI(alloc, " ")); try testing.expectError(error.InvalidValue, p.parseCLI(alloc, " "));