aboutsummaryrefslogtreecommitdiff
path: root/lua
diff options
context:
space:
mode:
authorDamjan 9000 <damjan.9000@gmail.com>2024-03-01 11:09:32 +0100
committerDamjan 9000 <damjan.9000@gmail.com>2024-03-01 11:09:32 +0100
commitb650582c60755e3ade2866665f710f07e91022de (patch)
tree8a2a6950a3be0b67e8f4bb8fba6347382b6f1774 /lua
parentd6d745da330e66c629f7874ba7e8fa37b1df9fbb (diff)
parent38828dcaf7c140902fedeaa75b017bf968400bb0 (diff)
Merge 'upstream/master' fixup style, lua lsp snippets
fixup: updated some style stuff feat: enable lua lsp snipppets
Diffstat (limited to 'lua')
-rw-r--r--lua/kickstart/plugins/lspconfig.lua17
-rw-r--r--lua/kickstart/plugins/mini.lua12
-rw-r--r--lua/lazy-plugins.lua3
3 files changed, 17 insertions, 15 deletions
diff --git a/lua/kickstart/plugins/lspconfig.lua b/lua/kickstart/plugins/lspconfig.lua
index da1f4e3..04564fb 100644
--- a/lua/kickstart/plugins/lspconfig.lua
+++ b/lua/kickstart/plugins/lspconfig.lua
@@ -163,6 +163,9 @@ return {
-- If lua_ls is really slow on your computer, you can try this instead:
-- library = { vim.env.VIMRUNTIME },
},
+ completion = {
+ callSnippet = 'Replace',
+ },
-- You can toggle below to ignore Lua_LS's noisy `missing-fields` warnings
-- diagnostics = { disable = { 'missing-fields' } },
},
@@ -190,15 +193,11 @@ return {
handlers = {
function(server_name)
local server = servers[server_name] or {}
- require('lspconfig')[server_name].setup {
- cmd = server.cmd,
- settings = server.settings,
- filetypes = server.filetypes,
- -- This handles overriding only values explicitly passed
- -- by the server configuration above. Useful when disabling
- -- certain features of an LSP (for example, turning off formatting for tsserver)
- capabilities = vim.tbl_deep_extend('force', {}, capabilities, server.capabilities or {}),
- }
+ -- This handles overriding only values explicitly passed
+ -- by the server configuration above. Useful when disabling
+ -- certain features of an LSP (for example, turning off formatting for tsserver)
+ server.capabilities = vim.tbl_deep_extend('force', {}, capabilities, server.capabilities or {})
+ require('lspconfig')[server_name].setup(server)
end,
},
}
diff --git a/lua/kickstart/plugins/mini.lua b/lua/kickstart/plugins/mini.lua
index 87a312a..2467207 100644
--- a/lua/kickstart/plugins/mini.lua
+++ b/lua/kickstart/plugins/mini.lua
@@ -20,9 +20,15 @@ return {
-- Simple and easy statusline.
-- You could remove this setup call if you don't like it,
-- and try some other statusline plugin
- require('mini.statusline').setup()
- MiniStatusline.section_location = function()
- return '%2l:%-2v'
+ local statusline = require 'mini.statusline'
+ statusline.setup()
+
+ -- You can confiure sections in the statusline by overriding their
+ -- default behavior. For example, here we disable the section for
+ -- cursor information because line numbers are already enabled
+ ---@diagnostic disable-next-line: duplicate-set-field
+ statusline.section_location = function()
+ return ''
end
-- ... and there is more!
diff --git a/lua/lazy-plugins.lua b/lua/lazy-plugins.lua
index f68fecb..8a18c1e 100644
--- a/lua/lazy-plugins.lua
+++ b/lua/lazy-plugins.lua
@@ -10,9 +10,6 @@
--
-- NOTE: Here is where you install your plugins.
require('lazy').setup {
-
- -- [[ Plugin Specs list ]]
-
-- NOTE: Plugins can be added with a link (or for a github repo: 'owner/repo' link).
'tpope/vim-sleuth', -- Detect tabstop and shiftwidth automatically