From 2ca409d39aa5f3b245fae8c985082d9b17e4cddb Mon Sep 17 00:00:00 2001 From: ray-x Date: Sun, 23 Oct 2022 00:24:21 +1100 Subject: [PATCH] issue #238 neodev loading --- lua/navigator/lspclient/clients.lua | 1 - lua/navigator/lspclient/sumneko_lua.lua | 12 ++++++------ 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/lua/navigator/lspclient/clients.lua b/lua/navigator/lspclient/clients.lua index 4259ccd..de05304 100644 --- a/lua/navigator/lspclient/clients.lua +++ b/lua/navigator/lspclient/clients.lua @@ -55,7 +55,6 @@ if _NgConfigValues.lsp['lua-dev'] ~= nil then vim.notify('lua-dev is deprecated, please use neodev instead', vim.lsp.log_levels.WARN) end -require('navigator.lazyloader').load('neodev.nvim', 'folke/neodev.nvim') if _NgConfigValues.mason then require('navigator.lazyloader').load('mason.nvim', 'williamboman/mason.nvim') diff --git a/lua/navigator/lspclient/sumneko_lua.lua b/lua/navigator/lspclient/sumneko_lua.lua index 1833ee9..374e885 100644 --- a/lua/navigator/lspclient/sumneko_lua.lua +++ b/lua/navigator/lspclient/sumneko_lua.lua @@ -70,12 +70,12 @@ local function sumneko_lua() local user_luadev = _NgConfigValues.lsp['neodev'] if user_luadev then luadevcfg = vim.tbl_deep_extend('force', luadevcfg, user_luadev) - end - require('navigator.lazyloader').load('neodev.nvim', 'folke/neodev.nvim') - - local ok, l = pcall(require, 'neodev') - if ok and l then - l.setup(luadevcfg) + require('navigator.lazyloader').load('neodev.nvim', 'folke/neodev.nvim') + local ok, l = pcall(require, 'neodev') + if ok and l then + l.setup(luadevcfg) + return + end end return sumneko_cfg