Skip to content

Normal mode selection works too now #7

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 1 commit into from
Mar 2, 2023
Merged

Normal mode selection works too now #7

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
16 changes: 11 additions & 5 deletions lua/advanced_git_search/init.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,12 @@ local finders = require("telescope.finders")

M = {}

-- Map a key to both insert and normal modes
local function omnimap(map_func, key, handler)
map_func('i', key, handler)
map_func('n', key, handler)
end

--- Opens a Telescope window with a list of local branches
---
--- <CR> opens a diff for the current file with the selected branch
Expand Down Expand Up @@ -169,15 +175,15 @@ M.diff_commit_file = function()
previewer = gu.git_diff_previewer_file(bufnr),
sorter = sorters.highlighter_only(),
attach_mappings = function(_, map)
map("i", "<CR>", function(prompt_bufnr)
omnimap(map, "<CR>", function(prompt_bufnr)
actions.close(prompt_bufnr)
local selection = action_state.get_selected_entry()
local commit_hash = selection.opts.commit_hash
local old_file_name = gu.determine_historic_file_name(commit_hash, bufnr)

gu.open_diff_view(commit_hash, old_file_name)
end)
map("i", "<C-e>", function(prompt_bufnr)
omnimap(map, "<C-e>", function(prompt_bufnr)
actions.close(prompt_bufnr)
local selection = action_state.get_selected_entry()
local commit_hash = selection.opts.commit_hash
Expand All @@ -197,7 +203,7 @@ M.diff_commit_file = function()
vim.api.nvim_buf_set_option(buf_handle, "modifiable", true)
vim.api.nvim_chan_send(jobID, table.concat(command, " "))
end)
map("i", "<C-o>", function(prompt_bufnr)
omnimap(map, "<C-o>", function(prompt_bufnr)
actions.close(prompt_bufnr)
local selection = action_state.get_selected_entry()
local commit_hash = selection.opts.commit_hash
Expand All @@ -221,7 +227,7 @@ M.checkout_reflog = function()
finder = finders.new_oneshot_job({ "git", "reflog", "--date=iso" }),
sorter = sorters.get_fuzzy_file(),
attach_mappings = function(_, map)
map("i", "<CR>", function(prompt_bufnr)
omnimap(map, "<CR>", function(prompt_bufnr)
actions.close(prompt_bufnr)
local selection = action_state.get_selected_entry()
local reflog_entry = selection.value
Expand Down Expand Up @@ -276,7 +282,7 @@ M.show_custom_functions = function()
end)),
sorter = sorters.get_fuzzy_file(),
attach_mappings = function(_, map)
map("i", "<CR>", function(prompt_bufnr)
omnimap(map, "<CR>", function(prompt_bufnr)
actions.close(prompt_bufnr)
local selection = action_state.get_selected_entry()
execute_git_function(selection.value)
Expand Down