hexedtech/codemp
3
0
Fork 0
mirror of https://github.com/hexedtech/codemp.git synced 2024-11-25 16:34:48 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix: imports and types

Browse source
This commit is contained in:
əlemi 2024-10-03 04:14:23 +02:00 committed by alemi.dev
parent 039a54b8e2
commit a318e3bc28
4 changed files with 9 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/ffi/java/cursor.rs
View file

@ -5,10 +5,6 @@ use crate::{
}, },
errors::ControllerError, errors::ControllerError,
}; };
use crate::{
api::{Controller, Cursor},
errors::ControllerError,
};
use jni::{objects::JObject, JNIEnv}; use jni::{objects::JObject, JNIEnv};
use jni_toolbox::jni; use jni_toolbox::jni;

10
src/ffi/js/buffer.rs
View file

@ -5,10 +5,6 @@ use crate::buffer::controller::BufferController;
use napi::threadsafe_function::{ use napi::threadsafe_function::{
ErrorStrategy::Fatal, ThreadSafeCallContext, ThreadsafeFunction, ThreadsafeFunctionCallMode, ErrorStrategy::Fatal, ThreadSafeCallContext, ThreadsafeFunction, ThreadsafeFunctionCallMode,
}; };
use napi::threadsafe_function::{
ErrorStrategy::Fatal, ThreadSafeCallContext, ThreadsafeFunction, ThreadsafeFunctionCallMode,
};
use napi_derive::napi;
use napi_derive::napi; use napi_derive::napi;
#[napi] #[napi]
@ -56,13 +52,15 @@ impl BufferController {
/// Return next buffer event if present /// Return next buffer event if present
#[napi(js_name = "try_recv")] #[napi(js_name = "try_recv")]
pub async fn js_try_recv(&self) -> napi::Result<Option<Delta<BufferAck>>> { pub async fn js_try_recv(
&self,
) -> napi::Result<Option<Delta<crate::buffer::controller::BufferAck>>> {
Ok(self.try_recv().await?) Ok(self.try_recv().await?)
} }
/// Wait for next buffer event and return it /// Wait for next buffer event and return it
#[napi(js_name = "recv")] #[napi(js_name = "recv")]
pub async fn js_recv(&self) -> napi::Result<Delta<BufferAck>> { pub async fn js_recv(&self) -> napi::Result<Delta<crate::buffer::controller::BufferAck>> {
Ok(self.recv().await?) Ok(self.recv().await?)
} }

5
src/ffi/js/cursor.rs
View file

@ -1,14 +1,9 @@
use crate::api::controller::{AsyncReceiver, AsyncSender}; use crate::api::controller::{AsyncReceiver, AsyncSender};
use crate::cursor::controller::CursorController; use crate::cursor::controller::CursorController;
use napi::threadsafe_function::ErrorStrategy::Fatal; use napi::threadsafe_function::ErrorStrategy::Fatal;
use napi::threadsafe_function::ErrorStrategy::Fatal;
use napi::threadsafe_function::{ use napi::threadsafe_function::{
ThreadSafeCallContext, ThreadsafeFunction, ThreadsafeFunctionCallMode, ThreadSafeCallContext, ThreadsafeFunction, ThreadsafeFunctionCallMode,
}; };
use napi::threadsafe_function::{
ThreadSafeCallContext, ThreadsafeFunction, ThreadsafeFunctionCallMode,
};
use napi_derive::napi;
use napi_derive::napi; use napi_derive::napi;
#[napi(object, js_name = "Cursor")] #[napi(object, js_name = "Cursor")]

7
src/ffi/js/workspace.rs
View file

@ -146,12 +146,15 @@ impl Workspace {
/// List users attached to a specific buffer /// List users attached to a specific buffer
#[napi(js_name = "list_buffer_users")] #[napi(js_name = "list_buffer_users")]
pub async fn js_list_buffer_users(&self, path: String) -> napi::Result<Vec<JsUser>> { pub async fn js_list_buffer_users(
&self,
path: String,
) -> napi::Result<Vec<crate::ffi::js::client::JsUser>> {
Ok(self Ok(self
.list_buffer_users(&path) .list_buffer_users(&path)
.await? .await?
.into_iter() .into_iter()
.map(JsUser::from) .map(super::client::JsUser::from)
.collect()) .collect())
} }
} }