minor updates

Signed-off-by: xiarui.xr <[email protected]>

kclvm/sema/src/info/mod.rs

@@ -1,4 +1,12 @@
+use regex::Regex;
+
 #[inline]
 pub fn is_private_field(name: &str) -> bool {
     name.starts_with('_')
 }
+
+#[inline]
+pub fn is_valid_kcl_name(name: &str) -> bool {
+    let re = Regex::new(r#"^[a-zA-Z_][a-zA-Z0-9_]*$"#).unwrap();
+    re.is_match(name)
+}

kclvm/tools/src/LSP/Cargo.toml

@@ -19,7 +19,6 @@ log = "0.4.14"
 im-rc = "15.0.0"
 rustc_lexer = "0.1.0"
 clap = "4.3.0"
-regex = "1.4"
 
 kclvm-tools = { path = "../../../tools" }
 kclvm-error = { path = "../../../error" }

kclvm/tools/src/LSP/src/request.rs

@@ -1,5 +1,6 @@
 use anyhow::{anyhow, Ok};
 use crossbeam_channel::Sender;
+use kclvm_sema::info::is_valid_kcl_name;
 use lsp_types::{Location, TextEdit};
 use ra_ap_vfs::VfsPath;
 use std::collections::HashMap;
@@ -16,7 +17,6 @@ use crate::{
     goto_def::goto_definition,
     hover, quick_fix,
     state::{log_message, LanguageServerSnapshot, LanguageServerState, Task},
-    util,
 };
 
 impl LanguageServerState {
@@ -226,7 +226,7 @@ pub(crate) fn handle_rename(
 ) -> anyhow::Result<Option<lsp_types::WorkspaceEdit>> {
     // 1. check the new name validity
     let new_name = params.new_name;
-    if !util::is_valid_kcl_name(new_name.clone()) {
+    if !is_valid_kcl_name(new_name.as_str()) {
         return Err(anyhow!("Can not rename to: {new_name}, invalid name"));
     }
 

kclvm/tools/src/LSP/src/util.rs

@@ -19,7 +19,6 @@ use kclvm_utils::pkgpath::rm_external_pkg_name;
 use lsp_types::{Location, Position, Range, Url};
 use parking_lot::{RwLock, RwLockReadGuard};
 use ra_ap_vfs::{FileId, Vfs};
-use regex::Regex;
 use serde::{de::DeserializeOwned, Serialize};
 use std::cell::RefCell;
 use std::collections::HashMap;
@@ -895,11 +894,6 @@ fn line_to_words(text: String) -> HashMap<String, Vec<Word>> {
     result
 }
 
-pub fn is_valid_kcl_name(name: String) -> bool {
-    let re = Regex::new(r#"^[a-zA-Z_][a-zA-Z0-9_]*$"#).unwrap();
-    re.is_match(&name)
-}
-
 #[cfg(test)]
 mod tests {
     use super::{build_word_index, line_to_words, word_index_add, word_index_subtract, Word};