Skip to content

Fix: Switch Tabs During Comment Creation #200

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
merged 2 commits into from
Feb 28, 2024
Merged

Fix: Switch Tabs During Comment Creation #200

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3ae3513
fixed comment creation during tabbing
harrisoncramer Feb 28, 2024
e74d769
.
harrisoncramer Feb 28, 2024
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
9 changes: 9 additions & 0 deletions lua/gitlab/reviewer/init.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ local diffview_lib = require("diffview.lib")
local M = {
bufnr = nil,
tabnr = nil,
stored_win = nil,
}

-- Checks for legacy installations, only Diffview is supported.
Expand Down Expand Up @@ -199,7 +200,14 @@ M.is_current_sha = function()
local view = diffview_lib.get_current_view()
local layout = view.cur_layout
local b_win = u.get_window_id_by_buffer_id(layout.b.file.bufnr)
local a_win = u.get_window_id_by_buffer_id(layout.a.file.bufnr)
local current_win = vim.fn.win_getid()

-- Handle cases where user navigates tabs in the middle of making a comment
if a_win ~= current_win and b_win ~= current_win then
current_win = M.stored_win
M.stored_win = nil
end
return current_win == b_win
end

Expand Down Expand Up @@ -266,6 +274,7 @@ M.set_callback_for_file_changed = function(callback)
pattern = { "DiffviewDiffBufWinEnter" },
group = group,
callback = function(...)
M.stored_win = vim.api.nvim_get_current_win()
if M.tabnr == vim.api.nvim_get_current_tabpage() then
callback(...)
end
Expand Down