Unterstützung für jsonc

5 files changed, 12 insertions, 6 deletions

diff --git a/nvim/ftplugin/json.lua b/nvim/ftplugin/json.lua
index a6321ff..73b5935 100644
--- a/nvim/ftplugin/json.lua
+++ b/nvim/ftplugin/json.lua
@@ -1,5 +1,3 @@
-local opt = vim.opt_local
-
-opt.expandtab = true
-opt.shiftwidth = 2
-opt.tabstop = 2
+-- Standard-Dateityp für .json-Dateien ist "jsonc" (siehe lua/config/filetypes.lua).
+-- Buffer, deren Dateityp explizit "json" ist, erben dieselben Einstellungen.
+vim.cmd("runtime! ftplugin/jsonc.lua")
diff --git a/nvim/ftplugin/jsonc.lua b/nvim/ftplugin/jsonc.lua
new file mode 100644
index 0000000..a6321ff
--- /dev/null
+++ b/nvim/ftplugin/jsonc.lua
@@ -0,0 +1,5 @@
+local opt = vim.opt_local
+
+opt.expandtab = true
+opt.shiftwidth = 2
+opt.tabstop = 2
diff --git a/nvim/lua/config/filetypes.lua b/nvim/lua/config/filetypes.lua
index 3161d40..37b1b65 100644
--- a/nvim/lua/config/filetypes.lua
+++ b/nvim/lua/config/filetypes.lua
@@ -37,6 +37,7 @@ vim.treesitter.language.register("yaml", M.ANSIBLE_YAML)
 vim.filetype.add({
   extension = {
     j2 = "jinja",
+    json = "jsonc",
   },
 })
 
diff --git a/nvim/lua/config/treesitter.lua b/nvim/lua/config/treesitter.lua
index f122f37..de71d50 100644
--- a/nvim/lua/config/treesitter.lua
+++ b/nvim/lua/config/treesitter.lua
@@ -10,7 +10,8 @@ M.languages = {
   -- "jinja",
   -- "jinja_inline",
   "jq",
-  "json",
+  "json", -- weiterhin nötig für Injections, z.B. ```json in Markdown
+  "jsonc",
   "lua",
   "make",
   "markdown",
diff --git a/nvim/lua/plugins/format.lua b/nvim/lua/plugins/format.lua
index 8b40229..ce3f4e7 100644
--- a/nvim/lua/plugins/format.lua
+++ b/nvim/lua/plugins/format.lua
@@ -33,6 +33,7 @@ return {
       javascript = prettier,
       jinja = djlint,
       json = jq,
+      jsonc = prettier,
       lua = stylua,
       python = ruff,
       sh = shfmt,