From add8d82c78c55d9f1697274e0514aacaef8ace1b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micka=C3=ABl=20Fortunato?= Date: Sat, 16 Aug 2025 22:31:40 +0200 Subject: [PATCH 1/2] languages/elixir: add HEEx and EEx treesitter grammars --- docs/release-notes/rl-0.8.md | 5 +++++ modules/plugins/languages/elixir.nix | 8 +++++++- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/docs/release-notes/rl-0.8.md b/docs/release-notes/rl-0.8.md index b677ae98..09b37878 100644 --- a/docs/release-notes/rl-0.8.md +++ b/docs/release-notes/rl-0.8.md @@ -486,3 +486,8 @@ - Add [roslyn-ls] to the `vim.languages.csharp` module. - Added json support under `vim.languages.json` using [jsonls] and [jsonfmt]. + +[Morsicus](https://github.com/Morsicus): + +- 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 diff --git a/modules/plugins/languages/elixir.nix b/modules/plugins/languages/elixir.nix index 20d6c668..12c8a517 100644 --- a/modules/plugins/languages/elixir.nix +++ b/modules/plugins/languages/elixir.nix @@ -56,6 +56,8 @@ in { treesitter = { enable = mkEnableOption "Elixir treesitter" // {default = config.vim.languages.enableTreesitter;}; package = mkGrammarOption pkgs "elixir"; + heexPackage = mkGrammarOption pkgs "heex"; + eexPackage = mkGrammarOption pkgs "eex"; }; lsp = { @@ -91,7 +93,11 @@ 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.package + cfg.treesitter.heexPackage + cfg.treesitter.eexPackage + ]; }) (mkIf cfg.lsp.enable { From a5ef2d032d3c1985a6d9bd22dd19c8e22685b440 Mon Sep 17 00:00:00 2001 From: Poseidon Date: Thu, 21 Aug 2025 15:31:52 -0400 Subject: [PATCH 2/2] docs: fixup release notes from main -> v0.8 merge (#1098) * Merge seperate sections for 'Cool-Game-Dev' Merge separate release notes sections for `Cool-Game-Dev` * Rename `Cool-Game-Dev` to `Poseidon` in release notes I have changed my username since I started contributing, this fixes the username link and display text. --- docs/release-notes/rl-0.8.md | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/docs/release-notes/rl-0.8.md b/docs/release-notes/rl-0.8.md index 6b1b6369..6136705d 100644 --- a/docs/release-notes/rl-0.8.md +++ b/docs/release-notes/rl-0.8.md @@ -484,21 +484,15 @@ - fix broken `neorg` grammars - remove obsolete warning in the `otter` module -[Cool-Game-Dev](https://github.com/Cool-Game-Dev): - -[nvim-biscuits]: https://github.com/code-biscuits/nvim-biscuits - -- Add [nvim-biscuits] to show block context. Available at - `vim.utility.nvim-biscuits`. - [JManch](https://github.com/JManch): - Fix default [blink.cmp] sources "path" and "buffer" not working when `autocomplete.nvim-cmp.enable` was disabled and `autocomplete.nvim-cmp.sources` had not been modified. -[Cool-Game-Dev](https://github.com/Cool-Game-Dev): +[Poseidon](https://github.com/poseidon-rises): +[nvim-biscuits]: https://github.com/code-biscuits/nvim-biscuits [just-lsp]: https://github.com/terror/just-lsp [roslyn-ls]: https://github.com/dotnet/vscode-csharp [jsonls]: https://github.com/microsoft/vscode/tree/1.101.2/extensions/json-language-features/server @@ -509,6 +503,7 @@ [qmlls]: https://doc.qt.io/qt-6/qtqml-tooling-qmlls.html [qmlformat]: https://doc.qt.io/qt-6/qtqml-tooling-qmlformat.html +- Add [nvim-biscuits] support under `vim.utility.nvim-biscuits`. - Add just support under `vim.languages.just` using [just-lsp]. - Add [roslyn-ls] to the `vim.languages.csharp` module. - Add JSON support under `vim.languages.json` using [jsonls] and [jsonfmt].