diff options
| author | Chris <[email protected]> | 2021-03-28 19:18:00 -0400 |
|---|---|---|
| committer | Chris <[email protected]> | 2021-03-28 19:18:00 -0400 |
| commit | cd764de1bf36e5c211fce9f34221994605dd4578 (patch) | |
| tree | 3d46af9b844e4b04dcc53484f8b8ff60596beb1e /lua/lsp | |
| parent | e1b725beb0f7634104bf802c3ca84d58bec332f8 (diff) | |
| parent | 94444afe20aa55266b82dd6f54b41aef65d5fd66 (diff) | |
Merge branch 'master' of github.com:ChristianChiarulli/nvcode
Diffstat (limited to 'lua/lsp')
| -rw-r--r-- | lua/lsp/efm-general-ls.lua | 3 | ||||
| -rw-r--r-- | lua/lsp/go-ls.lua | 4 | ||||
| -rw-r--r-- | lua/lsp/rust-ls.lua | 5 |
3 files changed, 12 insertions, 0 deletions
diff --git a/lua/lsp/efm-general-ls.lua b/lua/lsp/efm-general-ls.lua index db9ffbcb..39a63c78 100644 --- a/lua/lsp/efm-general-ls.lua +++ b/lua/lsp/efm-general-ls.lua @@ -13,6 +13,7 @@ local flake8 = { local isort = {formatCommand = "isort --quiet -", formatStdin = true} local yapf = {formatCommand = "yapf --quiet", formatStdin = true} +local black = {formatCommand = "black --quiet --stdin-filename ", formatStdin = true} if O.python.linter == 'flake8' then table.insert(python_arguments, flake8) @@ -20,6 +21,8 @@ end if O.python.formatter == 'yapf' then table.insert(python_arguments, yapf) +elseif O.python.formatter == 'black' then + table.insert(python_arguments, black) end if O.python.isort then diff --git a/lua/lsp/go-ls.lua b/lua/lsp/go-ls.lua new file mode 100644 index 00000000..d9df138e --- /dev/null +++ b/lua/lsp/go-ls.lua @@ -0,0 +1,4 @@ +require'lspconfig'.gopls.setup{ + cmd = {DATA_PATH .. "/lspinstall/go/gopls"}, + on_attach = require'lsp'.common_on_attach +} diff --git a/lua/lsp/rust-ls.lua b/lua/lsp/rust-ls.lua new file mode 100644 index 00000000..377a31e5 --- /dev/null +++ b/lua/lsp/rust-ls.lua @@ -0,0 +1,5 @@ +require'lspconfig'.rust_analyzer.setup{ + cmd = {DATA_PATH .. "/lspinstall/rust/rust-analyzer"}, + on_attach = require'lsp'.common_on_attach +} + |