fix: make sure queries are copied to the right place

[ckipp01]

I noticed that the queries in nvim-treesitter and this repo have
diverged, but we never got an error here. I think this was a regression
introduced in
7d348f5.

[eed3si9n]

Thanks!

[ckipp01]

Don't merge this yet, this should be failing, so something still isn't right.

EDIT:

Alright so this does catch them now. I'll sync some stuff that nvim doesn't have yet first in nvim-treesitter/nvim-treesitter#4920, and then I'll sync back the other way because we are missing a change from there as well. Then I'll update this and it should be 🟢 .

[ckipp01]

So I sort of forgot about this, but it's failing right now and it's somewhat expected. Basically some of the improvements that were added by @ghostbuster91 in #196 are great and they follow the upstream locals way of doing things. However, this is one area where nvim-treesitter differs. So if we sync the local queries here, it won't be quite as accurate. I'm sort of inclined to update the check to only check against the actual hightlights.scm file since the locals.scm will be different. Anyone have thoughts on this?

[susliko]

I'd suggest being explicit about the fact that queries are system-specific (as far as I remember, there are also nvim-specific captures for highlights, not only locals). For example, we could have a structure like

queries
  (highlights|locals).scm - vanilla tree-sitter
integrations
  nvim
    queries
      (highlights|locals|etc.).scm

And check only queries/* in the Ci

In this scheme queries from integrations/nvim/ should probably be a source of truth for nvim queries, and be synced to nvim-treesitter upon changes here

[ghostbuster91]

I'd suggest being explicit about the fact that queries are system-specific

👍

I would not revert the changes in the locals.scm as there might be other editors that use treestitter (e.g. kakune, helix), that could benefit from these definitions.

[ckipp01]

Just commenting that I haven't forgotten about this, 😬 just been busy lately with other things. I'll try to return soon.

[ckipp01]

Closing this just because I won't have time to work on it.