From e97f7b508fbbef9998e3676bdd3efd6331786da9 Mon Sep 17 00:00:00 2001 From: Xiaobo Liu Date: Mon, 5 Jan 2026 23:09:05 +0800 Subject: [PATCH] proto: Remove deprecated active view fields from call.proto (#45979) Release Notes: - N/A --------- Signed-off-by: Xiaobo Liu --- crates/proto/proto/call.proto | 7 ++----- crates/workspace/src/workspace.rs | 11 ++--------- 2 files changed, 4 insertions(+), 14 deletions(-) diff --git a/crates/proto/proto/call.proto b/crates/proto/proto/call.proto index 9e801515af3a4ea37eb3564c32b8ee9ad7278aa8..a7fe607bb5aaaff53518652186f46bcb6529e661 100644 --- a/crates/proto/proto/call.proto +++ b/crates/proto/proto/call.proto @@ -305,8 +305,7 @@ message Follow { message FollowResponse { View active_view = 3; - // TODO: Remove after version 0.145.x stabilizes. - optional ViewId active_view_id = 1; + reserved 1; repeated View views = 2; } @@ -316,7 +315,6 @@ message UpdateFollowers { reserved 3; oneof variant { View create_view = 5; - // TODO: Remove after version 0.145.x stabilizes. UpdateActiveView update_active_view = 4; UpdateView update_view = 6; } @@ -334,8 +332,7 @@ message ViewId { } message UpdateActiveView { - optional ViewId id = 1; - optional PeerId leader_id = 2; + reserved 1, 2; View view = 3; } diff --git a/crates/workspace/src/workspace.rs b/crates/workspace/src/workspace.rs index d12aa4f5a8eab3009d83004e50507fc3d07eff03..71459eea7c6fb59546c1efb6edbe750a60446d0f 100644 --- a/crates/workspace/src/workspace.rs +++ b/crates/workspace/src/workspace.rs @@ -4945,8 +4945,6 @@ impl Workspace { cx.notify(); proto::FollowResponse { - // TODO: Remove after version 0.145.x stabilizes. - active_view_id: active_view.as_ref().and_then(|view| view.id.clone()), views: active_view.iter().cloned().collect(), active_view, } @@ -5220,19 +5218,14 @@ impl Workspace { && let Some(variant) = item.to_state_proto(window, cx) { let view = Some(proto::View { - id: id.clone(), + id, leader_id: leader_peer_id, variant: Some(variant), panel_id: panel_id.map(|id| id as i32), }); is_project_item = item.is_project_item(window, cx); - update = proto::UpdateActiveView { - view, - // TODO: Remove after version 0.145.x stabilizes. - id, - leader_id: leader_peer_id, - }; + update = proto::UpdateActiveView { view }; }; } }