Compare commits

..

No commits in common. "3fd3d74ee57bf3178ea715d566a3cf309f90edf8" and "e6fb8cc47839763cfdaa18af995bf96db9191041" have entirely different histories.

9 changed files with 417 additions and 445 deletions

View File

@ -1,3 +0,0 @@
{
"workspace.checkThirdParty": false
}

View File

@ -1,5 +1,5 @@
function _G.dump(...) function _G.dump(...)
local objects = vim.tbl_map(vim.inspect, { ... }) local objects = vim.tbl_map(vim.inspect, {...})
print(unpack(objects)) print(unpack(objects))
return ... return ...
end end
@ -16,8 +16,8 @@ function _G.insert_uuid()
vim.api.nvim_command([[normal! "up]]) vim.api.nvim_command([[normal! "up]])
end end
vim.api.nvim_set_keymap("n", "<leader>pu", [[:lua _G.insert_uuid()<cr>]], { noremap = true, silent = true }) vim.api.nvim_set_keymap("n", "<leader>pu", [[:lua _G.insert_uuid()<cr>]], {noremap = true, silent = true})
vim.api.nvim_set_keymap("i", "<c-d><c-u>", [[<esc>:lua _G.insert_uuid()<cr>a]], { noremap = true, silent = true }) vim.api.nvim_set_keymap("i", "<c-d><c-u>", [[<esc>:lua _G.insert_uuid()<cr>a]], {noremap = true, silent = true})
function _G.insert_jira_url() function _G.insert_jira_url()
local url = vim.fn.system("jira") local url = vim.fn.system("jira")
@ -31,8 +31,8 @@ function _G.insert_jira_url()
vim.api.nvim_command([[normal! "up]]) vim.api.nvim_command([[normal! "up]])
end end
vim.api.nvim_set_keymap("n", "<leader>pj", [[:lua _G.insert_jira_url()<cr>]], { noremap = true, silent = true }) vim.api.nvim_set_keymap("n", "<leader>pj", [[:lua _G.insert_jira_url()<cr>]], {noremap = true, silent = true})
vim.api.nvim_set_keymap("i", "<c-d><c-j>", [[<esc>:lua _G.insert_jira_url()<cr>a]], { noremap = true, silent = true }) vim.api.nvim_set_keymap("i", "<c-d><c-j>", [[<esc>:lua _G.insert_jira_url()<cr>a]], {noremap = true, silent = true})
function _G.insert_iso8601_timestamp() function _G.insert_iso8601_timestamp()
local ts = vim.fn.system("echo -n $(date --iso-8601=seconds)") local ts = vim.fn.system("echo -n $(date --iso-8601=seconds)")
@ -47,15 +47,6 @@ function _G.insert_iso8601_timestamp()
vim.api.nvim_command([[normal! "up]]) vim.api.nvim_command([[normal! "up]])
end end
vim.api.nvim_set_keymap(
"n", vim.api.nvim_set_keymap("n", "<leader>pt", [[:lua _G.insert_iso8601_timestamp()<cr>]], {noremap = true, silent = true})
"<leader>pt", vim.api.nvim_set_keymap("i", "<c-d><c-t>", [[<esc>:lua _G.insert_iso8601_timestamp()<cr>a]], {noremap = true, silent = true})
[[:lua _G.insert_iso8601_timestamp()<cr>]],
{ noremap = true, silent = true }
)
vim.api.nvim_set_keymap(
"i",
"<c-d><c-t>",
[[<esc>:lua _G.insert_iso8601_timestamp()<cr>a]],
{ noremap = true, silent = true }
)

View File

