Finn EversandPeter Tripp
efaf358876
Resolves #26032 This PR changes the highlighting for `and`, `not` and `or` in Lua from `operator` to `keyword.operator`. [VS Code also highlights these as keyword operators](https://github.com/LuaLS/lua.tmbundle/blob/1483add845ebfb3e1e631fe372603e5fed2cdd42/Syntaxes/Lua.plist#L277-L279) and Zed does this for other languages as well, like [Python](https://github.com/zed-industries/zed/blob/813e207514f76ec3f8bc8bbb649deaafa304de9e/crates/languages/src/python/highlights.scm#L221-L229) or [Zig](https://github.com/zed-industries/zed/blob/813e207514f76ec3f8bc8bbb649deaafa304de9e/extensions/zig/languages/zig/highlights.scm#L145-L149). Additionally, in 813e207514f76ec3f8bc8bbb649deaafa304de9e I removed duplicate matches for existing keywords to improve readability and align them to how keywords are generally matched across languages (see [Rust](https://github.com/zed-industries/zed/blob/813e207514f76ec3f8bc8bbb649deaafa304de9e/crates/languages/src/rust/highlights.scm#L79-L119) and [Typescript](https://github.com/zed-industies/zed/blob/813e207514f76ec3f8bc8bbb649deaafa304de9e/crates/languages/src/typescript/highlights.scm#L210-L269) for example). Whilst contributing to the majority of the diff, this does not change any existing highlights. | Before | After | | --- | --- | | <img width="309" alt="old" src="https://github.com/user-attachments/assets/7790817e-4a0d-442b-b176-9a84bcc6f3c4" /> | <img width="309" alt="PR" src="https://github.com/user-attachments/assets/34a57962-938a-4465-9406-288f5c456aa3" /> | Release Notes: - N/A --------- Co-authored-by: Peter Tripp <peter@zed.dev>
Zed Extensions
This directory contains extensions for Zed that are largely maintained by the Zed team. They currently live in the Zed repository for ease of maintenance.
If you are looking for the Zed extension registry, see the zed-industries/extensions repo.
Structure
Currently, Zed includes support for a number of languages without requiring installing an extension. Those languages can be found under crates/languages/src.
Support for all other languages is done via extensions. This directory (extensions/) contains a number of officially maintained extensions. These extensions use the same zed_extension_api available to all Zed Extensions for providing language servers, tree-sitter grammars and tree-sitter queries.
Dev Extensions
See the docs for Developing an Extension Locally for how to work with one of these extensions.
Updating
Note
This update process is usually handled by Zed staff. Community contributors should just submit a PR (step 1) and we'll take it from there.
The process for updating an extension in this directory has three parts.
-
Create a PR with your changes. (Merge it)
-
Bump the extension version in:
- extensions/{language_name}/extension.toml
- extensions/{language_name}/Cargo.toml
- Cargo.lock
You can do this manually, or with a script:
# Output the current version for a given language ./script/language-extension-version <langname> # Update the version in `extension.toml` and `Cargo.toml` and trigger a `cargo check` ./script/language-extension-version <langname> <new_version>Commit your changes to a branch, push a PR and merge it.
-
Open a PR to
zed-industries/extensionsrepo that updates the extension in question
Edit extensions.toml in the extensions repo to reflect the new version you set above and update the submodule latest Zed commit.
# Go into your clone of the extensions repo
cd ../extensions
# Update
git checkout main
git pull
just init-submodule extensions/zed
# Update the Zed submodule
cd extensions/zed
git checkout main
git pull
cd -
git add extensions.toml extensions/zed