update rename

Author: xuhuanzy

crates/emmylua_ls/src/handlers/rename/rename_type.rs

@@ -88,6 +88,9 @@ fn determine_type_name_for_file(
 
     // 检查引用文件是否声明了相同的命名空间
     if let Some(file_namespace) = type_index.get_file_namespace(&reference_file_id) {
+        if file_namespace == reserved_namespace {
+            return new_simple_name.to_string();
+        }
         if reserved_namespace.starts_with(&format!("{}.", file_namespace)) {
             return new_simple_name.to_string();
         }
@@ -96,6 +99,9 @@ fn determine_type_name_for_file(
     // 检查引用文件是否使用了相应的命名空间
     if let Some(using_namespaces) = type_index.get_file_using_namespace(&reference_file_id) {
         for using_namespace in using_namespaces {
+            if using_namespace == reserved_namespace {
+                return new_simple_name.to_string();
+            }
             if reserved_namespace.starts_with(&format!("{}.", using_namespace)) {
                 return new_simple_name.to_string();
             }

crates/emmylua_ls/src/handlers/test/rename_test.rs

@@ -1,32 +1,74 @@
 #[cfg(test)]
 mod tests {
+    use lsp_types::WorkspaceEdit;
+
     use crate::handlers::test_lib::ProviderVirtualWorkspace;
 
+    fn check_len(result: &Option<WorkspaceEdit>, len: usize) -> bool {
+        let Some(result) = result else {
+            return false;
+        };
+        if let Some(changes) = &result.changes {
+            let mut count = 0;
+            for (_, edits) in changes {
+                count += edits.len();
+            }
+            if count != len {
+                return false;
+            }
+        }
+        true
+    }
+
+    /// 检查指定名称的文件的`new_text`是否为预期值
+    fn check_new_text(result: &Option<WorkspaceEdit>, file_name: &str, new_text: &str) -> bool {
+        let Some(result) = result else {
+            return false;
+        };
+        if let Some(changes) = &result.changes {
+            for (uri, edits) in changes {
+                let path = uri.path().as_str();
+                if path.ends_with(format!("/{}", file_name).as_str()) {
+                    if let Some(edit) = edits.first() {
+                        if edit.new_text == new_text {
+                            return true;
+                        }
+                    }
+                }
+            }
+        }
+        false
+    }
+
     #[test]
     fn test_int_key() {
         let mut ws = ProviderVirtualWorkspace::new();
-        assert!(ws.check_rename(
-            r#"
+        assert!(check_len(
+            &ws.check_rename(
+                r#"
                 local export = {
                     [<??>1] = 1,
                 }
 
                 export[1] = 2
             "#,
-            "2".to_string(),
-            2,
+                "2".to_string()
+            ),
+            2
         ));
 
-        assert!(ws.check_rename(
-            r#"
+        assert!(check_len(
+            &ws.check_rename(
+                r#"
                 local export = {
                     [1] = 1,
                 }
 
                 export[<??>1] = 2
             "#,
-            "2".to_string(),
-            2,
+                "2".to_string()
+            ),
+            2
         ));
     }
 
@@ -42,9 +84,8 @@ mod tests {
             Test[1] = 2
             "#,
             "2".to_string(),
-            2,
         );
-        assert!(result);
+        assert!(check_len(&result, 2));
     }
 
     #[test]
@@ -64,9 +105,8 @@ mod tests {
                 end
             "#,
             "_next".to_string(),
-            2,
         );
-        assert!(result);
+        assert!(check_len(&result, 2));
     }
 
     #[test]
@@ -79,9 +119,8 @@ mod tests {
             ---@type Para<??>ms<number>
             "#,
             "Params1".to_string(),
-            2,
         );
-        assert!(result);
+        assert!(check_len(&result, 2));
     }
 
     #[test]
@@ -99,9 +138,8 @@ mod tests {
                 ABC.test()
             "#,
             "test1".to_string(),
-            2,
         );
-        assert!(result);
+        assert!(check_len(&result, 2));
     }
 
     #[test]
@@ -116,9 +154,8 @@ mod tests {
                 end
             "#,
                 "aaa1".to_string(),
-                3,
             );
-            assert!(result);
+            assert!(check_len(&result, 3));
         }
         {
             let result = ws.check_rename(
@@ -129,9 +166,8 @@ mod tests {
                     end
                 "#,
                 "aaa1".to_string(),
-                3,
             );
-            assert!(result);
+            assert!(check_len(&result, 3));
         }
     }
 
@@ -147,14 +183,33 @@ mod tests {
 
             "#,
         );
-        ws.check_rename(
+        let result = ws.check_rename(
             r#"
                 ---@namespace Luakit
                 ---@class Test.Abc<??>
                 local Test = {}
             "#,
             "Abc".to_string(),
-            2,
         );
+        assert!(check_len(&result, 2));
+        assert!(check_new_text(&result, "a.lua", "Luakit.Abc"));
+    }
+
+    #[test]
+    fn test_namespace_class_1() {
+        let mut ws = ProviderVirtualWorkspace::new();
+        let result = ws.check_rename(
+            r#"
+                ---@namespace Luakit
+                ---@class Abc
+                local Test = {}
+
+                ---@type Abc<??>
+                local a = Test
+            "#,
+            "AAA".to_string(),
+        );
+        assert!(check_len(&result, 2));
+        assert!(check_new_text(&result, "virtual_0.lua", "AAA"));
     }
 }

crates/emmylua_ls/src/handlers/test_lib/mod.rs

@@ -4,7 +4,7 @@ use emmylua_code_analysis::{EmmyLuaAnalysis, Emmyrc, FileId, VirtualUrlGenerator
 use lsp_types::{
     CodeActionResponse, CompletionItemKind, CompletionResponse, CompletionTriggerKind,
     GotoDefinitionResponse, Hover, HoverContents, InlayHint, MarkupContent, Position,
-    SemanticTokensResult, SignatureHelpContext, SignatureHelpTriggerKind,
+    SemanticTokensResult, SignatureHelpContext, SignatureHelpTriggerKind, WorkspaceEdit,
 };
 use tokio_util::sync::CancellationToken;
 
@@ -352,32 +352,19 @@ impl ProviderVirtualWorkspace {
         };
 
         let data = serde_json::to_string(&result).unwrap();
-        dbg!(&data);
+        // dbg!(&data);
         Some(result)
     }
 
-    pub fn check_rename(&mut self, block_str: &str, new_name: String, len: usize) -> bool {
+    pub fn check_rename(&mut self, block_str: &str, new_name: String) -> Option<WorkspaceEdit> {
         let content = Self::handle_file_content(block_str);
         let Some((content, position)) = content else {
-            return false;
+            return None;
         };
         let file_id = self.def(&content);
         let result = rename(&self.analysis, file_id, position, new_name.clone());
-        let Some(result) = result else {
-            return false;
-        };
         // dbg!(&result);
-        if let Some(changes) = result.changes {
-            let mut count = 0;
-            for (_, edits) in changes {
-                count += edits.len();
-            }
-            if count != len {
-                return false;
-            }
-        }
-
-        true
+        return result;
     }
 
     pub fn check_references(&mut self, block_str: &str) -> Option<Vec<lsp_types::Location>> {