From c303f4a474aa2675d0cec90b6f1ff06b0a138a87 Mon Sep 17 00:00:00 2001 From: "Christoph J. Scherr" Date: Fri, 9 Feb 2024 15:29:17 +0100 Subject: [PATCH] djlint and formatting improvements --- lua/custom/mappings.lua | 2 +- lua/custom/plugins.lua | 15 ++++++--------- 2 files changed, 7 insertions(+), 10 deletions(-) diff --git a/lua/custom/mappings.lua b/lua/custom/mappings.lua index 42a15d1..0dcfdc2 100644 --- a/lua/custom/mappings.lua +++ b/lua/custom/mappings.lua @@ -410,7 +410,7 @@ M.edit = { -- format with conform ["ff"] = { function() - require("conform").format() + vim.lsp.buf.format() end, "format buffer", }, diff --git a/lua/custom/plugins.lua b/lua/custom/plugins.lua index cb96d77..fbb1d0e 100644 --- a/lua/custom/plugins.lua +++ b/lua/custom/plugins.lua @@ -580,15 +580,12 @@ local plugins = { local nls = require "null-ls" local builtins = nls.builtins local sources = { - builtins.formatting.black, - builtins.formatting.fixjson, - builtins.formatting.golines, - builtins.formatting.shellharden, - builtins.formatting.sql_formatter, - builtins.diagnostics.mypy, - builtins.diagnostics.vint, - builtins.diagnostics.yamllint, - builtins.code_actions.shellcheck, + builtins.formatting.djlint.with { + filetypes = { "django", "jinja.html", "htmldjango", "tera", "html" }, + }, + builtins.diagnostics.djlint.with { + filetypes = { "django", "jinja.html", "htmldjango", "tera", "html" }, + }, builtins.formatting.shfmt, builtins.diagnostics.write_good.with { diagnostics_postprocess = function(diagnostic)