summaryrefslogtreecommitdiff
path: root/lua
diff options
context:
space:
mode:
Diffstat (limited to 'lua')
-rw-r--r--lua/core/galaxyline.lua8
-rw-r--r--lua/core/info.lua41
-rw-r--r--lua/default-config.lua520
-rw-r--r--lua/lsp/init.lua5
-rw-r--r--lua/lsp/null-ls.lua142
-rw-r--r--lua/lsp/null-ls/formatters.lua79
-rw-r--r--lua/lsp/null-ls/init.lua44
-rw-r--r--lua/lsp/null-ls/linters.lua79
-rw-r--r--lua/lsp/null-ls/services.lua55
-rw-r--r--lua/lsp/utils.lua27
-rw-r--r--lua/utils/init.lua51
11 files changed, 577 insertions, 474 deletions
diff --git a/lua/core/galaxyline.lua b/lua/core/galaxyline.lua
index ee0a317d..512dd78c 100644
--- a/lua/core/galaxyline.lua
+++ b/lua/core/galaxyline.lua
@@ -204,19 +204,23 @@ table.insert(gls.right, {
local function get_attached_provider_name(msg)
msg = msg or "LSP Inactive"
+
local buf_clients = vim.lsp.buf_get_clients()
if next(buf_clients) == nil then
return msg
end
- local buf_ft = vim.bo.filetype
+
local buf_client_names = {}
- local null_ls_providers = require("lsp.null-ls").get_registered_providers_by_filetype(buf_ft)
for _, client in pairs(buf_clients) do
if client.name ~= "null-ls" then
table.insert(buf_client_names, client.name)
end
end
+
+ local null_ls = require "lsp.null-ls"
+ local null_ls_providers = null_ls.list_supported_provider_names(vim.bo.filetype)
vim.list_extend(buf_client_names, null_ls_providers)
+
return table.concat(buf_client_names, ", ")
end
diff --git a/lua/core/info.lua b/lua/core/info.lua
index 5e5c5edc..1610e763 100644
--- a/lua/core/info.lua
+++ b/lua/core/info.lua
@@ -1,6 +1,4 @@
local M = {}
-local u = require "utils"
-local null_ls_handler = require "lsp.null-ls"
local indent = " "
M.banner = {
@@ -25,7 +23,8 @@ local function str_list(list)
end
local function get_formatter_suggestion_msg(ft)
- local supported_formatters = u.get_supported_formatters_by_filetype(ft)
+ local null_formatters = require "lsp.null-ls.formatters"
+ local supported_formatters = null_formatters.list_available(ft)
return {
indent
.. "───────────────────────────────────────────────────────────────────",
@@ -36,7 +35,7 @@ local function get_formatter_suggestion_msg(ft)
indent .. "* Configured formatter needs to be installed and executable.",
indent .. "* Enable installed formatter(s) with following config in ~/.config/lvim/config.lua",
"",
- indent .. " lvim.lang." .. tostring(ft) .. [[.formatting = { { exe = ']] .. table.concat(
+ indent .. " lvim.lang." .. tostring(ft) .. [[.formatters = { { exe = ']] .. table.concat(
supported_formatters,
"│"
) .. [[' } }]],
@@ -45,7 +44,8 @@ local function get_formatter_suggestion_msg(ft)
end
local function get_linter_suggestion_msg(ft)
- local supported_linters = u.get_supported_linters_by_filetype(ft)
+ local null_linters = require "lsp.null-ls.linters"
+ local supported_linters = null_linters.list_available(ft)
return {
indent
.. "───────────────────────────────────────────────────────────────────",
@@ -129,16 +129,14 @@ local function tbl_set_highlight(terms, highlight_group)
end
function M.toggle_popup(ft)
- local client = u.get_active_client_by_ft(ft)
+ local lsp_utils = require "lsp.utils"
+ local client = lsp_utils.get_active_client_by_ft(ft)
local is_client_active = false
local client_enabled_caps = {}
local client_name = ""
local client_id = 0
local document_formatting = false
- local missing_linters = {}
- local missing_formatters = {}
local num_caps = 0
- local null_ls_providers = null_ls_handler.get_registered_providers_by_filetype(ft)
if client ~= nil then
is_client_active = not client.is_stopped()
client_enabled_caps = require("lsp").get_ls_capabilities(client.id)
@@ -147,10 +145,6 @@ function M.toggle_popup(ft)
client_id = client.id
document_formatting = client.resolved_capabilities.document_formatting
end
- if lvim.lang[ft] ~= nil then
- missing_linters = lvim.lang[ft].linters._failed_requests or {}
- missing_formatters = lvim.lang[ft].formatters._failed_requests or {}
- end
local buf_lines = {}
vim.list_extend(buf_lines, M.banner)
@@ -173,23 +167,27 @@ function M.toggle_popup(ft)
}
vim.list_extend(buf_lines, lsp_info)
+ local null_ls = require "lsp.null-ls"
+ local registered_providers = null_ls.list_supported_provider_names(ft)
local null_ls_info = {
indent .. "Formatters and linters",
- indent .. "* Configured providers: " .. table.concat(null_ls_providers, "  , ") .. "  ",
+ indent .. "* Configured providers: " .. table.concat(registered_providers, "  , ") .. "  ",
}
vim.list_extend(buf_lines, null_ls_info)
- local missing_formatters_status
+ local null_formatters = require "lsp.null-ls.formatters"
+ local missing_formatters = null_formatters.list_unsupported_names(ft)
if vim.tbl_count(missing_formatters) > 0 then
- missing_formatters_status = {
+ local missing_formatters_status = {
indent .. "* Missing formatters: " .. table.concat(missing_formatters, "  , ") .. "  ",
}
vim.list_extend(buf_lines, missing_formatters_status)
end
- local missing_linters_status
+ local null_linters = require "lsp.null-ls.linters"
+ local missing_linters = null_linters.list_unsupported_names(ft)
if vim.tbl_count(missing_linters) > 0 then
- missing_linters_status = {
+ local missing_linters_status = {
indent .. "* Missing linters: " .. table.concat(missing_linters, "  , ") .. "  ",
}
vim.list_extend(buf_lines, missing_linters_status)
@@ -198,7 +196,6 @@ function M.toggle_popup(ft)
vim.list_extend(buf_lines, { "" })
vim.list_extend(buf_lines, get_formatter_suggestion_msg(ft))
-
vim.list_extend(buf_lines, get_linter_suggestion_msg(ft))
local function set_syntax_hl()
@@ -209,11 +206,11 @@ function M.toggle_popup(ft)
vim.cmd('let m=matchadd("LvimInfoIdentifier", " ' .. ft .. '$")')
vim.cmd 'let m=matchadd("string", "true")'
vim.cmd 'let m=matchadd("error", "false")'
- tbl_set_highlight(null_ls_providers, "LvimInfoIdentifier")
+ tbl_set_highlight(registered_providers, "LvimInfoIdentifier")
tbl_set_highlight(missing_formatters, "LvimInfoIdentifier")
tbl_set_highlight(missing_linters, "LvimInfoIdentifier")
- -- tbl_set_highlight(u.get_supported_formatters_by_filetype(ft), "LvimInfoIdentifier")
- -- tbl_set_highlight(u.get_supported_linters_by_filetype(ft), "LvimInfoIdentifier")
+ -- tbl_set_highlight(require("lsp.null-ls.formatters").list_available(ft), "LvimInfoIdentifier")
+ -- tbl_set_highlight(require("lsp.null-ls.linters").list_available(ft), "LvimInfoIdentifier")
vim.cmd('let m=matchadd("LvimInfoIdentifier", "' .. client_name .. '")')
end
diff --git a/lua/default-config.lua b/lua/default-config.lua
index bba21206..13f74c30 100644
--- a/lua/default-config.lua
+++ b/lua/default-config.lua
@@ -127,11 +127,10 @@ end
lvim.lang = {
asm = {
formatters = {
- {
- -- @usage can be asmfmt
- exe = "",
- args = {},
- },
+ -- {
+ -- exe = "asmfmt",
+ -- args = {},
+ -- },
},
linters = {},
lsp = {
@@ -141,11 +140,10 @@ lvim.lang = {
},
beancount = {
formatters = {
- {
- -- @usage can be bean_format
- exe = "",
- args = {},
- },
+ -- {
+ -- exe = "bean_format",
+ -- args = {},
+ -- },
},
linters = {},
lsp = {
@@ -160,12 +158,14 @@ lvim.lang = {
},
c = {
formatters = {
- {
- -- @usage can be clang_format or uncrustify
- exe = "",
- args = {},
- stdin = true,
- },
+ -- {
+ -- exe = "clang_format",
+ -- args = {},
+ -- },
+ -- {
+ -- exe = "uncrustify",
+ -- args = {},
+ -- },
},
linters = {},
lsp = {
@@ -187,12 +187,14 @@ lvim.lang = {
},
cpp = {
formatters = {
- {
- -- @usage can be clang_format or uncrustify
- exe = "",
- args = {},
- stdin = true,
- },
+ -- {
+ -- exe = "clang_format",
+ -- args = {},
+ -- },
+ -- {
+ -- exe = "uncrustify",
+ -- args = {},
+ -- },
},
linters = {},
lsp = {
@@ -214,11 +216,10 @@ lvim.lang = {
},
crystal = {
formatters = {
- {
- -- @usage can be crystal_format
- exe = "",
- args = {},
- },
+ -- {
+ -- exe = "crystal_format",
+ -- args = {},
+ -- },
},
linters = {},
lsp = {
@@ -233,11 +234,14 @@ lvim.lang = {
},
cs = {
formatters = {
- {
- -- @usage can be clang_format or uncrustify
- exe = "",
- args = {},
- },
+ -- {
+ -- exe = "clang_format ",
+ -- args = {},
+ -- },
+ -- {
+ -- exe = "uncrustify",
+ -- args = {},
+ -- },
},
linters = {},
lsp = {
@@ -257,11 +261,10 @@ lvim.lang = {
},
cmake = {
formatters = {
- {
- -- @usage can be cmake_format
- exe = "",
- args = {},
- },
+ -- {
+ -- exe = "cmake_format",
+ -- args = {},
+ -- },
},
linters = {},
lsp = {
@@ -277,10 +280,7 @@ lvim.lang = {
},
},
clojure = {
- formatters = { {
- exe = "",
- args = {},
- } },
+ formatters = {},
linters = {},
lsp = {
provider = "clojure_lsp",
@@ -297,11 +297,14 @@ lvim.lang = {
},
css = {
formatters = {
- {
- -- @usage can be prettier or prettierd
- exe = "",
- args = {},
- },
+ -- {
+ -- exe = "prettier",
+ -- args = {},
+ -- },
+ -- {
+ -- exe = "prettierd",
+ -- args = {},
+ -- },
},
linters = {},
lsp = {
@@ -320,11 +323,14 @@ lvim.lang = {
},
less = {
formatters = {
- {
- -- @usage can be prettier or prettierd
- exe = "",
- args = {},
- },
+ -- {
+ -- exe = "prettier",
+ -- args = {},
+ -- },
+ -- {
+ -- exe = "prettierd",
+ -- args = {},
+ -- },
},
linters = {},
lsp = {
@@ -343,11 +349,10 @@ lvim.lang = {
},
d = {
formatters = {
- {
- -- @usage can be dfmt
- exe = "",
- args = {},
- },
+ -- {
+ -- exe = "dfmt",
+ -- args = {},
+ -- },
},
linters = {},
lsp = {
@@ -362,12 +367,10 @@ lvim.lang = {
},
dart = {
formatters = {
- {
- -- @usage can be dart_format
- exe = "",
- args = {},
- stdin = true,
- },
+ -- {
+ -- exe = "dart_format",
+ -- args = {},
+ -- },
},
linters = {},
lsp = {
@@ -385,13 +388,7 @@ lvim.lang = {
},
},
docker = {
- formatters = {
- {
- exe = "",
- args = {},
- },
- -- @usage can be {"hadolint"}
- },
+ formatters = {},
linters = {},
lsp = {
provider = "dockerls",
@@ -408,12 +405,10 @@ lvim.lang = {
},
elixir = {
formatters = {
- {
- -- @usage can be mix
- exe = "",
- args = {},
- stdin = true,
- },
+ -- {
+ -- exe = "mix",
+ -- args = {},
+ -- },
},
linters = {},
lsp = {
@@ -430,12 +425,10 @@ lvim.lang = {
},
elm = {
formatters = {
- {
- -- @usage can be elm_format
- exe = "",
- args = {},
- stdin = true,
- },
+ -- {
+ -- exe = "elm_format",
+ -- args = {},
+ -- },
},
linters = {},
lsp = {
@@ -457,11 +450,10 @@ lvim.lang = {
},
erlang = {
formatters = {
- {
- -- @usage can be erlfmt
- exe = "",
- args = {},
- },
+ -- {
+ -- exe = "erlfmt",
+ -- args = {},
+ -- },
},
linters = {},
lsp = {
@@ -479,11 +471,10 @@ lvim.lang = {
emmet = { active = false },
fish = {
formatters = {
- {
- -- @usage can be fish_indent
- exe = "",
- args = {},
- },
+ -- {
+ -- exe = "fish_indent",
+ -- args = {},
+ -- },
},
linters = {},
lsp = {
@@ -497,12 +488,18 @@ lvim.lang = {
},
go = {
formatters = {
- {
- -- @usage can be gofmt or goimports or gofumpt
- exe = "",
- args = {},
- stdin = true,
- },
+ -- {
+ -- exe = "gofmt",
+ -- args = {},
+ -- },
+ -- {
+ -- exe = "goimports",
+ -- args = {},
+ -- },
+ -- {
+ -- exe = "gofumpt",
+ -- args = {},
+ -- },
},
linters = {},
lsp = {
@@ -518,10 +515,7 @@ lvim.lang = {
},
},
graphql = {
- formatters = { {
- exe = "",
- args = {},
- } },
+ formatters = {},
linters = {},
lsp = {
provider = "graphql",
@@ -539,10 +533,7 @@ lvim.lang = {
},
},
haskell = {
- formatters = { {
- exe = "",
- args = {},
- } },
+ formatters = {},
linters = {},
lsp = {
provider = "hls",
@@ -556,11 +547,14 @@ lvim.lang = {
},
html = {
formatters = {
- {
- -- @usage can be prettier or prettierd
- exe = "",
- args = {},
- },
+ -- {
+ -- exe = "prettier",
+ -- args = {},
+ -- },
+ -- {
+ -- exe = "prettierd",
+ -- args = {},
+ -- },
},
linters = {},
lsp = {
@@ -579,11 +573,14 @@ lvim.lang = {
},
java = {
formatters = {
- {
- -- @usage can be clang_format or uncrustify
- exe = "",
- args = {},
- },
+ -- {
+ -- exe = "clang_format",
+ -- args = {},
+ -- },
+ -- {
+ -- exe = "uncrustify",
+ -- args = {},
+ -- },
},
linters = {},
lsp = {
@@ -598,12 +595,18 @@ lvim.lang = {
},
json = {
formatters = {
- {
- -- @usage can be json_tool or prettier or prettierd
- exe = "",
- args = {},
- stdin = true,
- },
+ -- {
+ -- exe = "json_tool",
+ -- args = {},
+ -- },
+ -- {
+ -- exe = "prettier",
+ -- args = {},
+ -- },
+ -- {
+ -- exe = "prettierd",
+ -- args = {},
+ -- },
},
linters = {},
lsp = {
@@ -639,10 +642,7 @@ lvim.lang = {
},
},
julia = {
- formatters = { {
- exe = "",
- args = {},
- } },
+ formatters = {},
linters = {},
lsp = {
provider = "julials",
@@ -661,10 +661,7 @@ lvim.lang = {
},
},
kotlin = {
- formatters = { {
- exe = "",
- args = {},
- } },
+ formatters = {},
linters = {},
lsp = {
provider = "kotlin_language_server",
@@ -695,11 +692,14 @@ lvim.lang = {
},
lua = {
formatters = {
- {
- -- @usage can be stylua or lua_format
- exe = "",
- args = {},
- },
+ -- {
+ -- exe = "stylua",
+ -- args = {},
+ -- },
+ -- {
+ -- exe = "lua_format",
+ -- args = {},
+ -- },
},
linters = {},
lsp = {
@@ -742,25 +742,23 @@ lvim.lang = {
},
nginx = {
formatters = {
- {
- -- @usage can be nginx_beautifier
- exe = "",
- args = {
- provider = "",
- setup = {},
- },
- },
+ -- {
+ -- exe = "nginx_beautifier",
+ -- args = {
+ -- provider = "",
+ -- setup = {},
+ -- },
+ -- },
},
linters = {},
lsp = {},
},
perl = {
formatters = {
- {
- -- @usage can be perltidy
- exe = "",
- args = {},
- },
+ -- {
+ -- exe = "perltidy",
+ -- args = {},
+ -- },
},
linters = {},
lsp = {
@@ -770,11 +768,10 @@ lvim.lang = {
},
sql = {
formatters = {
- {
- -- @usage can be sqlformat
- exe = "",
- args = {},
- },
+ -- {
+ -- exe = "sqlformat",
+ -- args = {},
+ -- },
},
linters = {},
lsp = {
@@ -786,11 +783,10 @@ lvim.lang = {
},
php = {
formatters = {
- {
- -- @usage can be phpcbf
- exe = "",
- args = {},
- },
+ -- {
+ -- exe = "phpcbf",
+ -- args = {},
+ -- },
},
linters = {},
lsp = {
@@ -814,10 +810,7 @@ lvim.lang = {
},
},
puppet = {
- formatters = { {
- exe = "",
- args = {},
- } },
+ formatters = {},
linters = {},
lsp = {
provider = "puppet",
@@ -829,12 +822,19 @@ lvim.lang = {
},
},
javascript = {
- -- @usage can be prettier or prettier_d_slim or prettierd
formatters = {
- {
- exe = "",
- args = {},
- },
+ -- {
+ -- exe = "prettier",
+ -- args = {},
+ -- },
+ -- {
+ -- exe = "prettier_d_slim",
+ -- args = {},
+ -- },
+ -- {
+ -- exe = "prettierd",
+ -- args = {},
+ -- },
},
-- @usage can be {"eslint"} or {"eslint_d"}
linters = {},
@@ -854,13 +854,19 @@ lvim.lang = {
},
javascriptreact = {
formatters = {
- {
- -- @usage can be prettier or prettier_d_slim or prettierd
- exe = "",
- args = {},
- },
+ -- {
+ -- exe = "prettier",
+ -- args = {},
+ -- },
+ -- {
+ -- exe = "prettier_d_slim",
+ -- args = {},
+ -- },
+ -- {
+ -- exe = "prettierd",
+ -- args = {},
+ -- },
},
- -- @usage can be {"eslint"} or {"eslint_d"}
linters = {},
lsp = {
provider = "tsserver",
@@ -878,11 +884,14 @@ lvim.lang = {
},
python = {
formatters = {
- {
- -- @usage can be black or yapf or isort
- exe = "",
- args = {},
- },
+ -- {
+ -- exe = "yapf",
+ -- args = {},
+ -- },
+ -- {
+ -- exe = "isort",
+ -- args = {},
+ -- },
},
linters = {},
lsp = {
@@ -902,11 +911,10 @@ lvim.lang = {
-- R -e 'install.packages("readr",repos = "http://cran.us.r-project.org")'
r = {
formatters = {
- {
- -- @usage can be format_r
- exe = "",
- args = {},
- },
+ -- {
+ -- exe = "format_r",
+ -- args = {},
+ -- },
},
linters = {},
lsp = {
@@ -926,11 +934,10 @@ lvim.lang = {
},
ruby = {
formatters = {
- {
- -- @usage can be rufo
- exe = "",
- args = {},
- },
+ -- {
+ -- exe = "rufo",
+ -- args = {},
+ -- },
},
linters = {},
lsp = {
@@ -961,11 +968,10 @@ lvim.lang = {
},
rust = {
formatters = {
- {
- -- @usage can be rustfmt
- exe = "",
- args = {},
- },
+ -- {
+ -- exe = "rustfmt",
+ -- args = {},
+ -- },
},
linters = {},
lsp = {
@@ -982,11 +988,10 @@ lvim.lang = {
},
scala = {
formatters = {
- {
- -- @usage can be scalafmt
- exe = "",
- args = {},
- },
+ -- {
+ -- exe = "scalafmt",
+ -- args = {},
+ -- },
},
linters = { "" },
lsp = {
@@ -1000,11 +1005,10 @@ lvim.lang = {
},
sh = {
formatters = {
- {
- -- @usage can be shfmt
- exe = "",
- args = {},
- },
+ -- {
+ -- exe = "shfmt",
+ -- args = {},
+ -- },
},
linters = {},
lsp = {
@@ -1021,10 +1025,7 @@ lvim.lang = {
},
},
svelte = {
- formatters = { {
- exe = "",
- args = {},
- } },
+ formatters = {},
linters = {},
lsp = {
provider = "svelte",
@@ -1041,11 +1042,10 @@ lvim.lang = {
},
swift = {
formatters = {
- {
- -- @usage can be swiftformat
- exe = "",
- args = {},
- },
+ -- {
+ -- exe = "swiftformat",
+ -- args = {},
+ -- },
},
linters = {},
lsp = {
@@ -1075,11 +1075,10 @@ lvim.lang = {
},
terraform = {
formatters = {
- {
- -- @usage can be terraform_fmt
- exe = "",
- args = {},
- },
+ -- {
+ -- exe = "terraform_fmt",
+ -- args = {},
+ -- },
},
linters = {},
lsp = {
@@ -1096,14 +1095,7 @@ lvim.lang = {
},
},
tex = {
- formatters = {
- {
- exe = "",
- args = {},
- stdin = false,
- },
- -- @usage can be chktex or vale
- },
+ formatters = {},
linters = {},
lsp = {
provider = "texlab",
@@ -1117,12 +1109,18 @@ lvim.lang = {
},
typescript = {
formatters = {
- {
- -- @usage can be prettier or prettierd or prettier_d_slim
- exe = "",
- args = {},
- },
- -- @usage can be {"eslint"} or {"eslint_d"}
+ -- {
+ -- exe = "prettier",
+ -- args = {},
+ -- },
+ -- {
+ -- exe = "prettierd",
+ -- args = {},
+ -- },
+ -- {
+ -- exe = "prettier_d_slim",
+ -- args = {},
+ -- },
},
linters = {},
lsp = {
@@ -1141,11 +1139,18 @@ lvim.lang = {
},
typescriptreact = {
formatters = {
- {
- -- @usage can be prettier or prettierd or prettier_d_slim
- exe = "",
- args = {},
- },
+ -- {
+ -- exe = "prettier",
+ -- args = {},
+ -- },
+ -- {
+ -- exe = "prettierd",
+ -- args = {},
+ -- },
+ -- {
+ -- exe = "prettier_d_slim",
+ -- args = {},
+ -- },
},
-- @usage can be {"eslint"} or {"eslint_d"}
linters = {},
@@ -1164,13 +1169,7 @@ lvim.lang = {
},
},
vim = {
- formatters = {
- {
- exe = "",
- args = {},
- },
- },
- -- @usage can be {"vint"}
+ formatters = {},
linters = { "" },
lsp = {
provider = "vimls",
@@ -1187,13 +1186,19 @@ lvim.lang = {
},
vue = {
formatters = {
- {
- -- @usage can be prettier or prettierd or prettier_d_slim
- exe = "",
- args = {},
- },
+ -- {
+ -- exe = "prettier",
+ -- args = {},
+ -- },
+ -- {
+ -- exe = "prettierd",
+ -- args = {},
+ -- },
+ -- {
+ -- exe = "prettier_d_slim",
+ -- args = {},
+ -- },
},
- -- @usage can be {"eslint"} or {"eslint_d"}
linters = {},
lsp = {
provider = "vuels",
@@ -1209,11 +1214,14 @@ lvim.lang = {
},
yaml = {
formatters = {
- {
- -- @usage can be prettier or prettierd
- exe = "",
- args = {},
- },
+ -- {
+ -- exe = "prettier",
+ -- args = {},
+ -- },
+ -- {
+ -- exe = "prettierd",
+ -- args = {},
+ -- },
},
linters = {},
lsp = {
@@ -1230,11 +1238,7 @@ lvim.lang = {
},
},
zig = {
- formatters = { {
- exe = "",
- args = {},
- stdin = false,
- } },
+ formatters = {},
linters = {},
lsp = {
provider = "zls",
diff --git a/lua/lsp/init.lua b/lua/lsp/init.lua
index e4ea02db..891147e5 100644
--- a/lua/lsp/init.lua
+++ b/lua/lsp/init.lua
@@ -1,5 +1,6 @@
local M = {}
local Log = require "core.log"
+
function M.config()
vim.lsp.protocol.CompletionItemKind = lvim.lsp.completion.item_kind
@@ -127,13 +128,13 @@ function M.common_on_attach(client, bufnr)
end
function M.setup(lang)
+ local lsp_utils = require "lsp.utils"
local lsp = lvim.lang[lang].lsp
- if require("utils").check_lsp_client_active(lsp.provider) then
+ if lsp_utils.is_client_active(lsp.provider) then
return
end
local overrides = lvim.lsp.override
-
if type(overrides) == "table" then
if vim.tbl_contains(overrides, lang) then
return
diff --git a/lua/lsp/null-ls.lua b/lua/lsp/null-ls.lua
deleted file mode 100644
index 2ce98f2c..00000000
--- a/lua/lsp/null-ls.lua
+++ /dev/null
@@ -1,142 +0,0 @@
-local M = {}
-local Log = require "core.log"
-
-local null_ls = require "null-ls"
-
-local nodejs_local_providers = { "prettier", "prettierd", "prettier_d_slim", "eslint_d", "eslint" }
-
-M.requested_providers = {}
-
-function M.get_registered_providers_by_filetype(ft)
- local matches = {}
- for _, provider in pairs(M.requested_providers) do
- if vim.tbl_contains(provider.filetypes, ft) then
- local provider_name = provider.name
- -- special case: show "eslint_d" instead of eslint
- -- https://github.com/jose-elias-alvarez/null-ls.nvim/blob/9b8458bd1648e84169a7e8638091ba15c2f20fc0/doc/BUILTINS.md#eslint
- if string.find(provider._opts.command, "eslint_d") then
- provider_name = "eslint_d"
- end
- table.insert(matches, provider_name)
- end
- end
-
- return matches
-end
-
-function M.get_missing_providers_by_filetype(ft)
- local matches = {}
- for _, provider in pairs(M.requested_providers) do
- if vim.tbl_contains(provider.filetypes, ft) then
- local provider_name = provider.name
-
- table.insert(matches, provider_name)
- end
- end
-
- return matches
-end
-
-local function register_failed_request(ft, provider, operation)
- if not lvim.lang[ft][operation]._failed_requests then
- lvim.lang[ft][operation]._failed_requests = {}
- end
- table.insert(lvim.lang[ft][operation]._failed_requests, provider)
-end
-
-local function validate_nodejs_provider(provider)
- local command_path
- local root_dir
- if lvim.builtin.rooter.active then
- --- use vim-rooter to set root_dir
- vim.cmd "let root_dir = FindRootDirectory()"
- root_dir = vim.api.nvim_get_var "root_dir"
- else
- --- use LSP to set root_dir
- local ts_client = require("utils").get_active_client_by_ft "typescript"
- if ts_client == nil then
- Log:get_default().error "Unable to determine root directory since tsserver didn't start correctly"
- return
- end
- root_dir = ts_client.config.root_dir
- end
- local local_nodejs_command = root_dir .. "/node_modules/.bin/" .. provider._opts.command
- Log:get_default().debug("checking for local node module: ", vim.inspect(provider))
-
- if vim.fn.executable(local_nodejs_command) == 1 then
- command_path = local_nodejs_command
- elseif vim.fn.executable(provider._opts.command) == 1 then
- Log:get_default().debug("checking in global path instead for node module", provider._opts.command)
- command_path = provider._opts.command
- else
- Log:get_default().debug("Unable to find node module", provider._opts.command)
- end
- return command_path
-end
-
-local function validate_provider_request(provider)
- if provider == "" or provider == nil then
- return
- end
- -- NOTE: we can't use provider.name because eslint_d uses eslint name
- if vim.tbl_contains(nodejs_local_providers, provider._opts.command) then
- return validate_nodejs_provider(provider)
- end
- if vim.fn.executable(provider._opts.command) ~= 1 then
- Log:get_default().debug("Unable to find the path for", vim.inspect(provider))
- Log:get_default().warn("Unable to find the path for ", provider._opts.command)
- return
- end
- return provider._opts.command
-end
-
--- TODO: for linters and formatters with spaces and '-' replace with '_'
-function M.setup(filetype)
- for _, formatter in pairs(lvim.lang[filetype].formatters) do
- Log:get_default().debug("validating format provider: ", formatter.exe)
- local builtin_formatter = null_ls.builtins.formatting[formatter.exe]
- if not vim.tbl_contains(M.requested_providers, builtin_formatter) then
- -- FIXME: why doesn't this work?
- builtin_formatter._opts.args = formatter.args or builtin_formatter._opts.args
- -- builtin_formatter._opts.to_stdin = formatter.stdin or builtin_formatter._opts.to_stdin
- local resolved_path = validate_provider_request(builtin_formatter)
- if resolved_path then
- builtin_formatter._opts.command = resolved_path
- table.insert(M.requested_providers, builtin_formatter)
- Log:get_default().info("Using format provider", builtin_formatter.name)
- else
- -- mark it here to avoid re-doing the lookup again
- register_failed_request(filetype, formatter.exe, "formatters")
- end
- end
- end
-
- for _, linter in pairs(lvim.lang[filetype].linters) do
- local builtin_diagnoser = null_ls.builtins.diagnostics[linter.exe]
- Log:get_default().debug("validating lint provider: ", linter.exe)
- -- special case: fallback to "eslint"
- -- https://github.com/jose-elias-alvarez/null-ls.nvim/blob/9b8458bd1648e84169a7e8638091ba15c2f20fc0/doc/BUILTINS.md#eslint
- -- if provider.exe
- if linter.exe == "eslint_d" then
- builtin_diagnoser = null_ls.builtins.diagnostics.eslint.with { command = "eslint_d" }
- end
- if not vim.tbl_contains(M.requested_providers, builtin_diagnoser) then
- -- FIXME: why doesn't this work?
- -- builtin_diagnoser._opts.args = linter.args or builtin_diagnoser._opts.args
- -- builtin_diagnoser._opts.to_stdin = linter.stdin or builtin_diagnoser._opts.to_stdin
- local resolved_path = validate_provider_request(builtin_diagnoser)
- if resolved_path then
- builtin_diagnoser._opts.command = resolved_path
- table.insert(M.requested_providers, builtin_diagnoser)
- Log:get_default().info("Using linter provider", builtin_diagnoser.name)
- else
- -- mark it here to avoid re-doing the lookup again
- register_failed_request(filetype, linter.exe, "linters")
- end
- end
- end
-
- null_ls.register { sources = M.requested_providers }
-end
-
-return M
diff --git a/lua/lsp/null-ls/formatters.lua b/lua/lsp/null-ls/formatters.lua
new file mode 100644
index 00000000..dd88fa60
--- /dev/null
+++ b/lua/lsp/null-ls/formatters.lua
@@ -0,0 +1,79 @@
+local M = {}
+local formatters_by_ft = {}
+
+local null_ls = require "null-ls"
+local services = require "lsp.null-ls.services"
+local logger = require("core.log"):get_default()
+
+local function list_names(formatters, options)
+ options = options or {}
+ local names = {}
+
+ local filter = options.filter or "supported"
+ for name, _ in pairs(formatters[filter]) do
+ table.insert(names, name)
+ end
+
+ return names
+end
+
+function M.list_supported_names(filetype)
+ if not formatters_by_ft[filetype] then
+ return {}
+ end
+ return list_names(formatters_by_ft[filetype], { filter = "supported" })
+end
+
+function M.list_unsupported_names(filetype)
+ if not formatters_by_ft[filetype] then
+ return {}
+ end
+ return list_names(formatters_by_ft[filetype], { filter = "unsupported" })
+end
+
+function M.list_available(filetype)
+ local formatters = {}
+ for _, provider in pairs(null_ls.builtins.formatting) do
+ -- TODO: Add support for wildcard filetypes
+ if vim.tbl_contains(provider.filetypes or {}, filetype) then
+ table.insert(formatters, provider.name)
+ end
+ end
+
+ return formatters
+end
+
+function M.list_configured(formatter_configs)
+ local formatters, errors = {}, {}
+
+ for _, fmt_config in ipairs(formatter_configs) do
+ local formatter = null_ls.builtins.formatting[fmt_config.exe]
+
+ if not formatter then
+ logger.error("Not a valid formatter:", fmt_config.exe)
+ errors[fmt_config.exe] = {} -- Add data here when necessary
+ else
+ local formatter_cmd = services.find_command(formatter._opts.command)
+ if not formatter_cmd then
+ logger.warn("Not found:", formatter._opts.command)
+ errors[fmt_config.exe] = {} -- Add data here when necessary
+ else
+ logger.info("Using formatter:", formatter_cmd)
+ formatters[fmt_config.exe] = formatter.with { command = formatter_cmd, args = fmt_config.args }
+ end
+ end
+ end
+
+ return { supported = formatters, unsupported = errors }
+end
+
+function M.setup(filetype, options)
+ if formatters_by_ft[filetype] and not options.force_reload then
+ return
+ end
+
+ formatters_by_ft[filetype] = M.list_configured(lvim.lang[filetype].formatters)
+ null_ls.register { sources = formatters_by_ft[filetype].supported }
+end
+
+return M
diff --git a/lua/lsp/null-ls/init.lua b/lua/lsp/null-ls/init.lua
new file mode 100644
index 00000000..8691982e
--- /dev/null
+++ b/lua/lsp/null-ls/init.lua
@@ -0,0 +1,44 @@
+local M = {}
+
+function M.list_supported_provider_names(filetype)
+ local names = {}
+
+ local formatters = require "lsp.null-ls.formatters"
+ local linters = require "lsp.null-ls.linters"
+
+ vim.list_extend(names, formatters.list_supported_names(filetype))
+ vim.list_extend(names, linters.list_supported_names(filetype))
+
+ return names
+end
+
+function M.list_unsupported_provider_names(filetype)
+ local names = {}
+
+ local formatters = require "lsp.null-ls.formatters"
+ local linters = require "lsp.null-ls.linters"
+
+ vim.list_extend(names, formatters.list_unsupported_names(filetype))
+ vim.list_extend(names, linters.list_unsupported_names(filetype))
+
+ return names
+end
+
+-- TODO: for linters and formatters with spaces and '-' replace with '_'
+function M.setup(filetype, options)
+ options = options or {}
+
+ local ok, _ = pcall(require, "null-ls")
+ if not ok then
+ require("core.log"):get_default().error "Missing null-ls dependency"
+ return
+ end
+
+ local formatters = require "lsp.null-ls.formatters"
+ local linters = require "lsp.null-ls.linters"
+
+ formatters.setup(filetype, options)
+ linters.setup(filetype, options)
+end
+
+return M
diff --git a/lua/lsp/null-ls/linters.lua b/lua/lsp/null-ls/linters.lua
new file mode 100644
index 00000000..780a9c4d
--- /dev/null
+++ b/lua/lsp/null-ls/linters.lua
@@ -0,0 +1,79 @@
+local M = {}
+local linters_by_ft = {}
+
+local null_ls = require "null-ls"
+local services = require "lsp.null-ls.services"
+local logger = require("core.log"):get_default()
+
+local function list_names(linters, options)
+ options = options or {}
+ local names = {}
+
+ local filter = options.filter or "supported"
+ for name, _ in pairs(linters[filter]) do
+ table.insert(names, name)
+ end
+
+ return names
+end
+
+function M.list_supported_names(filetype)
+ if not linters_by_ft[filetype] then
+ return {}
+ end
+ return list_names(linters_by_ft[filetype], { filter = "supported" })
+end
+
+function M.list_unsupported_names(filetype)
+ if not linters_by_ft[filetype] then
+ return {}
+ end
+ return list_names(linters_by_ft[filetype], { filter = "unsupported" })
+end
+
+function M.list_available(filetype)
+ local linters = {}
+ for _, provider in pairs(null_ls.builtins.diagnostics) do
+ -- TODO: Add support for wildcard filetypes
+ if vim.tbl_contains(provider.filetypes or {}, filetype) then
+ table.insert(linters, provider.name)
+ end
+ end
+
+ return linters
+end
+
+function M.list_configured(linter_configs)
+ local linters, errors = {}, {}
+
+ for _, lnt_config in pairs(linter_configs) do
+ local linter = null_ls.builtins.diagnostics[lnt_config.exe]
+
+ if not linter then
+ logger.error("Not a valid linter:", lnt_config.exe)
+ errors[lnt_config.exe] = {} -- Add data here when necessary
+ else
+ local linter_cmd = services.find_command(linter._opts.command)
+ if not linter_cmd then
+ logger.warn("Not found:", linter._opts.command)
+ errors[lnt_config.exe] = {} -- Add data here when necessary
+ else
+ logger.info("Using linter:", linter_cmd)
+ linters[lnt_config.exe] = linter.with { command = linter_cmd, args = lnt_config.args }
+ end
+ end
+ end
+
+ return { supported = linters, unsupported = errors }
+end
+
+function M.setup(filetype, options)
+ if linters_by_ft[filetype] and not options.force_reload then
+ return
+ end
+
+ linters_by_ft[filetype] = M.list_configured(lvim.lang[filetype].linters)
+ null_ls.register { sources = linters_by_ft[filetype].supported }
+end
+
+return M
diff --git a/lua/lsp/null-ls/services.lua b/lua/lsp/null-ls/services.lua
new file mode 100644
index 00000000..89073e5c
--- /dev/null
+++ b/lua/lsp/null-ls/services.lua
@@ -0,0 +1,55 @@
+local M = {}
+
+local logger = require("core.log"):get_default()
+
+local function find_root_dir()
+ if lvim.builtin.rooter.active then
+ --- use vim-rooter to set root_dir
+ vim.cmd "let root_dir = FindRootDirectory()"
+ return vim.api.nvim_get_var "root_dir"
+ end
+
+ -- TODO: Rework this to not make it javascript specific
+ --- use LSP to set root_dir
+ local lsp_utils = require "lsp.utils"
+ local ts_client = lsp_utils.get_active_client_by_ft "typescript"
+ if ts_client == nil then
+ logger.error "Unable to determine root directory since tsserver didn't start correctly"
+ return nil
+ end
+
+ return ts_client.config.root_dir
+end
+
+local function from_node_modules(command)
+ local root_dir = find_root_dir()
+ if not root_dir then
+ return nil
+ end
+
+ return root_dir .. "/node_modules/.bin/" .. command
+end
+
+local local_providers = {
+ prettier = { find = from_node_modules },
+ prettierd = { find = from_node_modules },
+ prettier_d_slim = { find = from_node_modules },
+ eslint_d = { find = from_node_modules },
+ eslint = { find = from_node_modules },
+}
+
+function M.find_command(command)
+ if local_providers[command] then
+ local local_command = local_providers[command].find(command)
+ if local_command and vim.fn.executable(local_command) == 1 then
+ return local_command
+ end
+ end
+
+ if vim.fn.executable(command) == 1 then
+ return command
+ end
+ return nil
+end
+
+return M
diff --git a/lua/lsp/utils.lua b/lua/lsp/utils.lua
new file mode 100644
index 00000000..e28c6085
--- /dev/null
+++ b/lua/lsp/utils.lua
@@ -0,0 +1,27 @@
+local M = {}
+
+function M.is_client_active(name)
+ local clients = vim.lsp.get_active_clients()
+ for _, client in pairs(clients) do
+ if client.name == name then
+ return true
+ end
+ end
+ return false
+end
+
+function M.get_active_client_by_ft(filetype)
+ if not lvim.lang[filetype] or not lvim.lang[filetype].lsp then
+ return nil
+ end
+
+ local clients = vim.lsp.get_active_clients()
+ for _, client in pairs(clients) do
+ if client.name == lvim.lang[filetype].lsp.provider then
+ return client
+ end
+ end
+ return nil
+end
+
+return M
diff --git a/lua/utils/init.lua b/lua/utils/init.lua
index 8264189d..0f42623b 100644
--- a/lua/utils/init.lua
+++ b/lua/utils/init.lua
@@ -99,55 +99,10 @@ function utils.reload_lv_config()
vim.cmd ":PackerCompile"
vim.cmd ":PackerInstall"
-- vim.cmd ":PackerClean"
- Log:get_default().info "Reloaded configuration"
-end
-
-function utils.check_lsp_client_active(name)
- local clients = vim.lsp.get_active_clients()
- for _, client in pairs(clients) do
- if client.name == name then
- return true
- end
- end
- return false
-end
-
-function utils.get_active_client_by_ft(filetype)
- local clients = vim.lsp.get_active_clients()
- for _, client in pairs(clients) do
- if client.name == lvim.lang[filetype].lsp.provider then
- return client
- end
- end
- return nil
-end
+ local null_ls = require "lsp.null-ls"
+ null_ls.setup(vim.bo.filetype, { force_reload = true })
--- TODO: consider porting this logic to null-ls instead
-function utils.get_supported_linters_by_filetype(filetype)
- local null_ls = require "null-ls"
- local matches = {}
- for _, provider in pairs(null_ls.builtins.diagnostics) do
- if vim.tbl_contains(provider.filetypes, filetype) then
- local provider_name = provider.name
-
- table.insert(matches, provider_name)
- end
- end
-
- return matches
-end
-
-function utils.get_supported_formatters_by_filetype(filetype)
- local null_ls = require "null-ls"
- local matches = {}
- for _, provider in pairs(null_ls.builtins.formatting) do
- if provider.filetypes and vim.tbl_contains(provider.filetypes, filetype) then
- -- table.insert(matches, { provider.name, ft })
- table.insert(matches, provider.name)
- end
- end
-
- return matches
+ Log:get_default().info "Reloaded configuration"
end
function utils.unrequire(m)
generated by cgit v1.2.3 (git 2.25.1) at 2025-10-25 04:51:54 +0000