hexedtech/codemp
3
0
Fork 0
mirror of https://github.com/hexedtech/codemp.git synced 2024-10-22 17:59:20 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix(lua): cursor fields must be tuples too

Browse source
This commit is contained in:
əlemi 2024-09-16 19:58:52 +02:00
parent cd1fc21df7
commit 7aff141e78
Signed by: alemi
GPG key ID: A4895B84D311642C
1 changed files with 16 additions and 51 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

67
src/ffi/lua.rs
View file

@ -40,31 +40,17 @@ fn tokio() -> &'static tokio::runtime::Runtime {
) )
} }
fn lua_tuple<T: IntoLua>(lua: &Lua, (a, b): (T, T)) -> LuaResult<LuaTable> {
let table = lua.create_table()?;
table.set(1, a)?;
table.set(2, b)?;
Ok(table)
}
// TODO cannot do Box<dyn IntoLuaMulti> ?? maybe its temporary because im using betas // TODO cannot do Box<dyn IntoLuaMulti> ?? maybe its temporary because im using betas
#[allow(unused)] // TODO pass callback args! #[allow(unused)] // TODO pass callback args!
enum CallbackArg { //struct CallbackArg<T: IntoLuaMulti>(tokio::sync::oneshot::Receiver<T>);
CursorController(CodempCursorController), struct CallbackArg;
BufferController(CodempBufferController),
Event(CodempEvent),
}
impl From<CodempCursorController> for CallbackArg {
fn from(value: CodempCursorController) -> Self {
Self::CursorController(value)
}
}
impl From<CodempBufferController> for CallbackArg {
fn from(value: CodempBufferController) -> Self {
Self::BufferController(value)
}
}
impl From<CodempEvent> for CallbackArg {
fn from(value: CodempEvent) -> Self {
Self::Event(value)
}
}
struct CallbackChannel { struct CallbackChannel {
tx: tokio::sync::mpsc::UnboundedSender<(LuaFunction, CallbackArg)>, tx: tokio::sync::mpsc::UnboundedSender<(LuaFunction, CallbackArg)>,
@ -82,8 +68,10 @@ impl Default for CallbackChannel {
} }
impl CallbackChannel { impl CallbackChannel {
fn send(&self, cb: LuaFunction, arg: impl Into<CallbackArg>) { fn send(&self, cb: LuaFunction, _arg: impl IntoLuaMulti) {
self.tx.send((cb, arg.into())).unwrap_or_warn("error scheduling callback") // let (tx, rx) = tokio::sync::oneshot::channel();
// tx.send(arg);
self.tx.send((cb, CallbackArg)).unwrap_or_warn("error scheduling callback")
} }
fn recv(&self) -> Option<(LuaFunction, CallbackArg)> { fn recv(&self) -> Option<(LuaFunction, CallbackArg)> {
@ -358,33 +346,10 @@ impl LuaUserData for Cursor {
fn add_fields<F: LuaUserDataFields<Self>>(fields: &mut F) { fn add_fields<F: LuaUserDataFields<Self>>(fields: &mut F) {
fields.add_field_method_get("user", |_, this| Ok(this.user.clone())); fields.add_field_method_get("user", |_, this| Ok(this.user.clone()));
fields.add_field_method_get("buffer", |_, this| Ok(this.buffer.clone())); fields.add_field_method_get("buffer", |_, this| Ok(this.buffer.clone()));
fields.add_field_method_get("start", |_, this| Ok(RowCol::from(this.start))); fields.add_field_method_get("start", |lua, this| lua_tuple(lua, this.start));
fields.add_field_method_get("end", |_, this| Ok(RowCol::from(this.end))); fields.add_field_method_get("end", |lua, this| lua_tuple(lua, this.end));
// add a 'finish' accessor too because in Lua 'end' is reserved // add a 'finish' accessor too because in Lua 'end' is reserved
fields.add_field_method_get("finish", |_, this| Ok(RowCol::from(this.end))); fields.add_field_method_get("finish", |lua, this| lua_tuple(lua, this.end));
}
}
#[derive(Debug, Clone, Copy)]
struct RowCol {
row: i32,
col: i32,
}
impl From<(i32, i32)> for RowCol {
fn from((row, col): (i32, i32)) -> Self {
Self { row, col }
}
}
impl LuaUserData for RowCol {
fn add_methods<M: LuaUserDataMethods<Self>>(methods: &mut M) {
methods.add_meta_method(LuaMetaMethod::ToString, |_, this, ()| Ok(format!("{:?}", this)));
}
fn add_fields<F: LuaUserDataFields<Self>>(fields: &mut F) {
fields.add_field_method_get("row", |_, this| Ok(this.row));
fields.add_field_method_get("col", |_, this| Ok(this.col));
} }
} }