Skip to content

ui: Don't panic on invalid highlight indices in HighlightedLabel#57291

Merged
osyvokon merged 2 commits into
mainfrom
fix-highlighted-label-panic
May 21, 2026
Merged

ui: Don't panic on invalid highlight indices in HighlightedLabel#57291
osyvokon merged 2 commits into
mainfrom
fix-highlighted-label-panic

Conversation

@osyvokon

@osyvokon osyvokon commented May 20, 2026

Copy link
Copy Markdown
Contributor

HighlightedLabel would crash the application if any provided highlight index was invalid. In theory, this should never happen. In practice, this can happen due to race conditions at call sites.

After this change, we only panic in debug builds. In release builds, we log an error and return a label with no highlights. The error message includes the call site so that it's easier to fix the root cause.

Related to #57290

Part of FR-11.

Release Notes:

  • N/A

HighlightedLabel would crash the application if any provided highlight
index was invalid. In theory, this should never happen. In practice,
this can happen due to race conditions at call sites.

After this change, we only panic in debug builds. In release builds, we
log an error and return a label with no highlights. The error message
includes the call site so that it's easier to fix the root cause.
@cla-bot cla-bot Bot added the cla-signed The user has signed the Contributor License Agreement label May 20, 2026
@zed-community-bot zed-community-bot Bot added the staff Pull requests authored by a current member of Zed staff label May 20, 2026
@maxdeviant maxdeviant changed the title Don't panic on invalid highlight indices ui: Don't panic on invalid highlight indices in HighlightedLabel May 20, 2026

@maxdeviant maxdeviant left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nice!

@osyvokon osyvokon added this pull request to the merge queue May 21, 2026
Merged via the queue into main with commit 7f7c215 May 21, 2026
34 checks passed
@osyvokon osyvokon deleted the fix-highlighted-label-panic branch May 21, 2026 04:04
@osyvokon

Copy link
Copy Markdown
Contributor Author

/cherry-pick stable
/cherry-pick preview

zed-zippy Bot added a commit that referenced this pull request May 21, 2026
…57291) (cherry-pick to preview) (#57367)

Cherry-pick of #57291 to preview

----
HighlightedLabel would crash the application if any provided highlight
index was invalid. In theory, this should never happen. In practice,
this can happen due to race conditions at call sites.

After this change, we only panic in debug builds. In release builds, we
log an error and return a label with no highlights. The error message
includes the call site so that it's easier to fix the root cause.

Related to #57290

Part of FR-11.

Release Notes:

- N/A

Co-authored-by: Oleksiy Syvokon <oleksiy@zed.dev>
zed-zippy Bot added a commit that referenced this pull request May 21, 2026
…57291) (cherry-pick to stable) (#57366)

Cherry-pick of #57291 to stable

----
HighlightedLabel would crash the application if any provided highlight
index was invalid. In theory, this should never happen. In practice,
this can happen due to race conditions at call sites.

After this change, we only panic in debug builds. In release builds, we
log an error and return a label with no highlights. The error message
includes the call site so that it's easier to fix the root cause.

Related to #57290

Part of FR-11.

Release Notes:

- N/A

Co-authored-by: Oleksiy Syvokon <oleksiy@zed.dev>
TomPlanche pushed a commit to TomPlanche/zed that referenced this pull request Jun 2, 2026
…ed-industries#57291)

HighlightedLabel would crash the application if any provided highlight
index was invalid. In theory, this should never happen. In practice,
this can happen due to race conditions at call sites.

After this change, we only panic in debug builds. In release builds, we
log an error and return a label with no highlights. The error message
includes the call site so that it's easier to fix the root cause.

Related to zed-industries#57290

Part of FR-11.

Release Notes:

- N/A
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