mirror of
https://github.com/zed-industries/zed.git
synced 2025-01-13 13:50:38 +00:00
c3075dfe9a
Fixes https://github.com/zed-industries/zed/issues/18405 In https://github.com/zed-industries/zed/pull/18313, we introduced a problem where git addition highlights might spuriously return when undoing certain changes. It turned out, there were already some cases where git hunk highlighting was incorrect when editing at the boundaries of expanded diff hunks. In this PR, I've introduced a test helper method for more rigorously (and readably) testing the editor's git state. You can assert about the entire state of an editor's diff decorations using a formatted diff: ```rust cx.assert_diff_hunks( r#" - use some::mod1; use some::mod2; const A: u32 = 42; - const B: u32 = 42; const C: u32 = 42; fn main() { - println!("hello"); + //println!("hello"); println!("world"); + // + // } fn another() { println!("another"); + println!("another"); } - fn another2() { println!("another2"); } "# .unindent(), ); ``` This will assert about the editor's actual row highlights, not just the editor's internal hunk-tracking state. I rewrote all of our editor diff tests to use these more high-level assertions, and it caught the new bug, as well as some pre-existing bugs in the highlighting of added content. The problem was how we *remove* highlighted rows. Previously, it relied on supplying exactly the same range as one that we had previously highlighted. I've added a `remove_highlighted_rows(ranges)` APIs which is much simpler - it clears out any row ranges that intersect the given ranges (which is all that we need for the Git diff use case). Release Notes: - N/A
104 lines
2.8 KiB
TOML
104 lines
2.8 KiB
TOML
[package]
|
|
name = "editor"
|
|
version = "0.1.0"
|
|
edition = "2021"
|
|
publish = false
|
|
license = "GPL-3.0-or-later"
|
|
|
|
[lints]
|
|
workspace = true
|
|
|
|
[lib]
|
|
path = "src/editor.rs"
|
|
doctest = false
|
|
|
|
[features]
|
|
test-support = [
|
|
"text/test-support",
|
|
"language/test-support",
|
|
"gpui/test-support",
|
|
"multi_buffer/test-support",
|
|
"project/test-support",
|
|
"theme/test-support",
|
|
"util/test-support",
|
|
"workspace/test-support",
|
|
"tree-sitter-rust",
|
|
"tree-sitter-typescript",
|
|
"tree-sitter-html",
|
|
"unindent",
|
|
]
|
|
|
|
[dependencies]
|
|
aho-corasick.workspace = true
|
|
anyhow.workspace = true
|
|
assets.workspace = true
|
|
chrono.workspace = true
|
|
client.workspace = true
|
|
clock.workspace = true
|
|
collections.workspace = true
|
|
convert_case.workspace = true
|
|
db.workspace = true
|
|
emojis.workspace = true
|
|
file_icons.workspace = true
|
|
futures.workspace = true
|
|
fuzzy.workspace = true
|
|
git.workspace = true
|
|
gpui.workspace = true
|
|
http_client.workspace = true
|
|
indoc.workspace = true
|
|
itertools.workspace = true
|
|
language.workspace = true
|
|
linkify.workspace = true
|
|
log.workspace = true
|
|
lsp.workspace = true
|
|
markdown.workspace = true
|
|
multi_buffer.workspace = true
|
|
ordered-float.workspace = true
|
|
parking_lot.workspace = true
|
|
pretty_assertions.workspace = true
|
|
project.workspace = true
|
|
rand.workspace = true
|
|
rpc.workspace = true
|
|
schemars.workspace = true
|
|
serde.workspace = true
|
|
serde_json.workspace = true
|
|
settings.workspace = true
|
|
similar.workspace = true
|
|
smallvec.workspace = true
|
|
smol.workspace = true
|
|
snippet.workspace = true
|
|
sum_tree.workspace = true
|
|
task.workspace = true
|
|
text.workspace = true
|
|
time.workspace = true
|
|
time_format.workspace = true
|
|
theme.workspace = true
|
|
tree-sitter-html = { workspace = true, optional = true }
|
|
tree-sitter-rust = { workspace = true, optional = true }
|
|
tree-sitter-typescript = { workspace = true, optional = true }
|
|
unindent = { workspace = true, optional = true }
|
|
ui.workspace = true
|
|
url.workspace = true
|
|
util.workspace = true
|
|
workspace.workspace = true
|
|
|
|
[dev-dependencies]
|
|
ctor.workspace = true
|
|
env_logger.workspace = true
|
|
gpui = { workspace = true, features = ["test-support"] }
|
|
language = { workspace = true, features = ["test-support"] }
|
|
lsp = { workspace = true, features = ["test-support"] }
|
|
multi_buffer = { workspace = true, features = ["test-support"] }
|
|
project = { workspace = true, features = ["test-support"] }
|
|
release_channel.workspace = true
|
|
rand.workspace = true
|
|
settings = { workspace = true, features = ["test-support"] }
|
|
text = { workspace = true, features = ["test-support"] }
|
|
theme = { workspace = true, features = ["test-support"] }
|
|
tree-sitter-html.workspace = true
|
|
tree-sitter-rust.workspace = true
|
|
tree-sitter-typescript.workspace = true
|
|
unindent.workspace = true
|
|
util = { workspace = true, features = ["test-support"] }
|
|
workspace = { workspace = true, features = ["test-support"] }
|
|
http_client = { workspace = true, features = ["test-support"] }
|