diff --git a/.emmyrc.json b/.emmyrc.json index 96e7d5b..8fd5def 100644 --- a/.emmyrc.json +++ b/.emmyrc.json @@ -2,6 +2,15 @@ "$schema": "https://raw.githubusercontent.com/EmmyLuaLs/emmylua-analyzer-rust/refs/heads/main/crates/emmylua_code_analysis/resources/schema.json", "runtime": { "version": "LuaJIT", - "requirePattern": ["lua/?.lua", "lua/?/init.lua"] + "requirePattern": ["lua/?.lua", "lua/?/init.lua", "test/?.lua"] + }, + "diagnostics": { + "disable": ["unnecessary-if", "preferred-local-alias", "redefined-local"] + }, + "workspace": { + "library": [ + "/usr/share/nvim/runtime", + "/home/oscar/.local/share/nvim/site/pack/core/opt" + ] } } diff --git a/after/lsp/emmylua_ls.lua b/after/lsp/emmylua_ls.lua index d909ec7..e230bfe 100644 --- a/after/lsp/emmylua_ls.lua +++ b/after/lsp/emmylua_ls.lua @@ -2,13 +2,6 @@ return { settings = { emmylua = { - diagnostics = { - disable = { - "unnecessary-if", - "preferred-local-alias", - "redefined-local", - }, - }, format = { -- Re-enable once luafmt is integrated in server -- useDiff = true, @@ -18,33 +11,6 @@ return { }, }, }, - ---@param config vim.lsp.ClientConfig - before_init = function(_, config) - ---@param path string|string[] - ---@return string? - local function realpath(path) - ---@type string? - local p - if type(path) == "table" then - p = path[1] - else - p = path - end - return p and vim.uv.fs_realpath(p) or p - end - local config_root = realpath(vim.fn.stdpath("config")) - local folder = config.workspace_folders and config.workspace_folders[1] - local root = config.root_dir or (folder and folder.name) - if root and realpath(root) == config_root then - local lib = { vim.env.VIMRUNTIME } - vim.list_extend(lib, require("pack").get_paths()) - ---@cast config.settings table - config.settings.emmylua = - vim.tbl_deep_extend("force", config.settings.emmylua or {}, { - workspace = { library = lib }, - }) - end - end, on_attach = function(_, bufnr) local util = require("util")