NotAShelf/nvf
2
1
Fork 0
mirror of https://github.com/NotAShelf/nvf.git synced 2025-09-06 18:31:35 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Merge pull request #1078 from diced/fix-ts

Browse source 
languages/ts: add `typescript` treesitter grammar
This commit is contained in:
raf 2025-08-22 09:10:58 +03:00 • committed by GitHub
commit d36996c8ba
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 12 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

5
docs/release-notes/rl-0.8.md
View file

@ -517,3 +517,8 @@
- Add [EEx Treesitter Grammar](https://github.com/connorlay/tree-sitter-eex) for Elixir - 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 - 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.

9
modules/plugins/languages/ts.nix
View file

@ -219,7 +219,8 @@ in {
treesitter = { treesitter = {
enable = mkEnableOption "Typescript/Javascript treesitter" // {default = config.vim.languages.enableTreesitter;}; 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"; jsPackage = mkGrammarOption pkgs "javascript";
}; };
@ -283,7 +284,11 @@ in {
config = mkIf cfg.enable (mkMerge [ config = mkIf cfg.enable (mkMerge [
(mkIf cfg.treesitter.enable { (mkIf cfg.treesitter.enable {
vim.treesitter.enable = true; 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 { (mkIf cfg.lsp.enable {