start keymap descriptions

This commit is contained in:
Matthew Leong 2023-01-09 15:28:39 -08:00
parent 5673bcd017
commit 5966aa4882
6 changed files with 77 additions and 41 deletions

View file

@ -26,12 +26,12 @@
"nvim-lsp-ts-utils": { "branch": "main", "commit": "0a6a16ef292c9b61eac6dad00d52666c7f84b0e7" },
"nvim-lspconfig": { "branch": "master", "commit": "7b98aadc6e85db4fc3af6c1ec22c4774d965506e" },
"nvim-notify": { "branch": "master", "commit": "b005821516f1f37801a73067afd1cef2dbc4dfe8" },
"nvim-tree.lua": { "branch": "master", "commit": "87961d38a7b6cd799ebe193946e86a1037ba66e8" },
"nvim-treesitter": { "branch": "master", "commit": "ed021ac3affdfd04a26325896d221f5f519e5971" },
"nvim-tree.lua": { "branch": "master", "commit": "677d54afee1dfa7a30eb9e16ab7d9d1affc6484b" },
"nvim-treesitter": { "branch": "master", "commit": "5fb315df12a3091f241b0326aed0ec70381adbd8" },
"nvim-treesitter-refactor": { "branch": "master", "commit": "75f5895cc662d61eb919da8050b7a0124400d589" },
"nvim-ts-autotag": { "branch": "main", "commit": "fdefe46c6807441460f11f11a167a2baf8e4534b" },
"nvim-ts-context-commentstring": { "branch": "main", "commit": "4a42b30376c1bd625ab5016c2079631d531d797a" },
"nvim-web-devicons": { "branch": "master", "commit": "7f55bc36eddec87597167a97de5b690997edaf7d" },
"nvim-web-devicons": { "branch": "master", "commit": "6c38926351372ea87034dec26182b62c835ff3bc" },
"plenary.nvim": { "branch": "master", "commit": "9d81624fbcedd3dd43b38d7e13a1e7b3f873d8cd" },
"popup.nvim": { "branch": "master", "commit": "b7404d35d5d3548a82149238289fa71f7f6de4ac" },
"telescope-fzf-native.nvim": { "branch": "main", "commit": "fab3e2212e206f4f8b3bbaa656e129443c9b802e" },
@ -40,5 +40,6 @@
"tokyonight.nvim": { "branch": "main", "commit": "def91651c41f6d1d43ebcb50763324d35331baee" },
"vim-floaterm": { "branch": "master", "commit": "280b34a0760801168a67f952542b6c49292aa5f3" },
"vim-fugitive": { "branch": "master", "commit": "99cdb88bc64063dc4656ae53496f06fb2a394cd4" },
"vim-hcl": { "branch": "main", "commit": "1e1116c17a5774851360ea8077f349e36fc733c1" }
"vim-hcl": { "branch": "main", "commit": "1e1116c17a5774851360ea8077f349e36fc733c1" },
"which-key.nvim": { "branch": "main", "commit": "85f69b07afce4ea77c58ae9a3aeb4e6c918b4d34" }
}

View file

