From b342c1154a2f9f156642f5d6f9b384375c5270b4 Mon Sep 17 00:00:00 2001 From: Blallo Date: Sun, 16 Apr 2023 11:45:06 -0300 Subject: [PATCH] Update lspconfig --- lua/config/lspconfig.lua | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/lua/config/lspconfig.lua b/lua/config/lspconfig.lua index a61c5d7..dfa10f2 100644 --- a/lua/config/lspconfig.lua +++ b/lua/config/lspconfig.lua @@ -6,13 +6,13 @@ local configs = require('lspconfig.configs') if not configs.harepls then configs.harepls = { default_config = { - cmd = { '/home/leo/code/hare/harepls/harepls' }; - filetypes = { 'hare' }; + cmd = { '/home/leo/code/hare/harepls/harepls' }, + filetypes = { 'hare' }, root_dir = function(fname) return nvim_lsp.util.find_git_ancestor(fname) - end; - settings = {}; - }; + end, + settings = {}, + }, } end @@ -44,7 +44,7 @@ local on_attach = function(client, bufrn) buf_set_keymap('n', 'wr', 'lua vim.lsp.buf.remove_workspace_folder()', opts, "LSP", "remove_workspace_folder", "Remove workspace folder") buf_set_keymap('n', 'wl', 'lua print(vim.inspect(vim.lsp.buf.list_workspace_folders()))', opts, "LSP" - , "list_workspace_folders", "List workspace folder") + , "list_workspace_folders", "List workspace folder") buf_set_keymap('n', 'D', 'lua vim.lsp.buf.type_definition()', opts, "LSP", "type_definition", "Show type definition") buf_set_keymap('n', 'rn', 'lua vim.lsp.buf.rename()', opts, "LSP", "rename", "Rename") @@ -57,7 +57,7 @@ local on_attach = function(client, bufrn) buf_set_keymap('n', ']d', 'lua vim.lsp.diagnostic.goto_next()', opts, "LSP", "goto_next", "Go to next") buf_set_keymap('n', 'q', 'lua vim.lsp.diagnostic.set_loclist()', opts, "LSP", "set_loclist", "Set loclist") - buf_set_keymap('n', 'f', 'lua vim.lsp.buf.formatting()', opts, "LSP", "formatting", "Format") + buf_set_keymap('n', 'f', 'lua vim.lsp.buf.format()', opts, "LSP", "formatting", "Format") end -- Launch language servers @@ -102,7 +102,7 @@ local runtime_path = vim.split(package.path, ';') table.insert(runtime_path, "lua/?.lua") table.insert(runtime_path, "lua/?/init.lua") -require 'lspconfig'.sumneko_lua.setup { +require 'lspconfig'.lua_ls.setup { settings = { Lua = { runtime = { @@ -143,4 +143,6 @@ vim.keymap.set( -- Format on save -vim.cmd [[autocmd BufWritePre lua vim.lsp.buf.formatting_sync()]] +vim.cmd [[autocmd BufWritePre lua vim.lsp.buf.format()]] + +return servers