Revert "vimPlugins.nvim-treesitter: collate grammars"

[PerchunPak]

Description of changes

This reverts PR #319233. It caused a lot of weird regressions and a lot of headaches for me. Even a 20% improvement isn't worth it. Also see #319233 (comment)

In addition, I added a workaround for #332580 as it is also a very annoying regression that will reappear after merging this (minimal reproduction example: #332580 (comment))

Fixes #341442

Things done

• Built on platform(s)
  • x86_64-linux
  • aarch64-linux
  • x86_64-darwin
  • aarch64-darwin
• For non-Linux: Is sandboxing enabled in nix.conf? (See Nix manual)
  • sandbox = relaxed
  • sandbox = true
• Tested, as applicable:
  • NixOS test(s) (look inside nixos/tests)
  • and/or package tests
  • or, for functions and "core" functionality, tests in lib/tests or pkgs/test
  • made sure NixOS tests are linked to the relevant packages
• Tested compilation of all packages that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage
• Tested basic functionality of all binary files (usually in ./result/bin/)
• 24.11 Release Notes (or backporting 23.11 and 24.05 Release notes)
  • (Package updates) Added a release notes entry if the change is major or breaking
  • (Module updates) Added a release notes entry if the change is significant
  • (Module addition) Added a release notes entry if adding a new NixOS module
• Fits CONTRIBUTING.md.

CC @figsoda, @BirdeeHub
@MangoIV, could you try this with koka? Treesitter didn't detect its grammar for some reason for me

---

Add a 👍 reaction to pull requests you find important.

[PerchunPak]

Result of nixpkgs-review pr 341079 run on x86_64-linux 1

2 packages built:

• vimPlugins.nvim-treesitter-parsers.nix
• vimPluginsUpdater

Result of nixpkgs-review pr 341079 run on (emulated) aarch64-linux 1

2 packages built:

• vimPlugins.nvim-treesitter-parsers.nix
• vimPluginsUpdater

[BirdeeHub]

This is a straight up revert, yes? Im ok with that. It does cause weird things when multiple things add grammars because now you have 2 bundled grammar balls with the same name instead of just 1

The workaround added is ok I think? You likely know more about if thats a good solution or not than I do right now. Id like to see a fix get pushed to the nix grammar eventually for that.

[BirdeeHub]

Result of nixpkgs-review pr 341079 run on x86_64-linux 1

2 packages built:

• vimPlugins.nvim-treesitter-parsers.nix
• vimPluginsUpdater

[stephen-huan]

Apologies again and thanks for handling this @PerchunPak!

For posterity, what do #332580 and #321550 have to do with #319233?

[PerchunPak]

For posterity, what do #332580 and #321550 have to do with #319233?

#319233 accidentally reverted #321550 and #321550 introduced a very annoying regression described in #332580. On every key press in nix file, there was an error emitted

[PerchunPak]

This is a straight up revert, yes?

Yes, it is

It does cause weird things when multiple things add grammars because now you have 2 bundled grammar balls with the same name instead of just 1

Treesitter should prefer the first grammar it finds, as stated in :help treesitter, and looks like this behavior was fine for everyone

Parsers are searched for as parser/{lang}.* in any 'runtimepath' directory.
If multiple parsers for the same language are found, the first one is used.
(NOTE: This typically implies the priority "user config > plugins > bundled".)

---

Id like to see a fix get pushed to the nix grammar eventually for that.

That's for upstream to work on, I don't know anything about writing queries for treesitter
nix-community/tree-sitter-nix#84

[BirdeeHub]

LGTM then!

[GaetanLepage]

LGTM