Skip to content

project: Fix SymbolKind serialization over RPC - #62458

Merged
MrSubidubi merged 1 commit into
zed-industries:mainfrom
Huliiiiii:symbol-kind-mapping
Aug 11, 2026
Merged

project: Fix SymbolKind serialization over RPC#62458
MrSubidubi merged 1 commit into
zed-industries:mainfrom
Huliiiiii:symbol-kind-mapping

Conversation

@Huliiiiii

@Huliiiiii Huliiiiii commented Aug 10, 2026

Copy link
Copy Markdown
Contributor

Objective

I noticed that in workspace symbol search, the function's symbol kind has become Trait.

Solution

Add to_proto and a macro to define the mapping instead of as i32.

Testing

Updated the test.

Self-Review Checklist:

  • I've reviewed my own diff for quality, security, and reliability
  • Unsafe blocks (if any) have justifying comments
  • The content adheres to Zed's UI standards (UX/UI and icon guidelines)
  • Tests cover the new/changed behavior
  • Performance impact has been considered and is acceptable

Release Notes:

  • Fixed SymbolKind mapping to LSP protocol values

@cla-bot cla-bot Bot added the cla-signed The user has signed the Contributor License Agreement label Aug 10, 2026
@Huliiiiii Huliiiiii changed the title project: Fix SymbolKind mapping to LSP protocol values project: Fix SymbolKind serialization over RPC Aug 11, 2026
@Huliiiiii
Huliiiiii force-pushed the symbol-kind-mapping branch from a4ec69f to 1a901c2 Compare August 11, 2026 02:51
Comment thread crates/collab/tests/integration/integration_tests.rs Outdated
@Huliiiiii
Huliiiiii force-pushed the symbol-kind-mapping branch from 1a901c2 to 9e1578e Compare August 11, 2026 05:58

@MrSubidubi MrSubidubi 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.

Thanks!

@MrSubidubi
MrSubidubi added this pull request to the merge queue Aug 11, 2026
@MrSubidubi

Copy link
Copy Markdown
Member

/cherry-pick preview
/cherry-pick stable

Merged via the queue into zed-industries:main with commit c83adb3 Aug 11, 2026
36 checks passed
zed-zippy Bot added a commit that referenced this pull request Aug 11, 2026
…k to preview) (#62470)

Cherry-pick of #62458 to preview

----
# Objective

I noticed that in workspace symbol search, the function's symbol kind
has become `Trait`.


## Solution

Add `to_proto` and a macro to define the mapping instead of `as i32`.

## Testing

Updated the test.

## 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 adheres to Zed's UI standards

([UX/UI](https://github.com/zed-industries/zed/blob/main/CONTRIBUTING.md#uiux-checklist)
and

[icon](https://github.com/zed-industries/zed/blob/main/crates/icons/README.md)
guidelines)
- [x] Tests cover the new/changed behavior
- [x] Performance impact has been considered and is acceptable

---

Release Notes:

- Fixed `SymbolKind` mapping to LSP protocol values

Co-authored-by: 狐狸 <308013446a@gmail.com>
zed-zippy Bot added a commit that referenced this pull request Aug 11, 2026
…k to stable) (#62471)

Cherry-pick of #62458 to stable

----
# Objective

I noticed that in workspace symbol search, the function's symbol kind
has become `Trait`.


## Solution

Add `to_proto` and a macro to define the mapping instead of `as i32`.

## Testing

Updated the test.

## 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 adheres to Zed's UI standards

([UX/UI](https://github.com/zed-industries/zed/blob/main/CONTRIBUTING.md#uiux-checklist)
and

[icon](https://github.com/zed-industries/zed/blob/main/crates/icons/README.md)
guidelines)
- [x] Tests cover the new/changed behavior
- [x] Performance impact has been considered and is acceptable

---

Release Notes:

- Fixed `SymbolKind` mapping to LSP protocol values

Co-authored-by: 狐狸 <308013446a@gmail.com>
@Huliiiiii
Huliiiiii deleted the symbol-kind-mapping branch August 11, 2026 12:28
playdohface pushed a commit to playdohface/zed that referenced this pull request Aug 29, 2026
# Objective

I noticed that in workspace symbol search, the function's symbol kind
has become `Trait`.


## Solution

Add `to_proto` and a macro to define the mapping instead of `as i32`.

## Testing

Updated the test.

## 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 adheres to Zed's UI standards
([UX/UI](https://github.com/zed-industries/zed/blob/main/CONTRIBUTING.md#uiux-checklist)
and
[icon](https://github.com/zed-industries/zed/blob/main/crates/icons/README.md)
guidelines)
- [x] Tests cover the new/changed behavior
- [x] Performance impact has been considered and is acceptable

---

Release Notes:

- Fixed `SymbolKind` mapping to LSP protocol values
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

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants