From 9d1cec158bdcf9b4a8fe069e29d9d067dfb2c199 Mon Sep 17 00:00:00 2001
From: Snoweuph <snow@euph.email>
Date: Wed, 18 Feb 2026 11:53:04 +0100
Subject: [PATCH] language/go: correct treesitter filetypes and package options
 (#1402)

---
 docs/manual/release-notes/rl-0.9.md | 14 ++++++++++++++
 modules/plugins/languages/go.nix    | 16 +++++++++++++---
 2 files changed, 27 insertions(+), 3 deletions(-)

diff --git a/docs/manual/release-notes/rl-0.9.md b/docs/manual/release-notes/rl-0.9.md
index d5931113..93961818 100644
--- a/docs/manual/release-notes/rl-0.9.md
+++ b/docs/manual/release-notes/rl-0.9.md
@@ -27,6 +27,20 @@
 
 [Snoweuph](https://github.com/snoweuph)
 
+- "Correct `languages.go.treesitter` to contain all Go file types.
+  `languages.go.treesitter.package` is now `languages.go.treesitter.goPackage`.
+  New are:
+
+  - `languages.go.treesitter.goPackage`.
+
+  - `languages.go.treesitter.gomodPackage`.
+
+  - `languages.go.treesitter.gosumPackage`.
+
+  - `languages.go.treesitter.goworkPackage`.
+
+  - `languages.go.treesitter.gotmplPackage`.
+
 - Fix `vim.assistant.codecompanion-nvim.setupOpts.display.diff.provider` to only
   allow valid options. `default` is no longer valid. `inline` and `split` are
   two new valid options.
diff --git a/modules/plugins/languages/go.nix b/modules/plugins/languages/go.nix
index bfaafd0d..da3700a7 100644
--- a/modules/plugins/languages/go.nix
+++ b/modules/plugins/languages/go.nix
@@ -20,7 +20,7 @@
   servers = {
     gopls = {
       cmd = [(getExe pkgs.gopls)];
-      filetypes = ["go" "gomod" "gowork" "gotmpl"];
+      filetypes = ["go" "gomod" "gosum" "gowork" "gotmpl"];
       root_dir = mkLuaInline ''
         function(bufnr, on_dir)
           local fname = vim.api.nvim_buf_get_name(bufnr)
@@ -170,7 +170,11 @@ in {
     treesitter = {
       enable = mkEnableOption "Go treesitter" // {default = config.vim.languages.enableTreesitter;};
 
-      package = mkGrammarOption pkgs "go";
+      goPackage = mkGrammarOption pkgs "go";
+      gomodPackage = mkGrammarOption pkgs "gomod";
+      gosumPackage = mkGrammarOption pkgs "gosum";
+      goworkPackage = mkGrammarOption pkgs "gowork";
+      gotmplPackage = mkGrammarOption pkgs "gotmpl";
     };
 
     lsp = {
@@ -232,7 +236,13 @@ in {
   config = mkIf cfg.enable (mkMerge [
     (mkIf cfg.treesitter.enable {
       vim.treesitter.enable = true;
-      vim.treesitter.grammars = [cfg.treesitter.package];
+      vim.treesitter.grammars = [
+        cfg.treesitter.goPackage
+        cfg.treesitter.gomodPackage
+        cfg.treesitter.gosumPackage
+        cfg.treesitter.goworkPackage
+        cfg.treesitter.gotmplPackage
+      ];
     })
 
     (mkIf cfg.lsp.enable {