From 17201507ebeab21c7054b392b72712114a0c4ff8 Mon Sep 17 00:00:00 2001
From: Matthew Leong <mattleong91@gmail.com>
Date: Mon, 9 Jan 2023 19:07:05 -0800
Subject: [PATCH] refactor(mappings): clean up telescope

---
 lua/cosmic/plugins/telescope/init.lua     | 20 +++++++++++++---
 lua/cosmic/plugins/telescope/mappings.lua | 28 -----------------------
 lua/cosmic/plugins/telescope/utils.lua    | 11 +++++++++
 3 files changed, 28 insertions(+), 31 deletions(-)
 delete mode 100644 lua/cosmic/plugins/telescope/mappings.lua
 create mode 100644 lua/cosmic/plugins/telescope/utils.lua

diff --git a/lua/cosmic/plugins/telescope/init.lua b/lua/cosmic/plugins/telescope/init.lua
index b6ac283..1838a08 100644
--- a/lua/cosmic/plugins/telescope/init.lua
+++ b/lua/cosmic/plugins/telescope/init.lua
@@ -14,10 +14,24 @@ return {
   end,
   init = function()
     -- normal mappings
-    require('cosmic.plugins.telescope.mappings').init()
+    local u = require('cosmic.utils')
+    local map = u.map
+
+    map('n', '<leader>ff', '', {
+      callback = require('cosmic.plugins.telescope.utils').project_files,
+      desc = 'Find file',
+    })
+    map('n', '<leader>fp', ':Telescope find_files<cr>', { desc = 'Find project file' })
+    map('n', '<leader>fk', ':Telescope buffers<cr>', { desc = 'Find buffer' })
+    map('n', '<leader>fs', ':Telescope live_grep<cr>', { desc = 'Grep string' })
+    map('n', '<leader>fw', ':Telescope grep_string<cr>', { desc = 'Grep current word' })
+
+    -- git navigation
+    map('n', '<leader>vtc', ':Telescope git_commits<cr>', { desc = 'Git commits' })
+    map('n', '<leader>vts', ':Telescope git_status<cr>', { desc = 'Git status' })
 
     user_config.lsp.add_on_attach_mapping(function(client, bufnr)
-      local buf_map = require('cosmic.utils').create_buf_map(bufnr)
+      local buf_map = u.create_buf_map(bufnr)
 
       buf_map('n', 'gd', '<cmd>Telescope lsp_definitions<cr>', { desc = 'Go to definition' })
       buf_map('n', 'gi', '<cmd>Telescope lsp_implementations<cr>', { desc = 'Go to implementation' })
@@ -33,7 +47,7 @@ return {
     {
       '<leader>ff',
       '<cmd>lua require("cosmic.plugins.telescope.mappings").project_files()<cr>',
-      desc = 'Project find files',
+      desc = 'Find project file',
     },
   },
   enabled = not vim.tbl_contains(user_config.disable_builtin_plugins, 'telescope'),
diff --git a/lua/cosmic/plugins/telescope/mappings.lua b/lua/cosmic/plugins/telescope/mappings.lua
deleted file mode 100644
index 6e05281..0000000
--- a/lua/cosmic/plugins/telescope/mappings.lua
+++ /dev/null
@@ -1,28 +0,0 @@
-local map = require('cosmic.utils').map
-local M = {}
-
-M.project_files = function()
-  local opts = {} -- define here if you want to define something
-  local ok = pcall(require('telescope.builtin').git_files, opts)
-  if not ok then
-    require('telescope.builtin').find_files(opts)
-  end
-end
-
-M.init = function()
-  -- navigation
-  map('n', '<leader>ff', '', {
-    callback = require('cosmic.plugins.telescope.mappings').project_files,
-    desc = 'Find files',
-  })
-  map('n', '<leader>fp', ':Telescope find_files<cr>', { desc = 'Find project file' })
-  map('n', '<leader>fk', ':Telescope buffers<cr>', { desc = 'Find buffer' })
-  map('n', '<leader>fs', ':Telescope live_grep<cr>', { desc = 'Grep string' })
-  map('n', '<leader>fw', ':Telescope grep_string<cr>', { desc = 'Grep current word' })
-
-  -- git navigation
-  map('n', '<leader>vtc', ':Telescope git_commits<cr>', { desc = 'Git commits' })
-  map('n', '<leader>vts', ':Telescope git_status<cr>', { desc = 'Git status' })
-end
-
-return M
diff --git a/lua/cosmic/plugins/telescope/utils.lua b/lua/cosmic/plugins/telescope/utils.lua
new file mode 100644
index 0000000..4aee25b
--- /dev/null
+++ b/lua/cosmic/plugins/telescope/utils.lua
@@ -0,0 +1,11 @@
+local M = {}
+
+M.project_files = function()
+  local opts = {} -- define here if you want to define something
+  local ok = pcall(require('telescope.builtin').git_files, opts)
+  if not ok then
+    require('telescope.builtin').find_files(opts)
+  end
+end
+
+return M