commit 57b75021a7be38eb02f4e643338322910f8f2dfd
parent 3419a009a9d9a4de1b0be030db5198f7a163d764
Author: Tomas Nemec <nemi@skaut.cz>
Date: Sun, 5 Jun 2022 00:39:53 +0200
update: remove noremap
Diffstat:
16 files changed, 117 insertions(+), 101 deletions(-)
diff --git a/after/plugin/actions.lua b/after/plugin/actions.lua
@@ -3,7 +3,7 @@ if not pcall(require, 'actions') then return end
local utils = require 'actions.utils'
local actions = {}
-local mappings = { ['n <leader>dr'] = 'run', ['n <leader>dt'] = 'test', ['n <leader>db'] = 'build' }
+local mappings = { ['n <leader>ar'] = 'run', ['n <leader>at'] = 'test', ['n <leader>ab'] = 'build' }
local function make(_) vim.cmd [[make]] end
diff --git a/after/plugin/dadbod.lua b/after/plugin/dadbod.lua
@@ -1,3 +1,3 @@
-if pcall(require, 'vim-dadbod-completion') then
+if pcall(require, 'vim-dadbod-completion') then
vim.cmd [[autocmd FileType sql,mysql,plsql lua require('cmp').setup.buffer({ sources = {{ name = 'vim-dadbod-completion' }} })]]
end
diff --git a/after/plugin/dap.lua b/after/plugin/dap.lua
@@ -1,69 +1,82 @@
if not pcall(require, 'dap') then return end
-local cpp = function(dap)
- dap.adapters.cpp = {
- type = 'executable',
- attach = { pidProperty = 'pid', pidSelect = 'ask' },
- command = 'lldb', -- my binary was called 'lldb-vscode-11'
- env = { LLDB_LAUNCH_FLAG_LAUNCH_IN_TTY = 'YES' },
- name = 'lldb',
- }
+vim.keymap.set('n', '<leader>dc', function() require'dap'.continue() end, { silent = true, desc = 'DAP Continue' })
+vim.keymap.set('n', '<leader>do', function() require'dap'.step_over() end, { silent = true, desc = 'DAP Step Over' })
+vim.keymap.set('n', '<leader>di', function() require'dap'.step_into() end, { silent = true, desc = 'DAP Step Into' })
+vim.keymap.set('n', '<leader>dt', function() require'dap'.step_out() end, { silent = true, desc = 'DAP Step Out' })
+vim.keymap.set('n', '<leader>db', function() require'dap'.toggle_breakpoint() end,
+ { silent = true, desc = 'DAP Toggle Breakpoint' })
+vim.keymap.set('n', '<leader>dC', function() require'dap'.clear_breakpoints() end,
+ { silent = true, desc = 'DAP Clear Breakpoint' })
+vim.keymap.set('n', '<Leader>dB', function() require'dap'.set_breakpoint(vim.fn.input('Breakpoint condition: ')) end,
+ { silent = true, desc = 'DAP Set Breakpoint' })
+vim.keymap.set('n', '<leader>dL',
+ function() require'dap'.set_breakpoint(nil, nil, vim.fn.input('Log point message: ')) end,
+ { silent = true, desc = 'DAP Set Log Point' })
+vim.keymap.set('n', '<leader>dr', function() require'dap'.repl.open() end, { silent = true, desc = 'DAP Open Repl' })
+vim.keymap.set('n', '<leader>dl', function() require'dap'.run_last() end, { silent = true, desc = 'DAP Run Last' })
- dap.configurations.cpp = { { type = 'cpp', request = 'launch', name = 'Launch File', program = '${file}' } }
-end
-
-local dart = function(dap)
- dap.defaults.fallback.external_terminal = { command = '/usr/bin/alacritty', args = { '-e' } }
-
- dap.adapters.dart = {
- type = 'executable',
- command = 'node',
- args = { os.getenv('HOME') .. '/downloads/Dart-Code/out/dist/debug.js', 'dart' },
- }
-
- dap.configurations.dart = {
- {
- type = 'dart',
- request = 'launch',
- name = 'Launch File',
- dartSdkPath = os.getenv('HOME') .. '/.local/lib/dart/stable/',
- -- flutterSdkPath = os.getenv('HOME') .. "/flutter",
- program = '${file}',
- cwd = '${workspaceFolder}',
- },
- }
+local dap = require('dap')
+local has_dapui, dapui = pcall(require, 'dapui')
+if has_dapui then
+ dapui.setup()
+ dap.listeners.after.event_initialized['dapui_config'] = function() dapui.open() end
+ dap.listeners.before.event_terminated['dapui_config'] = function() dapui.close() end
+ dap.listeners.before.event_exited['dapui_config'] = function() dapui.close() end
+ vim.keymap.set('n', '<leader>du', function() dapui.toggle() end, { silent = true, desc = 'DAP UI Toggle' })
end
+local has_dapvt, dapvt = pcall(require, 'nvim-dap-virtual-text')
+if has_dapvt then dapvt.setup() end
-local function lua(dap)
- dap.configurations.lua = {
- {
- type = 'nlua',
- request = 'attach',
- name = 'Attach to running Neovim instance',
- host = function()
- local value = vim.fn.input('Host [127.0.0.1]: ')
- if value ~= '' then return value end
- return '127.0.0.1'
- end,
- port = function()
- local val = tonumber(vim.fn.input('Port: '))
- assert(val, 'Please provide a port number')
- return val
- end,
- },
- }
-
- dap.adapters.nlua =
- function(callback, config) callback({ type = 'server', host = config.host, port = config.port }) end
-end
+-- cpp
+-- dap.adapters.cpp = {
+-- type = 'executable',
+-- attach = { pidProperty = 'pid', pidSelect = 'ask' },
+-- command = 'lldb', -- my binary was called 'lldb-vscode-11'
+-- env = { LLDB_LAUNCH_FLAG_LAUNCH_IN_TTY = 'YES' },
+-- name = 'lldb',
+-- }
+-- dap.configurations.cpp = { { type = 'cpp', request = 'launch', name = 'Launch File', program = '${file}' } }
-local dap = require('dap')
--- cpp(dap)
--- dart(dap)
-lua(dap)
+-- dart
+-- dap.defaults.fallback.external_terminal = { command = '/usr/bin/alacritty', args = { '-e' } }
+-- dap.adapters.dart = {
+-- type = 'executable',
+-- command = 'node',
+-- args = { os.getenv('HOME') .. '/downloads/Dart-Code/out/dist/debug.js', 'dart' },
+-- }
+-- dap.configurations.dart = {
+-- {
+-- type = 'dart',
+-- request = 'launch',
+-- name = 'Launch File',
+-- dartSdkPath = os.getenv('HOME') .. '/.local/lib/dart/stable/',
+-- -- flutterSdkPath = os.getenv('HOME') .. "/flutter",
+-- program = '${file}',
+-- cwd = '${workspaceFolder}',
+-- },
+-- }
-local has_dapui, dapui = pcall(require, 'dapui')
-if has_dapui then dapui.setup() end
+-- lua
+-- dap.configurations.lua = {
+-- {
+-- type = 'nlua',
+-- request = 'attach',
+-- name = 'Attach to running Neovim instance',
+-- host = function()
+-- local value = vim.fn.input('Host [127.0.0.1]: ')
+-- if value ~= '' then return value end
+-- return '127.0.0.1'
+-- end,
+-- port = function()
+-- local val = tonumber(vim.fn.input('Port: '))
+-- assert(val, 'Please provide a port number')
+-- return val
+-- end,
+-- },
+-- }
+-- dap.adapters.nlua = function(callback, config) callback({ type = 'server', host = config.host, port = config.port }) end
-local has_dapvt, dapvt = pcall(require, 'nvim-dap-virtual-text')
-if has_dapvt then dapvt.setup() end
+-- go
+local has_dapgo, dapgo = pcall(require, 'dap-go')
+if has_dapgo then dapgo.setup() end
diff --git a/after/plugin/git.lua b/after/plugin/git.lua
@@ -1,12 +1,12 @@
if vim.g.loaded_git_messenger == 1 then
vim.g.git_messenger_floating_win_opts = { border = 'single' }
- vim.keymap.set('n', '<leader>gm', '<plug>(git-messenger)', { noremap = true, desc = 'Git Message' })
+ vim.keymap.set('n', '<leader>gm', '<plug>(git-messenger)', { desc = 'Git Message' })
end
if vim.g.loaded_fugitive then
- vim.keymap.set('n', '<leader>gg', '<cmd>G<cr>', { noremap = true, desc = 'Git Status' })
- vim.keymap.set('n', '<leader>gc', '<cmd>G commit<cr>', { noremap = true, desc = 'Git Commit' })
- vim.keymap.set('n', '<leader>gb', '<cmd>Git blame<cr>', { noremap = true, desc = 'Git Blame' })
+ vim.keymap.set('n', '<leader>gg', '<cmd>G<cr>', { desc = 'Git Status' })
+ vim.keymap.set('n', '<leader>gc', '<cmd>G commit<cr>', { desc = 'Git Commit' })
+ vim.keymap.set('n', '<leader>gb', '<cmd>Git blame<cr>', { desc = 'Git Blame' })
end
local has_igit, igit = pcall(require, 'igit')
diff --git a/after/plugin/notify.lua b/after/plugin/notify.lua
@@ -3,4 +3,4 @@ if not pcall(require, 'notify') then return end
local notify = require('notify')
notify.setup({ on_open = function(win) vim.api.nvim_win_set_config(win, { focusable = false }) end, stages = 'slide' })
vim.notify = notify
-vim.keymap.set('n', '<leader>N', require('notify').dismiss, { noremap = true, desc = 'Dismiss notification' })
+vim.keymap.set('n', '<leader>N', require('notify').dismiss, { desc = 'Dismiss notification' })
diff --git a/after/plugin/nulls.lua b/after/plugin/nulls.lua
@@ -25,7 +25,7 @@ null_ls.setup({
sources = {
-- formatting
builtins.formatting.prettier.with {
- filetypes = { 'html', 'yaml', 'markdown', 'css', 'scss' },
+ filetypes = { 'yaml', 'markdown', 'css', 'scss' },
args = h.range_formatting_args_factory({
'--parser',
vim.api.nvim_buf_get_option(0, 'filetype'),
diff --git a/after/plugin/refactoring.lua b/after/plugin/refactoring.lua
@@ -2,9 +2,6 @@ do return end
if not pcall(require, 'refactoring') then return end
local refactor = require('refactoring')
refactor.setup({})
-vim.keymap
- .set('n', '<leader>re', require('refactoring').refactor('Extract Function'), { silent = true, noremap = true })
-vim.keymap.set('v', '<leader>rf', require('refactoring').refactor('Extract Function To File'),
- { silent = true, noremap = true })
-vim.keymap
- .set('n', '<leader>rv', require('refactoring').refactor('Extract Variable'), { silent = true, noremap = true })
+vim.keymap.set('n', '<leader>re', require('refactoring').refactor('Extract Function'), { silent = true })
+vim.keymap.set('v', '<leader>rf', require('refactoring').refactor('Extract Function To File'), { silent = true })
+vim.keymap.set('n', '<leader>rv', require('refactoring').refactor('Extract Variable'), { silent = true })
diff --git a/ftplugin/dart.lua b/ftplugin/dart.lua
@@ -18,7 +18,7 @@ vim.api.nvim_buf_create_user_command(0, 'DartFixAll', lsp.fix_all, cmd_opts)
vim.api.nvim_buf_create_user_command(0, 'DartExtract', lsp.extract_method, cmd_opts)
vim.api.nvim_buf_create_user_command(0, 'DartVariable', lsp.extract_local_variable, cmd_opts)
-local opts = function(desc) return { buffer = true, noremap = true, desc = desc } end
+local opts = function(desc) return { buffer = true, desc = desc } end
vim.keymap.set('n', '<leader>pp', function() ddebug.print() end, opts('Dart Debug Print'))
vim.keymap.set('n', '<leader>pn', function() analyze.qf2131() end, opts('Dart Analyze'))
vim.keymap.set('n', '<leader>po', lsp.organize_imports, opts('Dart Organize Imports'))
diff --git a/ftplugin/go.lua b/ftplugin/go.lua
@@ -1,4 +1,11 @@
vim.cmd [[comp go]]
vim.cmd [[command! -buffer -nargs=? Godoc lua require('tms.ft.go.doc').godoc(vim.fn.expand('<args>'), vim.fn.expand('<cword>'))]]
-vim.api.nvim_create_autocmd('BufWritePre', { callback = function() require('tms.ft.go').org_imports() end, buffer = 0, desc = "GO Organize Imports" })
+vim.api.nvim_create_autocmd('BufWritePre', {
+ callback = function() require('tms.ft.go').org_imports() end,
+ buffer = 0,
+ desc = 'GO Organize Imports',
+})
+
+vim.keymap.set('n', '<leader>po', function() require('tms.ft.go').org_imports() end,
+ { buffer = true, desc = 'Go Organize Imports' })
diff --git a/lua/tms/plugins.lua b/lua/tms/plugins.lua
@@ -116,6 +116,7 @@ return packer.startup({
-- dap
use 'mfussenegger/nvim-dap'
+ use 'leoluz/nvim-dap-go'
use 'rcarriga/nvim-dap-ui'
use 'theHamsta/nvim-dap-virtual-text'
diff --git a/lua/tms/ws/init.lua b/lua/tms/ws/init.lua
@@ -3,7 +3,7 @@ local M = {}
M.medoro = {
path = '*/medoro/**',
config = function()
- vim.keymap.set('n', '<leader>pl', '<cmd>lua require("tms.ws.medoro").lang()<cr>', { buffer = true, noremap = true })
+ vim.keymap.set('n', '<leader>pl', '<cmd>lua require("tms.ws.medoro").lang()<cr>', { buffer = true })
end,
}
diff --git a/plugin/file_pairs.lua b/plugin/file_pairs.lua
@@ -5,9 +5,9 @@ local letter_set = {}
local set_mark = function(letter, path, buffer)
path = path or vim.fn.expand('%')
if buffer == nil then buffer = true end
- vim.keymap.set('n', '<leader>m' .. letter, '<cmd>edit ' .. path .. '<cr>', { buffer = buffer, noremap = true })
- vim.keymap.set('n', '<leader>mv' .. letter, '<cmd>vsplit ' .. path .. '<cr>', { buffer = buffer, noremap = true })
- vim.keymap.set('n', '<leader>mx' .. letter, '<cmd>split ' .. path .. '<cr>', { buffer = buffer, noremap = true })
+ vim.keymap.set('n', '<leader>m' .. letter, '<cmd>edit ' .. path .. '<cr>', { buffer = buffer})
+ vim.keymap.set('n', '<leader>mv' .. letter, '<cmd>vsplit ' .. path .. '<cr>', { buffer = buffer})
+ vim.keymap.set('n', '<leader>mx' .. letter, '<cmd>split ' .. path .. '<cr>', { buffer = buffer})
end
local unset_marks = function()
diff --git a/plugin/marks.lua b/plugin/marks.lua
@@ -27,7 +27,7 @@ for _, l in ipairs({
'y',
'z',
}) do
- vim.keymap.set('n', 'm' .. l, 'm' .. l:upper(), {noremap = true})
- vim.keymap.set('n', '\'' .. l, '`' .. l:upper(), {noremap = true})
- vim.keymap.set('n', '`' .. l, '\'' .. l:upper(), {noremap = true})
+ vim.keymap.set('n', 'm' .. l, 'm' .. l:upper())
+ vim.keymap.set('n', '\'' .. l, '`' .. l:upper())
+ vim.keymap.set('n', '`' .. l, '\'' .. l:upper())
end
diff --git a/plugin/scratch.lua b/plugin/scratch.lua
@@ -7,4 +7,4 @@ local open = function()
end
vim.api.nvim_create_user_command('Scratch', open, {})
-vim.keymap.set('n', '<space>j', open, {noremap = true})
+vim.keymap.set('n', '<space>j', open)
diff --git a/plugin/terminal.lua b/plugin/terminal.lua
@@ -1,20 +1,20 @@
local terminal = require('tms.p.terminal')
-vim.keymap.set('n', '<leader>tl', function() terminal.interactive() end, {noremap = true})
-vim.keymap.set('n', '<leader>tL', function() terminal.catchup() end, {noremap = true})
-vim.keymap.set('n', '<leader>to', function() terminal.toggle() end, {noremap = true})
-vim.keymap.set('n', '<leader>tj', ':TerminalRun<space>', {noremap = true})
+vim.keymap.set('n', '<leader>tl', function() terminal.interactive() end)
+vim.keymap.set('n', '<leader>tL', function() terminal.catchup() end)
+vim.keymap.set('n', '<leader>to', function() terminal.toggle() end)
+vim.keymap.set('n', '<leader>tj', ':TerminalRun<space>')
vim.keymap.set('n', '<leader>tk', function()
local ok = terminal.rerun()
if not ok then vim.api.nvim_feedkeys(':TerminalRun ', 'n', nil) end
-end, {noremap = true})
-vim.keymap.set('n', '<leader>th', function() terminal.exit() end, {noremap = true})
-vim.keymap.set('t', '<leader>tn', '<C-\\><C-n>', {noremap = true})
-vim.keymap.set('t', '<leader>tl', function() terminal.interactive() end, {noremap = true})
-vim.keymap.set('t', '<leader>to', function() terminal.toggle() end, {noremap = true})
-vim.keymap.set('t', '<leader>th', function() terminal.exit() end, {noremap = true})
+end)
+vim.keymap.set('n', '<leader>th', function() terminal.exit() end)
+vim.keymap.set('t', '<leader>tn', '<C-\\><C-n>')
+vim.keymap.set('t', '<leader>tl', function() terminal.interactive() end)
+vim.keymap.set('t', '<leader>to', function() terminal.toggle() end)
+vim.keymap.set('t', '<leader>th', function() terminal.exit() end)
-local group = vim.api.nvim_create_augroup('user-terminal', {clear = true})
+local group = vim.api.nvim_create_augroup('user-terminal', { clear = true })
vim.api.nvim_create_autocmd('BufEnter', {
group = group,
pattern = 'terminal',
@@ -26,5 +26,5 @@ vim.api.nvim_create_autocmd('BufLeave', {
command = 'let g:SexyScroller_ScrollTime=10|let g:SexyScroller_CursorTime=5',
})
-vim.api
- .nvim_create_user_command('TerminalRun', function(data) require('tms.p.terminal').run(data.args) end, {nargs = 1})
+vim.api.nvim_create_user_command('TerminalRun', function(data) require('tms.p.terminal').run(data.args) end,
+ { nargs = 1 })
diff --git a/plugin/unimpaired.lua b/plugin/unimpaired.lua
@@ -43,9 +43,7 @@ local toggle = function(op, mode)
scope[op] = not val
end
-local map_toggle = function(letter, option, mode)
- vim.keymap.set('n', 'yo' .. letter, function() toggle(option) end, {noremap = true})
-end
+local map_toggle = function(letter, option, mode) vim.keymap.set('n', 'yo' .. letter, function() toggle(option) end) end
map_toggle('c', 'cursorline', 'local')
map_toggle('u', 'cursorcolumn', 'local')
