Commit Graph

65 Commits

Author SHA1 Message Date
Valdemar Lorenzen ef4c38d8a7 feat: resolve conflicts through focused two-way drafts
Replace the marker-filled three-pane resolver with a marker-free native
Draft versus frozen Alternative projected from current working text.
Preserve preexisting outside edits, native undo, dirty-save guards, all
sides/bases, and draft caret/viewports across separate History views.
Reuse DiffState alignment/highlighting/excerpts for Resolution and merge
its base-aligned rows for readonly three-way History. Hide explorer and
source-selector chrome by default.

Verified 926 tests plus actual terminal projection, History highlighting,
hunk choice, optional explorer, and guarded jj-confirmed save workflows.
Clippy completes with pre-existing warnings only. Smoke fixtures stay
unresolved in this ancestry; remove that ancestry before publication.

Size exception: approximately 1650 implementation added/deleted lines,
excluding tests/docs, kept coherent because native draft lifecycle and
aligned rendering must change together without parallel legacy modes.
2026-10-14 17:01:45 +02:00
Valdemar Lorenzen a3aef713e2 feat: resolve current jj working-copy conflicts
Add a dedicated native resolver workspace with all side/base inputs,
shared editable Results, region choices, retained per-file status,
responsive rendering, and explicit nontext file choices.

Guard writes with jj working-copy locking, frozen checkout identity,
exact disk baselines, native dirty-buffer protection, and asynchronous
jj snapshot/status confirmation. Historical comparisons remain readonly.

Verified all 916 tests and live isolated terminal workflows covering text
regions, narrow layouts, binary bytes and symlink targets/types.
Clippy completes with pre-existing warnings only.

