update

.gitignore

@@ -3,3 +3,4 @@
 /resources/log
 /log
 /bin
+/server

Cargo.toml

@@ -10,5 +10,5 @@ lazy_static = "1.4.0"
 encoding_rs = "0.8"
 tokio = { version = "1.40.0", features = ["full"] }
 notify = { version = "6.1.1", features = ["serde"] }
-emmylua_parser = "0.3"
-rowan = { version = "0.15.16" }
+emmylua_parser = "0.5"
+rowan = { version = "0.16" }

crates/basic/src/parser/lua_node.rs

@@ -1,5 +1,6 @@
 use emmylua_parser::{LuaSyntaxKind, LuaSyntaxNode, LuaSyntaxToken, LuaTokenKind};
 use mlua::prelude::*;
+use rowan::NodeOrToken;
 
 pub enum LuaNodeWrapper {
     Node(LuaSyntaxNode),
@@ -82,8 +83,8 @@ impl LuaUserData for LuaNodeWrapper {
                 LuaNodeWrapper::Node(node) => node
                     .children_with_tokens()
                     .filter_map(|it| match it {
-                        rowan::NodeOrToken::Node(node) => Some(LuaNodeWrapper::Node(node)),
-                        rowan::NodeOrToken::Token(token) => Some(LuaNodeWrapper::Token(token)),
+                        NodeOrToken::Node(node) => Some(LuaNodeWrapper::Node(node)),
+                        NodeOrToken::Token(token) => Some(LuaNodeWrapper::Token(token)),
                     })
                     .collect(),
                 LuaNodeWrapper::Token(_) => vec![],

crates/basic/src/parser/lua_syntax_tree.rs

@@ -1,6 +1,5 @@
 use emmylua_parser::LuaSyntaxTree as EmmyLuaSyntaxTree;
 use mlua::prelude::*;
-use rowan::TextSize;
 
 use super::lua_node::LuaNodeWrapper;
 
@@ -16,32 +15,11 @@ impl LuaSyntaxTree {
     pub fn get_root(&self) -> LuaNodeWrapper {
         LuaNodeWrapper::new(self.tree.get_red_root().clone())
     }
-
-    pub fn get_line_col(&self, offset: usize) -> Option<(usize, usize)> {
-        let offset = TextSize::from(offset as u32);
-        let (line, col) = self.tree.get_line_col(offset)?;
-        Some((line, col))
-    }
-
-    pub fn get_offset(&self, line: usize, col: usize) -> Option<usize> {
-        let offset = self.tree.get_offset(line, col)?;
-        Some(offset.into())
-    }
 }
 
 impl LuaUserData for LuaSyntaxTree {
     fn add_methods<M: LuaUserDataMethods<Self>>(methods: &mut M) {
         methods.add_method("getRoot", |_, this, ()| Ok(this.get_root()));
         // methods.add_method("get_chunk_node", |_, this, ()| Ok(this.get_chunk_node()));
-        methods.add_method("getLineCol", |lua, this, offset: usize| {
-            let (line, col) = this.get_line_col(offset).unwrap();
-            let table = lua.create_table()?;
-            table.set(1, line)?;
-            table.set(2, col)?;
-            Ok(table)
-        });
-        methods.add_method("getOffset", |_, this, (line, col): (usize, usize)| {
-            Ok(this.get_offset(line, col))
-        });
     }
 }