chore: autofmt

This commit is contained in:
əlemi 2024-10-03 04:06:54 +02:00
parent 8225524cb3
commit 2fe217ad85
Signed by: alemi
GPG key ID: A4895B84D311642C
9 changed files with 84 additions and 74 deletions

View file

@ -30,7 +30,8 @@ pub trait Controller<Tx, Rx = Tx> : AsyncSender<Tx> + AsyncReceiver<Rx>
where where
Tx: Sized + Sync + Send, Tx: Sized + Sync + Send,
Rx: Sized + Sync + Send, Rx: Sized + Sync + Send,
{} {
}
/// Asynchronous and thread-safe handle to send data over a stream. /// Asynchronous and thread-safe handle to send data over a stream.
/// See [`Controller`]'s documentation for details. /// See [`Controller`]'s documentation for details.

View file

@ -142,7 +142,12 @@ impl BufferController {
} }
impl BufferWorker { impl BufferWorker {
async fn handle_editor_change(&mut self, change: TextChange, ack: oneshot::Sender<LocalVersion>, tx: &mpsc::Sender<Operation>) { async fn handle_editor_change(
&mut self,
change: TextChange,
ack: oneshot::Sender<LocalVersion>,
tx: &mpsc::Sender<Operation>,
) {
let agent_id = self.oplog.get_or_create_agent_id(&self.user_id.to_string()); let agent_id = self.oplog.get_or_create_agent_id(&self.user_id.to_string());
let last_ver = self.oplog.local_version(); let last_ver = self.oplog.local_version();
// clip to buffer extents // clip to buffer extents
@ -151,20 +156,27 @@ impl BufferWorker {
// in case we have a "replace" span // in case we have a "replace" span
if change.is_delete() { if change.is_delete() {
self.branch.delete_without_content(&mut self.oplog, agent_id, clip_start..clip_end); self.branch
.delete_without_content(&mut self.oplog, agent_id, clip_start..clip_end);
} }
if change.is_insert() { if change.is_insert() {
self.branch.insert(&mut self.oplog, agent_id, clip_start, &change.content); self.branch
.insert(&mut self.oplog, agent_id, clip_start, &change.content);
} }
if change.is_delete() || change.is_insert() { if change.is_delete() || change.is_insert() {
tx.send(Operation { data: self.oplog.encode_from(Default::default(), &last_ver) }).await tx.send(Operation {
data: self.oplog.encode_from(Default::default(), &last_ver),
})
.await
.unwrap_or_warn("failed to send change!"); .unwrap_or_warn("failed to send change!");
self.latest_version.send(self.oplog.local_version()) self.latest_version
.send(self.oplog.local_version())
.unwrap_or_warn("failed to update latest version!"); .unwrap_or_warn("failed to update latest version!");
} }
ack.send(self.branch.local_version()).unwrap_or_warn("controller didn't wait for ack"); ack.send(self.branch.local_version())
.unwrap_or_warn("controller didn't wait for ack");
} }
async fn handle_server_change(&mut self, change: BufferEvent) -> bool { async fn handle_server_change(&mut self, change: BufferEvent) -> bool {
@ -172,7 +184,8 @@ impl BufferWorker {
None => true, // clean exit actually, just weird we caught it here None => true, // clean exit actually, just weird we caught it here
Some(controller) => match self.oplog.decode_and_add(&change.op.data) { Some(controller) => match self.oplog.decode_and_add(&change.op.data) {
Ok(local_version) => { Ok(local_version) => {
self.latest_version.send(local_version) self.latest_version
.send(local_version)
.unwrap_or_warn("failed to update latest version!"); .unwrap_or_warn("failed to update latest version!");
for tx in self.pollers.drain(..) { for tx in self.pollers.drain(..) {
tx.send(()).unwrap_or_warn("could not wake up poller"); tx.send(()).unwrap_or_warn("could not wake up poller");
@ -181,17 +194,18 @@ impl BufferWorker {
cb.call(BufferController(controller)); // TODO should we run this on another task/thread? cb.call(BufferController(controller)); // TODO should we run this on another task/thread?
} }
false false
}, }
Err(e) => { Err(e) => {
tracing::error!("could not deserialize operation from server: {}", e); tracing::error!("could not deserialize operation from server: {}", e);
true true
},
} }
},
} }
} }
async fn handle_delta_request(&mut self, last_ver: LocalVersion, tx: oneshot::Sender<DeltaOp>) { async fn handle_delta_request(&mut self, last_ver: LocalVersion, tx: oneshot::Sender<DeltaOp>) {
if let Some((lv, Some(dtop))) = self.oplog if let Some((lv, Some(dtop))) = self
.oplog
.iter_xf_operations_from(&last_ver, self.oplog.local_version_ref()) .iter_xf_operations_from(&last_ver, self.oplog.local_version_ref())
.next() .next()
{ {
@ -204,33 +218,36 @@ impl BufferWorker {
let hash = if self.timer.step() { let hash = if self.timer.step() {
Some(crate::ext::hash(self.branch.content().to_string())) Some(crate::ext::hash(self.branch.content().to_string()))
} else { None }; } else {
None
};
let tc = match dtop.kind { let tc = match dtop.kind {
diamond_types::list::operation::OpKind::Ins => { diamond_types::list::operation::OpKind::Ins => {
if dtop.end() - dtop.start() != dtop.content_as_str().unwrap_or_default().len() { if dtop.end() - dtop.start() != dtop.content_as_str().unwrap_or_default().len()
{
tracing::error!("[?!?!] Insert span differs from effective content len (TODO remove this error after a bit)"); tracing::error!("[?!?!] Insert span differs from effective content len (TODO remove this error after a bit)");
} }
crate::api::change::TextChange { crate::api::change::TextChange {
start: dtop.start() as u32, start: dtop.start() as u32,
end: dtop.start() as u32, end: dtop.start() as u32,
content: dtop.content_as_str().unwrap_or_default().to_string(), content: dtop.content_as_str().unwrap_or_default().to_string(),
hash hash,
}
} }
},
diamond_types::list::operation::OpKind::Del => { diamond_types::list::operation::OpKind::Del => crate::api::change::TextChange {
crate::api::change::TextChange {
start: dtop.start() as u32, start: dtop.start() as u32,
end: dtop.end() as u32, end: dtop.end() as u32,
content: dtop.content_as_str().unwrap_or_default().to_string(), content: dtop.content_as_str().unwrap_or_default().to_string(),
hash hash,
} },
}
}; };
tx.send((new_local_v, Some(tc))).unwrap_or_warn("could not update ops channel -- is controller dead?"); tx.send((new_local_v, Some(tc)))
.unwrap_or_warn("could not update ops channel -- is controller dead?");
} else { } else {
tx.send((last_ver, None)).unwrap_or_warn("could not update ops channel -- is controller dead?"); tx.send((last_ver, None))
.unwrap_or_warn("could not update ops channel -- is controller dead?");
} }
} }
} }

View file

@ -54,7 +54,7 @@ impl LuaUserData for Promise {
Some(x) => { Some(x) => {
x.abort(); x.abort();
Ok(()) Ok(())
}, }
}); });
methods.add_method_mut("and_then", |_, this, (cb,): (LuaFunction,)| { methods.add_method_mut("and_then", |_, this, (cb,): (LuaFunction,)| {
match this.0.take() { match this.0.take() {

View file

@ -33,9 +33,9 @@ impl LuaUserData for CodempWorkspace {
Ok(this.buffer_by_name(&name)) Ok(this.buffer_by_name(&name))
}); });
methods.add_method("fetch_buffers", |_, this, ()| methods.add_method(
a_sync! { this => this.fetch_buffers().await? } "fetch_buffers",
|_, this, ()| a_sync! { this => this.fetch_buffers().await? },
); );
methods.add_method( methods.add_method(
"fetch_users", "fetch_users",
@ -49,24 +49,21 @@ impl LuaUserData for CodempWorkspace {
}, },
); );
methods.add_method("user_list", |_, this, ()| methods.add_method("user_list", |_, this, ()| Ok(this.user_list()));
Ok(this.user_list())
methods.add_method("recv", |_, this, ()| a_sync! { this => this.recv().await? });
methods.add_method(
"try_recv",
|_, this, ()| a_sync! { this => this.try_recv().await? },
); );
methods.add_method("recv", |_, this, ()| methods.add_method("poll", |_, this, ()| a_sync! { this => this.poll().await? });
a_sync! { this => this.recv().await? }
);
methods.add_method("try_recv", |_, this, ()|
a_sync! { this => this.try_recv().await? }
);
methods.add_method("poll", |_, this, ()|
a_sync! { this => this.poll().await? }
);
methods.add_method("callback", |_, this, (cb,): (LuaFunction,)| { methods.add_method("callback", |_, this, (cb,): (LuaFunction,)| {
this.callback(move |controller: CodempWorkspace| super::ext::callback().invoke(cb.clone(), controller)); this.callback(move |controller: CodempWorkspace| {
super::ext::callback().invoke(cb.clone(), controller)
});
Ok(()) Ok(())
}); });
@ -74,7 +71,6 @@ impl LuaUserData for CodempWorkspace {
this.clear_callback(); this.clear_callback();
Ok(()) Ok(())
}); });
} }
fn add_fields<F: LuaUserDataFields<Self>>(fields: &mut F) { fn add_fields<F: LuaUserDataFields<Self>>(fields: &mut F) {

View file

@ -1,4 +1,4 @@
use crate::api::controller::{AsyncSender, AsyncReceiver}; use crate::api::controller::{AsyncReceiver, AsyncSender};
use crate::api::Cursor; use crate::api::Cursor;
use crate::api::TextChange; use crate::api::TextChange;
use crate::buffer::Controller as BufferController; use crate::buffer::Controller as BufferController;

View file

@ -1,7 +1,7 @@
use crate::api::controller::AsyncReceiver;
use crate::buffer::Controller as BufferController; use crate::buffer::Controller as BufferController;
use crate::cursor::Controller as CursorController; use crate::cursor::Controller as CursorController;
use crate::workspace::Workspace; use crate::workspace::Workspace;
use crate::api::controller::AsyncReceiver;
use pyo3::exceptions::PyValueError; use pyo3::exceptions::PyValueError;
use pyo3::prelude::*; use pyo3::prelude::*;

View file

@ -2,14 +2,9 @@
//! All-in-one renamed imports with `use codemp::prelude::*`. //! All-in-one renamed imports with `use codemp::prelude::*`.
pub use crate::api::{ pub use crate::api::{
Controller as CodempController, controller::AsyncReceiver as CodempAsyncReceiver, controller::AsyncSender as CodempAsyncSender,
controller::AsyncSender as CodempAsyncSender, Config as CodempConfig, Controller as CodempController, Cursor as CodempCursor,
controller::AsyncReceiver as CodempAsyncReceiver, Event as CodempEvent, TextChange as CodempTextChange, User as CodempUser,
TextChange as CodempTextChange,
Cursor as CodempCursor,
User as CodempUser,
Event as CodempEvent,
Config as CodempConfig,
}; };
pub use crate::{ pub use crate::{

View file

@ -4,7 +4,10 @@
//! Buffers are typically organized in a filetree-like reminiscent of POSIX filesystems. //! Buffers are typically organized in a filetree-like reminiscent of POSIX filesystems.
use crate::{ use crate::{
api::{controller::{AsyncReceiver, ControllerCallback}, Event, User}, api::{
controller::{AsyncReceiver, ControllerCallback},
Event, User,
},
buffer, cursor, buffer, cursor,
errors::{ConnectionResult, ControllerResult, RemoteResult}, errors::{ConnectionResult, ControllerResult, RemoteResult},
ext::InternallyMutable, ext::InternallyMutable,
@ -24,7 +27,7 @@ use codemp_proto::{
use dashmap::{DashMap, DashSet}; use dashmap::{DashMap, DashSet};
use std::{collections::BTreeSet, sync::Arc}; use std::{collections::BTreeSet, sync::Arc};
use tokio::sync::{mpsc::error::TryRecvError, mpsc}; use tokio::sync::{mpsc, mpsc::error::TryRecvError};
use tonic::Streaming; use tonic::Streaming;
use uuid::Uuid; use uuid::Uuid;
@ -60,12 +63,7 @@ struct WorkspaceInner {
impl AsyncReceiver<Event> for Workspace { impl AsyncReceiver<Event> for Workspace {
async fn try_recv(&self) -> ControllerResult<Option<Event>> { async fn try_recv(&self) -> ControllerResult<Option<Event>> {
match self.0 match self.0.events.lock().await.try_recv() {
.events
.lock()
.await
.try_recv()
{
Ok(x) => Ok(Some(x)), Ok(x) => Ok(Some(x)),
Err(TryRecvError::Empty) => Ok(None), Err(TryRecvError::Empty) => Ok(None),
Err(TryRecvError::Disconnected) => Err(crate::errors::ControllerError::Stopped), Err(TryRecvError::Disconnected) => Err(crate::errors::ControllerError::Stopped),
@ -74,7 +72,9 @@ impl AsyncReceiver<Event> for Workspace {
async fn poll(&self) -> ControllerResult<()> { async fn poll(&self) -> ControllerResult<()> {
loop { loop {
if !self.0.events.lock().await.is_empty() { break Ok(()) } if !self.0.events.lock().await.is_empty() {
break Ok(());
}
// TODO disgusting, please send help // TODO disgusting, please send help
tokio::time::sleep(std::time::Duration::from_millis(200)).await; tokio::time::sleep(std::time::Duration::from_millis(200)).await;
} }
@ -312,7 +312,8 @@ impl Workspace {
/// A filter may be applied, and it may be strict (equality check) or not (starts_with check). /// A filter may be applied, and it may be strict (equality check) or not (starts_with check).
// #[cfg_attr(feature = "js", napi)] // https://github.com/napi-rs/napi-rs/issues/1120 // #[cfg_attr(feature = "js", napi)] // https://github.com/napi-rs/napi-rs/issues/1120
pub fn filetree(&self, filter: Option<&str>, strict: bool) -> Vec<String> { pub fn filetree(&self, filter: Option<&str>, strict: bool) -> Vec<String> {
let mut tree = self.0 let mut tree = self
.0
.filetree .filetree
.iter() .iter()
.filter(|f| { .filter(|f| {