@ -1,25 +1,25 @@
local map = require('cosmic.utils').map
-- Quickfix mappings
map('n', '<leader>ck', ':cexpr []<cr>')
map('n', '<leader>cc', ':cclose <cr>')
map('n', '<leader>co', ':copen <cr>')
map('n', '<leader>cf', ':cfdo %s/')
map('n', '<leader>cp', ':cprev<cr>zz')
map('n', '<leader>cn', ':cnext<cr>zz')
map('n', '<leader>ck', ':cexpr []<cr>', { desc = 'Clear list' })
map('n', '<leader>cc', ':cclose <cr>', { desc = 'Close list' })
map('n', '<leader>co', ':copen <cr>', { desc = 'Open list' })
map('n', '<leader>cf', ':cfdo %s/', { desc = 'Search & Replace' })
map('n', '<leader>cp', ':cprev<cr>zz', { desc = 'Prev Item' })
map('n', '<leader>cn', ':cnext<cr>zz', { desc = 'Next Item' })
-- buffer navigation
map('n', '<leader>bp', ':bprev<cr>')
map('n', '<leader>bn', ':bnext<cr>')
map('n', '<leader>bd', ':bdelete<cr>')
map('n', '<leader>bp', ':bprev<cr>', { desc = 'Prev buffer' })
map('n', '<leader>bn', ':bnext<cr>', { desc = 'Next buffer' })
map('n', '<leader>bd', ':bdelete<cr>', { desc = 'Delete buffer' })
-- tab navigation
map('n', '<leader>tp', ':tabprevious<cr>')
map('n', '<leader>tn', ':tabnext<cr>')
map('n', '<leader>td', ':tabclose<cr>')
map('n', '<leader>tp', ':tabprevious<cr>', { desc = 'Prev tab' })
map('n', '<leader>tn', ':tabnext<cr>', { desc = 'Next tab' })
map('n', '<leader>td', ':tabclose<cr>', { desc = 'Close tab' })
-- resize with arrows
map('n', '<C-Up>', ':resize -2<CR>')
map('n', '<C-Down>', ':resize +2<CR>')
map('n', '<C-Left>', ':vertical resize -2<CR>')
map('n', '<C-Right>', ':vertical resize +2<CR>')
map('n', '<C-Up>', ':resize -2<CR>', { desc = 'Resize -2' })
map('n', '<C-Down>', ':resize +2<CR>', { desc = 'Resize +2' })
map('n', '<C-Left>', ':vertical resize -2<CR>', { desc = 'Vertical Resize -2' })
map('n', '<C-Right>', ':vertical resize +2<CR>', { desc = 'Vertical Resize +2' })

View file

@ -1,4 +1,5 @@
local utils = require('cosmic.utils')
local lsp_utils = require('cosmic.utils.lsp')
local M = {}
-- Mappings.
@ -7,37 +8,50 @@ function M.init(client, bufnr)
noremap = false,
})
buf_map('n', 'gd', '<cmd>lua vim.lsp.buf.definition()<cr>')
buf_map('n', 'gD', '<cmd>lua vim.lsp.buf.declaration()<cr>')
buf_map('n', 'gi', '<cmd>lua vim.lsp.buf.implementation()<cr>')
buf_map('n', 'gt', '<cmd>lua vim.lsp.buf.type_definition()<cr>')
buf_map('n', 'gr', '<cmd>lua vim.lsp.buf.references()<cr>')
buf_map('n', 'gd', '<cmd>lua vim.lsp.buf.definition()<cr>', { desc = 'Go to definition' })
buf_map('n', 'gD', '<cmd>lua vim.lsp.buf.declaration()<cr>', { desc = 'Go to declaration' })
buf_map('n', 'gi', '<cmd>lua vim.lsp.buf.implementation()<cr>', { desc = 'Go to implementation' })
buf_map('n', 'gt', '<cmd>lua vim.lsp.buf.type_definition()<cr>', { desc = 'Go to type definition' })
buf_map('n', 'gr', '<cmd>lua vim.lsp.buf.references()<cr>', { desc = 'Find references' })
-- diagnostics
buf_map('n', '[g', '<cmd>lua vim.diagnostic.goto_prev()<cr>')
buf_map('n', ']g', '<cmd>lua vim.diagnostic.goto_next()<cr>')
buf_map('n', 'ge', '<cmd>lua vim.diagnostic.open_float(nil, { scope = "line", })<cr>')
buf_map('n', '<leader>ge', '<cmd>lua vim.diagnostic.open_float(nil, { scope = "buffer", })<cr>')
buf_map('n', '[g', '<cmd>lua vim.diagnostic.goto_prev()<cr>', { desc = 'Next diagnostic' })
buf_map('n', ']g', '<cmd>lua vim.diagnostic.goto_next()<cr>', { desc = 'Prev diagnostic' })
buf_map(
'n',
'ge',
'<cmd>lua vim.diagnostic.open_float(nil, { scope = "line", })<cr>',
{ desc = 'Show current line diagnostic' }
)
buf_map(
'n',
'<leader>ge',
'<cmd>lua vim.diagnostic.open_float(nil, { scope = "buffer", })<cr>',
{ desc = 'Show buffer diagnostic' }
)
-- hover
buf_map('n', 'K', '<cmd>lua vim.lsp.buf.hover()<cr>')
buf_map('n', 'K', '<cmd>lua vim.lsp.buf.hover()<cr>', { desc = 'Show documentation' })
-- code actions
buf_map('n', 'gn', '<cmd>lua vim.lsp.buf.rename()<cr>')
buf_map('n', '<leader>ga', '<cmd>lua vim.lsp.buf.code_actions()<cr>')
buf_map('v', '<leader>ga', '<cmd>lua vim.lsp.buf.range_code_actions()<cr>')
buf_map('n', 'gn', '<cmd>lua vim.lsp.buf.rename()<cr>', { desc = 'Rename' })
buf_map('n', '<leader>ga', '<cmd>lua vim.lsp.buf.code_actions()<cr>', { desc = 'Code Actions' })
buf_map('v', '<leader>ga', '<cmd>lua vim.lsp.buf.range_code_actions()<cr>', { desc = 'Range Code Actions' })
-- formatting
buf_map('n', '<leader>gf', '<cmd>lua vim.lsp.buf.formatting()<cr>')
buf_map('v', '<leader>gf', '<cmd>lua vim.lsp.buf.range_formatting()<cr>')
buf_map('n', '<leader>gf', '', { desc = 'Format', callback = lsp_utils.format })
buf_map('v', '<leader>gf', '<cmd>lua vim.lsp.buf.range_formatting()<cr>', { desc = 'Range Format' })
-- lsp workspace
buf_map('n', '<leader>wa', '<cmd>lua vim.lsp.buf.add_workspace_folder()<cr>')
buf_map('n', '<leader>wr', '<cmd>lua vim.lsp.buf.remove_workspace_folder()<cr>')
buf_map('n', '<leader>wa', '<cmd>lua vim.lsp.buf.add_workspace_folder()<cr>', { desc = 'Add workspace folder' })
buf_map('n', '<leader>wr', '<cmd>lua vim.lsp.buf.remove_workspace_folder()<cr>', {
desc = 'Remove workspace folder',
})
buf_map(
'n',
'<leader>wl',
'<cmd>lua require("cosmic.utils.logger"):log(vim.inspect(vim.lsp.buf.list_workspace_folders()))<cr>'
'<cmd>lua require("cosmic.utils.logger"):log(vim.inspect(vim.lsp.buf.list_workspace_folders()))<cr>',
{ desc = 'Show workspace folders' }
)
end

