diff --git a/lua/plugins/conform.lua b/lua/plugins/conform.lua index 51aae05..5f39242 100644 --- a/lua/plugins/conform.lua +++ b/lua/plugins/conform.lua @@ -13,26 +13,24 @@ return { -- Autoformat }, opts = { notify_on_error = false, - format_on_save = false, - -- format_on_save = function(bufnr) - -- -- Disable "format_on_save lsp_fallback" for languages that don't - -- -- have a well standardized coding style. You can add additional - -- -- languages here or re-enable it for the disabled ones. - -- local disable_filetypes = { c = true, cpp = true } - -- return { - -- timeout_ms = 500, - -- lsp_fallback = not disable_filetypes[vim.bo[bufnr].filetype], - -- } - -- end, + format_on_save = function(bufnr) + -- Disable "format_on_save lsp_fallback" for languages that don't + -- have a well standardized coding style. You can add additional + -- languages here or re-enable it for the disabled ones. + local disable_filetypes = { c = true, cpp = true } + return { + timeout_ms = 500, + lsp_fallback = not disable_filetypes[vim.bo[bufnr].filetype], + } + end, formatters_by_ft = { lua = { 'stylua' }, -- Conform can also run multiple formatters sequentially - python = { 'isort', 'black' }, + -- python = { "isort", "black" }, -- -- You can use a sub-list to tell conform to run *until* a formatter -- is found. - javascript = { { 'prettierd', 'prettier' } }, - java = { 'clang-format' }, + -- javascript = { { "prettierd", "prettier" } }, }, }, } diff --git a/lua/plugins/nvim-lspconfig.lua b/lua/plugins/nvim-lspconfig.lua index 3598b04..53047b2 100644 --- a/lua/plugins/nvim-lspconfig.lua +++ b/lua/plugins/nvim-lspconfig.lua @@ -171,7 +171,6 @@ return { -- LSP Configuration & Plugins pyright = {}, rust_analyzer = {}, zls = {}, - jdtls = {}, -- ... etc. See `:help lspconfig-all` for a list of all the pre-configured LSPs -- -- Some languages (like typescript) have entire language plugins that can be useful: