From 07c4b0a06c9c87eda1d16b756ed8648dc3ac7920 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakub=20F=2E=20Bortl=C3=ADk?= Date: Sat, 1 Mar 2025 19:22:17 +0100 Subject: [PATCH] Fix: Store reviewer data before creating comment popup (#476) --- lua/gitlab/reviewer/init.lua | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/lua/gitlab/reviewer/init.lua b/lua/gitlab/reviewer/init.lua index 76d24f3..9e35110 100644 --- a/lua/gitlab/reviewer/init.lua +++ b/lua/gitlab/reviewer/init.lua @@ -200,8 +200,18 @@ M.get_reviewer_data = function(current_win) local opposite_bufnr = new_sha_focused and layout.a.file.bufnr or layout.b.file.bufnr return { +<<<<<<< HEAD old_file_name = M.is_file_renamed() and layout.a.file.path or "", 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, new_line_from_buf = new_line, modification_type = modification_type,