View file

@ -14,9 +14,14 @@ return {
user_config.lsp.add_on_attach_mapping(function(client, bufnr)
local buf_map = utils.create_buf_map(bufnr)
buf_map('n', 'gn', '<cmd>lua require("cosmic-ui").rename()<cr>')
buf_map('n', '<leader>ga', '<cmd>lua require("cosmic-ui").code_actions()<cr>')
buf_map('v', '<leader>ga', '<cmd>lua require("cosmic-ui").range_code_actions()<cr>')
buf_map('n', 'gn', '<cmd>lua require("cosmic-ui").rename()<cr>', { desc = 'Rename' })
buf_map('n', '<leader>ga', '<cmd>lua require("cosmic-ui").code_actions()<cr>', { desc = 'Code Actions' })
buf_map(
'v',
'<leader>ga',
'<cmd>lua require("cosmic-ui").range_code_actions()<cr>',
{ desc = 'Range Code Actions' }
)
end)
end,
config = function()

View file

@ -34,6 +34,7 @@ return {
-- map for toggling lines
map('n', '<leader>ld', '', {
callback = toggle,
desc = 'Toggle LSP Lines',
})
end,
enabled = not vim.tbl_contains(user_config.disable_builtin_plugins, 'lsp_lines'),

View file

@ -0,0 +1,15 @@
local user_config = require('cosmic.core.user')
return {
{ -- color scheme
'folke/which-key.nvim',
config = function()
require('which-key').setup({
-- your configuration comes here
-- or leave it empty to use the default settings
-- refer to the configuration section below
})
end,
event = 'VeryLazy',
enabled = not vim.tbl_contains(user_config.disable_builtin_plugins, 'which-key'),
},
}