PR to get zed2 into main. Because we have taken the approach of porting crates by renaming them to `-2` we will need to manually reapply any changes that were made to ported crates since the `zed2` branch diverged from master. I think this is the list of PRs that may need changes ported manually. Any changes to the following crates may need to be moved from crate `x` to `x2` for each of the following crates: `audio call client copilot db feature_flags fs fuzzy gpui install_cli language lsp prettier project rpc settings storybook terminal theme ui zed`. - [x]f75eb3f62Conrad Irwin (origin/main, origin/HEAD, main) Merge branch 'more-signing' (17 hours ago) - [x]832026a0aJulia Limit language server reinstallation attempts (#3177) (18 hours ago) - [x]4539cef6dJulia Capture language server stderr during startup/init and log if failure (#3175) (21 hours ago) - [x]e6f2288a0Conrad Irwin Don't use function_name in vim tests (#3171) (2 days ago) - [x]f67f42779Mikayla Maki Rename IIFE to maybe (#3165) (2 days ago) - [ ]90f65ec9fMax Brunsfeld Remove logic for multiple channel parents (#3162) (2 days ago) - [ ]4f859e025Conrad Irwin link to channel notes (#3167) (2 days ago) - [ ]b8bd070a8Conrad Irwin Fix panic by disallowing multiple room joins (#3149) (3 days ago) - [ ]cc9e92857Max Brunsfeld Guest roles (#3140) (3 days ago) - [x]b090cefddKirill Bulatov Rework prettier tests (#3160) (3 days ago) - [ ]ff497810dKyle Caverly move keychain access into semantic index as opposed to on init (#3158) (3 days ago) - [x]2b95db087Conrad Irwin Fix infinite loop in select all (#3154) (3 days ago) - [ ]a5836b033Max Brunsfeld Add chat mentions and a notifications panel (#3121) (4 days ago) - [ ]ef1a69156Kyle Caverly update semantic search to use keychain as fallback (#3151) (6 days ago) - [x]26638748bKirill Bulatov Move prettier parsers data into languages from LSP adapters (#3150) (6 days ago) - [ ]0dae0f602Conrad Irwin pixel columns (#3052) (7 days ago) - [x]cc7df91ccJulia Whoops (#3146) (7 days ago) - [x]808976ee2Julia Magic incantations for Tailwind autocomplete in more languages (#3141) (7 days ago) - [ ]cc390ba86Conrad Irwin Start writing role to database (#3120) (10 days ago) - [ ]2795091f0Kyle Caverly Introduce Context Retrieval in Inline Assistant (#3097) (10 days ago) - [x]b168bded1Conrad Irwin New entitlements: (#3118) (10 days ago) - [x]247cdb1e1Joseph T. Lyons Fix telemetry-related crash on start up (#3131) (11 days ago) - [ ]2323fd17bJulia Autocomplete docs (#3126) (2 weeks ago) - [x]16d9d77d8Kirill Bulatov Update diagnostics indicator when diagnostics are udpated (#3128) (2 weeks ago) - [ ]634202340Kirill Bulatov Remove zed -> ... -> semantic_index -> zed Cargo dependency cycle (#3127) (2 weeks ago) Note: this list does not include any PRs that did not change crates that have been converted; it also does not include any commits that were pushed directly to master. ### To figure out what needs migrating, run: ``` git diff COMMIT^..COMMIT -- crates/audio crates/call crates/client crates/copilot crates/db crates/feature_flags crates/fs crates/fuzzy crates/gpui crates/install_cli crates/language crates/lsp crates/prettier crates/project crates/rpc crates/settings crates/storybook crates/terminal crates/theme crates/ui crates/zed ```
Zed
Welcome to Zed, a lightning-fast, collaborative code editor that makes your dreams come true.
Development tips
Dependencies
-
Install Xcode from https://apps.apple.com/us/app/xcode/id497799835?mt=12, and accept the license:
sudo xcodebuild -license -
Install homebrew, node and rustup-init (rustup, rust, cargo, etc.)
/bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/HEAD/install.sh)" brew install node rustup-init rustup-init # follow the installation steps -
Install postgres and configure the database
brew install postgresql@15 brew services start postgresql@15 psql -c "CREATE ROLE postgres SUPERUSER LOGIN" postgres psql -U postgres -c "CREATE DATABASE zed" -
Install the
LiveKitserver, thePostgRESTAPI server, and theforemanprocess supervisor:brew install livekit brew install postgrest brew install foreman -
Ensure the Zed.dev website is checked out in a sibling directory and install its dependencies:
cd .. git clone https://github.com/zed-industries/zed.dev cd zed.dev && npm install npm install -g vercel -
Return to Zed project directory and Initialize submodules
cd zed git submodule update --init --recursive -
Set up a local
zeddatabase and seed it with some initial users:Create a personal GitHub token to run
script/bootstraponce successfully: the token needs to have an access to private repositories for the script to work (repoOAuth scope). Then delete that token.GITHUB_TOKEN=<$token> script/bootstrap -
Now try running zed with collaboration disabled:
cargo run
Common errors
xcrun: error: unable to find utility "metal", not a developer tool or in PATH- You need to install Xcode and then run:
xcode-select --switch /Applications/Xcode.app/Contents/Developer - (see https://github.com/gfx-rs/gfx/issues/2309)
- You need to install Xcode and then run:
Testing against locally-running servers
Start the web and collab servers:
foreman start
If you want to run Zed pointed at the local servers, you can run:
script/zed-local
Dump element JSON
If you trigger cmd-alt-i, Zed will copy a JSON representation of the current window contents to the clipboard. You can paste this in a tool like DJSON to navigate the state of on-screen elements in a structured way.
Licensing
We use cargo-about to automatically comply with open source licenses. If CI is failing, check the following:
- Is it showing a
no license specifiederror for a crate you've created? If so, addpublish = falseunder[package]in your crate's Cargo.toml. - Is the error
failed to satisfy license requirementsfor a dependency? If so, first determine what license the project has and whether this system is sufficient to comply with this license's requirements. If you're unsure, ask a lawyer. Once you've verified that this system is acceptable add the license's SPDX identifier to theacceptedarray inscript/licenses/zed-licenses.toml. - Is
cargo-aboutunable to find the license for a dependency? If so, add a clarification field at the end ofscript/licenses/zed-licenses.toml, as specified in the cargo-about book.
Wasm Plugins
Zed has a Wasm-based plugin runtime which it currently uses to embed plugins. To compile Zed, you'll need to have the wasm32-wasi toolchain installed on your system. To install this toolchain, run:
rustup target add wasm32-wasi
Plugins can be found in the plugins folder in the root. For more information about how plugins work, check the Plugin Guide in crates/plugin_runtime/README.md.