sumneko cfg refact

lua/navigator/lspclient/sumneko_lua.lua

@@ -1,44 +1,8 @@
 local vfn = vim.fn
 
-local library = {}
-
 local on_attach = require('navigator.lspclient.attach').on_attach
-local sumneko_cfg = {
-  cmd = { 'lua-language-server' },
-  filetypes = { 'lua' },
-  on_attach = on_attach,
-  flags = { allow_incremental_sync = true, debounce_text_changes = 500 },
-  settings = {
-    Lua = {
-      runtime = {
-        -- Tell the language server which version of Lua you're using (most likely LuaJIT in the case of Neovim)
-        version = 'LuaJIT',
-      },
-      diagnostics = {
-        enable = true,
-        -- Get the language server to recognize the `vim` global
-        globals = { 'vim', 'describe', 'it', 'before_each', 'after_each', 'teardown', 'pending' },
-      },
-      completion = { callSnippet = 'Both' },
-      workspace = {
-        -- Make the server aware of Neovim runtime files
-        library = library,
-        maxPreload = 2000,
-        preloadFileSize = 40000,
-      },
-      telemetry = { enable = false },
-    },
-  },
-  on_new_config = function(cfg, root)
-    local libs = vim.schedule(function()
-      vim.tbl_deep_extend('force', {}, library)
-    end)
-    libs[root] = nil
-    cfg.settings.Lua.workspace.library = libs
-    return cfg
-  end,
-}
 
+local library = {}
 local function add(lib)
   for _, p in pairs(vfn.expand(lib, false, true)) do
     p = vim.loop.fs_realpath(p)
@@ -59,16 +23,41 @@ local function sumneko_lua()
   library[vfn.expand('$VIMRUNTIME/lua/vim')] = true
   library[vfn.expand('$VIMRUNTIME/lua/vim/lsp')] = true
 
-  local luadevcfg = {
-    library = {
-      enabled = true, -- runtime path
-      runtime = true,
-      types = true, -- full signature, docs and completion of vim.api, vim.treesitter, vim.lsp and others
-      plugins = { 'nvim-treesitter', 'plenary.nvim' },
+  return {
+    cmd = { 'lua-language-server' },
+    filetypes = { 'lua' },
+    on_attach = on_attach,
+    flags = { allow_incremental_sync = true, debounce_text_changes = 500 },
+    settings = {
+      Lua = {
+        runtime = {
+          -- Tell the language server which version of Lua you're using (most likely LuaJIT in the case of Neovim)
+          version = 'LuaJIT',
+        },
+        diagnostics = {
+          enable = true,
+          -- Get the language server to recognize the `vim` global
+          globals = { 'vim', 'describe', 'it', 'before_each', 'after_each', 'teardown', 'pending' },
+        },
+        completion = { callSnippet = 'Both' },
+        workspace = {
+          -- Make the server aware of Neovim runtime files
+          library = library,
+          maxPreload = 2000,
+          preloadFileSize = 40000,
+        },
+        telemetry = { enable = false },
+      },
     },
-    setup_jsonls = true,
+    on_new_config = function(cfg, root)
+      local libs = vim.schedule(function()
+        vim.tbl_deep_extend('force', {}, library)
+      end)
+      libs[root] = nil
+      cfg.settings.Lua.workspace.library = libs
+      return cfg
+    end,
   }
-  return sumneko_cfg
 end
 
 return {