Size exception: 2614 implementation additions/deletions excluding tests
and docs. Native workspace integration, explicit file choices and the
safe save/check operation are retained as one complete behavioral slice.
2026-10-14 16:04:15 +02:00
Valdemar Lorenzen af6496bd5a feat: browse GitHub GitLab and Gitea pull requests 2026-10-14 13:40:43 +02:00
Valdemar Lorenzen c5f80f27a6 fix: replace selected ranges instead of ignoring visual paste 2026-10-14 13:13:01 +02:00
Valdemar Lorenzen 6a43fb9e0c feat: configure spaces on Tab per language 2026-10-14 13:12:46 +02:00
hl-valdemar cd427f74dc fix: replace selected characters with visual r 2026-10-14 00:09:42 +02:00
hl-valdemar e84d70463f feat: add counted word change actions
Add cw/cb and configurable core actions using the same line-local spans as dw/db. Enter Insert with grouped replacement undo and native dot repeat.
2026-10-13 17:43:13 +02:00
Valdemar Lorenzen f5ba61624f feat: add a searchable buffer picker 2026-10-13 14:30:36 +02:00
Valdemar Lorenzen bfdb7c544f feat: follow forward working-checkout changes in diffs 2026-10-13 13:49:10 +02:00
Valdemar Lorenzen b16232aa1d feat: jump to a line with counted g 2026-10-13 13:32:42 +02:00
Valdemar Lorenzen c912abaf17 fix: yank whole lines with yy and preserve paste shape 2026-10-13 13:04:48 +02:00
hl-valdemar fafec2a6b0 refactor: name diff orientations vertical and horizontal 2026-10-13 08:45:43 +02:00
hl-valdemar d1855dbdb7 feat: add configurable diff modes and split orientation 2026-10-13 08:45:43 +02:00
hl-valdemar c35abe0f03 fix: retain alternate screen across executable restart 2026-10-12 23:40:51 +02:00
hl-valdemar d85998e1cb feat: add guarded and forceful editor restart actions 2026-10-12 23:40:51 +02:00
hl-valdemar 298d586c3e feat: reload clean buffers and guard external-change writes 2026-10-12 23:40:50 +02:00
hl-valdemar 1cd56cf3f6 feat: bind Ctrl-U to backward line deletion 2026-10-12 22:09:43 +02:00
Valdemar Lorenzen 7bc5eab22f fix: preserve selector text input and close on escape 2026-10-12 13:33:41 +02:00
Valdemar Lorenzen fc382529c5 feat: add editor tabs 2026-10-12 09:41:28 +02:00
hl-valdemar 0ca0d89b9e feat: add counted forward and backward character seek motions 2026-10-11 12:52:08 +02:00
hl-valdemar 5186714ef5 feat: enable native readonly diff interaction and synchronized pane cursors 2026-10-11 12:34:38 +02:00
hl-valdemar 86d22d4fa2 fix: skip omitted diff lines instead of expanding excerpts during navigation 2026-10-11 03:17:21 +02:00
hl-valdemar 54bb196192 refactor: derive canonical commands from core actions and centralize aliases 2026-10-11 02:57:10 +02:00
hl-valdemar 9a34669c08 feat: edit working-checkout comparisons with normal editor actions 2026-10-11 02:44:24 +02:00
hl-valdemar 2f595ca4ca feat: toggle diff explorer and show file change indicators 2026-10-11 01:03:52 +02:00
hl-valdemar 81a2bf9a02 feat: add local and remote repository diff views 2026-10-11 00:08:58 +02:00
hl-valdemar 4e9378816e feat: add counted cc and dd line actions 2026-10-10 21:27:11 +02:00
hl-valdemar 232be6a032 feat: expand completion snippets and navigate placeholders 2026-10-10 19:42:29 +02:00
hl-valdemar b6059d5ed9 feat: add live-cycling LSP completion 2026-10-10 18:48:45 +02:00
hl-valdemar 9d3b25e9d3 feat: add gt and gb document navigation 2026-10-10 18:08:02 +02:00
hl-valdemar 27b94744f0 feat: add linewise Visual selection and paste 2026-10-10 17:50:58 +02:00
hl-valdemar 9a96706c36 feat: navigate jump history with Ctrl+o and Ctrl+i 2026-10-09 23:32:14 +02:00
hl-valdemar 2264dcb6e9 feat: follow Markdown file links and heading fragments 2026-10-09 23:19:21 +02:00
hl-valdemar d418d670ee feat: enable LSP semantic token highlighting by default 2026-10-09 22:44:55 +02:00
hl-valdemar 548711980c feat: preconfigure Python with Astral ty and Ruff 2026-10-09 22:11:37 +02:00
hl-valdemar 099c15771f feat: add Solargraph as the built-in Ruby LSP preset 2026-10-09 20:13:18 +02:00
Valdemar Lorenzen dbafaf6266 refactor: use dotted LSP command names 2026-10-09 17:07:29 +02:00
Valdemar Lorenzen be6be22b76 refactor: nest Ruby LSP actions under core.lsp 2026-10-09 14:57:27 +02:00
Valdemar Lorenzen f093091002 feat: add native LSP hover action and popup 2026-10-09 14:48:25 +02:00
Valdemar Lorenzen 30aa70672e feat: migrate LSP to opt-in native language servers 2026-10-09 13:58:57 +02:00
Valdemar Lorenzen 92679ecbe1 feat: add asynchronous LSP plugin diagnostics and definitions 2026-10-09 12:25:25 +02:00
Valdemar Lorenzen 981011096e feat: default editing to shared system clipboard 2026-10-09 10:51:33 +02:00
Valdemar Lorenzen d61f0b750b feat: repeat last native edit with dot 2026-10-09 10:26:04 +02:00
Valdemar Lorenzen 4fe3accc56 feat: retain explorer filters in navigation mode 2026-10-09 10:06:22 +02:00
Valdemar Lorenzen 86395cf5ce feat: open floating explorer as Tree in Insert mode 2026-10-09 09:17:47 +02:00
Valdemar Lorenzen 49242bb6e4 feat: use hjkl for explorer Normal navigation 2026-10-08 16:40:35 +02:00
Valdemar Lorenzen 5b8e5fbfbf fix: make explorer filtering explicitly modal 2026-10-08 16:29:33 +02:00
Valdemar Lorenzen 6d7be0c169 feat: default explorer to compact directory tree 2026-10-08 16:18:16 +02:00
Valdemar Lorenzen 9ba8b38898 feat: add configurable Ctrl+j/k list navigation 2026-10-08 15:41:01 +02:00
Valdemar Lorenzen c60e625555 feat: add floating and docked searchable file picker 2026-10-08 14:40:39 +02:00