diff --git a/symlinks/config/nvim/lua/esensar/lsp/diagnostic.lua b/symlinks/config/nvim/lua/esensar/lsp/diagnostic.lua index 02f5897..3b58044 100644 --- a/symlinks/config/nvim/lua/esensar/lsp/diagnostic.lua +++ b/symlinks/config/nvim/lua/esensar/lsp/diagnostic.lua @@ -2,55 +2,57 @@ -- - LSP diagnostics config - ------------------------------------------------------------------------------- -require("formatter").setup({ - filetype = { - python = { - require("formatter.filetypes.python").isort, - require("formatter.filetypes.python").autopep8, +if not vim.g.disable_formatting then + require("formatter").setup({ + filetype = { + python = { + require("formatter.filetypes.python").isort, + require("formatter.filetypes.python").autopep8, + }, + kotlin = { + require("formatter.filetypes.kotlin").ktlint, + require("formatter.filetypes.kotlin").detekt, + }, + cpp = { + require("formatter.filetypes.cpp").clangformat, + }, + c = { + require("formatter.filetypes.c").clangformat, + }, + cmake = { + require("formatter.filetypes.cmake").cmakeformat, + }, + lua = { + require("formatter.filetypes.lua").stylua, + }, + dart = { + require("formatter.filetypes.dart").dartformat, + }, + go = { + require("formatter.filetypes.go").gofmt, + }, + rust = { + require("formatter.filetypes.rust").rustfmt, + }, + zig = { + require("formatter.filetypes.zig").zigfmt, + }, + java = { + require("esensar.lsp.formatters.clang-format-java"), + }, + godot = { + require("esensar.lsp.formatters.gdformat"), + }, + xml = { + require("formatter.filetypes.xml").xmlformat, + require("formatter.filetypes.xml").xmllint, + }, + ["*"] = { + require("formatter.filetypes.any").remove_trailing_whitespace, + }, }, - kotlin = { - require("formatter.filetypes.kotlin").ktlint, - require("formatter.filetypes.kotlin").detekt, - }, - cpp = { - require("formatter.filetypes.cpp").clangformat, - }, - c = { - require("formatter.filetypes.c").clangformat, - }, - cmake = { - require("formatter.filetypes.cmake").cmakeformat, - }, - lua = { - require("formatter.filetypes.lua").stylua, - }, - dart = { - require("formatter.filetypes.dart").dartformat, - }, - go = { - require("formatter.filetypes.go").gofmt, - }, - rust = { - require("formatter.filetypes.rust").rustfmt, - }, - zig = { - require("formatter.filetypes.zig").zigfmt, - }, - java = { - require("esensar.lsp.formatters.clang-format-java"), - }, - godot = { - require("esensar.lsp.formatters.gdformat"), - }, - xml = { - require("formatter.filetypes.xml").xmlformat, - require("formatter.filetypes.xml").xmllint, - }, - ["*"] = { - require("formatter.filetypes.any").remove_trailing_whitespace, - }, - }, -}) + }) +end require("lint").linters_by_ft = { python = { "flake8" }, @@ -103,7 +105,9 @@ vim.api.nvim_create_user_command("Format", vim.lsp.buf.format, { desc = "Format -- Auto linting vim.api.nvim_create_autocmd({ "BufWritePost" }, { callback = function() - vim.cmd("FormatWrite") + if not vim.g.disable_formatting then + vim.cmd("FormatWrite") + end require("lint").try_lint() require("lint").try_lint({ "codespell" }) require("lint").try_lint({ "misspell" })