Skip to content
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

Add keymaps for start, resume, submit and discard Reviews #498

Merged
merged 1 commit into from
Feb 15, 2024
Merged

Add keymaps for start, resume, submit and discard Reviews #498

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 6 additions & 0 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -222,6 +222,8 @@ require"octo".setup({
react_rocket = { lhs = "<space>rr", desc = "add/remove 🚀 reaction" },
react_laugh = { lhs = "<space>rl", desc = "add/remove 😄 reaction" },
react_confused = { lhs = "<space>rc", desc = "add/remove 😕 reaction" },
review_start = { lhs = "<space>vs", desc = "start a review for the current PR" },
review_resume = { lhs = "<space>vr", desc = "resume a pending review for the current PR" },
},
review_thread = {
goto_issue = { lhs = "<space>gi", desc = "navigate to a local repo issue" },
Expand Down Expand Up @@ -251,6 +253,8 @@ require"octo".setup({
close_review_tab = { lhs = "<C-c>", desc = "close review tab" },
},
review_diff = {
submit_review = { lhs = "<leader>vs", desc = "submit review" },
discard_review = { lhs = "<leader>vd", desc = "discard review" },
add_review_comment = { lhs = "<space>ca", desc = "add a new review comment" },
add_review_suggestion = { lhs = "<space>sa", desc = "add a new review suggestion" },
focus_files = { lhs = "<leader>e", desc = "move focus to changed file panel" },
Expand All @@ -266,6 +270,8 @@ require"octo".setup({
goto_file = { lhs = "gf", desc = "go to file" },
},
file_panel = {
submit_review = { lhs = "<leader>vs", desc = "submit review" },
discard_review = { lhs = "<leader>vd", desc = "discard review" },
next_entry = { lhs = "j", desc = "move to next changed file" },
prev_entry = { lhs = "k", desc = "move to previous changed file" },
select_entry = { lhs = "<cr>", desc = "show selected changed file diffs" },
Expand Down
14 changes: 2 additions & 12 deletions lua/octo/commands.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -204,20 +204,10 @@ function M.setup()
end
end,
submit = function()
local current_review = reviews.get_current_review()
if current_review then
current_review:collect_submit_info()
else
utils.error "Please start or resume a review first"
end
reviews.submit_review()
end,
discard = function()
local current_review = reviews.get_current_review()
if current_review then
current_review:discard()
else
utils.error "Please start or resume a review first"
end
reviews.discard_review()
end,
close = function()
if reviews.get_current_review() then
Expand Down
6 changes: 6 additions & 0 deletions lua/octo/config.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -205,6 +205,8 @@ function M.get_default_values()
react_rocket = { lhs = "<space>rr", desc = "add/remove 🚀 reaction" },
react_laugh = { lhs = "<space>rl", desc = "add/remove 😄 reaction" },
react_confused = { lhs = "<space>rc", desc = "add/remove 😕 reaction" },
review_start = { lhs = "<space>vs", desc = "start a review for the current PR" },
review_resume = { lhs = "<space>vr", desc = "resume a pending review for the current PR" },
},
review_thread = {
goto_issue = { lhs = "<space>gi", desc = "navigate to a local repo issue" },
Expand Down Expand Up @@ -234,6 +236,8 @@ function M.get_default_values()
close_review_tab = { lhs = "<C-c>", desc = "close review tab" },
},
review_diff = {
submit_review = { lhs = "<leader>vs", desc = "submit review" },
discard_review = { lhs = "<leader>vd", desc = "discard review" },
add_review_comment = { lhs = "<space>ca", desc = "add a new review comment" },
add_review_suggestion = { lhs = "<space>sa", desc = "add a new review suggestion" },
focus_files = { lhs = "<leader>e", desc = "move focus to changed file panel" },
Expand All @@ -249,6 +253,8 @@ function M.get_default_values()
goto_file = { lhs = "gf", desc = "go to file" },
},
file_panel = {
submit_review = { lhs = "<leader>vs", desc = "submit review" },
discard_review = { lhs = "<leader>vd", desc = "discard review" },
next_entry = { lhs = "j", desc = "move to next changed file" },
prev_entry = { lhs = "k", desc = "move to previous changed file" },
select_entry = { lhs = "<cr>", desc = "show selected changed file diffs" },
Expand Down
25 changes: 19 additions & 6 deletions lua/octo/mappings.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,14 +111,27 @@ return {
react_confused = function()
require("octo.commands").reaction_action "confused"
end,
review_start = function()
reviews.start_review()
end,
review_resume = function()
reviews.resume_review()
end,
discard_review = function()
reviews.discard_review()
end,
submit_review = function()
reviews.submit_review()
end,
add_review_comment = function()
require("octo.reviews").add_review_comment(false)
reviews.add_review_comment(false)
end,
add_review_suggestion = function()
require("octo.reviews").add_review_comment(true)
reviews.add_review_comment(true)
end,
close_review_tab = function()
require("octo.reviews").close()
local tabpage = vim.api.nvim_get_current_tabpage()
reviews.close(tabpage)
end,
next_thread = function()
require("octo.reviews.file-panel").next_thread()
Expand Down Expand Up @@ -207,15 +220,15 @@ return {
vim.api.nvim_win_close(vim.api.nvim_get_current_win())
end,
approve_review = function()
local current_review = require("octo.reviews").get_current_review()
local current_review = reviews.get_current_review()
current_review:submit "APPROVE"
end,
comment_review = function()
local current_review = require("octo.reviews").get_current_review()
local current_review = reviews.get_current_review()
current_review:submit "COMMENT"
end,
request_changes = function()
local current_review = require("octo.reviews").get_current_review()
local current_review = reviews.get_current_review()
current_review:submit "REQUEST_CHANGES"
end,
toggle_viewed = function()
Expand Down
18 changes: 18 additions & 0 deletions lua/octo/reviews/init.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -527,4 +527,22 @@ function M.resume_review()
end
end

function M.discard_review()
local current_review = M.get_current_review()
if current_review then
current_review:discard()
else
utils.error "Please start or resume a review first"
end
end

function M.submit_review()
local current_review = M.get_current_review()
if current_review then
current_review:collect_submit_info()
else
utils.error "Please start or resume a review first"
end
end

return M
Loading