From c8bb625a887ed07911569e7869ceaee468da6abf Mon Sep 17 00:00:00 2001 From: diced Date: Tue, 12 Aug 2025 19:43:36 -0700 Subject: [PATCH 1/2] languages/ts: add typescript treesitter grammar --- modules/plugins/languages/ts.nix | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/modules/plugins/languages/ts.nix b/modules/plugins/languages/ts.nix index 9f15ff24..40e598ae 100644 --- a/modules/plugins/languages/ts.nix +++ b/modules/plugins/languages/ts.nix @@ -219,7 +219,8 @@ in { treesitter = { enable = mkEnableOption "Typescript/Javascript treesitter" // {default = config.vim.languages.enableTreesitter;}; - tsPackage = mkGrammarOption pkgs "tsx"; + tsPackage = mkGrammarOption pkgs "typescript"; + tsxPackage = mkGrammarOption pkgs "tsx"; jsPackage = mkGrammarOption pkgs "javascript"; }; @@ -283,7 +284,11 @@ in { config = mkIf cfg.enable (mkMerge [ (mkIf cfg.treesitter.enable { vim.treesitter.enable = true; - vim.treesitter.grammars = [cfg.treesitter.tsPackage cfg.treesitter.jsPackage]; + vim.treesitter.grammars = [ + cfg.treesitter.tsPackage + cfg.treesitter.tsxPackage + cfg.treesitter.jsPackage + ]; }) (mkIf cfg.lsp.enable { From 77c642935d67aa61977e5dc8840afa6c0f67d6a3 Mon Sep 17 00:00:00 2001 From: diced Date: Tue, 12 Aug 2025 19:50:24 -0700 Subject: [PATCH 2/2] docs(rl): add ts treesitter fix entry --- docs/release-notes/rl-0.8.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/docs/release-notes/rl-0.8.md b/docs/release-notes/rl-0.8.md index 20140624..7c92ee80 100644 --- a/docs/release-notes/rl-0.8.md +++ b/docs/release-notes/rl-0.8.md @@ -517,3 +517,8 @@ - Add [EEx Treesitter Grammar](https://github.com/connorlay/tree-sitter-eex) for Elixir - Add [HEEx Treesitter Grammar](https://github.com/phoenixframework/tree-sitter-heex) for Elixir + +[diced](https://github.com/diced): + +- Fixed `typescript` treesitter grammar not being included by default. +