feat(view): add focus_diff option, fix selected_row focus#61
Merged
dlyongemallo merged 1 commit intomainfrom Mar 28, 2026
Merged
feat(view): add focus_diff option, fix selected_row focus#61dlyongemallo merged 1 commit intomainfrom
focus_diff option, fix selected_row focus#61dlyongemallo merged 1 commit intomainfrom
Conversation
There was a problem hiding this comment.
Pull request overview
Adds a new per-view configuration option to control whether Diffview focuses the diff window on initial open, and adjusts initial selected_row positioning to focus the main diff window.
Changes:
- Introduce
view.<section>.focus_diff(default/merge_tool/file_history) with defaultfalse. - Route initial focus in
DiffView:update_files()andFileHistoryView:post_open()based onfocus_diff. - Add functional specs covering config defaults/overrides, focus routing, and
selected_rowfocusing behavior.
Reviewed changes
Copilot reviewed 4 out of 4 changed files in this pull request and generated 3 comments.
| File | Description |
|---|---|
| lua/diffview/config.lua | Adds focus_diff = false defaults to each view section. |
| lua/diffview/scene/views/diff/diff_view.lua | Uses focus_diff to decide whether to focus diff window on first open; focuses main win when applying selected_row. |
| lua/diffview/scene/views/file_history/file_history_view.lua | Passes view.file_history.focus_diff into set_file() during initial open. |
| lua/diffview/tests/functional/focus_diff_spec.lua | Adds new functional tests for config + focus behavior (with some test maintainability concerns). |
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
49ecc4e to
9f2d195
Compare
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
No description provided.