-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #27 from raelldottin/dev
Dev
- Loading branch information
Showing
6 changed files
with
151 additions
and
153 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,70 +1,66 @@ | ||
| local mason_status, mason = pcall(require, "mason") | ||
| if not mason_status then | ||
| return | ||
| return | ||
| end | ||
|
|
||
| -- import mason-lspconfig plugin safely | ||
| local mason_lspconfig_status, mason_lspconfig = pcall(require, "mason-lspconfig") | ||
| if not mason_lspconfig_status then | ||
| return | ||
| return | ||
| end | ||
|
|
||
| -- import mason-null-ls plugin safely | ||
| local mason_null_ls_status, mason_null_ls = pcall(require, "mason-null-ls") | ||
| if not mason_null_ls_status then | ||
| return | ||
| return | ||
| end | ||
|
|
||
| -- enable mason | ||
| mason.setup({ | ||
| ui = { | ||
| icons = { | ||
| package_installed = "✓", | ||
| package_pending = "➜", | ||
| package_uninstalled = "✗", | ||
| }, | ||
| }, | ||
| ui = { | ||
| icons = { | ||
| package_installed = "✓", | ||
| package_pending = "➜", | ||
| package_uninstalled = "✗", | ||
| }, | ||
| }, | ||
| }) | ||
|
|
||
| mason_lspconfig.setup({ | ||
| -- list of servers for mason to install | ||
| ensure_installed = { | ||
| "bashls", | ||
| "clangd", | ||
| "dockerls", | ||
| "golangci_lint_ls", | ||
| "gopls", | ||
| "jsonls", | ||
| "lua_ls", | ||
| "prosemd_lsp", | ||
| "marksman", | ||
| "powershell_es", | ||
| "terraformls", | ||
| "tflint", | ||
| }, | ||
| -- auto-install configured servers (with lspconfig) | ||
| automatic_installation = true, -- not the same as ensure_installed | ||
| -- list of servers for mason to install | ||
| ensure_installed = { | ||
| "bashls", | ||
| "clangd", | ||
| "dockerls", | ||
| "golangci_lint_ls", | ||
| "gopls", | ||
| "jsonls", | ||
| "lua_ls", | ||
| "prosemd_lsp", | ||
| "marksman", | ||
| "terraformls", | ||
| "tflint", | ||
| }, | ||
| -- auto-install configured servers (with lspconfig) | ||
| automatic_installation = true, -- not the same as ensure_installed | ||
| }) | ||
|
|
||
| mason_null_ls.setup({ | ||
| -- list of formatters & linters for mason to install | ||
| ensure_installed = { | ||
| "cpplint", | ||
| "clang_format", | ||
| "hadolint", | ||
| "gitlint", | ||
| "gofumpt", | ||
| "stylua", | ||
| "alex", | ||
| "autopep8", | ||
| "black", | ||
| "pyright", | ||
| "pylint", | ||
| "shellcheck", | ||
| "shellharden", | ||
| "shfmt", | ||
| "stylua", -- lua formatter | ||
| }, | ||
| -- auto-install configured formatters & linters (with null-ls) | ||
| automatic_setup = false, | ||
| -- list of formatters & linters for mason to install | ||
| ensure_installed = { | ||
| "cpplint", | ||
| "clang_format", | ||
| "hadolint", | ||
| "gitlint", | ||
| "gofumpt", | ||
| "stylua", | ||
| "alex", | ||
| "black", | ||
| "pylint", | ||
| "shellcheck", | ||
| "shfmt", | ||
| "stylua", -- lua formatter | ||
| }, | ||
| -- auto-install configured formatters & linters (with null-ls) | ||
| automatic_setup = true, | ||
| }) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -125,6 +125,7 @@ python-packaging | |
| python-psutil | ||
| python-setuptools | ||
| [email protected] | ||
| [email protected] | ||
| pyyaml | ||
| readline | ||
| reattach-to-user-namespace | ||
|
|
||