Skip to content

fix: ファイル末尾の改行が常に差分として表示される問題を修正 #149

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
kyu08 merged 3 commits into from
Jun 16, 2026
Merged

fix: ファイル末尾の改行が常に差分として表示される問題を修正 #149

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
fec2561
fix: strip trailing newline from git show output in preview buffer
kyu08 Jun 16, 2026
a83a151
test: add trailing newline handling tests for preview
kyu08 Jun 16, 2026
0c9e0fc
test: add trailing blank line preservation test for preview
kyu08 Jun 16, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions lua/fude/preview.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,9 @@ function M.open_preview(source_win)
end

local preview_buf = vim.api.nvim_create_buf(false, true)
if content:sub(-1) == "\n" then
content = content:sub(1, -2)
end
Comment thread
kyu08 marked this conversation as resolved.
local lines = vim.split(content, "\n", { trimempty = false })
vim.api.nvim_buf_set_lines(preview_buf, 0, -1, false, lines)

Expand Down
40 changes: 39 additions & 1 deletion tests/fude/preview_integration_spec.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ describe("preview integration", function()
before_each(function()
config.setup({})
helpers.mock_diff({ ["source.lua"] = "source.lua" })
helpers.mock_base_content("base line 1\nbase line 2\nbase line 3")
helpers.mock_base_content("base line 1\nbase line 2\nbase line 3\n")
end)

after_each(function()
Expand Down Expand Up @@ -42,11 +42,49 @@ describe("preview integration", function()

assert.is_not_nil(config.state.preview_buf)
local lines = vim.api.nvim_buf_get_lines(config.state.preview_buf, 0, -1, false)
assert.are.equal(3, #lines)
assert.are.equal("base line 1", lines[1])
assert.are.equal("base line 2", lines[2])
assert.are.equal("base line 3", lines[3])
end)

it("handles base content without trailing newline", function()
helpers.mock_base_content("no trailing newline")

local buf = helpers.create_buf({ "current line 1" }, "source.lua")
local source_win = vim.api.nvim_get_current_win()
vim.api.nvim_win_set_buf(source_win, buf)

config.state.active = true
config.state.base_ref = "main"
config.state.scope = "full_pr"

preview.open_preview(source_win)

local lines = vim.api.nvim_buf_get_lines(config.state.preview_buf, 0, -1, false)
assert.are.equal(1, #lines)
assert.are.equal("no trailing newline", lines[1])
end)

it("preserves trailing blank lines in base content", function()
helpers.mock_base_content("line 1\n\n")

local buf = helpers.create_buf({ "current line 1" }, "source.lua")
local source_win = vim.api.nvim_get_current_win()
vim.api.nvim_win_set_buf(source_win, buf)

config.state.active = true
config.state.base_ref = "main"
config.state.scope = "full_pr"

preview.open_preview(source_win)

local lines = vim.api.nvim_buf_get_lines(config.state.preview_buf, 0, -1, false)
assert.are.equal(2, #lines)
assert.are.equal("line 1", lines[1])
assert.are.equal("", lines[2])
end)

it("enables diff mode on both windows", function()
local buf = helpers.create_buf({ "line 1", "line 2" }, "source.lua")
local source_win = vim.api.nvim_get_current_win()
Expand Down
Loading