Skip to content

Handle newlines better in parse_edits#48960

Merged
eholk merged 2 commits intozed-industries:mainfrom
eholk:crash-repro2
Feb 12, 2026
Merged

Handle newlines better in parse_edits#48960
eholk merged 2 commits intozed-industries:mainfrom
eholk:crash-repro2

Conversation

@eholk
Copy link
Contributor

@eholk eholk commented Feb 11, 2026

Release Notes:

  • Fix a potential crash around multibyte characters in edit predictions

@cla-bot cla-bot bot added the cla-signed The user has signed the Contributor License Agreement label Feb 11, 2026
@zed-community-bot zed-community-bot bot added the staff Pull requests authored by a current member of Zed staff label Feb 11, 2026
@eholk eholk merged commit 65027dd into zed-industries:main Feb 12, 2026
27 checks passed
morgankrey added a commit that referenced this pull request Feb 13, 2026
Add 3 regression tests for the edit_prediction parse_edits UTF-8 crash
(ZED-4VS) that was fixed in PR #48960. These tests ensure the fix for
multi-byte character handling near editable region markers won't regress.

Tests added:
- test_parse_edits_with_multibyte_utf8
- test_parse_edits_multibyte_before_end_marker
- test_parse_edits_multibyte_after_start_marker_no_newline

Co-authored-by: factory-droid[bot] <138933559+factory-droid[bot]@users.noreply.github.com>
morgankrey added a commit that referenced this pull request Feb 13, 2026
Add 3 regression tests for the edit_prediction parse_edits UTF-8 crash
(ZED-4VS) that was fixed in PR #48960. These tests ensure the fix for
multi-byte character handling near editable region markers won't regress.

Tests added:
- test_parse_edits_with_multibyte_utf8
- test_parse_edits_multibyte_before_end_marker
- test_parse_edits_multibyte_after_start_marker_no_newline

Co-authored-by: factory-droid[bot] <138933559+factory-droid[bot]@users.noreply.github.com>
@osyvokon
Copy link
Contributor

/cherry-pick stable
/cherry-pick preview

github-actions bot pushed a commit that referenced this pull request Feb 17, 2026
Release Notes:

- Fix a potential crash around multibyte characters in edit predictions

---------

Co-authored-by: Ben Kunkle <ben@zed.dev>
github-actions bot pushed a commit that referenced this pull request Feb 17, 2026
Release Notes:

- Fix a potential crash around multibyte characters in edit predictions

---------

Co-authored-by: Ben Kunkle <ben@zed.dev>
zed-zippy bot added a commit that referenced this pull request Feb 17, 2026
#49368)

Cherry-pick of #48960 to stable

----
Release Notes:

- Fix a potential crash around multibyte characters in edit predictions

---------

Co-authored-by: Ben Kunkle <ben@zed.dev>

Co-authored-by: Eric Holk <eric@zed.dev>
Co-authored-by: Ben Kunkle <ben@zed.dev>
zed-zippy bot added a commit that referenced this pull request Feb 17, 2026
…w) (#49369)

Cherry-pick of #48960 to preview

----
Release Notes:

- Fix a potential crash around multibyte characters in edit predictions

---------

Co-authored-by: Ben Kunkle <ben@zed.dev>

Co-authored-by: Eric Holk <eric@zed.dev>
Co-authored-by: Ben Kunkle <ben@zed.dev>
eholk pushed a commit that referenced this pull request Feb 24, 2026
Add 3 regression tests for the edit_prediction parse_edits UTF-8 crash
(ZED-4VS) that was fixed in PR #48960. These tests ensure the fix for
multi-byte character handling near editable region markers won't regress.

Tests added:
- test_parse_edits_with_multibyte_utf8
- test_parse_edits_multibyte_before_end_marker
- test_parse_edits_multibyte_after_start_marker_no_newline

Co-authored-by: factory-droid[bot] <138933559+factory-droid[bot]@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

cla-signed The user has signed the Contributor License Agreement staff Pull requests authored by a current member of Zed staff

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants