holm/LunarVim.LunarVim
1
0
Fork 0
mirror of https://github.com/LunarVim/LunarVim.git synced 2025-08-19 08:49:00 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

move istable and isstring to utils

Browse source
This commit is contained in:
Chris 2021-07-28 17:24:05 -04:00
parent 15eaebff92
commit 2e3a07480f
2 changed files with 25 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

31
lua/lsp/init.lua
View file

@ -1,3 +1,4 @@
local utils = require "utils"
local lsp_config = {} local lsp_config = {}
function lsp_config.config() function lsp_config.config()
@ -34,24 +35,6 @@ require("core.autocmds").define_augroups {
}, },
} }
local function is_table(t)
return type(t) == "table"
end
local function is_string(t)
return type(t) == "string"
end
local function has_value(tab, val)
for _, value in ipairs(tab) do
if value == val then
return true
end
end
return false
end
function lsp_config.setup(lang) function lsp_config.setup(lang)
local lang_server = lvim.lang[lang].lsp local lang_server = lvim.lang[lang].lsp
local provider = lang_server.provider local provider = lang_server.provider
@ -61,13 +44,13 @@ function lsp_config.setup(lang)
local overrides = lvim.lsp.override local overrides = lvim.lsp.override
if is_table(overrides) then if utils.is_table(overrides) then
if has_value(overrides, lang) then if utils.has_value(overrides, lang) then
return return
end end
end end
if is_string(overrides) then if utils.is_string(overrides) then
if overrides == lang then if overrides == lang then
return return
end end
@ -78,13 +61,13 @@ function lsp_config.setup(lang)
local method = source.method local method = source.method
local format_method = "NULL_LS_FORMATTING" local format_method = "NULL_LS_FORMATTING"
if is_table(method) then if utils.is_table(method) then
if has_value(method, format_method) then if utils.has_value(method, format_method) then
lang_server.setup.on_attach = no_formatter_on_attach lang_server.setup.on_attach = no_formatter_on_attach
end end
end end
if is_string(method) then if utils.is_string(method) then
if method == format_method then if method == format_method then
lang_server.setup.on_attach = no_formatter_on_attach lang_server.setup.on_attach = no_formatter_on_attach
end end

18
lua/utils/init.lua
View file

@ -102,6 +102,24 @@ function utils.check_lsp_client_active(name)
return false return false
end end
function utils.is_table(t)
return type(t) == "table"
end
function utils.is_string(t)
return type(t) == "string"
end
function utils.has_value(tab, val)
for _, value in ipairs(tab) do
if value == val then
return true
end
end
return false
end
function utils.add_keymap(mode, opts, keymaps) function utils.add_keymap(mode, opts, keymaps)
for _, keymap in ipairs(keymaps) do for _, keymap in ipairs(keymaps) do
vim.api.nvim_set_keymap(mode, keymap[1], keymap[2], opts) vim.api.nvim_set_keymap(mode, keymap[1], keymap[2], opts)