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

fix: codemp dependency, reverted some changes

Browse source 
basically lock it to lib version 0.3
This commit is contained in:
əlemi 2023-08-17 00:15:34 +02:00
parent 27048efac9
commit ed01ecfb5f
3 changed files with 11 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.cargo/config Normal file
View file

@ -0,0 +1,2 @@
[net]
git-fetch-with-cli = true

2
Cargo.toml
View file

@ -9,7 +9,7 @@ exclude = ["index.node"]
crate-type = ["cdylib"] crate-type = ["cdylib"]
[dependencies] [dependencies]
codemp = { path = "../.." } codemp = { git = "ssh://git@github.com/codewithotherpeopleandchangenamelater/codemp.git", tag = "v0.3" }
tracing = "0.1" tracing = "0.1"
tracing-subscriber = "0.3" tracing-subscriber = "0.3"
uuid = { version = "1.3.1", features = ["v4"] } uuid = { version = "1.3.1", features = ["v4"] }

14
src/lib.rs
View file

@ -3,12 +3,10 @@ use std::sync::Arc;
use neon::prelude::*; use neon::prelude::*;
use once_cell::sync::OnceCell; use once_cell::sync::OnceCell;
use codemp::{ use codemp::{
cursor::controller::{CursorSubscriber, CursorControllerHandle}, controller::cursor::{CursorSubscriber, CursorControllerHandle},
buffer::{ controller::buffer::{OperationControllerHandle, OperationControllerSubscriber},
controller::{OperationControllerHandle, OperationControllerSubscriber},
client::CodempClient, client::CodempClient,
factory::OperationFactory, factory::OperationFactory,
},
proto::buffer_client::BufferClient, proto::buffer_client::BufferClient,
}; };
use codemp::tokio::{runtime::Runtime, sync::Mutex}; use codemp::tokio::{runtime::Runtime, sync::Mutex};
@ -79,7 +77,7 @@ fn create_client(mut cx: FunctionContext) -> JsResult<JsPromise> {
let channel = cx.channel(); let channel = cx.channel();
runtime(&mut cx)?.spawn(async move { runtime(&mut cx)?.spawn(async move {
match rc.lock().await.create(&path, content.as_deref()).await { match rc.lock().await.create(path, content).await {
Ok(accepted) => deferred.settle_with(&channel, move |mut cx| Ok(cx.boolean(accepted))), Ok(accepted) => deferred.settle_with(&channel, move |mut cx| Ok(cx.boolean(accepted))),
Err(e) => deferred.settle_with(&channel, move |mut cx| cx.throw_error::<String, neon::handle::Handle<JsString>>(e.to_string())), Err(e) => deferred.settle_with(&channel, move |mut cx| cx.throw_error::<String, neon::handle::Handle<JsString>>(e.to_string())),
} }
@ -127,7 +125,7 @@ fn attach_client(mut cx: FunctionContext) -> JsResult<JsPromise> {
let channel = cx.channel(); let channel = cx.channel();
runtime(&mut cx)?.spawn(async move { runtime(&mut cx)?.spawn(async move {
match rc.lock().await.attach(&path).await { match rc.lock().await.attach(path).await {
Ok(controller) => { Ok(controller) => {
deferred.settle_with(&channel, move |mut cx| { deferred.settle_with(&channel, move |mut cx| {
let obj = cx.empty_object(); let obj = cx.empty_object();
@ -187,7 +185,7 @@ fn callback_operation(mut cx: FunctionContext) -> JsResult<JsUndefined> {
let boxed : Handle<JsBox<OperationControllerJs>> = this.get(&mut cx, "boxed")?; let boxed : Handle<JsBox<OperationControllerJs>> = this.get(&mut cx, "boxed")?;
let callback = Arc::new(cx.argument::<JsFunction>(0)?.root(&mut cx)); let callback = Arc::new(cx.argument::<JsFunction>(0)?.root(&mut cx));
let rc = boxed.0.clone(); let mut rc = boxed.0.clone();
let channel = cx.channel(); let channel = cx.channel();
// TODO when garbage collecting OperationController stop this worker // TODO when garbage collecting OperationController stop this worker
@ -217,7 +215,7 @@ fn callback_cursor(mut cx: FunctionContext) -> JsResult<JsUndefined> {
let boxed : Handle<JsBox<CursorEventsHandle>> = this.get(&mut cx, "boxed")?; let boxed : Handle<JsBox<CursorEventsHandle>> = this.get(&mut cx, "boxed")?;
let callback = Arc::new(cx.argument::<JsFunction>(0)?.root(&mut cx)); let callback = Arc::new(cx.argument::<JsFunction>(0)?.root(&mut cx));
let rc = boxed.0.clone(); let mut rc = boxed.0.clone();
let channel = cx.channel(); let channel = cx.channel();
// TODO when garbage collecting OperationController stop this worker // TODO when garbage collecting OperationController stop this worker