aboutsummaryrefslogtreecommitdiffstats
path: root/lua/alpha
diff options
context:
space:
mode:
Diffstat (limited to 'lua/alpha')
-rw-r--r--lua/alpha/lsp/attach.lua20
-rw-r--r--lua/alpha/lsp/null-ls.lua6
-rw-r--r--lua/alpha/php/gateway.lua4
-rw-r--r--lua/alpha/snips/ft/go.lua7
-rw-r--r--lua/alpha/telescope/actions.lua13
-rw-r--r--lua/alpha/telescope/init.lua6
-rw-r--r--lua/alpha/telescope/mappings.lua60
-rw-r--r--lua/alpha/utils.lua24
8 files changed, 71 insertions, 69 deletions
diff --git a/lua/alpha/lsp/attach.lua b/lua/alpha/lsp/attach.lua
index d9f32bf..45ce904 100644
--- a/lua/alpha/lsp/attach.lua
+++ b/lua/alpha/lsp/attach.lua
@@ -8,11 +8,11 @@ local filetype_attach = setmetatable({}, {
return function(client, bufnr)
local filetype = vim.api.nvim_buf_get_option(0, "filetype")
-- keymaps for lsp
- vim.keymap.set("n", "K", vim.lsp.buf.hover, { buffer = 0 })
- vim.keymap.set("n", "<leader>vrn", vim.lsp.buf.rename, { buffer = 0 })
- vim.keymap.set("i", "<c-h>", vim.lsp.buf.signature_help, { buffer = 0 })
- vim.keymap.set("n", "<leader>vo", ":LspRestart<cr>", { noremap = true })
- vim.keymap.set({ "n", "v" }, "<leader>vca", vim.lsp.buf.code_action, {})
+ vim.keymap.set("n", "K", vim.lsp.buf.hover, { buffer = 0, desc = "LSP Help information of symbol under the cursor" })
+ vim.keymap.set("n", "<leader>vrn", vim.lsp.buf.rename, { buffer = 0, desc = "LSP Rename symbol under cursor" })
+ vim.keymap.set("i", "<c-h>", vim.lsp.buf.signature_help, { buffer = 0, desc = "LSP Signature help" })
+ vim.keymap.set("n", "<leader>vo", ":LspRestart<cr>", { noremap = true, desc = "LSP Restart Server" })
+ vim.keymap.set({ "n", "v" }, "<leader>vca", vim.lsp.buf.code_action, { buffer = 0, desc = "LSP Code actions" })
vim.keymap.set("n", "<leader>vf", function()
return vim.lsp.buf.format {
async = true,
@@ -20,12 +20,12 @@ return function(client, bufnr)
return cli.name ~= "lua_ls"
end,
}
- end, {})
+ end, { buffer = 0, desc = "LSP format file" })
- telescope_mapper("gr", "lsp_references", nil, true)
- telescope_mapper("<leader>pv", "find_symbol", nil, true)
- telescope_mapper("<leader>pd", "lsp_document_symbols", nil, true)
- telescope_mapper("<c-]>", "lsp_definitions", nil, true)
+ telescope_mapper("gr", "lsp_references", { buffer = true, desc = "LSP References of symbol on cursor" })
+ telescope_mapper("<leader>pv", "find_symbol", { buffer = true, desc = "LSP find symbol on the project" })
+ telescope_mapper("<leader>pd", "lsp_document_symbols", { buffer = true, desc = "LSP document symbols" })
+ telescope_mapper("<c-]>", "lsp_definitions", { buffer = true, desc = "LSP go to definition" })
vim.bo.omnifunc = "v:lua.vim.lsp.omnifunc"
diff --git a/lua/alpha/lsp/null-ls.lua b/lua/alpha/lsp/null-ls.lua
index 0a4443a..2c4c3bc 100644
--- a/lua/alpha/lsp/null-ls.lua
+++ b/lua/alpha/lsp/null-ls.lua
@@ -4,7 +4,7 @@ local php_actions = require "php-code-actions"
null_ls.setup {
sources = {
- null_ls.builtins.code_actions.gitsigns,
+ -- null_ls.builtins.code_actions.gitsigns,
null_ls.builtins.formatting.jq,
null_ls.builtins.code_actions.refactoring,
null_ls.builtins.formatting.alejandra,
@@ -32,7 +32,7 @@ null_ls.setup {
},
}
-vim.keymap.set({ "n", "v" }, "<leader>vca", vim.lsp.buf.code_action, {})
+vim.keymap.set({ "n", "v" }, "<leader>vca", vim.lsp.buf.code_action, {desc = "LSP (null ls) Code actions"})
vim.keymap.set("n", "<leader>vf", function()
return vim.lsp.buf.format { async = true }
-end, {})
+end, {desc = "LSP (null ls) Format file"})
diff --git a/lua/alpha/php/gateway.lua b/lua/alpha/php/gateway.lua
index 614c4f2..07fad33 100644
--- a/lua/alpha/php/gateway.lua
+++ b/lua/alpha/php/gateway.lua
@@ -49,7 +49,7 @@ end
--- @param bufnr integer Buff id
gateway.get_graphql_definitions = function(bufnr)
- vim.treesitter.set_query(
+ vim.treesitter.query.set(
"yaml",
"GraphQL_endpoints",
[[
@@ -69,7 +69,7 @@ gateway.get_graphql_definitions = function(bufnr)
]]
)
- local query = vim.treesitter.get_query("yaml", "GraphQL_endpoints")
+ local query = vim.treesitter.query.get("yaml", "GraphQL_endpoints")
local elements = {}
diff --git a/lua/alpha/snips/ft/go.lua b/lua/alpha/snips/ft/go.lua
index 637f57d..9c3977f 100644
--- a/lua/alpha/snips/ft/go.lua
+++ b/lua/alpha/snips/ft/go.lua
@@ -13,11 +13,6 @@ local ts_utils = require "nvim-treesitter.ts_utils"
local get_node_text = vim.treesitter.get_node_text
-if vim.fn.has "nvim-0.9.0" ~= 1 then
- vim.treesitter.query.get = vim.treesitter.get_query
- vim.treesitter.query.set = vim.treesitter.set_query
-end
-
vim.treesitter.query.set(
"go",
"LuaSnip_Result",
@@ -88,7 +83,7 @@ local function go_result_type(info)
end
end
- local query = vim.treesitter.query.get_query("go", "LuaSnip_Result")
+ local query = vim.treesitter.query.get("go", "LuaSnip_Result")
for _, node in query:iter_captures(function_node, 0) do
if handlers[node:type()] then
return handlers[node:type()](node, info)
diff --git a/lua/alpha/telescope/actions.lua b/lua/alpha/telescope/actions.lua
index c7cdaa8..b0e9f10 100644
--- a/lua/alpha/telescope/actions.lua
+++ b/lua/alpha/telescope/actions.lua
@@ -9,8 +9,9 @@ M.create_plugin = function(prompt_bufnr)
vim.cmd(string.format("edit ~/.config/nvim/lua/plugins/%s.lua", new_plugin))
end
+
local get_disable_stm_node = function(bufnr, tree)
- vim.treesitter.set_query(
+ vim.treesitter.query.set(
"lua",
"alpha_plugin_is_disabled",
[[
@@ -27,7 +28,7 @@ local get_disable_stm_node = function(bufnr, tree)
]]
)
- local query = vim.treesitter.get_query("lua", "alpha_plugin_is_disabled")
+ local query = vim.treesitter.query.get("lua", "alpha_plugin_is_disabled")
for id, node in query:iter_captures(tree:root(), bufnr) do
if query.captures[id] == "enabled" then
@@ -39,7 +40,7 @@ local get_disable_stm_node = function(bufnr, tree)
end
local get_enabled_node = function(bufnr, tree)
- vim.treesitter.set_query(
+ vim.treesitter.query.set(
"lua",
"alpha_plugin_has_enable_property",
[[
@@ -55,7 +56,7 @@ local get_enabled_node = function(bufnr, tree)
]]
)
- local query = vim.treesitter.get_query("lua", "alpha_plugin_has_enable_property")
+ local query = vim.treesitter.query.get("lua", "alpha_plugin_has_enable_property")
for id, node in query:iter_captures(tree:root(), bufnr) do
if query.captures[id] == "enabled" then
@@ -67,7 +68,7 @@ local get_enabled_node = function(bufnr, tree)
end
local get_return_node = function(bufnr, tree)
- vim.treesitter.set_query(
+ vim.treesitter.query.set(
"lua",
"alpha_plugin_return_table_constructor",
[[
@@ -79,7 +80,7 @@ local get_return_node = function(bufnr, tree)
]]
)
- local query = vim.treesitter.get_query("lua", "alpha_plugin_return_table_constructor")
+ local query = vim.treesitter.query.get("lua", "alpha_plugin_return_table_constructor")
for id, node in query:iter_captures(tree:root(), bufnr) do
if query.captures[id] == "table_constructor" then
diff --git a/lua/alpha/telescope/init.lua b/lua/alpha/telescope/init.lua
index 28397b0..70ef47f 100644
--- a/lua/alpha/telescope/init.lua
+++ b/lua/alpha/telescope/init.lua
@@ -84,7 +84,7 @@ function M.find_symbol()
end
function M.my_plugins()
- if vim.fn.isdirectory "~/code/plugins/" == 0 then
+ if vim.fn.isdirectory(vim.fn.getenv "HOME" .. "/code/plugins/") == 0 then
vim.notify("Directory ~/code/plugins does not exists", vim.log.levels.WARN, { title = "Telescope Mappings" })
return
end
@@ -98,11 +98,11 @@ function M.scratchs()
prompt_title = "Scratchs",
no_ignore = true,
cwd = "~/.config/nvim/lua/scratchs/",
- attach_mappings = function (_, map)
+ attach_mappings = function(_, map)
map("i", "<c-t>", my_actions.create_scratch_file)
return true
- end
+ end,
}
end
diff --git a/lua/alpha/telescope/mappings.lua b/lua/alpha/telescope/mappings.lua
index be59eaf..4843731 100644
--- a/lua/alpha/telescope/mappings.lua
+++ b/lua/alpha/telescope/mappings.lua
@@ -1,44 +1,50 @@
-TelescopeMapArgs = TelescopeMapArgs or {}
-
-local map_tele = function(key, f, options, buffer, mode)
- mode = mode or "n"
+local map_tele = function(key, f, opts)
+ local default = {
+ mode = "n",
+ options = {},
+ buffer = nil,
+ desc = nil,
+ }
+ opts = opts or {}
+ opts = vim.tbl_deep_extend("force", default, opts or {})
local rhs = function()
- R("alpha.telescope")[f](options or {})
+ R("alpha.telescope")[f](opts.options)
end
local map_options = {
remap = false,
silent = true,
}
- if buffer then
- map_options.buffer = buffer
+ if opts.buffer then
+ map_options.buffer = opts.buffer
+ end
+ if opts.desc then
+ map_options.desc = "Telescope: " .. opts.desc
end
- vim.keymap.set(mode, key, rhs, map_options)
+ vim.keymap.set(opts.mode, key, rhs, map_options)
end
-- not shure what this line does
vim.api.nvim_set_keymap("c", "<c-r><c-r>", "<Plug>(TelescopeFuzzyCommandSearch)", { noremap = false, nowait = true })
-map_tele("<leader>pp", "project_files")
-map_tele("<leader>gc", "branches")
-map_tele("<leader>pw", "grep_word")
-map_tele("<leader>ps", "grep_string")
-map_tele("<leader>pf", "projectionist")
-map_tele("<leader>rc", "search_config")
-map_tele("<leader>rn", "find_nvim_config")
-map_tele("<leader>rp", "find_nvim_plugin")
-map_tele("<leader>rs", "scratchs")
-map_tele("<leader>ph", "help_tags")
-map_tele("<leader>pe", "buffers")
-map_tele("<leader>pr", "treesitter")
-map_tele("<leader>bb", "file_browser_relative")
-map_tele("<leader>bp", "file_browser")
-map_tele("<leader>gs", "git_status")
-map_tele("<leader>ve", "diagnostics")
-map_tele("<leader>fp", "my_plugins")
-map_tele("<leader>po", "api_specs")
-map_tele("<leader>pm", "gateway")
+map_tele("<leader>pp", "project_files", { desc = "Open Project files" })
+map_tele("<leader>gc", "branches", { desc = "Git Branches selector" })
+map_tele("<leader>pw", "grep_word", { desc = "Grep word under cursor" })
+map_tele("<leader>ps", "grep_string", { desc = "Grep provided input string" })
+map_tele("<leader>rc", "search_config", { desc = "Search Files in .dotfiles directory" })
+map_tele("<leader>rn", "find_nvim_config", { desc = "Search Files in nvim config directory" })
+map_tele("<leader>rp", "find_nvim_plugin", { desc = "Search Neovim plugins" })
+map_tele("<leader>rs", "scratchs", { desc = "Search Neovim Scratchs files" })
+map_tele("<leader>ph", "help_tags", { desc = "Neovim Help" })
+map_tele("<leader>pe", "buffers", { desc = "Open buffers" })
+map_tele("<leader>pr", "treesitter", { desc = "Treesitter buffer elements" })
+map_tele("<leader>bb", "file_browser_relative", { desc = "Current directory" })
+map_tele("<leader>bp", "file_browser", { desc = "Project directory" })
+map_tele("<leader>gs", "git_status", { desc = "Git status" })
+map_tele("<leader>ve", "diagnostics", { desc = "Diagnostic of the buffer" })
+map_tele("<leader>po", "api_specs", { desc = "Openapi directory" })
+map_tele("<leader>pm", "gateway", { desc = "Graphql mutations and queries" })
return map_tele
diff --git a/lua/alpha/utils.lua b/lua/alpha/utils.lua
index b1202d6..ee80a1c 100644
--- a/lua/alpha/utils.lua
+++ b/lua/alpha/utils.lua
@@ -1,21 +1,21 @@
local M = {}
M.save_and_exec = function()
- local source_commands = {
- lua = "luafi %",
- vim = "source %",
- }
-
- local ft = vim.api.nvim_buf_get_option(0, "filetype")
- local command = source_commands[ft]
- if command == nil then
- vim.notify("This type cant not be sourced", vim.log.levels.ERROR, { title = "Alpha Developer" })
- return
- end
+ -- local source_commands = {
+ -- lua = "luafi %",
+ -- vim = "source %",
+ -- }
+ --
+ -- local ft = vim.api.nvim_buf_get_option(0, "filetype")
+ -- local command = source_commands[ft]
+ -- if command == nil then
+ -- vim.notify("This type cant not be sourced", vim.log.levels.ERROR, { title = "Alpha Developer" })
+ -- return
+ -- end
-- Save and source
vim.api.nvim_command "silent w"
- vim.api.nvim_command(command)
+ vim.api.nvim_command "so"
local current_file_name = vim.fn.fnamemodify(vim.api.nvim_buf_get_name(0), ":t")
vim.notify(string.format("File %s Sourced", current_file_name), vim.log.levels.INFO, { title = "Alpha Developer" })
git.all.ar ยท elvis.ar