Code at the speed of thought – Zed is a high-performance, multiplayer code editor from the creators of Atom and Tree-sitter.
Find a file
Hans ec6efe262f
Fix crash when joining two consecutive lines (#10000)
Release notes:

- Fixed a crash when joining two consecutive lines
([#9692](https://github.com/zed-industries/zed/pull/9692)).


This crash is not caused by `vim` or `editor`'s code logic, `join_line`
logic is okay, I found that the crash is caused by a refresh of git
`diff` after every update, hhen git diff generates hunks, it will look
for the cursor to the beginning of a line, and judge that if the cursor
result column is greater than 0, that is, it is not the beginning of a
line, it will correct the row to the next line, I think before we forgot
here that I need to adjust the column to 0 at the same time, otherwise
it is easy to go out of bounds, I am not sure if I need to add more
tests for this method, I can add if I need to, but I feel that this case
is a bit extreme

---------

Co-authored-by: Thorsten Ball <mrnugget@gmail.com>
2024-04-05 15:45:29 +02:00
.cargo
.config
.github Bump Python version in actions 2024-04-05 08:24:00 -04:00
.zed
assets Fix typo (#10183) 2024-04-05 01:07:19 +02:00
crates Fix crash when joining two consecutive lines (#10000) 2024-04-05 15:45:29 +02:00
docs Document formatter: code_actions (#10157) 2024-04-04 14:12:28 +02:00
extensions Add label_for_symbol to extension API (#10179) 2024-04-04 15:38:38 -04:00
script Use existence of issue_reference_number flag to determine if prod 2024-04-05 08:13:33 -04:00
tooling/xtask Windows: Enable clippy deny warnings (#9920) 2024-03-28 11:55:35 -04:00
.dockerignore
.gitattributes
.gitignore
.gitmodules
.mailmap
Cargo.lock Add label_for_symbol to extension API (#10179) 2024-04-04 15:38:38 -04:00
Cargo.toml Add emmet-language-server support (#9910) 2024-04-03 19:54:53 +02:00
CODE_OF_CONDUCT.md
CONTRIBUTING.md
debug.plist
docker-compose.sql
docker-compose.yml
Dockerfile
LICENSE-AGPL
LICENSE-APACHE
LICENSE-GPL
livekit.yaml
Procfile
README.md
rust-toolchain.toml
typos.toml Remove basic.conf (#10120) 2024-04-03 09:38:36 -04:00

Zed

CI

Welcome to Zed, a high-performance, multiplayer code editor from the creators of Atom and Tree-sitter.

Installation

You can download Zed today for macOS (v10.15+).

Support for additional platforms is on our roadmap:

For macOS users, you can also install Zed using Homebrew:

brew install zed

Alternatively, to install the Preview release:

brew tap homebrew/cask-versions
brew install zed-preview

Developing Zed

Contributing

See CONTRIBUTING.md for ways you can contribute to Zed.

Licensing

License information for third party dependencies must be correctly provided for CI to pass.

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.