Update version (v0.1.10)

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "els"
-version = "0.1.9"
+version = "0.1.10"
 edition = "2021"
 description = "An Erg compiler frontend for IDEs, implements LSP."
 authors = ["Shunsuke Shibayama <[email protected]>"]
@@ -13,8 +13,8 @@ keywords = ["erg", "language-server"]
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-erg_common = "0.5.12"
-erg_compiler = "0.5.12"
+erg_common = "0.5.13"
+erg_compiler = "0.5.13"
 serde = { version = "1.0", features = ["derive"] }
 serde_json = "1.0.85"
 lsp-types = "0.93.1"

src/server.rs

@@ -275,7 +275,7 @@ impl Server {
                     } else {
                         uri.clone()
                     };
-                    let message = Self::remove_escape(&err.core.desc);
+                    let message = Self::remove_escape(&err.core.main_message);
                     let start = Position::new(err.core.loc.ln_begin().unwrap_or(1) as u32 - 1, err.core.loc.col_begin().unwrap_or(0) as u32);
                     let end = Position::new(err.core.loc.ln_end().unwrap_or(1) as u32 - 1, err.core.loc.col_end().unwrap_or(0) as u32);
                     let err_code = err.core.kind as u8;
@@ -384,7 +384,7 @@ impl Server {
         if !token.category_is(TokenCategory::Symbol) {
             self.send_log(format!("not symbol: {token}"))?;
             Ok(None)
-        } else if let Ok((name, vi)) = self.context.as_ref().unwrap().get_var_info(token.inspect()) {
+        } else if let Some((name, vi)) = self.context.as_ref().unwrap().get_var_info(token.inspect()) {
             Ok(Some((name.clone(), vi.clone())))
         } else {
             self.send_log("not found")?;
@@ -440,7 +440,7 @@ impl Server {
             File::open(&path)?.read_to_string(&mut code)?;
             if let Ok(tokens) = Lexer::from_str(code).lex() {
                 let mut token = None;
-                for tok in tokens.into_iter() {
+                for tok in tokens.payload().into_iter() {
                     if Self::pos_in_loc(&tok, pos) {
                         token = Some(tok);
                         break;
@@ -475,7 +475,7 @@ impl Server {
                     }
                 }
                 if let Some(idx) = found_index {
-                    if let Some(token) = tokens.into_iter().nth((idx as isize + plus_minus) as usize) {
+                    if let Some(token) = tokens.payload().into_iter().nth((idx as isize + plus_minus) as usize) {
                         if !token.is(TokenKind::Newline) {
                             return Ok(Some(token));
                         }