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
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
c5f80f27a6
fix: replace selected ranges instead of ignoring visual paste
2026-10-14 13:13:01 +02:00
hl-valdemar
99fa5a2aff
feat: track checkout identity for pinned diff editability
2026-10-13 17:28:59 +02:00
f5ba61624f
feat: add a searchable buffer picker
2026-10-13 14:30:36 +02:00
hl-valdemar
d1855dbdb7
feat: add configurable diff modes and split orientation
2026-10-13 08:45:43 +02:00
7bc5eab22f
fix: preserve selector text input and close on escape
2026-10-12 13:33:41 +02:00
fc382529c5
feat: add editor tabs
2026-10-12 09:41:28 +02:00
hl-valdemar
ad9b214b8f
feat: add panes and shared-buffer splits
2026-10-11 18:17:06 +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
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
d418d670ee
feat: enable LSP semantic token highlighting by default
2026-10-09 22:44:55 +02:00
hl-valdemar
9629655206
docs: split README into audience-focused guides
2026-10-09 20:17:54 +02:00
hl-valdemar
099c15771f
feat: add Solargraph as the built-in Ruby LSP preset
2026-10-09 20:13:18 +02:00
hl-valdemar
788638f34e
fix: surface rejected configuration in a floating startup diagnostic
2026-10-09 20:13:18 +02:00
hl-valdemar
de6b4d47f3
ui: enlarge floating explorer modestly and remove redundant mode label
2026-10-09 19:33:10 +02:00
18dc8cc155
refactor: derive Ruby action namespaces from Rust catalog
2026-10-09 17:18:44 +02:00
dbafaf6266
refactor: use dotted LSP command names
2026-10-09 17:07:29 +02:00
be6be22b76
refactor: nest Ruby LSP actions under core.lsp
2026-10-09 14:57:27 +02:00
f093091002
feat: add native LSP hover action and popup
2026-10-09 14:48:25 +02:00
529d1fd5b3
feat: expose typed core LSP binding actions
2026-10-09 14:29:58 +02:00
30aa70672e
feat: migrate LSP to opt-in native language servers
2026-10-09 13:58:57 +02:00
92679ecbe1
feat: add asynchronous LSP plugin diagnostics and definitions
2026-10-09 12:25:25 +02:00
e5d545a4ca
refactor: migrate syntax highlighting to Tree-sitter
2026-10-09 11:56:21 +02:00
7c1e4c3ca0
feat: add syntax highlighting to text buffers
2026-10-09 11:15:17 +02:00
981011096e
feat: default editing to shared system clipboard
2026-10-09 10:51:33 +02:00
d61f0b750b
feat: repeat last native edit with dot
2026-10-09 10:26:04 +02:00
4fe3accc56
feat: retain explorer filters in navigation mode
2026-10-09 10:06:22 +02:00
86395cf5ce
feat: open floating explorer as Tree in Insert mode
2026-10-09 09:17:47 +02:00
49242bb6e4
feat: use hjkl for explorer Normal navigation
2026-10-08 16:40:35 +02:00
5b8e5fbfbf
fix: make explorer filtering explicitly modal
2026-10-08 16:29:33 +02:00
6d7be0c169
feat: default explorer to compact directory tree
2026-10-08 16:18:16 +02:00
9ba8b38898
feat: add configurable Ctrl+j/k list navigation
2026-10-08 15:41:01 +02:00
c60e625555
feat: add floating and docked searchable file picker
2026-10-08 14:40:39 +02:00
5a67bf64a3
feat: add configurable Space leader bindings
2026-10-08 14:22:01 +02:00
5d2d67ab09
feat: add multiple buffers and file switching
2026-10-08 13:54:48 +02:00
38006c1eca
feat: add counted motions in Normal and Visual modes
2026-10-08 12:39:19 +02:00
bd78656691
feat: show relative line numbers around primary cursor
2026-10-08 12:15:18 +02:00
a3a0da2586
feat: add line-number gutter
2026-10-08 11:23:52 +02:00
619c180316
feat: add searchable command palette
2026-10-08 11:17:03 +02:00
6ae5ccb220
refactor: derive terminal regions from Ratatui layout
2026-10-08 11:04:17 +02:00
8ef92a7b15
feat: implement selection-first multi-target editing
2026-10-08 10:59:25 +02:00
53fcd7a1f2
feat: add Visual change with grouped replacement undo
2026-10-07 13:30:11 +02:00
f775ff3b59
feat: add Visual selection and clipboard editing
2026-10-06 13:16:47 +02:00
Valdemar Lorenzen
hl-valdemar