Code at the speed of thought – Zed is a high-performance, multiplayer code editor from the creators of Atom and Tree-sitter.
Go to file
Marshall Bowers f272881a6b
theme_importer: Improve syntax token matching (#3549)
This PR improves the approach we use to match syntax tokens between Zed
and VS Code in the `theme_importer`.

We now use the list of scopes assigned to each Zed syntax token to rank
the possible candidates in the VS Code and then pick the candidate with
the highest rank.

So far this has proved to provide better colors across the board, but
we'll continue to refine the matching over time.

Release Notes:

- N/A
2023-12-07 22:11:31 -05:00
.cargo ci: Add ci-config.toml in .cargo folder. 2023-11-22 22:25:26 +01:00
.config tests: Test 'db' package sequentially (#2654) 2023-06-28 15:00:43 +02:00
.github Remove '-nightly' suffix from nightly build version number 2023-12-07 16:51:53 -08:00
.vscode Hit the local server when debugging 2021-08-24 17:11:40 -06:00
.zed Ensure json uses a tab size of 4 2023-07-31 13:08:40 -04:00
assets Put ToggleZoom key binding back into the block with no context 2023-12-06 11:32:05 -08:00
crates theme_importer: Improve syntax token matching (#3549) 2023-12-07 22:11:31 -05:00
docs Update docs to refer to new zed-local script 2023-10-09 12:49:12 -07:00
plugins Use the same serde version across the entire workspace 2023-03-28 09:42:00 -07:00
script Merge branch 'main' into welcome 2023-11-27 18:55:23 -08:00
styles MODAL 2023-11-07 13:23:27 -07:00
.dockerignore Removed old experiments settings and staff mode flag, added new StaffMode global that is set based on the webserver's staff bit 2023-01-27 15:43:12 -08:00
.gitignore Ignore .idea directory 2023-09-15 11:17:02 -04:00
.gitmodules WIP: start on live_kit_server 2022-10-17 09:59:16 +02:00
Cargo.lock Emit accurate hex colors in generated themes (#3547) 2023-12-07 18:34:03 -05:00
Cargo.toml Port recent_projects to Zed2 (#3525) 2023-12-06 18:41:50 -05:00
Dockerfile chore: Upgrade to Rust 1.73 (#3096) 2023-10-06 14:50:29 +02:00
Procfile show warnings by default 2023-10-13 15:07:49 -06:00
Procfile.zed2 Add scripts for running Zed2 collab environment 2023-11-23 14:19:06 +01:00
README.md Update docs to refer to new zed-local script 2023-10-09 12:49:12 -07:00
rust-toolchain.toml chore: Upgrade to Rust 1.73 (#3096) 2023-10-06 14:50:29 +02:00

Zed

CI

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 LiveKit server, the PostgREST API server, and the foreman process 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 zed database and seed it with some initial users:

    Create a personal GitHub token to run script/bootstrap once successfully: the token needs to have an access to private repositories for the script to work (repo OAuth 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

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 specified error for a crate you've created? If so, add publish = false under [package] in your crate's Cargo.toml.
  • Is the error failed to satisfy license requirements for 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 the accepted array in script/licenses/zed-licenses.toml.
  • Is cargo-about unable to find the license for a dependency? If so, add a clarification field at the end of script/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.