fix: Proper injection queries
This commit is contained in:
parent
e3ef9e4716
commit
8efea03163
GPG key ID:
A509E8F77FB9D696
3 changed files with 104 additions and 124 deletions
|
|
@ -23,51 +23,43 @@ in {
|
|||
];
|
||||
|
||||
autoCmd = [
|
||||
(autocmds.mk' ["FocusGained" "TermClose" "TermLeave"] "checktime" (mkRaw
|
||||
# lua
|
||||
''
|
||||
function()
|
||||
if vim.o.buftype ~= "nofile" then
|
||||
vim.cmd("checktime")
|
||||
end
|
||||
(autocmds.mk' ["FocusGained" "TermClose" "TermLeave"] "checktime" (mkRaw ''
|
||||
function()
|
||||
if vim.o.buftype ~= "nofile" then
|
||||
vim.cmd("checktime")
|
||||
end
|
||||
'') "Check if file needs to be reloaded when changed")
|
||||
end
|
||||
'') "Check if file needs to be reloaded when changed")
|
||||
|
||||
(autocmds.mk' ["TextYankPost"] "highlight_yank" (mkRaw
|
||||
# lua
|
||||
''
|
||||
function()
|
||||
(vim.hl or vim.highlight).on_yank()
|
||||
end
|
||||
'') "Highlight on yank")
|
||||
(autocmds.mk' ["TextYankPost"] "highlight_yank" (mkRaw ''
|
||||
function()
|
||||
(vim.hl or vim.highlight).on_yank()
|
||||
end
|
||||
'') "Highlight on yank")
|
||||
|
||||
(autocmds.mk' ["VimResized"] "resize_splits" (mkRaw
|
||||
# lua
|
||||
''
|
||||
function()
|
||||
local current_tab = vim.fn.tabpagenr()
|
||||
vim.cmd("tabdo wincmd =")
|
||||
vim.cmd("tabnext " .. current_tab)
|
||||
end
|
||||
'') "Resize splits on window resize")
|
||||
(autocmds.mk' ["VimResized"] "resize_splits" (mkRaw ''
|
||||
function()
|
||||
local current_tab = vim.fn.tabpagenr()
|
||||
vim.cmd("tabdo wincmd =")
|
||||
vim.cmd("tabnext " .. current_tab)
|
||||
end
|
||||
'') "Resize splits on window resize")
|
||||
|
||||
(autocmds.mk' ["BufReadPost"] "last_loc" (mkRaw
|
||||
# lua
|
||||
''
|
||||
function(event)
|
||||
local exclude = { "gitcommit" }
|
||||
local buf = event.buf
|
||||
if vim.tbl_contains(exclude, vim.bo[buf].filetype) or vim.b[buf].marleyvim_last_loc then
|
||||
return
|
||||
end
|
||||
vim.b[buf].marleyvim_last_loc = true
|
||||
local mark = vim.api.nvim_buf_get_mark(buf, '"')
|
||||
local lcount = vim.api.nvim_buf_line_count(buf)
|
||||
if mark[1] > 0 and mark[1] <= lcount then
|
||||
pcall(vim.api.nvim_win_set_cursor, 0, mark)
|
||||
end
|
||||
(autocmds.mk' ["BufReadPost"] "last_loc" (mkRaw ''
|
||||
function(event)
|
||||
local exclude = { "gitcommit" }
|
||||
local buf = event.buf
|
||||
if vim.tbl_contains(exclude, vim.bo[buf].filetype) or vim.b[buf].marleyvim_last_loc then
|
||||
return
|
||||
end
|
||||
'') "Go to last location when opening a buffer")
|
||||
vim.b[buf].marleyvim_last_loc = true
|
||||
local mark = vim.api.nvim_buf_get_mark(buf, '"')
|
||||
local lcount = vim.api.nvim_buf_line_count(buf)
|
||||
if mark[1] > 0 and mark[1] <= lcount then
|
||||
pcall(vim.api.nvim_win_set_cursor, 0, mark)
|
||||
end
|
||||
end
|
||||
'') "Go to last location when opening a buffer")
|
||||
|
||||
(autocmds.mk ["FileType"] "close_with_q" [
|
||||
"PlenaryTestPopup"
|
||||
|
|
@ -86,31 +78,27 @@ in {
|
|||
"spectre_panel"
|
||||
"startuptime"
|
||||
"tsplayground"
|
||||
] (mkRaw
|
||||
# lua
|
||||
''
|
||||
function(event)
|
||||
vim.bo[event.buf].buflisted = false
|
||||
vim.schedule(function()
|
||||
vim.keymap.set("n", "q", function()
|
||||
vim.cmd("close")
|
||||
pcall(vim.api.nvim_buf_delete, event.buf, { force = true })
|
||||
end, {
|
||||
buffer = event.buf,
|
||||
silent = true,
|
||||
desc = "Quit buffer",
|
||||
})
|
||||
end)
|
||||
end
|
||||
'') "Close some filetypes with <q>")
|
||||
|
||||
(autocmds.mk ["FileType"] "man_unlisted" ["man"] (mkRaw
|
||||
# lua
|
||||
''
|
||||
] (mkRaw ''
|
||||
function(event)
|
||||
vim.bo[event.buf].buflisted = false
|
||||
vim.schedule(function()
|
||||
vim.keymap.set("n", "q", function()
|
||||
vim.cmd("close")
|
||||
pcall(vim.api.nvim_buf_delete, event.buf, { force = true })
|
||||
end, {
|
||||
buffer = event.buf,
|
||||
silent = true,
|
||||
desc = "Quit buffer",
|
||||
})
|
||||
end)
|
||||
end
|
||||
'') "Easy-close man files")
|
||||
'') "Close some filetypes with <q>")
|
||||
|
||||
(autocmds.mk ["FileType"] "man_unlisted" ["man"] (mkRaw ''
|
||||
function(event)
|
||||
vim.bo[event.buf].buflisted = false
|
||||
end
|
||||
'') "Easy-close man files")
|
||||
|
||||
(autocmds.mk ["FileType"] "wrap_spell" [
|
||||
"text"
|
||||
|
|
@ -118,33 +106,27 @@ in {
|
|||
"typst"
|
||||
"gitcommit"
|
||||
"markdown"
|
||||
] (mkRaw
|
||||
# lua
|
||||
''
|
||||
function()
|
||||
vim.opt_local.wrap = true
|
||||
vim.opt_local.spell = true
|
||||
end
|
||||
'') "Wrap & check spelling in text files")
|
||||
|
||||
(autocmds.mk ["FileType"] "json_conceal" ["json" "jsonc" "json5"] (mkRaw
|
||||
# lua
|
||||
''
|
||||
] (mkRaw ''
|
||||
function()
|
||||
vim.opt_local.conceallevel = 0
|
||||
vim.opt_local.wrap = true
|
||||
vim.opt_local.spell = true
|
||||
end
|
||||
'') "Fix conceallevel for json files")
|
||||
'') "Wrap & check spelling in text files")
|
||||
|
||||
(autocmds.mk' ["BufWritePre"] "auto_create_dir" (mkRaw
|
||||
# lua
|
||||
''
|
||||
function(event)
|
||||
if event.match:match("^%w%w+:[\\/][\\/]") then
|
||||
return
|
||||
end
|
||||
local file = vim.uv.fs_realpath(event.match) or event.match
|
||||
vim.fn.mkdir(vim.fn.fnamemodify(file, ":p:h"), "p")
|
||||
(autocmds.mk ["FileType"] "json_conceal" ["json" "jsonc" "json5"] (mkRaw ''
|
||||
function()
|
||||
vim.opt_local.conceallevel = 0
|
||||
end
|
||||
'') "Fix conceallevel for json files")
|
||||
|
||||
(autocmds.mk' ["BufWritePre"] "auto_create_dir" (mkRaw ''
|
||||
function(event)
|
||||
if event.match:match("^%w%w+:[\\/][\\/]") then
|
||||
return
|
||||
end
|
||||
'') "Auto create missing parent dirs when saving")
|
||||
local file = vim.uv.fs_realpath(event.match) or event.match
|
||||
vim.fn.mkdir(vim.fn.fnamemodify(file, ":p:h"), "p")
|
||||
end
|
||||
'') "Auto create missing parent dirs when saving")
|
||||
];
|
||||
}
|
||||
|
|
|
|||
|
|
@ -165,9 +165,9 @@ in {
|
|||
# Diagnostics - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
|
||||
++ [
|
||||
(keys.mk ["n"] "<LEADER>cd" (
|
||||
mkRaw
|
||||
# lua
|
||||
"function() vim.diagnostic.open_float() end"
|
||||
mkRaw ''
|
||||
function() vim.diagnostic.open_float() end
|
||||
''
|
||||
) "Line Diagnostics")
|
||||
]
|
||||
++ (
|
||||
|
|
@ -200,13 +200,11 @@ in {
|
|||
cmd = toLower dir;
|
||||
sev = sevs."${key}".key;
|
||||
in
|
||||
keys.mk ["n"] kmap
|
||||
(
|
||||
mkRaw
|
||||
# lua
|
||||
"function() vim.diagnostic.goto_${cmd}({ severity = ${sev} }) end"
|
||||
)
|
||||
"${dir} ${sevs."${key}".desc}"
|
||||
keys.mk ["n"] kmap (
|
||||
mkRaw ''
|
||||
function() vim.diagnostic.goto_${cmd}({ severity = ${sev} }) end
|
||||
''
|
||||
) "${dir} ${sevs."${key}".desc}"
|
||||
)
|
||||
{
|
||||
dir = ["Next" "Prev"];
|
||||
|
|
|
|||
|
|
@ -23,62 +23,62 @@ in {
|
|||
|
||||
keymaps = [
|
||||
(keys.mk ["n"] "<LEADER>un" (
|
||||
mkRaw
|
||||
# lua
|
||||
"function() Snacks.notifier.hide() end"
|
||||
mkRaw ''
|
||||
function() Snacks.notifier.hide() end
|
||||
''
|
||||
) "Dismiss All Notifications")
|
||||
|
||||
(keys.mk ["n"] "<LEADER>bd" (
|
||||
mkRaw
|
||||
# lua
|
||||
"function() Snacks.bufdelete() end"
|
||||
mkRaw ''
|
||||
function() Snacks.bufdelete() end
|
||||
''
|
||||
) "Delete Buffer")
|
||||
|
||||
(keys.mk ["n"] "<LEADER>bo" (
|
||||
mkRaw
|
||||
# lua
|
||||
"function() Snacks.bufdelete.other() end"
|
||||
mkRaw ''
|
||||
function() Snacks.bufdelete.other() end
|
||||
''
|
||||
) "Delete Other Buffers")
|
||||
|
||||
# LazyGit - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
|
||||
(keys.mk ["n"] "<LEADER>gg" (
|
||||
mkRaw
|
||||
# lua
|
||||
"function() Snacks.lazygit() end"
|
||||
mkRaw ''
|
||||
function() Snacks.lazygit() end
|
||||
''
|
||||
) "Lazygit")
|
||||
|
||||
(keys.mk ["n"] "<LEADER>gf" (
|
||||
mkRaw
|
||||
# lua
|
||||
"function() Snacks.lazygit.log_file() end"
|
||||
mkRaw ''
|
||||
function() Snacks.lazygit.log_file() end
|
||||
''
|
||||
) "Lazygit Current File History")
|
||||
|
||||
(keys.mk ["n"] "<LEADER>gl" (
|
||||
mkRaw
|
||||
# lua
|
||||
"function() Snacks.lazygit.log() end"
|
||||
mkRaw ''
|
||||
function() Snacks.lazygit.log() end
|
||||
''
|
||||
) "Lazygit Log")
|
||||
|
||||
# Git - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
|
||||
(keys.mk ["n"] "<LEADER>gb" (
|
||||
mkRaw
|
||||
# lua
|
||||
"function() Snacks.git.blame_line() end"
|
||||
mkRaw ''
|
||||
function() Snacks.git.blame_line() end
|
||||
''
|
||||
) "Git Blame Line")
|
||||
|
||||
(keys.mk ["n" "x"] "<LEADER>gB" (
|
||||
mkRaw
|
||||
# lua
|
||||
"function() Snacks.gitbrowse() end"
|
||||
mkRaw ''
|
||||
function() Snacks.gitbrowse() end
|
||||
''
|
||||
) "Git Browse (open)")
|
||||
|
||||
(keys.mk ["n" "x"] "<LEADER>gY" (mkRaw
|
||||
# lua
|
||||
''
|
||||
(keys.mk ["n" "x"] "<LEADER>gY" (
|
||||
mkRaw ''
|
||||
function()
|
||||
Snacks.gitbrowse({ open = function(url) vim.fn.setreg("+", url) end })
|
||||
end
|
||||
'') "Git Browse (copy)")
|
||||
''
|
||||
) "Git Browse (copy)")
|
||||
];
|
||||
|
||||
# Toggles - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
|
||||
|
|
|
|||
Loading…
Reference in a new issue