Repository navigation
Description
The text that a split-layout diff accepts can differ from what :w writes for the same buffer in some corner cases of 'fileformat' and 'fileformats'. Each case below exists on main before #577 too. #577 fixes the common cases (CRLF proposals under the default 'fileformats', and an unedited proposal under any 'fileformats') and leaves these for a follow-up.
ff=macwith a CR inside a line::wwrites that CR as NL, the accepted text keeps it."a\rb\n"then:setlocal ff=macgives"a\rb\r", while:wgives"a\nb\r".mainjoined with LF, which is also wrong. Codex flagged this on fix(diff): save a line the user types into a CRLF proposal with CRLF #577 (diff.lua, "Translate embedded CR bytes before joining Mac lines").set ffs=unix,mac: Neovim reads, for example,"a\r\nb\r\r\n"as mac, but the diff never detects mac. In 24ff=macedit cases,main's answer equals a file-read oracle and fix(diff): save a line the user types into a CRLF proposal with CRLF #577's does not. Both differ from:wof the same buffer.- Empty proposal, then typed lines:
'eol'stays off (fix(diff): accept a proposal without a final line break as it is in the split layouts #542), soGoxgives"\nx", while:wof an empty file gives"\nx\n". 'fileformats'starting withdosand a proposal with no LF ("","a","a\r"): Neovim reads it as dos, the diff keeps unix, so a typed line gets LF where:wwrites CRLF.set ffs=dos(one entry): Neovim reads every file as dos, an LF file too. An LF or mixed proposal stays unix, so a typed line gets LF where:wof the file writes CRLF.
Fix direction: one function that decides 'fileformat' and splits the proposal the way readfile does (empty value: 'fileformat'; one entry: forced; several entries: dos unless a lone LF, mac when there are more CRs than LFs, the first entry when there is no LF), plus a join that translates CRs for mac. The neovim_writes oracle in tests/integration/diff_accept_crlf_spec.lua (#577) can be reused.
Evidence: a probe of 1860 cases per run on Neovim 0.12.3 and 0.8.0, under 'fileformats' unix,dos, dos,unix, unix, dos and unix,mac. Mismatches with :w left on #577 (on main): 144 (748), 184 (788), 192 (304), 516 (1104), 544 (608).
The maintainer agreed to defer items 1 and 3 (and item 2, which belongs to item 1) from the README verification run, and later agreed to defer items 4 and 5 and item 6 in the comment below as well.
Owner: the next change to the diff accept path in lua/claudecode/diff.lua (follow-up trigger: any PR that touches how accepted text is joined or how 'fileformat' is set).
Generated with xum • Model: anthropic:claude-opus-5-5 • Thinking: high
Activity
ThomasK33 commentedon Nov 12, 2026
One more item from the #577 advisor review:
nvim -dof the same two files also marks none. This is not a defect, but no README line says it. Add one sentence tolua/claudecode/README.mdnext to the line-ending rule.Also from that review: the patch Codex suggested on #577 (turn CRs into LFs before the mac join) removes every mismatch against
:wof the same buffer, but it is worse thanmainin 24 cases underset ffs=unix,mac, because the diff never detects mac. Items 1 and 2 above need to be fixed together.Generated with
xum• Model:anthropic:claude-opus-5-5• Thinking:highfix(diff): save a line the user types into a CRLF proposal with CRLF (c…