acoolname/gitlab.nvim
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix: Swap file_name and old_file_name in reviewer data (#485)

Browse Source
This commit is contained in:
Jakub F. Bortlík
2025-04-09 15:48:33 +02:00
committed by Harrison Cramer
parent 07c4b0a06c
commit 569784efa9
1 changed files with 0 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
lua/gitlab/reviewer/init.lua
View File

@@ -200,18 +200,8 @@ M.get_reviewer_data = function(current_win)
local opposite_bufnr = new_sha_focused and layout.a.file.bufnr or layout.b.file.bufnr local opposite_bufnr = new_sha_focused and layout.a.file.bufnr or layout.b.file.bufnr
return { return {
<<<<<<< HEAD
old_file_name = M.is_file_renamed() and layout.a.file.path or "", old_file_name = M.is_file_renamed() and layout.a.file.path or "",
file_name = layout.b.file.path, file_name = layout.b.file.path,
||||||| parent of f57cc84 (Fix: Store reviewer data before creating comment popup (#476))
old_file_name = layout.a.file.path,
file_name = layout.b.file.path,
=======
-- TODO: swap 'a' and 'b' to fix lua/gitlab/actions/comment.lua:158, and hopefully also
-- lua/gitlab/indicators/diagnostics.lua:129.
file_name = layout.a.file.path,
old_file_name = M.is_file_renamed() and layout.b.file.path or "",
>>>>>>> f57cc84 (Fix: Store reviewer data before creating comment popup (#476))
old_line_from_buf = old_line, old_line_from_buf = old_line,
new_line_from_buf = new_line, new_line_from_buf = new_line,
modification_type = modification_type, modification_type = modification_type,