Add quickfix listing and improve conflict handling#9
Merged
StackInTheWild merged 5 commits intoStackInTheWild:mainfrom Oct 6, 2025
Merged
Add quickfix listing and improve conflict handling#9StackInTheWild merged 5 commits intoStackInTheWild:mainfrom
StackInTheWild merged 5 commits intoStackInTheWild:mainfrom
Conversation
Contributor
Author
|
Fixes #5 |
There was a problem hiding this comment.
Pull Request Overview
This PR adds quickfix list functionality to the headhunter plugin and improves conflict marker handling to support different git conflict styles (HEAD vs stash markers). The changes make conflict discovery reusable and provide a comprehensive view of all conflicts in the quickfix list.
Key changes:
- Expose conflict discovery via
M._get_conflictsand add quickfix population functionality - Generalize conflict marker parsing to handle both HEAD and stash-style conflicts
- Add comprehensive test coverage for the new quickfix integration and stash-style conflict handling
Reviewed Changes
Copilot reviewed 5 out of 5 changed files in this pull request and generated 1 comment.
Show a summary per file
| File | Description |
|---|---|
| lua/headhunter/init.lua | Main implementation adding quickfix functionality, exposing _get_conflicts, generalizing conflict parsing, and adding duplicate file handling |
| lua/tests/quickfix_spec.lua | New test suite for quickfix integration functionality |
| lua/tests/headhunter_spec.lua | Extended tests for stash-style conflict marker parsing |
| lua/tests/conflict_resolution_spec.lua | Additional tests for handling stash-style conflict resolution |
| README.md | Updated documentation to use <cmd> syntax for key mappings |
Tip: Customize your code reviews with copilot-instructions.md. Create the file or learn how to get started.
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.
M._get_conflictsand reuse it to populate the quickfix list:HeadhunterQuickfixplus default<leader>gqbinding and extend the test suite for parser/quickfix behaviour