noe.trevino/haunt.nvim
1
0
Fork 1
Code Issues 5 Pull requests 7 Projects 1 Releases 19 Packages Wiki Activity Actions

feat: nesting rules for range annotations #130

Open
noe.trevino wants to merge 8 commits from feature-108/nesting-rules into feature-108/render-helper
pull from: feature-108/nesting-rules
merge into: noe.trevino:feature-108/render-helper
Conversation 0 Commits 8 Files changed 8 +627 -63
noe.trevino commented 2026-10-13 15:28:11 -05:00
Owner
Copy link

Stacked on #129. Retarget to the umbrella (#127) once #128 and #129 merge.

  • add the nesting rules doc (docs/visual-annotations/priority.md)
  • add get_innermost_bookmark (one synced pass); ties go single, then smaller range, then older
  • get_bookmark_at_line uses the same tie-break
  • annotate uses "starts on": edits there, else creates (even inside a range)
  • a selection over an existing start line resizes that bookmark
  • delete and toggle use "innermost"
  • hooks get the bookmark's line, not the cursor's
  • fix: picker edit goes by id (annotate_by_id), so stacked start lines edit the right one
  • fix: a failed delete puts the bookmark back at its old index

Calls to look at:

  • a one-line selection on a range's start shrinks it to a single

  • the update hook doesn't carry the old/new end_line yet

  • one test per row of the doc's cases table

  • note-only edits keep the extmark, so undo still restores a range

  • tests pass (606)

  • retarget to the umbrella after #128 and #129

Refs #108

Stacked on #129. Retarget to the umbrella (#127) once #128 and #129 merge. - add the nesting rules doc (`docs/visual-annotations/priority.md`) - add `get_innermost_bookmark` (one synced pass); ties go single, then smaller range, then older - `get_bookmark_at_line` uses the same tie-break - annotate uses "starts on": edits there, else creates (even inside a range) - a selection over an existing start line resizes that bookmark - delete and toggle use "innermost" - hooks get the bookmark's line, not the cursor's - fix: picker edit goes by id (`annotate_by_id`), so stacked start lines edit the right one - fix: a failed delete puts the bookmark back at its old index Calls to look at: - a one-line selection on a range's start shrinks it to a single - the update hook doesn't carry the old/new `end_line` yet - [x] one test per row of the doc's cases table - [x] note-only edits keep the extmark, so undo still restores a range - [x] tests pass (606) - [ ] retarget to the umbrella after #128 and #129 Refs #108
Refs #108
- add get_innermost_bookmark
- break ties: single, then smaller range, then older
- make get_bookmark_at_line use the same tie-break

Refs #108
- resize the bookmark starting on the range's first line instead of creating one
- re-render its tracking extmark so the new end is tracked
- roll back end_line and note when the save fails
- draw the note and emit the update at the bookmark's own line

Refs #108
feat(api): delete and toggle the innermost bookmark
All checks were successful
Auto Assign / assign (pull_request_target) Successful in 2s
Details
CI / stylua (pull_request) Successful in 5s
Details
CI / config (pull_request) Successful in 5s
Details
CI / Check for debug messages (pull_request) Successful in 5s
Details
CI / tests (pull_request) Successful in 17s
Details
CI / docs (pull_request) Has been skipped
Details
CI / release (pull_request) Has been skipped
Details
CI / ci (pull_request) Successful in 0s
Details
02459ce5ca 
- look up delete and toggle_annotation with get_innermost_bookmark
- draw a toggled note on the bookmark's own line
- emit delete and toggle hooks with the bookmark's line

Refs #108
noe.trevino force-pushed feature-108/nesting-rules from 02459ce5ca
All checks were successful
Auto Assign / assign (pull_request_target) Successful in 2s
Details
CI / stylua (pull_request) Successful in 5s
Details
CI / config (pull_request) Successful in 5s
Details
CI / Check for debug messages (pull_request) Successful in 5s
Details
CI / tests (pull_request) Successful in 17s
Details
CI / docs (pull_request) Has been skipped
Details
CI / release (pull_request) Has been skipped
Details
CI / ci (pull_request) Successful in 0s
Details
to ecad5b8abf
All checks were successful
CI / config (pull_request) Successful in 3s
Details
CI / stylua (pull_request) Successful in 4s
Details
CI / Check for debug messages (pull_request) Successful in 3s
Details
CI / docs (pull_request) Has been skipped
Details
CI / tests (pull_request) Successful in 17s
Details
CI / release (pull_request) Has been skipped
Details
CI / ci (pull_request) Successful in 0s
Details
2026-10-13 17:34:39 -05:00 Compare
All checks were successful
CI / config (pull_request) Successful in 3s
Details
CI / stylua (pull_request) Successful in 4s
Details
CI / Check for debug messages (pull_request) Successful in 3s
Details
CI / docs (pull_request) Has been skipped
Details
CI / tests (pull_request) Successful in 17s
Details
CI / release (pull_request) Has been skipped
Details
CI / ci (pull_request) Successful in 0s
Details
This pull request can be merged automatically.
You are not authorized to merge this pull request.
View command line instructions

Checkout

From your project repository, check out a new branch and test the changes.
git fetch -u origin feature-108/nesting-rules:feature-108/nesting-rules
git switch feature-108/nesting-rules

Merge

Merge the changes and update on Forgejo.

Warning: The "Autodetect manual merge" setting is not enabled for this repository, you will have to mark this pull request as manually merged afterwards.

git switch feature-108/render-helper
git merge --no-ff feature-108/nesting-rules
git switch feature-108/nesting-rules
git rebase feature-108/render-helper
git switch feature-108/render-helper
git merge --ff-only feature-108/nesting-rules
git switch feature-108/nesting-rules
git rebase feature-108/render-helper
git switch feature-108/render-helper
git merge --no-ff feature-108/nesting-rules
git switch feature-108/render-helper
git merge --squash feature-108/nesting-rules
git switch feature-108/render-helper
git merge --ff-only feature-108/nesting-rules
git switch feature-108/render-helper
git merge feature-108/nesting-rules
git push origin feature-108/render-helper
Sign in to join this conversation.
Reviewers
No reviewers
Labels
Clear labels   
autorelease: pending

   
autorelease: tagged

   
bug
Something isn't working

  
ci/cd

   
documentation
Improvements or additions to documentation

  
duplicate
This issue or pull request already exists

  
enhancement
New feature or request

  
good first issue
Good for newcomers

  
help wanted
Extra attention is needed

  
improvement

   
invalid
This doesn't seem right

  
priority
high
 Priority, carried over from the GitHub project board

  
priority
low
 Priority, carried over from the GitHub project board

  
question
Further information is requested

  
refactor
  
size
L

  
size
M
 Size, carried over from the GitHub project board

  
size
S
 Size, carried over from the GitHub project board

  
size
XS
 Size, carried over from the GitHub project board

  
wontfix
This will not be worked on

No labels
autorelease: pending
autorelease: tagged
bug
ci/cd
documentation
duplicate
enhancement
good first issue
help wanted
improvement
invalid
priority
high
priority
low
question
refactor
size
L
size
M
size
S
size
XS
wontfix
Milestone
Clear milestone
No items
No milestone
Projects
Clear projects
No items
No project
Assignees
Clear assignees
No assignees
1 participant
Notifications
Due date
The due date is invalid or out of range. Please use the format "yyyy-mm-dd".

No due date set.

Dependencies

No dependencies set.

Reference
noe.trevino/haunt.nvim!130
No description provided.