Rename requires

Signed-off-by: Aaron Hallaert <[email protected]>

Author: aaronhallaert

lua/advanced_git_search/fzf/finders/init.lua

@@ -1,6 +1,6 @@
-local preview_utils = require("advanced_git_search.fzf.previewers.utils")
-local cmd_utils = require("advanced_git_search.commands.utils")
-local finder_cmds = require("advanced_git_search.commands.find")
+local fzf_preview_utils = require("advanced_git_search.fzf.previewers.utils")
+local command_utils = require("advanced_git_search.commands.utils")
+local finder_commands = require("advanced_git_search.commands.find")
 local utils = require("advanced_git_search.utils")
 
 local M = {}
@@ -9,12 +9,12 @@ local M = {}
 ---@param bufnr number|nil
 ---@return string
 M.git_log_content_finder = function(query, bufnr)
-    preview_utils.set_last_query(query)
+    fzf_preview_utils.set_last_query(query)
 
-    local prompt, author = cmd_utils.split_query_from_author(query)
+    local prompt, author = command_utils.split_query_from_author(query)
 
     local command = table.concat(
-        finder_cmds.git_log_content(
+        finder_commands.git_log_content(
             '"' .. utils.escape_term(prompt) .. '"',
             author,
             bufnr
@@ -26,12 +26,12 @@ M.git_log_content_finder = function(query, bufnr)
 end
 
 M.git_log_location_finder = function(query, bufnr, s_start, s_end)
-    preview_utils.set_last_query(query)
+    fzf_preview_utils.set_last_query(query)
 
-    local prompt, author = cmd_utils.split_query_from_author(query)
+    local prompt, author = command_utils.split_query_from_author(query)
 
     local command = table.concat(
-        finder_cmds.git_log_location(
+        finder_commands.git_log_location(
             '"' .. utils.escape_term(prompt) .. '"',
             author,
             bufnr,
@@ -45,12 +45,12 @@ M.git_log_location_finder = function(query, bufnr, s_start, s_end)
 end
 
 M.git_log_file_finder = function(query, bufnr)
-    preview_utils.set_last_query(query)
+    fzf_preview_utils.set_last_query(query)
 
-    local prompt, author = cmd_utils.split_query_from_author(query)
+    local prompt, author = command_utils.split_query_from_author(query)
 
     local command = table.concat(
-        finder_cmds.git_log_file(
+        finder_commands.git_log_file(
             '"' .. utils.escape_term(prompt) .. '"',
             author,
             bufnr

lua/advanced_git_search/fzf/init.lua

@@ -3,6 +3,12 @@ local config = require("advanced_git_search.utils.config")
 
 M.setup = function(opts)
     config.setup(opts)
+
+    vim.api.nvim_create_user_command(
+        "AdvancedGitSearch",
+        "lua require('advanced_git_search.fzf').show_custom_functions()",
+        { range = true }
+    )
 end
 
 M.search_log_content =

lua/advanced_git_search/fzf/mappings/init.lua

@@ -1,8 +1,8 @@
 local M = {}
 local utils = require("advanced_git_search.utils")
 
-local ags_actions = require("advanced_git_search.actions")
-local file = require("advanced_git_search.utils.file")
+local global_actions = require("advanced_git_search.actions")
+local file_utils = require("advanced_git_search.utils.file")
 local git_utils = require("advanced_git_search.utils.git")
 
 ---FZF: <C-o> Opens the selected commit in browser
@@ -13,7 +13,7 @@ M.open_commit_in_brower = function()
             local selection = selected[1]
             local hash = utils.split_string(selection, " ")[1]
 
-            ags_actions.open_in_browser(hash)
+            global_actions.open_in_browser(hash)
         end,
     }
 end
@@ -27,9 +27,9 @@ M.open_diff_buffer_with_selected_commit = function(bufnr)
             local selection = selected[1]
             local commit_hash = utils.split_string(selection, " ")[1]
 
-            ags_actions.open_diff_view(
+            global_actions.open_diff_view(
                 commit_hash,
-                file.git_relative_path(bufnr)
+                file_utils.git_relative_path(bufnr)
             )
         end,
     }
@@ -43,7 +43,7 @@ M.show_entire_commit = function()
             local selection = selected[1]
             local commit_hash = utils.split_string(selection, " ")[1]
 
-            ags_actions.open_commit(commit_hash)
+            global_actions.open_commit(commit_hash)
         end,
     }
 end
@@ -56,11 +56,11 @@ M.diff_buffer_with_branch = function(bufnr)
         ["default"] = function(selected, _)
             local branch = selected[1]
 
-            ags_actions.open_diff_view(
+            global_actions.open_diff_view(
                 branch,
                 git_utils.file_name_on_commit(
                     branch,
-                    file.git_relative_path(bufnr)
+                    file_utils.git_relative_path(bufnr)
                 )
             )
         end,
@@ -75,7 +75,7 @@ M.copy_commit_hash = function()
             local selection = selected[1]
             local commit_hash = utils.split_string(selection, " ")[1]
 
-            ags_actions.copy_to_clipboard(commit_hash)
+            global_actions.copy_to_clipboard(commit_hash)
         end,
     }
 end

lua/advanced_git_search/fzf/pickers/init.lua

@@ -1,9 +1,9 @@
 local M = {}
 
-local ags_previewers = require("advanced_git_search.fzf.previewers")
-local ags_finders = require("advanced_git_search.fzf.finders")
-local ags_mappings = require("advanced_git_search.fzf.mappings")
-local picker_utils = require("advanced_git_search.fzf.pickers.utils")
+local fzf_previewers = require("advanced_git_search.fzf.previewers")
+local fzf_finders = require("advanced_git_search.fzf.finders")
+local fzf_mappings = require("advanced_git_search.fzf.mappings")
+local fzf_picker_utils = require("advanced_git_search.fzf.pickers.utils")
 local global_picker = require("advanced_git_search.global_picker")
 
 M.search_log_content = function()
@@ -13,22 +13,22 @@ M.search_log_content = function()
         exec_empty_query = false,
         func_async_callback = false,
         fzf_opts = {
-            ["--preview"] = ags_previewers.git_diff_content_previewer(),
+            ["--preview"] = fzf_previewers.git_diff_content_previewer(),
         },
         fn_transform = function(x)
-            return picker_utils.make_entry(x)
+            return fzf_picker_utils.make_entry(x)
         end,
         actions = vim.tbl_extend(
             "keep",
-            ags_mappings.open_commit_in_brower(),
-            ags_mappings.open_diff_buffer_with_selected_commit(bufnr),
-            ags_mappings.show_entire_commit(),
-            ags_mappings.copy_commit_hash()
+            fzf_mappings.open_commit_in_brower(),
+            fzf_mappings.open_diff_buffer_with_selected_commit(bufnr),
+            fzf_mappings.show_entire_commit(),
+            fzf_mappings.copy_commit_hash()
         ),
     }
 
     require("fzf-lua").fzf_live(function(query)
-        return ags_finders.git_log_content_finder(query, nil)
+        return fzf_finders.git_log_content_finder(query, nil)
     end, opts)
 end
 
@@ -40,22 +40,22 @@ M.search_log_content_file = function()
         exec_empty_query = false,
         func_async_callback = false,
         fzf_opts = {
-            ["--preview"] = ags_previewers.git_diff_content_previewer(),
+            ["--preview"] = fzf_previewers.git_diff_content_previewer(),
         },
         fn_transform = function(x)
-            return picker_utils.make_entry(x)
+            return fzf_picker_utils.make_entry(x)
         end,
         actions = vim.tbl_extend(
             "keep",
-            ags_mappings.open_commit_in_brower(),
-            ags_mappings.open_diff_buffer_with_selected_commit(bufnr),
-            ags_mappings.show_entire_commit(),
-            ags_mappings.copy_commit_hash()
+            fzf_mappings.open_commit_in_brower(),
+            fzf_mappings.open_diff_buffer_with_selected_commit(bufnr),
+            fzf_mappings.show_entire_commit(),
+            fzf_mappings.copy_commit_hash()
         ),
     }
 
     require("fzf-lua").fzf_live(function(query)
-        return ags_finders.git_log_content_finder(query, bufnr)
+        return fzf_finders.git_log_content_finder(query, bufnr)
     end, opts)
 end
 
@@ -69,22 +69,22 @@ M.diff_commit_line = function()
         exec_empty_query = true,
         func_async_callback = false,
         fzf_opts = {
-            ["--preview"] = ags_previewers.git_diff_file_previewer(bufnr),
+            ["--preview"] = fzf_previewers.git_diff_file_previewer(bufnr),
         },
         fn_transform = function(x)
-            return picker_utils.make_entry(x)
+            return fzf_picker_utils.make_entry(x)
         end,
         actions = vim.tbl_extend(
             "keep",
-            ags_mappings.open_commit_in_brower(),
-            ags_mappings.open_diff_buffer_with_selected_commit(bufnr),
-            ags_mappings.show_entire_commit(),
-            ags_mappings.copy_commit_hash()
+            fzf_mappings.open_commit_in_brower(),
+            fzf_mappings.open_diff_buffer_with_selected_commit(bufnr),
+            fzf_mappings.show_entire_commit(),
+            fzf_mappings.copy_commit_hash()
         ),
     }
 
     require("fzf-lua").fzf_live(function(query)
-        return ags_finders.git_log_location_finder(query, bufnr, s_start, s_end)
+        return fzf_finders.git_log_location_finder(query, bufnr, s_start, s_end)
     end, opts)
 end
 
@@ -96,22 +96,22 @@ M.diff_commit_file = function()
         exec_empty_query = true,
         func_async_callback = false,
         fzf_opts = {
-            ["--preview"] = ags_previewers.git_diff_file_previewer(bufnr),
+            ["--preview"] = fzf_previewers.git_diff_file_previewer(bufnr),
         },
         fn_transform = function(x)
-            return picker_utils.make_entry(x)
+            return fzf_picker_utils.make_entry(x)
         end,
         actions = vim.tbl_extend(
             "keep",
-            ags_mappings.open_commit_in_brower(),
-            ags_mappings.open_diff_buffer_with_selected_commit(bufnr),
-            ags_mappings.show_entire_commit(),
-            ags_mappings.copy_commit_hash()
+            fzf_mappings.open_commit_in_brower(),
+            fzf_mappings.open_diff_buffer_with_selected_commit(bufnr),
+            fzf_mappings.show_entire_commit(),
+            fzf_mappings.copy_commit_hash()
         ),
     }
 
     require("fzf-lua").fzf_live(function(query)
-        return ags_finders.git_log_file_finder(query, bufnr)
+        return fzf_finders.git_log_file_finder(query, bufnr)
     end, opts)
 end
 
@@ -122,15 +122,15 @@ M.diff_branch_file = function()
         prompt = "Branch> ",
         func_async_callback = false,
         fzf_opts = {
-            ["--preview"] = ags_previewers.git_diff_branch_file_previewer(
+            ["--preview"] = fzf_previewers.git_diff_branch_file_previewer(
                 bufnr
             ),
         },
         actions = vim.tbl_extend(
             "keep",
-            ags_mappings.open_commit_in_brower(),
-            ags_mappings.open_diff_buffer_with_selected_commit(bufnr),
-            ags_mappings.copy_commit_hash()
+            fzf_mappings.open_commit_in_brower(),
+            fzf_mappings.open_diff_buffer_with_selected_commit(bufnr),
+            fzf_mappings.copy_commit_hash()
         ),
     }
 
@@ -148,7 +148,7 @@ M.changed_on_branch = function()
         prompt = "File> ",
         func_async_callback = false,
         fzf_opts = {
-            ["--preview"] = ags_previewers.git_diff_base_branch(),
+            ["--preview"] = fzf_previewers.git_diff_base_branch(),
         },
     }
 
@@ -165,7 +165,7 @@ M.checkout_reflog = function()
     local opts = {
         func_async_callback = false,
         fn_transform = function(x)
-            return picker_utils.make_reflog_entry(x)
+            return fzf_picker_utils.make_reflog_entry(x)
         end,
         actions = {
             ["default"] = function(selected)

lua/advanced_git_search/fzf/previewers/init.lua

@@ -1,6 +1,6 @@
-local cmd_utils = require("advanced_git_search.commands.utils")
+local command_utils = require("advanced_git_search.commands.utils")
 local fzf_lua = require("fzf-lua")
-local preview_utils = require("advanced_git_search.fzf.previewers.utils")
+local fzf_preview_utils = require("advanced_git_search.fzf.previewers.utils")
 local utils = require("advanced_git_search.utils")
 local preview_commands = require("advanced_git_search.commands.preview")
 local git_utils = require("advanced_git_search.utils.git")
@@ -13,8 +13,9 @@ M.git_diff_content_previewer = function()
         local hash = string.sub(selection, 1, 7)
 
         local prev_commit = git_utils.previous_commit_hash(hash)
-        local prompt, _ =
-            cmd_utils.split_query_from_author(preview_utils.get_last_query())
+        local prompt, _ = command_utils.split_query_from_author(
+            fzf_preview_utils.get_last_query()
+        )
 
         local preview_command = table.concat(
             preview_commands.git_diff_content(