diff options
Diffstat (limited to 'lua/lsp/efm-general-ls.lua')
-rw-r--r-- | lua/lsp/efm-general-ls.lua | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/lua/lsp/efm-general-ls.lua b/lua/lsp/efm-general-ls.lua index 24bdde23..da01db12 100644 --- a/lua/lsp/efm-general-ls.lua +++ b/lua/lsp/efm-general-ls.lua @@ -15,13 +15,13 @@ local isort = {formatCommand = "isort --quiet -", formatStdin = true} local yapf = {formatCommand = "yapf --quiet", formatStdin = true} local black = {formatCommand = "black --quiet -", formatStdin = true} -if O.python.linter == 'flake8' then table.insert(python_arguments, flake8) end +if O.lang.python.linter == 'flake8' then table.insert(python_arguments, flake8) end -if O.python.isort then table.insert(python_arguments, isort) end +if O.lang.python.isort then table.insert(python_arguments, isort) end -if O.python.formatter == 'yapf' then +if O.lang.python.formatter == 'yapf' then table.insert(python_arguments, yapf) -elseif O.python.formatter == 'black' then +elseif O.lang.python.formatter == 'black' then table.insert(python_arguments, black) end @@ -38,9 +38,9 @@ local lua_fmt = { formatStdin = true } -if O.lua.formatter == 'lua-format' then +if O.lang.lua.formatter == 'lua-format' then table.insert(lua_arguments, luaFormat) -elseif O.lua.formatter == 'lua-fmt' then +elseif O.lang.lua.formatter == 'lua-fmt' then table.insert(lua_arguments, lua_fmt) end @@ -54,9 +54,9 @@ local shellcheck = { lintFormats = {'%f:%l:%c: %trror: %m', '%f:%l:%c: %tarning: %m', '%f:%l:%c: %tote: %m'} } -if O.sh.formatter == 'shfmt' then table.insert(sh_arguments, shfmt) end +if O.lang.sh.formatter == 'shfmt' then table.insert(sh_arguments, shfmt) end -if O.sh.linter == 'shellcheck' then table.insert(sh_arguments, shellcheck) end +if O.lang.sh.linter == 'shellcheck' then table.insert(sh_arguments, shellcheck) end -- tsserver/web javascript react, vue, json, html, css, yaml local prettier = {formatCommand = "prettier --stdin-filepath ${INPUT}", formatStdin = true} @@ -74,9 +74,9 @@ local eslint = { local tsserver_args = {} -if O.tsserver.formatter == 'prettier' then table.insert(tsserver_args, prettier) end +if O.lang.tsserver.formatter == 'prettier' then table.insert(tsserver_args, prettier) end -if O.tsserver.linter == 'eslint' then table.insert(tsserver_args, eslint) end +if O.lang.tsserver.linter == 'eslint' then table.insert(tsserver_args, eslint) end -- local markdownlint = { -- -- TODO default to global lintrc |