Skip to content

plugins/treesitter: don't exclude nvim-treesitter from combining by default #3422

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jun 2, 2025

Conversation

stasjok
Copy link
Contributor

@stasjok stasjok commented Jun 2, 2025

Originally nvim-treesitter was added to standalonePlugins as workaround for NixOS/nixpkgs#321550.
Nvim-treesitter from nixpkgs don't include queries from upstream parsers anymore since NixOS/nixpkgs#344849.

If the user has some other plugin containing treesitter queries, this
change can cause a build failure due to collisions. But since it is
easier to add the plugin to standalonePlugins compared to removing it, I
think this should be the default.

…efault

Nvim-treesitter's parsers from nixpkgs don't include grammars anymore.
Originally it was added to standalonePlugins as workaround.
If the user has some other plugin containing treesitter queries, this
change can cause a build failure due to collisions. But since it is
easier to add the plugin to standalonePlugins compared to removing it, I
think this should be the default.
Copy link
Member

@MattSturgeon MattSturgeon left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Awesome 😎

@MattSturgeon

This comment has been minimized.

This comment has been minimized.

Copy link
Contributor

mergify bot commented Jun 2, 2025

This pull request, with head sha d063d0dd5e0b82d8be4dd4bc00b887ac1f92e4b2, has been successfully merged with fast-forward by Mergify.

This pull request will be automatically closed by GitHub.

As soon as GitHub detects that the sha d063d0dd5e0b82d8be4dd4bc00b887ac1f92e4b2 is part of the main branch, it will mark this pull request as merged.

It is possible for this pull request to remain open if this detection does not happen, this usually happens when a force-push is done on this branch combine-nvim-treesitter, this means GitHub will fail to detect the merge.

@mergify mergify bot merged commit d063d0d into nix-community:main Jun 2, 2025
4 checks passed
@mergify mergify bot temporarily deployed to github-pages June 2, 2025 21:00 Inactive
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants