emh/dotfiles
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

sumneko to lua_ls{

Browse Source
This commit is contained in:
EvilMuffinHa 2023-05-11 21:09:38 -04:00
parent 9e08782ca9
commit 1e7719417f
2 changed files with 11 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
nvim/lua/lsp.lua
View File

@ -26,9 +26,9 @@ vim.g.coq_settings = {
local coq = require('coq') local coq = require('coq')
require('coq_3p') { require('coq_3p') {
{ src = 'vimtex', short_name = 'TEX' }, { src = 'vimtex', short_name = 'TEX' },
{ src = 'nvimlua', short_name = 'NLUA', conf_only = true }, { src = 'nvimlua', short_name = 'NLUA', conf_only = true },
{ src = 'bc', short_name = 'CALC', precision = 8 }, { src = 'bc', short_name = 'CALC', precision = 8 },
} }
@ -54,7 +54,7 @@ local function find_repo_root(names)
end end
local lsp_confs = { local lsp_confs = {
sumneko_lua = { lua_ls = {
settings = { settings = {
Lua = { Lua = {
-- Settings for working with nvim (copied from https://github.com/neovim/nvim-lspconfig/blob/master/doc/server_configurations.md#sumneko_lua) -- Settings for working with nvim (copied from https://github.com/neovim/nvim-lspconfig/blob/master/doc/server_configurations.md#sumneko_lua)
@ -127,7 +127,6 @@ local lsp_confs = {
}, },
svelte = {}, svelte = {},
svls = {}, svls = {},
} }
local lsp_special_setup = { local lsp_special_setup = {
@ -189,9 +188,9 @@ vim.diagnostic.config({
do -- signs do -- signs
local signs = { local signs = {
{ 'DiagnosticSignError', text = '×', texthl = 'DiagnosticSignError' }, { 'DiagnosticSignError', text = '×', texthl = 'DiagnosticSignError' },
{ 'DiagnosticSignWarn', text = '>', texthl = 'DiagnosticSignWarn' }, { 'DiagnosticSignWarn', text = '>', texthl = 'DiagnosticSignWarn' },
{ 'DiagnosticSignInfo', text = 'I', texthl = 'DiagnosticSignInfo' }, { 'DiagnosticSignInfo', text = 'I', texthl = 'DiagnosticSignInfo' },
{ 'DiagnosticSignHint', text = 'H', texthl = 'DiagnosticSignHint' }, { 'DiagnosticSignHint', text = 'H', texthl = 'DiagnosticSignHint' },
} }
for _, sign in pairs(signs) do for _, sign in pairs(signs) do
local name = sign[1] local name = sign[1]
@ -232,7 +231,7 @@ M.format_on_save_hook = function()
end end
vim.cmd [[ vim.cmd [[
augroup hoverlspconfig augroup hoverlspconfig
au! au!
" diagnostic on hover " diagnostic on hover
au BufWritePre * lua require'lsp'.format_on_save_hook() au BufWritePre * lua require'lsp'.format_on_save_hook()

10
nvim/lua/tel.lua
View File

@ -7,14 +7,11 @@ telescope.setup({
i = { i = {
['<C-o>'] = { '<Esc>', type = 'command' }, ['<C-o>'] = { '<Esc>', type = 'command' },
['<Esc>'] = 'close', ['<Esc>'] = 'close',
['<C-s>'] = 'select_horizontal', ['<C-s>'] = 'select_horizontal',
}, },
n = { n = {
q = 'close', q = 'close',
['<C-o>'] = { '<Nop>', type = 'command' }, ['<C-o>'] = { '<Nop>', type = 'command' },
['<C-s>'] = 'select_horizontal', ['<C-s>'] = 'select_horizontal',
}, },
}, },
@ -110,9 +107,9 @@ telescope.register_extension {
make_display = function(displayer) make_display = function(displayer)
return function(e) return function(e)
return displayer { return displayer {
{ e.value.idx .. ":", "TelescopePromptPrefix" }, { e.value.idx .. ":", "TelescopePromptPrefix" },
{ e.value.add.command_title }, { e.value.add.command_title },
{ e.value.add.client_name, "TelescopeResultsComment" }, { e.value.add.client_name, "TelescopeResultsComment" },
} }
end end
end, end,
@ -142,7 +139,8 @@ telescope.register_extension {
end end
return indexed_items return indexed_items
end)(items) end)(items)
local displayer = vim.F.if_nil(sopts.make_displayer, function() end)(widths) local displayer = vim.F.if_nil(sopts.make_displayer, function()
end)(widths)
local make_display = vim.F.if_nil(sopts.make_display, function(_) local make_display = vim.F.if_nil(sopts.make_display, function(_)
return function(e) return function(e)
local x, _ = opts.format_item(e.value.text) local x, _ = opts.format_item(e.value.text)