Skip to content
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

fixup(ts): put ts_query_cursor_set_match_limit behind feature guard #14930

Merged
merged 1 commit into from
Jun 29, 2021
Merged

fixup(ts): put ts_query_cursor_set_match_limit behind feature guard #14930

merged 1 commit into from
Jun 29, 2021

Conversation

clason
Copy link
Member

@clason clason commented Jun 29, 2021

This is a fixup for #14915, which used the above-mentioned call to restore the behavior of the pre-release version of tree-sitter to that of 0.19.5. However, this function was introduced after 0.19.5, breaking distro builds that link against 0.19.5 instead of the tag specified in neovim's build script.

Now the function should only be called when it is available and needed. This now builds against both the pre-release tag (with the fix) and 0.19.5 (without the fix). Also tested with brew install neovim --HEAD @carlocab

Once tree-sitter is bumped to 0.19.6 (when this is released), this guard can be removed again.

Fixes #14923 (among others)

@clason clason requested review from bfredl and jamessan June 29, 2021 14:13
@github-actions github-actions bot added build building and installing Neovim using the provided scripts tree-sitter labels Jun 29, 2021
CMakeLists.txt Show resolved Hide resolved
@carlocab
Copy link
Contributor

Thanks, @clason. Apologies for the extra code you have to carry around for these annoying package managers 🙂

src/nvim/lua/treesitter.c Outdated Show resolved Hide resolved
This is a fixup for #14915, which used the above-mentioned call to
restore the behavior of the pre-release version of tree-sitter to
that of 0.19.5. However, this function was introduced after 0.19.5,
breaking distro builds that link against 0.19.5 instead of the tag
specified in neovim's build script.

Now the function should only be called when it is available _and_
needed. Once tree-sitter is bumped to 0.19.6 (when this is released),
this guard can be removed again.

Fixes #14923 (among others)
@bfredl bfredl merged commit 384f987 into neovim:master Jun 29, 2021
@clason clason deleted the ts-ifdef-fixup branch June 29, 2021 20:25
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
build building and installing Neovim using the provided scripts treesitter
Projects
None yet
Development

Successfully merging this pull request may close these issues.

brew install --HEAD neovim fails: Undefined symbols for architecture x86_64
4 participants