fix lua warnings

tommsawyer · Apr 22, 2023 · 3a73a49 · 3a73a49
1 parent 2a561d1
commit 3a73a49
Show file tree

Hide file tree

Showing 2 changed files with 32 additions and 17 deletions.
diff --git a/files/nvim/after/plugin/mason-lspconfig.lua b/files/nvim/after/plugin/mason-lspconfig.lua
@@ -4,22 +4,22 @@ require("mason-lspconfig").setup()
 local lsp_capabilities = require('cmp_nvim_lsp').default_capabilities()
 
 local lsp_attach = function(client, bufnr)
-    local bufmap = function(mode, lhs, rhs)
-      local opts = {buffer = true}
-      vim.keymap.set(mode, lhs, rhs, opts)
-    end
-
-    bufmap('n', 'K', '<cmd>lua vim.lsp.buf.hover()<cr>')
-    bufmap('n', 'gd', '<cmd>lua vim.lsp.buf.definition()<cr>')
-    bufmap('n', 'gi', '<cmd>lua vim.lsp.buf.implementation()<cr>')
-    bufmap('n', 'gy', '<cmd>lua vim.lsp.buf.type_definition()<cr>')
-    bufmap('n', 'gfr', '<cmd>lua vim.lsp.buf.references()<cr>')
-    bufmap('n', 'gr', '<cmd>lua vim.lsp.buf.rename()<cr>')
-    bufmap('n', 'ga', '<cmd>lua vim.lsp.buf.code_action()<cr>')
-    bufmap('x', 'ga', '<cmd>lua vim.lsp.buf.code_action()<cr>')
-    bufmap('n', 'gl', '<cmd>lua vim.diagnostic.open_float()<cr>')
-    bufmap('n', '[d', '<cmd>lua vim.diagnostic.goto_prev()<cr>')
-    bufmap('n', ']d', '<cmd>lua vim.diagnostic.goto_next()<cr>')
+  local bufmap = function(mode, lhs, rhs)
+    local opts = { buffer = true }
+    vim.keymap.set(mode, lhs, rhs, opts)
+  end
+
+  bufmap('n', 'K', '<cmd>lua vim.lsp.buf.hover()<cr>')
+  bufmap('n', 'gd', '<cmd>lua vim.lsp.buf.definition()<cr>')
+  bufmap('n', 'gi', '<cmd>lua vim.lsp.buf.implementation()<cr>')
+  bufmap('n', 'gy', '<cmd>lua vim.lsp.buf.type_definition()<cr>')
+  bufmap('n', 'gfr', '<cmd>lua vim.lsp.buf.references()<cr>')
+  bufmap('n', 'gr', '<cmd>lua vim.lsp.buf.rename()<cr>')
+  bufmap('n', 'ga', '<cmd>lua vim.lsp.buf.code_action()<cr>')
+  bufmap('x', 'ga', '<cmd>lua vim.lsp.buf.code_action()<cr>')
+  bufmap('n', 'gl', '<cmd>lua vim.diagnostic.open_float()<cr>')
+  bufmap('n', '[d', '<cmd>lua vim.diagnostic.goto_prev()<cr>')
+  bufmap('n', ']d', '<cmd>lua vim.diagnostic.goto_next()<cr>')
 end
 
 local lspconfig = require('lspconfig')
@@ -42,3 +42,19 @@ lspconfig.yamlls.setup {
     },
   },
 }
+
+lspconfig.lua_ls.setup({
+  settings = {
+    Lua = {
+      diagnostics = {
+        globals = { "vim" },
+      },
+      workspace = {
+        library = vim.api.nvim_get_runtime_file("", true),
+      },
+      telemetry = {
+        enable = false,
+      },
+    },
+  },
+})
diff --git a/files/nvim/after/plugin/null-ls.lua b/files/nvim/after/plugin/null-ls.lua
@@ -1,5 +1,4 @@
 local augroup = vim.api.nvim_create_augroup("LspFormatting", {})
-
 local null_ls = require("null-ls")
 
 null_ls.setup({