a2115e7242
This is a pure refactor of our Git diff state management. Buffers are no longer are associated with one single diff (the unstaged changes). Instead, there is an explicit project API for retrieving a buffer's unstaged changes, and the `Editor` view layer is responsible for choosing what diff to associate with a buffer. The reason for this change is that we'll soon want to add multiple "git diff views" to Zed, one of which will show the *uncommitted* changes for a buffer. But that view will need to co-exist with other views of the same buffer, which may want to show the unstaged changes. ### Todo * [x] Get git gutter and git hunks working with new structure * [x] Update editor tests to use new APIs * [x] Update buffer tests * [x] Restructure remoting/collab protocol * [x] Update assertions about staged text in `random_project_collaboration_tests` * [x] Move buffer tests for git diff management to a new spot, using the new APIs Release Notes: - N/A --------- Co-authored-by: Richard <richard@zed.dev> Co-authored-by: Cole <cole@zed.dev> Co-authored-by: Conrad <conrad@zed.dev>
738 lines
23 KiB
Rust
738 lines
23 KiB
Rust
#![allow(non_snake_case)]
|
|
|
|
pub mod error;
|
|
mod macros;
|
|
mod typed_envelope;
|
|
|
|
pub use error::*;
|
|
pub use typed_envelope::*;
|
|
|
|
use collections::HashMap;
|
|
pub use prost::{DecodeError, Message};
|
|
use serde::Serialize;
|
|
use std::{
|
|
any::{Any, TypeId},
|
|
cmp,
|
|
fmt::{self, Debug},
|
|
iter, mem,
|
|
time::{Duration, SystemTime, UNIX_EPOCH},
|
|
};
|
|
|
|
include!(concat!(env!("OUT_DIR"), "/zed.messages.rs"));
|
|
|
|
pub const SSH_PEER_ID: PeerId = PeerId { owner_id: 0, id: 0 };
|
|
pub const SSH_PROJECT_ID: u64 = 0;
|
|
|
|
pub trait EnvelopedMessage: Clone + Debug + Serialize + Sized + Send + Sync + 'static {
|
|
const NAME: &'static str;
|
|
const PRIORITY: MessagePriority;
|
|
fn into_envelope(
|
|
self,
|
|
id: u32,
|
|
responding_to: Option<u32>,
|
|
original_sender_id: Option<PeerId>,
|
|
) -> Envelope;
|
|
fn from_envelope(envelope: Envelope) -> Option<Self>;
|
|
}
|
|
|
|
pub trait EntityMessage: EnvelopedMessage {
|
|
type Entity;
|
|
fn remote_entity_id(&self) -> u64;
|
|
}
|
|
|
|
pub trait RequestMessage: EnvelopedMessage {
|
|
type Response: EnvelopedMessage;
|
|
}
|
|
|
|
pub trait AnyTypedEnvelope: 'static + Send + Sync {
|
|
fn payload_type_id(&self) -> TypeId;
|
|
fn payload_type_name(&self) -> &'static str;
|
|
fn as_any(&self) -> &dyn Any;
|
|
fn into_any(self: Box<Self>) -> Box<dyn Any + Send + Sync>;
|
|
fn is_background(&self) -> bool;
|
|
fn original_sender_id(&self) -> Option<PeerId>;
|
|
fn sender_id(&self) -> PeerId;
|
|
fn message_id(&self) -> u32;
|
|
}
|
|
|
|
pub enum MessagePriority {
|
|
Foreground,
|
|
Background,
|
|
}
|
|
|
|
impl<T: EnvelopedMessage> AnyTypedEnvelope for TypedEnvelope<T> {
|
|
fn payload_type_id(&self) -> TypeId {
|
|
TypeId::of::<T>()
|
|
}
|
|
|
|
fn payload_type_name(&self) -> &'static str {
|
|
T::NAME
|
|
}
|
|
|
|
fn as_any(&self) -> &dyn Any {
|
|
self
|
|
}
|
|
|
|
fn into_any(self: Box<Self>) -> Box<dyn Any + Send + Sync> {
|
|
self
|
|
}
|
|
|
|
fn is_background(&self) -> bool {
|
|
matches!(T::PRIORITY, MessagePriority::Background)
|
|
}
|
|
|
|
fn original_sender_id(&self) -> Option<PeerId> {
|
|
self.original_sender_id
|
|
}
|
|
|
|
fn sender_id(&self) -> PeerId {
|
|
self.sender_id
|
|
}
|
|
|
|
fn message_id(&self) -> u32 {
|
|
self.message_id
|
|
}
|
|
}
|
|
|
|
impl PeerId {
|
|
pub fn from_u64(peer_id: u64) -> Self {
|
|
let owner_id = (peer_id >> 32) as u32;
|
|
let id = peer_id as u32;
|
|
Self { owner_id, id }
|
|
}
|
|
|
|
pub fn as_u64(self) -> u64 {
|
|
((self.owner_id as u64) << 32) | (self.id as u64)
|
|
}
|
|
}
|
|
|
|
impl Copy for PeerId {}
|
|
|
|
impl Eq for PeerId {}
|
|
|
|
impl Ord for PeerId {
|
|
fn cmp(&self, other: &Self) -> cmp::Ordering {
|
|
self.owner_id
|
|
.cmp(&other.owner_id)
|
|
.then_with(|| self.id.cmp(&other.id))
|
|
}
|
|
}
|
|
|
|
impl PartialOrd for PeerId {
|
|
fn partial_cmp(&self, other: &Self) -> Option<cmp::Ordering> {
|
|
Some(self.cmp(other))
|
|
}
|
|
}
|
|
|
|
impl std::hash::Hash for PeerId {
|
|
fn hash<H: std::hash::Hasher>(&self, state: &mut H) {
|
|
self.owner_id.hash(state);
|
|
self.id.hash(state);
|
|
}
|
|
}
|
|
|
|
impl fmt::Display for PeerId {
|
|
fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
|
|
write!(f, "{}/{}", self.owner_id, self.id)
|
|
}
|
|
}
|
|
|
|
messages!(
|
|
(AcceptTermsOfService, Foreground),
|
|
(AcceptTermsOfServiceResponse, Foreground),
|
|
(Ack, Foreground),
|
|
(AckBufferOperation, Background),
|
|
(AckChannelMessage, Background),
|
|
(AddNotification, Foreground),
|
|
(AddProjectCollaborator, Foreground),
|
|
(ApplyCodeAction, Background),
|
|
(ApplyCodeActionResponse, Background),
|
|
(ApplyCompletionAdditionalEdits, Background),
|
|
(ApplyCompletionAdditionalEditsResponse, Background),
|
|
(BufferReloaded, Foreground),
|
|
(BufferSaved, Foreground),
|
|
(Call, Foreground),
|
|
(CallCanceled, Foreground),
|
|
(CancelCall, Foreground),
|
|
(ChannelMessageSent, Foreground),
|
|
(ChannelMessageUpdate, Foreground),
|
|
(ComputeEmbeddings, Background),
|
|
(ComputeEmbeddingsResponse, Background),
|
|
(CopyProjectEntry, Foreground),
|
|
(CreateBufferForPeer, Foreground),
|
|
(CreateChannel, Foreground),
|
|
(CreateChannelResponse, Foreground),
|
|
(CreateProjectEntry, Foreground),
|
|
(CreateRoom, Foreground),
|
|
(CreateRoomResponse, Foreground),
|
|
(DeclineCall, Foreground),
|
|
(DeleteChannel, Foreground),
|
|
(DeleteNotification, Foreground),
|
|
(UpdateNotification, Foreground),
|
|
(DeleteProjectEntry, Foreground),
|
|
(EndStream, Foreground),
|
|
(Error, Foreground),
|
|
(ExpandProjectEntry, Foreground),
|
|
(ExpandProjectEntryResponse, Foreground),
|
|
(Follow, Foreground),
|
|
(FollowResponse, Foreground),
|
|
(FormatBuffers, Foreground),
|
|
(FormatBuffersResponse, Foreground),
|
|
(FuzzySearchUsers, Foreground),
|
|
(GetCachedEmbeddings, Background),
|
|
(GetCachedEmbeddingsResponse, Background),
|
|
(GetChannelMembers, Foreground),
|
|
(GetChannelMembersResponse, Foreground),
|
|
(GetChannelMessages, Background),
|
|
(GetChannelMessagesById, Background),
|
|
(GetChannelMessagesResponse, Background),
|
|
(GetCodeActions, Background),
|
|
(GetCodeActionsResponse, Background),
|
|
(GetCompletions, Background),
|
|
(GetCompletionsResponse, Background),
|
|
(GetDefinition, Background),
|
|
(GetDefinitionResponse, Background),
|
|
(GetDeclaration, Background),
|
|
(GetDeclarationResponse, Background),
|
|
(GetDocumentHighlights, Background),
|
|
(GetDocumentHighlightsResponse, Background),
|
|
(GetHover, Background),
|
|
(GetHoverResponse, Background),
|
|
(GetNotifications, Foreground),
|
|
(GetNotificationsResponse, Foreground),
|
|
(GetPrivateUserInfo, Foreground),
|
|
(GetPrivateUserInfoResponse, Foreground),
|
|
(GetProjectSymbols, Background),
|
|
(GetProjectSymbolsResponse, Background),
|
|
(GetReferences, Background),
|
|
(GetReferencesResponse, Background),
|
|
(GetSignatureHelp, Background),
|
|
(GetSignatureHelpResponse, Background),
|
|
(GetSupermavenApiKey, Background),
|
|
(GetSupermavenApiKeyResponse, Background),
|
|
(GetTypeDefinition, Background),
|
|
(GetTypeDefinitionResponse, Background),
|
|
(GetImplementation, Background),
|
|
(GetImplementationResponse, Background),
|
|
(GetLlmToken, Background),
|
|
(GetLlmTokenResponse, Background),
|
|
(GetStagedText, Foreground),
|
|
(GetStagedTextResponse, Foreground),
|
|
(GetUsers, Foreground),
|
|
(Hello, Foreground),
|
|
(IncomingCall, Foreground),
|
|
(InlayHints, Background),
|
|
(InlayHintsResponse, Background),
|
|
(InviteChannelMember, Foreground),
|
|
(JoinChannel, Foreground),
|
|
(JoinChannelBuffer, Foreground),
|
|
(JoinChannelBufferResponse, Foreground),
|
|
(JoinChannelChat, Foreground),
|
|
(JoinChannelChatResponse, Foreground),
|
|
(JoinProject, Foreground),
|
|
(JoinProjectResponse, Foreground),
|
|
(JoinRoom, Foreground),
|
|
(JoinRoomResponse, Foreground),
|
|
(LeaveChannelBuffer, Background),
|
|
(LeaveChannelChat, Foreground),
|
|
(LeaveProject, Foreground),
|
|
(LeaveRoom, Foreground),
|
|
(MarkNotificationRead, Foreground),
|
|
(MoveChannel, Foreground),
|
|
(OnTypeFormatting, Background),
|
|
(OnTypeFormattingResponse, Background),
|
|
(OpenBufferById, Background),
|
|
(OpenBufferByPath, Background),
|
|
(OpenBufferForSymbol, Background),
|
|
(OpenBufferForSymbolResponse, Background),
|
|
(OpenBufferResponse, Background),
|
|
(PerformRename, Background),
|
|
(PerformRenameResponse, Background),
|
|
(Ping, Foreground),
|
|
(PrepareRename, Background),
|
|
(PrepareRenameResponse, Background),
|
|
(ProjectEntryResponse, Foreground),
|
|
(CountLanguageModelTokens, Background),
|
|
(CountLanguageModelTokensResponse, Background),
|
|
(RefreshLlmToken, Background),
|
|
(RefreshInlayHints, Foreground),
|
|
(RejoinChannelBuffers, Foreground),
|
|
(RejoinChannelBuffersResponse, Foreground),
|
|
(RejoinRoom, Foreground),
|
|
(RejoinRoomResponse, Foreground),
|
|
(ReloadBuffers, Foreground),
|
|
(ReloadBuffersResponse, Foreground),
|
|
(RemoveChannelMember, Foreground),
|
|
(RemoveChannelMessage, Foreground),
|
|
(UpdateChannelMessage, Foreground),
|
|
(RemoveContact, Foreground),
|
|
(RemoveProjectCollaborator, Foreground),
|
|
(RenameChannel, Foreground),
|
|
(RenameChannelResponse, Foreground),
|
|
(RenameProjectEntry, Foreground),
|
|
(RequestContact, Foreground),
|
|
(ResolveCompletionDocumentation, Background),
|
|
(ResolveCompletionDocumentationResponse, Background),
|
|
(ResolveInlayHint, Background),
|
|
(ResolveInlayHintResponse, Background),
|
|
(RespondToChannelInvite, Foreground),
|
|
(RespondToContactRequest, Foreground),
|
|
(RoomUpdated, Foreground),
|
|
(SaveBuffer, Foreground),
|
|
(SetChannelMemberRole, Foreground),
|
|
(SetChannelVisibility, Foreground),
|
|
(SendChannelMessage, Background),
|
|
(SendChannelMessageResponse, Background),
|
|
(ShareProject, Foreground),
|
|
(ShareProjectResponse, Foreground),
|
|
(ShowContacts, Foreground),
|
|
(StartLanguageServer, Foreground),
|
|
(SubscribeToChannels, Foreground),
|
|
(SynchronizeBuffers, Foreground),
|
|
(SynchronizeBuffersResponse, Foreground),
|
|
(TaskContextForLocation, Background),
|
|
(TaskContext, Background),
|
|
(Test, Foreground),
|
|
(Unfollow, Foreground),
|
|
(UnshareProject, Foreground),
|
|
(UpdateBuffer, Foreground),
|
|
(UpdateBufferFile, Foreground),
|
|
(UpdateChannelBuffer, Foreground),
|
|
(UpdateChannelBufferCollaborators, Foreground),
|
|
(UpdateChannels, Foreground),
|
|
(UpdateUserChannels, Foreground),
|
|
(UpdateContacts, Foreground),
|
|
(UpdateDiagnosticSummary, Foreground),
|
|
(UpdateDiffBase, Foreground),
|
|
(UpdateFollowers, Foreground),
|
|
(UpdateInviteInfo, Foreground),
|
|
(UpdateLanguageServer, Foreground),
|
|
(UpdateParticipantLocation, Foreground),
|
|
(UpdateProject, Foreground),
|
|
(UpdateProjectCollaborator, Foreground),
|
|
(UpdateUserPlan, Foreground),
|
|
(UpdateWorktree, Foreground),
|
|
(UpdateWorktreeSettings, Foreground),
|
|
(UsersResponse, Foreground),
|
|
(LspExtExpandMacro, Background),
|
|
(LspExtExpandMacroResponse, Background),
|
|
(LspExtOpenDocs, Background),
|
|
(LspExtOpenDocsResponse, Background),
|
|
(SetRoomParticipantRole, Foreground),
|
|
(BlameBuffer, Foreground),
|
|
(BlameBufferResponse, Foreground),
|
|
(RejoinRemoteProjects, Foreground),
|
|
(RejoinRemoteProjectsResponse, Foreground),
|
|
(MultiLspQuery, Background),
|
|
(MultiLspQueryResponse, Background),
|
|
(ListRemoteDirectory, Background),
|
|
(ListRemoteDirectoryResponse, Background),
|
|
(OpenNewBuffer, Foreground),
|
|
(RestartLanguageServers, Foreground),
|
|
(LinkedEditingRange, Background),
|
|
(LinkedEditingRangeResponse, Background),
|
|
(AdvertiseContexts, Foreground),
|
|
(OpenContext, Foreground),
|
|
(OpenContextResponse, Foreground),
|
|
(CreateContext, Foreground),
|
|
(CreateContextResponse, Foreground),
|
|
(UpdateContext, Foreground),
|
|
(SynchronizeContexts, Foreground),
|
|
(SynchronizeContextsResponse, Foreground),
|
|
(LspExtSwitchSourceHeader, Background),
|
|
(LspExtSwitchSourceHeaderResponse, Background),
|
|
(AddWorktree, Foreground),
|
|
(AddWorktreeResponse, Foreground),
|
|
(FindSearchCandidates, Background),
|
|
(FindSearchCandidatesResponse, Background),
|
|
(CloseBuffer, Foreground),
|
|
(ShutdownRemoteServer, Foreground),
|
|
(RemoveWorktree, Foreground),
|
|
(LanguageServerLog, Foreground),
|
|
(Toast, Background),
|
|
(HideToast, Background),
|
|
(OpenServerSettings, Foreground),
|
|
(GetPermalinkToLine, Foreground),
|
|
(GetPermalinkToLineResponse, Foreground),
|
|
(FlushBufferedMessages, Foreground),
|
|
(LanguageServerPromptRequest, Foreground),
|
|
(LanguageServerPromptResponse, Foreground),
|
|
(GitBranches, Background),
|
|
(GitBranchesResponse, Background),
|
|
(UpdateGitBranch, Background),
|
|
(ListToolchains, Foreground),
|
|
(ListToolchainsResponse, Foreground),
|
|
(ActivateToolchain, Foreground),
|
|
(ActiveToolchain, Foreground),
|
|
(ActiveToolchainResponse, Foreground),
|
|
(GetPathMetadata, Background),
|
|
(GetPathMetadataResponse, Background),
|
|
(GetPanicFiles, Background),
|
|
(GetPanicFilesResponse, Background),
|
|
(CancelLanguageServerWork, Foreground),
|
|
(SyncExtensions, Background),
|
|
(SyncExtensionsResponse, Background),
|
|
(InstallExtension, Background),
|
|
);
|
|
|
|
request_messages!(
|
|
(AcceptTermsOfService, AcceptTermsOfServiceResponse),
|
|
(ApplyCodeAction, ApplyCodeActionResponse),
|
|
(
|
|
ApplyCompletionAdditionalEdits,
|
|
ApplyCompletionAdditionalEditsResponse
|
|
),
|
|
(Call, Ack),
|
|
(CancelCall, Ack),
|
|
(CopyProjectEntry, ProjectEntryResponse),
|
|
(ComputeEmbeddings, ComputeEmbeddingsResponse),
|
|
(CreateChannel, CreateChannelResponse),
|
|
(CreateProjectEntry, ProjectEntryResponse),
|
|
(CreateRoom, CreateRoomResponse),
|
|
(DeclineCall, Ack),
|
|
(DeleteChannel, Ack),
|
|
(DeleteProjectEntry, ProjectEntryResponse),
|
|
(ExpandProjectEntry, ExpandProjectEntryResponse),
|
|
(Follow, FollowResponse),
|
|
(FormatBuffers, FormatBuffersResponse),
|
|
(FuzzySearchUsers, UsersResponse),
|
|
(GetCachedEmbeddings, GetCachedEmbeddingsResponse),
|
|
(GetChannelMembers, GetChannelMembersResponse),
|
|
(GetChannelMessages, GetChannelMessagesResponse),
|
|
(GetChannelMessagesById, GetChannelMessagesResponse),
|
|
(GetCodeActions, GetCodeActionsResponse),
|
|
(GetCompletions, GetCompletionsResponse),
|
|
(GetDefinition, GetDefinitionResponse),
|
|
(GetDeclaration, GetDeclarationResponse),
|
|
(GetImplementation, GetImplementationResponse),
|
|
(GetDocumentHighlights, GetDocumentHighlightsResponse),
|
|
(GetHover, GetHoverResponse),
|
|
(GetLlmToken, GetLlmTokenResponse),
|
|
(GetNotifications, GetNotificationsResponse),
|
|
(GetPrivateUserInfo, GetPrivateUserInfoResponse),
|
|
(GetProjectSymbols, GetProjectSymbolsResponse),
|
|
(GetReferences, GetReferencesResponse),
|
|
(GetSignatureHelp, GetSignatureHelpResponse),
|
|
(GetStagedText, GetStagedTextResponse),
|
|
(GetSupermavenApiKey, GetSupermavenApiKeyResponse),
|
|
(GetTypeDefinition, GetTypeDefinitionResponse),
|
|
(LinkedEditingRange, LinkedEditingRangeResponse),
|
|
(ListRemoteDirectory, ListRemoteDirectoryResponse),
|
|
(GetUsers, UsersResponse),
|
|
(IncomingCall, Ack),
|
|
(InlayHints, InlayHintsResponse),
|
|
(InviteChannelMember, Ack),
|
|
(JoinChannel, JoinRoomResponse),
|
|
(JoinChannelBuffer, JoinChannelBufferResponse),
|
|
(JoinChannelChat, JoinChannelChatResponse),
|
|
(JoinProject, JoinProjectResponse),
|
|
(JoinRoom, JoinRoomResponse),
|
|
(LeaveChannelBuffer, Ack),
|
|
(LeaveRoom, Ack),
|
|
(MarkNotificationRead, Ack),
|
|
(MoveChannel, Ack),
|
|
(OnTypeFormatting, OnTypeFormattingResponse),
|
|
(OpenBufferById, OpenBufferResponse),
|
|
(OpenBufferByPath, OpenBufferResponse),
|
|
(OpenBufferForSymbol, OpenBufferForSymbolResponse),
|
|
(OpenNewBuffer, OpenBufferResponse),
|
|
(PerformRename, PerformRenameResponse),
|
|
(Ping, Ack),
|
|
(PrepareRename, PrepareRenameResponse),
|
|
(CountLanguageModelTokens, CountLanguageModelTokensResponse),
|
|
(RefreshInlayHints, Ack),
|
|
(RejoinChannelBuffers, RejoinChannelBuffersResponse),
|
|
(RejoinRoom, RejoinRoomResponse),
|
|
(ReloadBuffers, ReloadBuffersResponse),
|
|
(RemoveChannelMember, Ack),
|
|
(RemoveChannelMessage, Ack),
|
|
(UpdateChannelMessage, Ack),
|
|
(RemoveContact, Ack),
|
|
(RenameChannel, RenameChannelResponse),
|
|
(RenameProjectEntry, ProjectEntryResponse),
|
|
(RequestContact, Ack),
|
|
(
|
|
ResolveCompletionDocumentation,
|
|
ResolveCompletionDocumentationResponse
|
|
),
|
|
(ResolveInlayHint, ResolveInlayHintResponse),
|
|
(RespondToChannelInvite, Ack),
|
|
(RespondToContactRequest, Ack),
|
|
(SaveBuffer, BufferSaved),
|
|
(FindSearchCandidates, FindSearchCandidatesResponse),
|
|
(SendChannelMessage, SendChannelMessageResponse),
|
|
(SetChannelMemberRole, Ack),
|
|
(SetChannelVisibility, Ack),
|
|
(ShareProject, ShareProjectResponse),
|
|
(SynchronizeBuffers, SynchronizeBuffersResponse),
|
|
(TaskContextForLocation, TaskContext),
|
|
(Test, Test),
|
|
(UpdateBuffer, Ack),
|
|
(UpdateParticipantLocation, Ack),
|
|
(UpdateProject, Ack),
|
|
(UpdateWorktree, Ack),
|
|
(LspExtExpandMacro, LspExtExpandMacroResponse),
|
|
(LspExtOpenDocs, LspExtOpenDocsResponse),
|
|
(SetRoomParticipantRole, Ack),
|
|
(BlameBuffer, BlameBufferResponse),
|
|
(RejoinRemoteProjects, RejoinRemoteProjectsResponse),
|
|
(MultiLspQuery, MultiLspQueryResponse),
|
|
(RestartLanguageServers, Ack),
|
|
(OpenContext, OpenContextResponse),
|
|
(CreateContext, CreateContextResponse),
|
|
(SynchronizeContexts, SynchronizeContextsResponse),
|
|
(LspExtSwitchSourceHeader, LspExtSwitchSourceHeaderResponse),
|
|
(AddWorktree, AddWorktreeResponse),
|
|
(ShutdownRemoteServer, Ack),
|
|
(RemoveWorktree, Ack),
|
|
(OpenServerSettings, OpenBufferResponse),
|
|
(GetPermalinkToLine, GetPermalinkToLineResponse),
|
|
(FlushBufferedMessages, Ack),
|
|
(LanguageServerPromptRequest, LanguageServerPromptResponse),
|
|
(GitBranches, GitBranchesResponse),
|
|
(UpdateGitBranch, Ack),
|
|
(ListToolchains, ListToolchainsResponse),
|
|
(ActivateToolchain, Ack),
|
|
(ActiveToolchain, ActiveToolchainResponse),
|
|
(GetPathMetadata, GetPathMetadataResponse),
|
|
(GetPanicFiles, GetPanicFilesResponse),
|
|
(CancelLanguageServerWork, Ack),
|
|
(SyncExtensions, SyncExtensionsResponse),
|
|
(InstallExtension, Ack),
|
|
);
|
|
|
|
entity_messages!(
|
|
{project_id, ShareProject},
|
|
AddProjectCollaborator,
|
|
AddWorktree,
|
|
ApplyCodeAction,
|
|
ApplyCompletionAdditionalEdits,
|
|
BlameBuffer,
|
|
BufferReloaded,
|
|
BufferSaved,
|
|
CloseBuffer,
|
|
CopyProjectEntry,
|
|
CreateBufferForPeer,
|
|
CreateProjectEntry,
|
|
DeleteProjectEntry,
|
|
ExpandProjectEntry,
|
|
FindSearchCandidates,
|
|
FormatBuffers,
|
|
GetCodeActions,
|
|
GetCompletions,
|
|
GetDefinition,
|
|
GetDeclaration,
|
|
GetImplementation,
|
|
GetDocumentHighlights,
|
|
GetHover,
|
|
GetProjectSymbols,
|
|
GetReferences,
|
|
GetSignatureHelp,
|
|
GetStagedText,
|
|
GetTypeDefinition,
|
|
InlayHints,
|
|
JoinProject,
|
|
LeaveProject,
|
|
LinkedEditingRange,
|
|
MultiLspQuery,
|
|
RestartLanguageServers,
|
|
OnTypeFormatting,
|
|
OpenNewBuffer,
|
|
OpenBufferById,
|
|
OpenBufferByPath,
|
|
OpenBufferForSymbol,
|
|
PerformRename,
|
|
PrepareRename,
|
|
RefreshInlayHints,
|
|
ReloadBuffers,
|
|
RemoveProjectCollaborator,
|
|
RenameProjectEntry,
|
|
ResolveCompletionDocumentation,
|
|
ResolveInlayHint,
|
|
SaveBuffer,
|
|
StartLanguageServer,
|
|
SynchronizeBuffers,
|
|
TaskContextForLocation,
|
|
UnshareProject,
|
|
UpdateBuffer,
|
|
UpdateBufferFile,
|
|
UpdateDiagnosticSummary,
|
|
UpdateDiffBase,
|
|
UpdateLanguageServer,
|
|
UpdateProject,
|
|
UpdateProjectCollaborator,
|
|
UpdateWorktree,
|
|
UpdateWorktreeSettings,
|
|
LspExtExpandMacro,
|
|
LspExtOpenDocs,
|
|
AdvertiseContexts,
|
|
OpenContext,
|
|
CreateContext,
|
|
UpdateContext,
|
|
SynchronizeContexts,
|
|
LspExtSwitchSourceHeader,
|
|
LanguageServerLog,
|
|
Toast,
|
|
HideToast,
|
|
OpenServerSettings,
|
|
GetPermalinkToLine,
|
|
LanguageServerPromptRequest,
|
|
GitBranches,
|
|
UpdateGitBranch,
|
|
ListToolchains,
|
|
ActivateToolchain,
|
|
ActiveToolchain,
|
|
GetPathMetadata,
|
|
CancelLanguageServerWork,
|
|
);
|
|
|
|
entity_messages!(
|
|
{channel_id, Channel},
|
|
ChannelMessageSent,
|
|
ChannelMessageUpdate,
|
|
RemoveChannelMessage,
|
|
UpdateChannelMessage,
|
|
UpdateChannelBuffer,
|
|
UpdateChannelBufferCollaborators,
|
|
);
|
|
|
|
impl From<Timestamp> for SystemTime {
|
|
fn from(val: Timestamp) -> Self {
|
|
UNIX_EPOCH
|
|
.checked_add(Duration::new(val.seconds, val.nanos))
|
|
.unwrap()
|
|
}
|
|
}
|
|
|
|
impl From<SystemTime> for Timestamp {
|
|
fn from(time: SystemTime) -> Self {
|
|
let duration = time.duration_since(UNIX_EPOCH).unwrap();
|
|
Self {
|
|
seconds: duration.as_secs(),
|
|
nanos: duration.subsec_nanos(),
|
|
}
|
|
}
|
|
}
|
|
|
|
impl From<u128> for Nonce {
|
|
fn from(nonce: u128) -> Self {
|
|
let upper_half = (nonce >> 64) as u64;
|
|
let lower_half = nonce as u64;
|
|
Self {
|
|
upper_half,
|
|
lower_half,
|
|
}
|
|
}
|
|
}
|
|
|
|
impl From<Nonce> for u128 {
|
|
fn from(nonce: Nonce) -> Self {
|
|
let upper_half = (nonce.upper_half as u128) << 64;
|
|
let lower_half = nonce.lower_half as u128;
|
|
upper_half | lower_half
|
|
}
|
|
}
|
|
|
|
#[cfg(any(test, feature = "test-support"))]
|
|
pub const MAX_WORKTREE_UPDATE_MAX_CHUNK_SIZE: usize = 2;
|
|
#[cfg(not(any(test, feature = "test-support")))]
|
|
pub const MAX_WORKTREE_UPDATE_MAX_CHUNK_SIZE: usize = 256;
|
|
|
|
pub fn split_worktree_update(mut message: UpdateWorktree) -> impl Iterator<Item = UpdateWorktree> {
|
|
let mut done_files = false;
|
|
|
|
let mut repository_map = message
|
|
.updated_repositories
|
|
.into_iter()
|
|
.map(|repo| (repo.work_directory_id, repo))
|
|
.collect::<HashMap<_, _>>();
|
|
|
|
iter::from_fn(move || {
|
|
if done_files {
|
|
return None;
|
|
}
|
|
|
|
let updated_entries_chunk_size = cmp::min(
|
|
message.updated_entries.len(),
|
|
MAX_WORKTREE_UPDATE_MAX_CHUNK_SIZE,
|
|
);
|
|
let updated_entries: Vec<_> = message
|
|
.updated_entries
|
|
.drain(..updated_entries_chunk_size)
|
|
.collect();
|
|
|
|
let removed_entries_chunk_size = cmp::min(
|
|
message.removed_entries.len(),
|
|
MAX_WORKTREE_UPDATE_MAX_CHUNK_SIZE,
|
|
);
|
|
let removed_entries = message
|
|
.removed_entries
|
|
.drain(..removed_entries_chunk_size)
|
|
.collect();
|
|
|
|
done_files = message.updated_entries.is_empty() && message.removed_entries.is_empty();
|
|
|
|
let mut updated_repositories = Vec::new();
|
|
|
|
if !repository_map.is_empty() {
|
|
for entry in &updated_entries {
|
|
if let Some(repo) = repository_map.remove(&entry.id) {
|
|
updated_repositories.push(repo)
|
|
}
|
|
}
|
|
}
|
|
|
|
let removed_repositories = if done_files {
|
|
mem::take(&mut message.removed_repositories)
|
|
} else {
|
|
Default::default()
|
|
};
|
|
|
|
if done_files {
|
|
updated_repositories.extend(mem::take(&mut repository_map).into_values());
|
|
}
|
|
|
|
Some(UpdateWorktree {
|
|
project_id: message.project_id,
|
|
worktree_id: message.worktree_id,
|
|
root_name: message.root_name.clone(),
|
|
abs_path: message.abs_path.clone(),
|
|
updated_entries,
|
|
removed_entries,
|
|
scan_id: message.scan_id,
|
|
is_last_update: done_files && message.is_last_update,
|
|
updated_repositories,
|
|
removed_repositories,
|
|
})
|
|
})
|
|
}
|
|
|
|
#[cfg(test)]
|
|
mod tests {
|
|
use super::*;
|
|
|
|
#[test]
|
|
fn test_converting_peer_id_from_and_to_u64() {
|
|
let peer_id = PeerId {
|
|
owner_id: 10,
|
|
id: 3,
|
|
};
|
|
assert_eq!(PeerId::from_u64(peer_id.as_u64()), peer_id);
|
|
let peer_id = PeerId {
|
|
owner_id: u32::MAX,
|
|
id: 3,
|
|
};
|
|
assert_eq!(PeerId::from_u64(peer_id.as_u64()), peer_id);
|
|
let peer_id = PeerId {
|
|
owner_id: 10,
|
|
id: u32::MAX,
|
|
};
|
|
assert_eq!(PeerId::from_u64(peer_id.as_u64()), peer_id);
|
|
let peer_id = PeerId {
|
|
owner_id: u32::MAX,
|
|
id: u32::MAX,
|
|
};
|
|
assert_eq!(PeerId::from_u64(peer_id.as_u64()), peer_id);
|
|
}
|
|
}
|