-
Notifications
You must be signed in to change notification settings - Fork 0
fix(overrides): emit clearing line for list-valued Ghostty directives #21
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.
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
Merged
Merged
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -119,6 +119,96 @@ func TestReadSkipsCommentsAndBlanks(t *testing.T) { | |
| } | ||
| } | ||
|
|
||
| func TestWriteEmitsClearingLineForListValuedKeys(t *testing.T) { | ||
| dir := t.TempDir() | ||
| path := filepath.Join(dir, "overrides") | ||
|
|
||
| settings := map[string]string{ | ||
| "font-family": "MartianMono Nerd Font", | ||
| "font-size": "14", | ||
| "theme": "Nord", | ||
| } | ||
|
|
||
| if err := Write(path, settings); err != nil { | ||
| t.Fatalf("Write: %v", err) | ||
| } | ||
|
|
||
| data, _ := os.ReadFile(path) | ||
| content := string(data) | ||
|
|
||
| // Clearing line must precede the value line, consecutive, for list-valued keys. | ||
| wantPair := "font-family =\nfont-family = MartianMono Nerd Font\n" | ||
| if !strings.Contains(content, wantPair) { | ||
| t.Errorf("expected output to contain clearing+value pair %q, got:\n%s", wantPair, content) | ||
| } | ||
|
|
||
| // Scalar keys must not get a clearing line. | ||
| for _, scalar := range []string{"font-size", "theme"} { | ||
| bare := scalar + " =\n" | ||
| if strings.Contains(content, bare) { | ||
| t.Errorf("scalar key %q must not have a clearing line; got:\n%s", scalar, content) | ||
| } | ||
| } | ||
| } | ||
|
|
||
| func TestWriteEmitsClearingLineForEachListValuedKey(t *testing.T) { | ||
| dir := t.TempDir() | ||
| path := filepath.Join(dir, "overrides") | ||
|
|
||
| settings := map[string]string{ | ||
| "font-family": "Mono", | ||
| "font-family-bold": "Mono Bold", | ||
| "font-family-italic": "Mono Italic", | ||
| "font-family-bold-italic": "Mono Bold Italic", | ||
| "keybind": "ctrl+a=copy_to_clipboard", | ||
| } | ||
|
|
||
| if err := Write(path, settings); err != nil { | ||
| t.Fatalf("Write: %v", err) | ||
| } | ||
|
|
||
| content := func() string { | ||
| data, _ := os.ReadFile(path) | ||
| return string(data) | ||
|
Comment on lines
+171
to
+172
Owner
Author
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Deferred to #22 — same as above; tracked there for a project-wide pass across the four current instances in |
||
| }() | ||
|
|
||
| for k, v := range settings { | ||
| want := k + " =\n" + k + " = " + v + "\n" | ||
| if !strings.Contains(content, want) { | ||
| t.Errorf("expected clearing+value pair for %q (%q), got:\n%s", k, want, content) | ||
| } | ||
| } | ||
| } | ||
|
|
||
| func TestReadWriteRoundTripPreservesListValuedKeys(t *testing.T) { | ||
| dir := t.TempDir() | ||
| path := filepath.Join(dir, "overrides") | ||
|
|
||
| original := map[string]string{ | ||
| "font-family": "MartianMono Nerd Font", | ||
| "keybind": "ctrl+a=copy_to_clipboard", | ||
| "theme": "Nord", | ||
| } | ||
|
|
||
| if err := Write(path, original); err != nil { | ||
| t.Fatalf("Write: %v", err) | ||
| } | ||
|
|
||
| got, err := Read(path) | ||
| if err != nil { | ||
| t.Fatalf("Read: %v", err) | ||
| } | ||
|
|
||
| if len(got) != len(original) { | ||
| t.Errorf("expected %d entries, got %d: %v", len(original), len(got), got) | ||
| } | ||
| for k, v := range original { | ||
| if got[k] != v { | ||
| t.Errorf("key %q = %q, want %q", k, got[k], v) | ||
| } | ||
| } | ||
| } | ||
|
|
||
| func TestMerge(t *testing.T) { | ||
| existing := map[string]string{ | ||
| "theme": "Nord", | ||
|
|
||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Deferred to #22 — the same
data, _ := os.ReadFile(path)pattern exists inTestWriteIncludesHeader:67andTestWriteSortsKeys:88already, so the cleanup belongs in a scoped project-wide pass rather than bundled into this PR.