From 51d5ed48f0168b60a826b25665c5611dc7a5f513 Mon Sep 17 00:00:00 2001 From: Antonio Scandurra Date: Tue, 8 Mar 2022 11:17:20 +0100 Subject: [PATCH] Remove unused `CloseBuffer` message --- crates/language/src/buffer.rs | 5 ----- crates/project/src/project.rs | 11 ----------- crates/project/src/worktree.rs | 14 -------------- crates/rpc/proto/zed.proto | 1 - crates/rpc/src/proto.rs | 2 -- crates/server/src/rpc.rs | 14 -------------- 6 files changed, 47 deletions(-) diff --git a/crates/language/src/buffer.rs b/crates/language/src/buffer.rs index 061d956444..909861eeda 100644 --- a/crates/language/src/buffer.rs +++ b/crates/language/src/buffer.rs @@ -201,8 +201,6 @@ pub trait File { cx: &mut MutableAppContext, ) -> Task>; - fn buffer_removed(&self, buffer_id: u64, cx: &mut MutableAppContext); - fn as_any(&self) -> &dyn Any; fn to_proto(&self) -> rpc::proto::File; @@ -273,8 +271,6 @@ impl File for FakeFile { cx.spawn(|_| async move { Ok((Default::default(), SystemTime::UNIX_EPOCH)) }) } - fn buffer_removed(&self, _: u64, _: &mut MutableAppContext) {} - fn as_any(&self) -> &dyn Any { self } @@ -1870,7 +1866,6 @@ impl Entity for Buffer { fn release(&mut self, cx: &mut gpui::MutableAppContext) { if let Some(file) = self.file.as_ref() { - file.buffer_removed(self.remote_id(), cx); if let Some((lang_server, file)) = self.language_server.as_ref().zip(file.as_local()) { let request = lang_server .server diff --git a/crates/project/src/project.rs b/crates/project/src/project.rs index f517560d95..5b1908c84d 100644 --- a/crates/project/src/project.rs +++ b/crates/project/src/project.rs @@ -201,7 +201,6 @@ impl Project { client.add_entity_message_handler(Self::handle_add_collaborator); client.add_entity_message_handler(Self::handle_buffer_reloaded); client.add_entity_message_handler(Self::handle_buffer_saved); - client.add_entity_message_handler(Self::handle_close_buffer); client.add_entity_message_handler(Self::handle_disk_based_diagnostics_updated); client.add_entity_message_handler(Self::handle_disk_based_diagnostics_updating); client.add_entity_message_handler(Self::handle_remove_collaborator); @@ -3456,16 +3455,6 @@ impl Project { }) } - async fn handle_close_buffer( - _: ModelHandle, - _: TypedEnvelope, - _: Arc, - _: AsyncAppContext, - ) -> Result<()> { - // TODO: use this for following - Ok(()) - } - async fn handle_buffer_saved( this: ModelHandle, envelope: TypedEnvelope, diff --git a/crates/project/src/worktree.rs b/crates/project/src/worktree.rs index 8761c7b80e..1130063c98 100644 --- a/crates/project/src/worktree.rs +++ b/crates/project/src/worktree.rs @@ -1415,20 +1415,6 @@ impl language::File for File { }) } - fn buffer_removed(&self, buffer_id: u64, cx: &mut MutableAppContext) { - self.worktree.update(cx, |worktree, _| { - if let Worktree::Remote(worktree) = worktree { - worktree - .client - .send(proto::CloseBuffer { - project_id: worktree.project_id, - buffer_id, - }) - .log_err(); - } - }); - } - fn as_any(&self) -> &dyn Any { self } diff --git a/crates/rpc/proto/zed.proto b/crates/rpc/proto/zed.proto index 377aef6946..7f43aaff1a 100644 --- a/crates/rpc/proto/zed.proto +++ b/crates/rpc/proto/zed.proto @@ -42,7 +42,6 @@ message Envelope { OpenBuffer open_buffer = 35; OpenBufferResponse open_buffer_response = 36; - CloseBuffer close_buffer = 37; UpdateBuffer update_buffer = 38; UpdateBufferFile update_buffer_file = 39; SaveBuffer save_buffer = 40; diff --git a/crates/rpc/src/proto.rs b/crates/rpc/src/proto.rs index ffb74f4939..d252decb3a 100644 --- a/crates/rpc/src/proto.rs +++ b/crates/rpc/src/proto.rs @@ -146,7 +146,6 @@ messages!( (BufferReloaded, Foreground), (BufferSaved, Foreground), (ChannelMessageSent, Foreground), - (CloseBuffer, Foreground), (DiskBasedDiagnosticsUpdated, Background), (DiskBasedDiagnosticsUpdating, Background), (Error, Foreground), @@ -247,7 +246,6 @@ entity_messages!( ApplyCompletionAdditionalEdits, BufferReloaded, BufferSaved, - CloseBuffer, DiskBasedDiagnosticsUpdated, DiskBasedDiagnosticsUpdating, FormatBuffers, diff --git a/crates/server/src/rpc.rs b/crates/server/src/rpc.rs index 7f1808fb08..0b5f5cf880 100644 --- a/crates/server/src/rpc.rs +++ b/crates/server/src/rpc.rs @@ -102,7 +102,6 @@ impl Server { .add_request_handler(Server::forward_project_request::) .add_request_handler(Server::forward_project_request::) .add_request_handler(Server::forward_project_request::) - .add_message_handler(Server::close_buffer) .add_request_handler(Server::update_buffer) .add_message_handler(Server::update_buffer_file) .add_message_handler(Server::buffer_reloaded) @@ -581,19 +580,6 @@ impl Server { .await?) } - async fn close_buffer( - self: Arc, - request: TypedEnvelope, - ) -> tide::Result<()> { - let host_connection_id = self - .state() - .read_project(request.payload.project_id, request.sender_id)? - .host_connection_id; - self.peer - .forward_send(request.sender_id, host_connection_id, request.payload)?; - Ok(()) - } - async fn save_buffer( self: Arc, request: TypedEnvelope,