From 569784efa982205cabc117a3e5ac8242a7bd3772 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakub=20F=2E=20Bortl=C3=ADk?= Date: Wed, 9 Apr 2025 15:48:33 +0200 Subject: [PATCH] Fix: Swap file_name and old_file_name in reviewer data (#485) --- lua/gitlab/reviewer/init.lua | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/lua/gitlab/reviewer/init.lua b/lua/gitlab/reviewer/init.lua index 9e35110..76d24f3 100644 --- a/lua/gitlab/reviewer/init.lua +++ b/lua/gitlab/reviewer/init.lua @@ -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 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,