Nathan Witmer
f506d16128
Self-Review Checklist: - [x] I've reviewed my own diff for quality, security, and reliability - [x] Unsafe blocks (if any) have justifying comments - [x] The content is consistent with the [UI/UX checklist](https://github.com/zed-industries/zed/blob/main/CONTRIBUTING.md#uiux-checklist) - [x] Tests cover the new/changed behavior - [x] Performance impact has been considered and is acceptable Closes #54737. #48752 added empty-prefix `block_comment` entries to several language configs (Go, C, C++, JSONC, Python, JSX inner) to support the new toggle-block-comments action. In `Editor::rewrap_impl`, the comment-format matcher used `buffer.contains_str_at(indent_end, &config.prefix)` to decide whether the current line is a continuation of a block comment. When the language is configured with an empty prefix, this is true on every line. `//` (and `#`) line comments inside a `comment` override scope were classified as `BlockLine("")` and never reached the line-comment fallback. The result was that the line-comment prefix was not stripped before wrapping and not re-prepended after, embedding `//` markers as text in the wrapped paragraph. Skip the BlockLine arm when the configured prefix is empty so the matcher falls through to `line_comment_prefixes`. I've included regression tests for both golang (which adds a new treesitter dep to the editor package) and C/C++. Release Notes: - Fixed line comment rewrapping in golang and C/C++
149 lines
4.0 KiB
TOML
149 lines
4.0 KiB
TOML
[package]
|
|
name = "editor"
|
|
version = "0.1.0"
|
|
edition.workspace = true
|
|
publish.workspace = true
|
|
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-c",
|
|
"tree-sitter-rust",
|
|
"tree-sitter-typescript",
|
|
"tree-sitter-html",
|
|
"proptest",
|
|
"unindent",
|
|
]
|
|
|
|
[dependencies]
|
|
aho-corasick.workspace = true
|
|
anyhow.workspace = true
|
|
assets.workspace = true
|
|
breadcrumbs.workspace = true
|
|
client.workspace = true
|
|
clock.workspace = true
|
|
collections.workspace = true
|
|
convert_case.workspace = true
|
|
dap.workspace = true
|
|
db.workspace = true
|
|
buffer_diff.workspace = true
|
|
emojis.workspace = true
|
|
feature_flags.workspace = true
|
|
file_icons.workspace = true
|
|
futures.workspace = true
|
|
futures-lite.workspace = true
|
|
fuzzy.workspace = true
|
|
fs.workspace = true
|
|
git.workspace = true
|
|
gpui.workspace = true
|
|
indoc.workspace = true
|
|
edit_prediction_types.workspace = true
|
|
itertools.workspace = true
|
|
language.workspace = true
|
|
linkify.workspace = true
|
|
log.workspace = true
|
|
lsp.workspace = true
|
|
markdown.workspace = true
|
|
menu.workspace = true
|
|
multi_buffer.workspace = true
|
|
ordered-float.workspace = true
|
|
parking_lot.workspace = true
|
|
pretty_assertions.workspace = true
|
|
project.workspace = true
|
|
proptest = { workspace = true, optional = true }
|
|
proptest-derive = { workspace = true, optional = true }
|
|
rand.workspace = true
|
|
regex.workspace = true
|
|
rpc.workspace = true
|
|
rope.workspace = true
|
|
schemars.workspace = true
|
|
serde.workspace = true
|
|
serde_json.workspace = true
|
|
settings.workspace = true
|
|
smallvec.workspace = true
|
|
snippet.workspace = true
|
|
sum_tree.workspace = true
|
|
task.workspace = true
|
|
telemetry.workspace = true
|
|
text.workspace = true
|
|
time.workspace = true
|
|
theme.workspace = true
|
|
theme_settings.workspace = true
|
|
tree-sitter-c = { workspace = true, optional = true }
|
|
tree-sitter-html = { workspace = true, optional = true }
|
|
tree-sitter-rust = { workspace = true, optional = true }
|
|
tree-sitter-typescript = { workspace = true, optional = true }
|
|
tree-sitter-python = { workspace = true, optional = true }
|
|
ztracing.workspace = true
|
|
tracing.workspace = true
|
|
unicode-segmentation.workspace = true
|
|
unicode-script.workspace = true
|
|
unindent = { workspace = true, optional = true }
|
|
ui.workspace = true
|
|
ui_input.workspace = true
|
|
url.workspace = true
|
|
util.workspace = true
|
|
uuid.workspace = true
|
|
vim_mode_setting.workspace = true
|
|
workspace.workspace = true
|
|
zed_actions.workspace = true
|
|
zlog.workspace = true
|
|
|
|
[dev-dependencies]
|
|
criterion.workspace = true
|
|
ctor.workspace = true
|
|
gpui = { workspace = true, features = ["test-support"] }
|
|
language = { workspace = true, features = ["test-support"] }
|
|
languages = {workspace = true, features = ["test-support"] }
|
|
lsp = { workspace = true, features = ["test-support"] }
|
|
markdown = { workspace = true, features = ["test-support"] }
|
|
multi_buffer = { workspace = true, features = ["test-support"] }
|
|
project = { workspace = true, features = ["test-support"] }
|
|
proptest.workspace = true
|
|
proptest-derive.workspace = true
|
|
release_channel.workspace = true
|
|
rand.workspace = true
|
|
semver.workspace = true
|
|
settings = { workspace = true, features = ["test-support"] }
|
|
|
|
text = { workspace = true, features = ["test-support"] }
|
|
theme = { workspace = true, features = ["test-support"] }
|
|
tree-sitter-c.workspace = true
|
|
tree-sitter-go.workspace = true
|
|
tree-sitter-html.workspace = true
|
|
tree-sitter-rust.workspace = true
|
|
tree-sitter-typescript.workspace = true
|
|
tree-sitter-yaml.workspace = true
|
|
tree-sitter-bash.workspace = true
|
|
tree-sitter-md.workspace = true
|
|
unicode-width.workspace = true
|
|
unindent.workspace = true
|
|
util = { workspace = true, features = ["test-support"] }
|
|
workspace = { workspace = true, features = ["test-support"] }
|
|
|
|
zlog.workspace = true
|
|
|
|
|
|
[[bench]]
|
|
name = "editor_render"
|
|
harness = false
|
|
|
|
[[bench]]
|
|
name = "display_map"
|
|
harness = false
|