Skip to content

Commit 7ea2722

Browse files
committed
fix socket and add release script
1 parent 452b394 commit 7ea2722

File tree

6 files changed

+37
-9
lines changed

6 files changed

+37
-9
lines changed

.vscode/launch.json

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,15 +11,17 @@
1111
"cargo": {
1212
"args": [
1313
"build",
14-
"--bin=luals-rust",
14+
"--bin=lua-language-server",
1515
"--package=luals-rust"
1616
],
1717
"filter": {
18-
"name": "luals-rust",
18+
"name": "lua-language-server",
1919
"kind": "bin"
2020
}
2121
},
22-
"args": [],
22+
"args": [
23+
"--socket=5007"
24+
],
2325
"cwd": "${workspaceFolder}"
2426
},
2527
{

Cargo.toml

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@
22
name = "luals-rust"
33
version = "0.1.0"
44
edition = "2021"
5+
license-file = "LICENSE"
6+
include = ["resources/**/*"]
57

68
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
79

@@ -14,4 +16,8 @@ notify = { version = "6.1.1", features = ["serde"] }
1416

1517
[build-dependencies]
1618
cc = "1.0"
17-
glob = "0.3.0"
19+
glob = "0.3.0"
20+
21+
[[bin]]
22+
name = "lua-language-server"
23+
path = "src/main.rs"

publish/UnixPublish.sh

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
#!/bin/bash
2+
3+
cargo build --release
4+
5+
if [ ! -d "dist" ]; then
6+
mkdir dist
7+
fi
8+
9+
cp target/release/lua-language-server.exe dist/
10+
11+
cp -r resources dist/

publish/WinPublish.ps1

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
cargo build --release
2+
3+
if (-Not (Test-Path -Path "dist")) {
4+
New-Item -ItemType Directory -Path "dist"
5+
}
6+
7+
Copy-Item -Path "target/release/lua-language-server.exe" -Destination "dist/"
8+
9+
Copy-Item -Path "resources" -Destination "dist/" -Recurse

src/bee/socket/lua_select.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ impl LuaSelect {
2121
}
2222
}
2323

24-
async fn wait(&mut self, time: u64) -> LuaResult<Vec<(mlua::Function, i32)>> {
24+
async fn wait(&mut self, time: i32) -> LuaResult<Vec<(mlua::Function, i32)>> {
2525
let mut rest_time = time;
2626
let mut result = Vec::new();
2727

@@ -56,7 +56,7 @@ impl LuaSelect {
5656
}
5757

5858
if (result.len() == 0) && (rest_time > 0) {
59-
tokio::time::sleep(tokio::time::Duration::from_millis(rest_time)).await;
59+
tokio::time::sleep(tokio::time::Duration::from_millis(rest_time as u64)).await;
6060
}
6161

6262
Ok(result)
@@ -82,7 +82,7 @@ impl LuaSelect {
8282

8383
impl LuaUserData for LuaSelect {
8484
fn add_methods<M: LuaUserDataMethods<Self>>(methods: &mut M) {
85-
methods.add_async_method_mut("wait", |lua, mut this, time: u64| async move {
85+
methods.add_async_method_mut("wait", |lua, mut this, time: i32| async move {
8686
let results: Vec<(LuaFunction, i32)> = this.wait(time).await.unwrap();
8787
// why this code is not working?
8888
// let iter = Rc::new(RefCell::new(results.into_iter()));

src/bee/socket/lua_socket.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -113,8 +113,8 @@ impl LuaSocket {
113113
}
114114
}
115115

116-
fn listen(&self) -> LuaResult<()> {
117-
Ok(())
116+
fn listen(&self) -> LuaResult<bool> {
117+
Ok(true)
118118
}
119119

120120
async fn connect(&mut self, addr: String, port: i32) -> LuaResult<()> {

0 commit comments

Comments
 (0)