@ -1,5 +1,5 @@
vim.defer_fn(function() vim.defer_fn(function()
require("copilot").setup({ require('copilot').setup({
panel = { panel = {
enabled = false, enabled = false,
auto_refresh = true, auto_refresh = true,

View File

@ -1,36 +1,26 @@
local prettier = function() local prettier = function()
return { return {
exe = Get_project_node_modules_path() .. "/.bin/prettier", exe = Get_project_node_modules_path() .. "/.bin/prettier",
args = { "--stdin-filepath", vim.api.nvim_buf_get_name(0), "--single-quote" }, args = {"--stdin-filepath", vim.api.nvim_buf_get_name(0), '--single-quote'},
stdin = true, stdin = true
} }
end end
require("formatter").setup({ require('formatter').setup({
log_level = vim.log.levels.INFO,
filetype = { filetype = {
javascript = { prettier }, javascript = { prettier },
typescript = { prettier }, typescript = { prettier },
typescriptreact = { prettier }, typescriptreact = { prettier },
}
-- https://github.com/JohnnyMorganz/StyLua
-- cargo install stylua --features lua54
lua = {
require("formatter.filetypes.lua").stylua,
},
},
}) })
-- TODO: use vim.api.nvim_create_augroup() -- TODO: use vim.api.nvim_create_augroup()
vim.api.nvim_exec2( vim.api.nvim_exec2([[
[[
augroup FormatAutogroup augroup FormatAutogroup
autocmd! autocmd!
autocmd BufWritePost *.js,*.ts,*.tsx,*.lua silent FormatWrite autocmd BufWritePost *.js,*.ts,*.tsx silent FormatWrite
augroup END augroup END
]], ]], { output = true })
{ output = true }
)
local bufnr = vim.fn.bufnr("%") local bufnr = vim.fn.bufnr("%")
vim.api.nvim_buf_set_keymap(bufnr, "n", "<leader>F", "<Cmd>silent Format<CR>", { noremap = true, silent = true }) vim.api.nvim_buf_set_keymap(bufnr, 'n', '<leader>F', '<Cmd>silent Format<CR>', { noremap=true, silent=true })

View File

@ -1,55 +1,55 @@
local nvim_lsp = require("lspconfig") local nvim_lsp = require('lspconfig')
local on_attach = function(client, bufnr) local on_attach = function(client, bufnr)
-- TODO: use vim.api.nvim_create_autocmd -- TODO: use vim.api.nvim_create_autocmd
vim.api.nvim_exec2([[autocmd User LspDiagnosticsChanged call lightline#update()]], { output = false }) vim.api.nvim_exec2([[autocmd User LspDiagnosticsChanged call lightline#update()]], { output = false })
local opts = { noremap = true, silent = false } local opts = { noremap=true, silent=false }
vim.api.nvim_buf_set_keymap(bufnr, "n", "gd", "<Cmd>lua vim.lsp.buf.definition()<CR>", opts) vim.api.nvim_buf_set_keymap(bufnr, 'n', 'gd', '<Cmd>lua vim.lsp.buf.definition()<CR>', opts)
vim.api.nvim_buf_set_keymap(bufnr, "n", "gD", "<Cmd>lua vim.lsp.buf.type_definition()<CR>", opts) vim.api.nvim_buf_set_keymap(bufnr, 'n', 'gD', '<Cmd>lua vim.lsp.buf.type_definition()<CR>', opts)
vim.api.nvim_buf_set_keymap(bufnr, "n", "<leader>gd", "<Cmd>lua vim.lsp.buf.definition()<CR>", opts) vim.api.nvim_buf_set_keymap(bufnr, 'n', '<leader>gd', '<Cmd>lua vim.lsp.buf.definition()<CR>', opts)
vim.api.nvim_buf_set_keymap(bufnr, "n", "<leader>gD", "<Cmd>lua vim.lsp.buf.type_definition()<CR>", opts) vim.api.nvim_buf_set_keymap(bufnr, 'n', '<leader>gD', '<Cmd>lua vim.lsp.buf.type_definition()<CR>', opts)
vim.api.nvim_buf_set_keymap(bufnr, "n", "<leader>e", "<Cmd>lua vim.lsp.buf.rename()<CR>", opts) vim.api.nvim_buf_set_keymap(bufnr, 'n', '<leader>e', '<Cmd>lua vim.lsp.buf.rename()<CR>', opts)
vim.api.nvim_buf_set_keymap(bufnr, "n", "<leader>r", "<Cmd>lua vim.lsp.buf.references()<CR>", opts) vim.api.nvim_buf_set_keymap(bufnr, 'n', '<leader>r', '<Cmd>lua vim.lsp.buf.references()<CR>', opts)
vim.api.nvim_buf_set_keymap(bufnr, "n", "<leader>i", "<Cmd>lua vim.lsp.buf.implementation()<CR>", opts) vim.api.nvim_buf_set_keymap(bufnr, 'n', '<leader>i', '<Cmd>lua vim.lsp.buf.implementation()<CR>', opts)
vim.api.nvim_buf_set_keymap(bufnr, "n", "<leader>ca", "<Cmd>lua vim.lsp.buf.code_action()<CR>", opts) vim.api.nvim_buf_set_keymap(bufnr, 'n', '<leader>ca', '<Cmd>lua vim.lsp.buf.code_action()<CR>', opts)
vim.api.nvim_buf_set_keymap(bufnr, "n", "<leader>ci", "<Cmd>lua vim.lsp.buf.incoming_calls()<CR>", opts) vim.api.nvim_buf_set_keymap(bufnr, 'n', '<leader>ci', '<Cmd>lua vim.lsp.buf.incoming_calls()<CR>', opts)
vim.api.nvim_buf_set_keymap(bufnr, "n", "<leader>co", "<Cmd>lua vim.lsp.buf.outgoing_calls()<CR>", opts) vim.api.nvim_buf_set_keymap(bufnr, 'n', '<leader>co', '<Cmd>lua vim.lsp.buf.outgoing_calls()<CR>', opts)
vim.api.nvim_buf_set_keymap(bufnr, "n", "K", "<Cmd>lua vim.lsp.buf.hover()<CR>", opts) vim.api.nvim_buf_set_keymap(bufnr, 'n', 'K', '<Cmd>lua vim.lsp.buf.hover()<CR>', opts)
vim.api.nvim_buf_set_keymap(bufnr, "n", "]e", '<Cmd>lua vim.diagnostic.goto_next({severity="Error"})<CR>', opts) vim.api.nvim_buf_set_keymap(bufnr, 'n', ']e', '<Cmd>lua vim.diagnostic.goto_next({severity="Error"})<CR>', opts)
vim.api.nvim_buf_set_keymap(bufnr, "n", "[e", '<Cmd>lua vim.diagnostic.goto_prev({severity="Error"})<CR>', opts) vim.api.nvim_buf_set_keymap(bufnr, 'n', '[e', '<Cmd>lua vim.diagnostic.goto_prev({severity="Error"})<CR>', opts)
vim.api.nvim_buf_set_keymap(bufnr, "n", "]d", "<Cmd>lua vim.diagnostic.goto_next()<CR>", opts) vim.api.nvim_buf_set_keymap(bufnr, 'n', ']d', '<Cmd>lua vim.diagnostic.goto_next()<CR>', opts)
vim.api.nvim_buf_set_keymap(bufnr, "n", "[d", "<Cmd>lua vim.diagnostic.goto_prev()<CR>", opts) vim.api.nvim_buf_set_keymap(bufnr, 'n', '[d', '<Cmd>lua vim.diagnostic.goto_prev()<CR>', opts)
vim.api.nvim_buf_set_keymap(bufnr, "n", "cd", "<Cmd>lua vim.diagnostic.hide(nil, 0)<CR>", opts) vim.api.nvim_buf_set_keymap(bufnr, 'n', 'cd', '<Cmd>lua vim.diagnostic.hide(nil, 0)<CR>', opts)
-- fzf triggers: -- fzf triggers:
vim.api.nvim_buf_set_keymap(bufnr, "n", "<leader>fr", "<Cmd>References<CR>", opts) vim.api.nvim_buf_set_keymap(bufnr, 'n', '<leader>fr', '<Cmd>References<CR>', opts)
vim.api.nvim_buf_set_keymap(bufnr, "n", "<leader>fi", "<Cmd>Implementations<CR>", opts) vim.api.nvim_buf_set_keymap(bufnr, 'n', '<leader>fi', '<Cmd>Implementations<CR>', opts)
vim.api.nvim_buf_set_keymap(bufnr, "n", "<leader>fs", "<Cmd>DocumentSymbols<CR>", opts) vim.api.nvim_buf_set_keymap(bufnr, 'n', '<leader>fs', '<Cmd>DocumentSymbols<CR>', opts)
vim.api.nvim_buf_set_keymap(bufnr, "n", "<leader>fw", "<Cmd>WorkspaceSymbols<CR>", opts) vim.api.nvim_buf_set_keymap(bufnr, 'n', '<leader>fw', '<Cmd>WorkspaceSymbols<CR>', opts)
vim.api.nvim_buf_set_keymap(bufnr, "n", "<leader>fc", "<Cmd>CodeActions<CR>", opts) vim.api.nvim_buf_set_keymap(bufnr, 'n', '<leader>fc', '<Cmd>CodeActions<CR>', opts)
vim.api.nvim_buf_set_keymap(bufnr, "n", "<leader>fci", "<Cmd>IncomingCalls<CR>", opts) vim.api.nvim_buf_set_keymap(bufnr, 'n', '<leader>fci', '<Cmd>IncomingCalls<CR>', opts)
vim.api.nvim_buf_set_keymap(bufnr, "n", "<leader>fco", "<Cmd>OutgoingCalls<CR>", opts) vim.api.nvim_buf_set_keymap(bufnr, 'n', '<leader>fco', '<Cmd>OutgoingCalls<CR>', opts)
require("lsp_signature").on_attach({ require 'lsp_signature'.on_attach({
hint_enable = false, hint_enable = false,
}) })
require("copilot_cmp").setup() require 'copilot_cmp'.setup();
end end
-- Go -- Go
local capabilities = require("cmp_nvim_lsp").default_capabilities() local capabilities = require('cmp_nvim_lsp').default_capabilities()
capabilities.textDocument.completion.completionItem.snippetSupport = true capabilities.textDocument.completion.completionItem.snippetSupport = true
capabilities.textDocument.completion.completionItem.resolveSupport = { capabilities.textDocument.completion.completionItem.resolveSupport = {
properties = { properties = {
"documentation", 'documentation',
"detail", 'detail',
"additionalTextEdits", 'additionalTextEdits',
}, }
} }
nvim_lsp.gopls.setup({ nvim_lsp.gopls.setup{
settings = { settings = {
gopls = { gopls = {
staticcheck = true, staticcheck = true,
@ -67,10 +67,10 @@ nvim_lsp.gopls.setup({
}, },
capabilities = capabilities, capabilities = capabilities,
on_attach = on_attach, on_attach = on_attach,
}) }
-- Rust -- Rust
nvim_lsp.rust_analyzer.setup({ nvim_lsp.rust_analyzer.setup{
capabilities = capabilities, capabilities = capabilities,
on_attach = on_attach, on_attach = on_attach,
settings = { settings = {
@ -91,23 +91,23 @@ nvim_lsp.rust_analyzer.setup({
}, },
diagnostics = { diagnostics = {
disabled = { "unresolved-proc-macro" }, disabled = { "unresolved-proc-macro" },
}, }
}, }
}, }
}) }
-- Ruby -- Ruby
nvim_lsp.solargraph.setup({ nvim_lsp.solargraph.setup{
on_attach = on_attach, on_attach = on_attach,
}) }
-- Typescript -- Typescript
-- https://jose-elias-alvarez.medium.com/configuring-neovims-lsp-client-for-typescript-development-5789d58ea9c -- https://jose-elias-alvarez.medium.com/configuring-neovims-lsp-client-for-typescript-development-5789d58ea9c
nvim_lsp.tsserver.setup({ nvim_lsp.tsserver.setup{
on_attach = on_attach, on_attach = on_attach,
}) }
local filetypes = { local filetypes = {
typescript = "eslint", typescript = "eslint",
@ -122,9 +122,9 @@ local linters = {
-- fallback to global eslint if the local is not found? -- fallback to global eslint if the local is not found?
-- https://github.com/creativenull/diagnosticls-configs-nvim/blob/e7d6f7e99f6b416d2aeee89314bc46fc36df7b22/lua/diagnosticls-configs/fs.lua#L20 -- https://github.com/creativenull/diagnosticls-configs-nvim/blob/e7d6f7e99f6b416d2aeee89314bc46fc36df7b22/lua/diagnosticls-configs/fs.lua#L20
command = "./node_modules/.bin/eslint", command = "./node_modules/.bin/eslint",
rootPatterns = { ".eslintrc", ".eslintrc.js" }, rootPatterns = {".eslintrc", ".eslintrc.js"},
debounce = 100, debounce = 100,
args = { "--stdin", "--stdin-filename", "%filepath", "--format", "json" }, args = {"--stdin", "--stdin-filename", "%filepath", "--format", "json"},
parseJson = { parseJson = {
errorsRoot = "[0].messages", errorsRoot = "[0].messages",
line = "line", line = "line",
@ -132,40 +132,40 @@ local linters = {
endLine = "endLine", endLine = "endLine",
endColumn = "endColumn", endColumn = "endColumn",
message = "${message} [${ruleId}]", message = "${message} [${ruleId}]",
security = "severity", security = "severity"
},
securities = { [1] = "error", [2] = "warning" },
}, },
securities = {[1] = "error", [2] = "warning"}
}
} }
nvim_lsp.diagnosticls.setup({ nvim_lsp.diagnosticls.setup{
on_attach = on_attach, on_attach = on_attach,
filetypes = vim.tbl_keys(filetypes), filetypes = vim.tbl_keys(filetypes),
init_options = { init_options = {
linters = linters, linters = linters,
filetypes = filetypes, filetypes = filetypes,
}, }
}) }
-- Lua -- Lua
local lua_ls_root_path = os.getenv("HOME") .. "/dev/lua-language-server" local lua_ls_root_path = os.getenv("HOME").."/dev/lua-language-server"
local lua_ls_binary = lua_ls_root_path .. "/bin/lua-language-server" local lua_ls_binary = lua_ls_root_path.."/bin/lua-language-server"
local runtime_path = vim.split(package.path, ";") local runtime_path = vim.split(package.path, ';')
table.insert(runtime_path, "lua/?.lua") table.insert(runtime_path, "lua/?.lua")
table.insert(runtime_path, "lua/?/init.lua") table.insert(runtime_path, "lua/?/init.lua")
nvim_lsp.lua_ls.setup({ nvim_lsp.lua_ls.setup {
cmd = { lua_ls_binary, "-E", lua_ls_root_path .. "/main.lua" }, cmd = {lua_ls_binary, "-E", lua_ls_root_path .. "/main.lua"};
settings = { settings = {
Lua = { Lua = {
runtime = { runtime = {
version = "LuaJIT", version = 'LuaJIT',
path = runtime_path, path = runtime_path,
}, },
diagnostics = { diagnostics = {
globals = { "vim" }, globals = {'vim'},
}, },
workspace = { workspace = {
library = vim.api.nvim_get_runtime_file("", true), library = vim.api.nvim_get_runtime_file("", true),
@ -176,4 +176,4 @@ nvim_lsp.lua_ls.setup({
}, },
}, },
on_attach = on_attach, on_attach = on_attach,
}) }

View File

@ -1,9 +1,9 @@
local cmp = require("cmp") local cmp = require('cmp')
local cmp_buffer = require("cmp_buffer") local cmp_buffer = require('cmp_buffer')
cmp.setup({ cmp.setup({
completion = { completion = {
completeopt = "menu,menuone,noinsert", completeopt = 'menu,menuone,noinsert',
}, },
snippet = { snippet = {
expand = function(args) expand = function(args)
@ -11,38 +11,37 @@ cmp.setup({
end, end,
}, },
mapping = cmp.mapping.preset.insert({ mapping = cmp.mapping.preset.insert({
["<C-u>"] = cmp.mapping.scroll_docs(-4), ['<C-u>'] = cmp.mapping.scroll_docs(-4),
["<C-d>"] = cmp.mapping.scroll_docs(4), ['<C-d>'] = cmp.mapping.scroll_docs(4),
["<C-Space>"] = cmp.mapping.complete(), ['<C-Space>'] = cmp.mapping.complete(),
["<C-e>"] = cmp.mapping.close(), ['<C-e>'] = cmp.mapping.close(),
["C-y"] = cmp.mapping.confirm({ select = true, behaviour = cmp.ConfirmBehavior.Replace }), ['C-y'] = cmp.mapping.confirm({ select = true, behaviour = cmp.ConfirmBehavior.Replace }),
["<CR>"] = cmp.mapping.confirm({ select = true, behaviour = cmp.ConfirmBehavior.Replace }), ['<CR>'] = cmp.mapping.confirm({ select = true, behaviour = cmp.ConfirmBehavior.Replace }),
}), }),
sources = cmp.config.sources({ sources = cmp.config.sources({
{ name = "copilot", keyword_length = 0 }, { name = 'copilot', keyword_length = 0 },
{ name = "nvim_lsp", keyword_length = 3 }, { name = 'nvim_lsp', keyword_length = 3 },
{ {
name = "buffer", name = 'buffer',
option = { option = {
get_bufnrs = function() get_bufnrs = function()
return vim.api.nvim_list_bufs() return vim.api.nvim_list_bufs()
end, end
}, },
}, },
{ name = "path" }, { name = 'path' },
{ name = "calc" }, { name = 'calc' },
}), }),
sorting = { sorting = {
comparators = { comparators = {
function(...) function(...) return cmp_buffer:compare_locality(...) end,
return cmp_buffer:compare_locality(...) }
end,
},
}, },
view = { view = {
entries = "native", entries = 'native',
}, },
experimental = { experimental = {
ghost_text = true, ghost_text = true,
}, },
}) })

View File

@ -36,12 +36,7 @@ _G.run_tests = function()
local winid = _G._test_cmd_to_wins[cmd] local winid = _G._test_cmd_to_wins[cmd]
local current_winid = vim.fn.win_getid() local current_winid = vim.fn.win_getid()
if if winid == nil or not vim.api.nvim_win_is_valid(winid) or winid == current_winid or not vim.fn.win_gotoid(winid) == -1 then
winid == nil
or not vim.api.nvim_win_is_valid(winid)
or winid == current_winid
or not vim.fn.win_gotoid(winid) == -1
then
vim.api.nvim_command([[10split]]) vim.api.nvim_command([[10split]])
winid = vim.fn.win_getid() winid = vim.fn.win_getid()
_G._test_cmd_to_wins[cmd] = winid _G._test_cmd_to_wins[cmd] = winid
@ -103,7 +98,7 @@ _G.copy_test_cmd = function()
print("Copied: " .. cmd) print("Copied: " .. cmd)
end end
vim.api.nvim_set_keymap("n", "<leader>cr", [[:lua _G.run_tests()<cr>]], { noremap = true, silent = true }) vim.api.nvim_set_keymap("n", "<leader>cr", [[:lua _G.run_tests()<cr>]], {noremap = true, silent = true})
vim.api.nvim_set_keymap("n", "<leader>cf", [[:lua _G.focus_tests()<cr>]], { noremap = true, silent = true }) vim.api.nvim_set_keymap("n", "<leader>cf", [[:lua _G.focus_tests()<cr>]], {noremap = true, silent = true})
vim.api.nvim_set_keymap("n", "<leader>cq", [[:lua _G.close_tests()<cr>]], { noremap = true, silent = true }) vim.api.nvim_set_keymap("n", "<leader>cq", [[:lua _G.close_tests()<cr>]], {noremap = true, silent = true})
vim.api.nvim_set_keymap("n", "<leader>cc", [[:lua _G.copy_test_cmd()<cr>]], { noremap = true, silent = true }) vim.api.nvim_set_keymap("n", "<leader>cc", [[:lua _G.copy_test_cmd()<cr>]], {noremap = true, silent = true})

View File

@ -1,8 +1,8 @@
require("nvim-treesitter.configs").setup({ require 'nvim-treesitter.configs'.setup {
ensure_installed = "all", ensure_installed = "all",
highlight = { highlight = {
enable = true, enable = true,
disable = { "vim", "swift" }, disable = {"vim", "swift"},
additional_vim_regex_highlighting = true, additional_vim_regex_highlighting = true,
}, },
incremental_selection = { incremental_selection = {
@ -74,20 +74,20 @@ require("nvim-treesitter.configs").setup({
updatetime = 25, updatetime = 25,
persist_queries = false, persist_queries = false,
keybindings = { keybindings = {
toggle_query_editor = "o", toggle_query_editor = 'o',
toggle_hl_groups = "i", toggle_hl_groups = 'i',
toggle_injected_languages = "t", toggle_injected_languages = 't',
toggle_anonymous_nodes = "a", toggle_anonymous_nodes = 'a',
toggle_language_display = "I", toggle_language_display = 'I',
focus_language = "f", focus_language = 'f',
unfocus_language = "F", unfocus_language = 'F',
update = "R", update = 'R',
goto_node = "<cr>", goto_node = '<cr>',
show_help = "?", show_help = '?',
}, },
}, }
}) }
require("treesitter-context").setup({ require'treesitter-context'.setup{
enable = true, enable = true,
}) }