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

Use standard injection.language and injection.content captures #22268

Merged

Conversation

uncenter
Copy link
Contributor

Closes #9656. Continuation of #9654, but with the addition of backwards compatibility for the existing captures.

Release Notes:

  • Improved Tree-sitter support with added compatibility for standard injections captures

@cla-bot cla-bot bot added the cla-signed The user has signed the Contributor License Agreement label Dec 19, 2024
@maxbrunsfeld
Copy link
Collaborator

Thanks! Sorry for the review delay. Can you resolve the conflicts? I think those extensions were extracted to separate repos.

@uncenter uncenter force-pushed the standard-injections-captures branch from 0d6e699 to 81491f6 Compare January 7, 2025 03:46
@uncenter uncenter changed the title Support standard injection.language and injection.content injections captures Use standard injection.language and injection.content captures Jan 7, 2025
@uncenter
Copy link
Contributor Author

uncenter commented Jan 7, 2025

Going to also update the docs while we are at real quick...

@uncenter uncenter requested a review from maxbrunsfeld January 7, 2025 03:55
@maxbrunsfeld maxbrunsfeld added this pull request to the merge queue Jan 7, 2025
@github-merge-queue github-merge-queue bot removed this pull request from the merge queue due to failed status checks Jan 7, 2025
@uncenter
Copy link
Contributor Author

uncenter commented Jan 7, 2025

Test failure of file_finder_tests::test_selected_match_stays_selected_after_matches_refreshed seems arbitrary and unrelated?

https://github.com/zed-industries/zed/actions/runs/12645360074/job/35234382353#step:7:2316

Co-authored-by: Finn Evers <finn.evers@outlook.de>
@maxbrunsfeld maxbrunsfeld added this pull request to the merge queue Jan 7, 2025
Merged via the queue into zed-industries:main with commit d58f006 Jan 7, 2025
14 checks passed
@uncenter uncenter deleted the standard-injections-captures branch January 7, 2025 19:05
notpeter added a commit that referenced this pull request Jan 23, 2025
notpeter added a commit to zed-industries/extensions that referenced this pull request Jan 23, 2025
notpeter added a commit that referenced this pull request Jan 23, 2025
notpeter added a commit to zed-industries/extensions that referenced this pull request Jan 23, 2025
notpeter added a commit that referenced this pull request Jan 23, 2025
notpeter added a commit to zed-industries/extensions that referenced this pull request Jan 23, 2025
notpeter added a commit that referenced this pull request Jan 23, 2025
notpeter added a commit to zed-industries/extensions that referenced this pull request Jan 23, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
cla-signed The user has signed the Contributor License Agreement
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Zed does not use the standard capture node and properties in injections.scm
3 participants