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

fix(lua): its all async now

Browse source
This commit is contained in:
əlemi 2024-08-14 15:56:36 +02:00
parent 4bed9d7432
commit 2916848165
Signed by: alemi
GPG key ID: A4895B84D311642C
1 changed files with 11 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
src/ffi/lua.rs
View file

@ -117,10 +117,10 @@ impl LuaUserData for CodempCursorController {
fn add_methods<'lua, M: LuaUserDataMethods<'lua, Self>>(methods: &mut M) { fn add_methods<'lua, M: LuaUserDataMethods<'lua, Self>>(methods: &mut M) {
methods.add_meta_method(LuaMetaMethod::ToString, |_, this, ()| Ok(format!("{:?}", this))); methods.add_meta_method(LuaMetaMethod::ToString, |_, this, ()| Ok(format!("{:?}", this)));
methods.add_method("send", |_, this, (buffer, start_row, start_col, end_row, end_col):(String, i32, i32, i32, i32)| { methods.add_method("send", |_, this, (buffer, start_row, start_col, end_row, end_col):(String, i32, i32, i32, i32)| {
Ok(this.send(CodempCursor { buffer, start: (start_row, start_col), end: (end_row, end_col), user: None })?) Ok(RT.block_on(this.send(CodempCursor { buffer, start: (start_row, start_col), end: (end_row, end_col), user: None }))?)
}); });
methods.add_method("try_recv", |_, this, ()| { methods.add_method("try_recv", |_, this, ()| {
match this.try_recv()? { match RT.block_on(this.try_recv())? {
Some(x) => Ok(Some(x)), Some(x) => Ok(Some(x)),
None => Ok(None), None => Ok(None),
} }
@ -165,24 +165,18 @@ impl LuaUserData for CodempBufferController {
methods.add_meta_method(LuaMetaMethod::ToString, |_, this, ()| Ok(format!("{:?}", this))); methods.add_meta_method(LuaMetaMethod::ToString, |_, this, ()| Ok(format!("{:?}", this)));
methods.add_method("send", |_, this, (start, end, text): (usize, usize, String)| { methods.add_method("send", |_, this, (start, end, text): (usize, usize, String)| {
Ok( Ok(
this.send( RT.block_on(this.send(
CodempTextChange { CodempTextChange {
start: start as u32, start: start as u32,
end: end as u32, end: end as u32,
content: text, content: text,
hash: None,
} }
)? ))?
)
});
methods.add_method("send_diff", |_, this, (content,):(String,)| {
Ok(
this.send(
CodempTextChange::from_diff(&this.content(), &content)
)?
) )
}); });
methods.add_method("try_recv", |_, this, ()| { methods.add_method("try_recv", |_, this, ()| {
match this.try_recv()? { match RT.block_on(this.try_recv())? {
Some(x) => Ok(Some(x)), Some(x) => Ok(Some(x)),
None => Ok(None), None => Ok(None),
} }
@ -191,10 +185,9 @@ impl LuaUserData for CodempBufferController {
RT.block_on(this.poll())?; RT.block_on(this.poll())?;
Ok(()) Ok(())
}); });
} methods.add_method("content", |_, this, ()|
Ok(RT.block_on(this.content())?)
fn add_fields<'lua, F: LuaUserDataFields<'lua, Self>>(fields: &mut F) { );
fields.add_field_method_get("content", |_, this| Ok(this.content()));
} }
} }
@ -206,11 +199,12 @@ impl LuaUserData for CodempTextChange {
} }
fn add_methods<'lua, M: LuaUserDataMethods<'lua, Self>>(methods: &mut M) { fn add_methods<'lua, M: LuaUserDataMethods<'lua, Self>>(methods: &mut M) {
methods.add_meta_function(LuaMetaMethod::Call, |_, (start, end, txt): (usize, usize, String)| { methods.add_meta_function(LuaMetaMethod::Call, |_, (start, end, txt, hash): (usize, usize, String, Option<i64>)| {
Ok(CodempTextChange { Ok(CodempTextChange {
start: start as u32, start: start as u32,
end: end as u32, end: end as u32,
content: txt, content: txt,
hash,
}) })
}); });
methods.add_meta_method(LuaMetaMethod::ToString, |_, this, ()| Ok(format!("{:?}", this))); methods.add_meta_method(LuaMetaMethod::ToString, |_, this, ()| Ok(format!("{:?}", this)));