optimize rename

Author: xuhuanzy

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

@@ -5,7 +5,7 @@ mod rename_type;
 use std::collections::HashMap;
 
 use emmylua_code_analysis::{LuaCompilation, LuaSemanticDeclId, SemanticDeclLevel, SemanticModel};
-use emmylua_parser::{LuaAstNode, LuaLiteralExpr, LuaSyntaxToken, LuaTableField, LuaTokenKind};
+use emmylua_parser::{LuaAstNode, LuaLiteralExpr, LuaSyntaxNode, LuaSyntaxToken, LuaTokenKind};
 use lsp_types::{
     ClientCapabilities, OneOf, PrepareRenameResponse, RenameOptions, RenameParams,
     ServerCapabilities, TextDocumentPositionParams, WorkspaceEdit,
@@ -54,7 +54,9 @@ pub async fn on_prepare_rename_handler(
     let token = match root.syntax().token_at_offset(position_offset) {
         TokenAtOffset::Single(token) => token,
         TokenAtOffset::Between(left, right) => {
-            if left.kind() == LuaTokenKind::TkName.into() {
+            if left.kind() == LuaTokenKind::TkName.into()
+                || left.kind() == LuaTokenKind::TkInt.into()
+            {
                 left
             } else {
                 right
@@ -118,10 +120,7 @@ fn rename_references(
 ) -> Option<WorkspaceEdit> {
     let mut result = HashMap::new();
     let semantic_decl = match try_get_table_field(token.clone()) {
-        Some(table_field) => semantic_model.find_decl(
-            table_field.syntax().clone().into(),
-            SemanticDeclLevel::NoTrace,
-        ),
+        Some(node) => semantic_model.find_decl(node.into(), SemanticDeclLevel::NoTrace),
         None => semantic_model.find_decl(token.into(), SemanticDeclLevel::NoTrace),
     }?;
 
@@ -169,10 +168,10 @@ fn rename_references(
     })
 }
 
-fn try_get_table_field(token: LuaSyntaxToken) -> Option<LuaTableField> {
+fn try_get_table_field(token: LuaSyntaxToken) -> Option<LuaSyntaxNode> {
     let parent = token.parent()?;
     let literal_expr = LuaLiteralExpr::cast(parent)?;
-    literal_expr.get_parent::<LuaTableField>()
+    literal_expr.syntax().parent()
 }
 
 pub struct RenameCapabilities;

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

@@ -4,8 +4,8 @@ use emmylua_code_analysis::{
     LuaCompilation, LuaMemberId, LuaSemanticDeclId, SemanticDeclLevel, SemanticModel,
 };
 use emmylua_parser::{
-    LuaAst, LuaAstNode, LuaAstToken, LuaIndexToken, LuaLiteralExpr, LuaNameToken, LuaSyntaxNode,
-    LuaTokenKind,
+    LuaAst, LuaAstNode, LuaAstToken, LuaIndexToken, LuaLiteralExpr, LuaNameToken, LuaNumberToken,
+    LuaSyntaxNode, LuaTokenKind,
 };
 use lsp_types::Uri;
 
@@ -72,12 +72,24 @@ fn get_member_name_token_lsp_range(
 
     // 此时可能是 [] 访问
     if let Some(_) = node.token::<LuaIndexToken>() {
-        let literal = node.child::<LuaLiteralExpr>()?.get_literal()?;
-        if matches!(
-            literal.get_token_kind(),
-            LuaTokenKind::TkInt | LuaTokenKind::TkString
-        ) {
-            return document.to_lsp_range(literal.get_range());
+        match node {
+            LuaAst::LuaDocTagField(tag) => {
+                if let Some(token) = tag.token::<LuaNumberToken>() {
+                    if matches!(token.get_token_kind(), LuaTokenKind::TkInt) {
+                        return document.to_lsp_range(token.get_range());
+                    }
+                    return document.to_lsp_range(token.get_range());
+                }
+            }
+            _ => {
+                let literal = node.child::<LuaLiteralExpr>()?.get_literal()?;
+                if matches!(
+                    literal.get_token_kind(),
+                    LuaTokenKind::TkInt | LuaTokenKind::TkString
+                ) {
+                    return document.to_lsp_range(literal.get_range());
+                }
+            }
         }
     }
 

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

@@ -5,7 +5,7 @@ mod tests {
     #[test]
     fn test_int_key() {
         let mut ws = ProviderVirtualWorkspace::new();
-        let result = ws.check_rename(
+        assert!(ws.check_rename(
             r#"
                 local export = {
                     [<??>1] = 1,
@@ -15,6 +15,34 @@ mod tests {
             "#,
             "2".to_string(),
             2,
+        ));
+
+        assert!(ws.check_rename(
+            r#"
+                local export = {
+                    [1] = 1,
+                }
+
+                export[<??>1] = 2
+            "#,
+            "2".to_string(),
+            2,
+        ));
+    }
+
+    #[test]
+    fn test_int_key_in_class() {
+        let mut ws = ProviderVirtualWorkspace::new();
+        let result = ws.check_rename(
+            r#"
+            ---@class Test
+            ---@field [<??>1] number
+            local Test = {}
+
+            Test[1] = 2
+            "#,
+            "2".to_string(),
+            2,
         );
         assert!(result);
     }

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

@@ -14,6 +14,7 @@ use crate::{
         code_actions::code_action,
         completion::{completion, completion_resolve},
         inlay_hint::inlay_hint,
+        rename::rename,
         semantic_token::semantic_token,
         signature_helper::signature_help,
     },