update attribute

Author: xuhuanzy

crates/emmylua_ls/src/handlers/completion/providers/auto_require_provider.rs

@@ -12,7 +12,7 @@ use crate::{
             completion_data::CompletionData,
         },
     },
-    util::{key_name_convert, module_name_convert},
+    util::{flie_name_convert, module_name_convert},
 };
 
 pub fn add_completion(builder: &mut CompletionBuilder) -> Option<()> {
@@ -136,7 +136,7 @@ fn try_add_member_completion_items(
             LuaType::TableConst(_) | LuaType::Def(_) => {
                 let member_infos = builder.semantic_model.get_member_infos(export_type)?;
                 for member_info in member_infos {
-                    let key_name = key_name_convert(
+                    let key_name = flie_name_convert(
                         &member_info.key.to_path(),
                         &member_info.typ,
                         file_conversion,

crates/emmylua_ls/src/handlers/semantic_token/build_semantic_tokens.rs

@@ -12,8 +12,8 @@ use emmylua_code_analysis::{
 };
 use emmylua_parser::{
     LuaAst, LuaAstNode, LuaAstToken, LuaCallArgList, LuaCallExpr, LuaComment, LuaDocFieldKey,
-    LuaDocObjectFieldKey, LuaExpr, LuaGeneralToken, LuaKind, LuaLiteralToken, LuaNameToken,
-    LuaSyntaxKind, LuaSyntaxNode, LuaSyntaxToken, LuaTokenKind, LuaVarExpr,
+    LuaDocObjectFieldKey, LuaDocType, LuaExpr, LuaGeneralToken, LuaKind, LuaLiteralToken,
+    LuaNameToken, LuaSyntaxKind, LuaSyntaxNode, LuaSyntaxToken, LuaTokenKind, LuaVarExpr,
 };
 use emmylua_parser_desc::{CodeBlockHighlightKind, DescItem, DescItemKind};
 use lsp_types::{SemanticToken, SemanticTokenModifier, SemanticTokenType};
@@ -202,7 +202,8 @@ fn build_tokens_semantic_token(
         | LuaTokenKind::TkTagSource
         | LuaTokenKind::TkTagReturnCast
         | LuaTokenKind::TkTagExport
-        | LuaTokenKind::TkLanguage => {
+        | LuaTokenKind::TkLanguage
+        | LuaTokenKind::TkTagAttribute => {
             builder.push_with_modifier(
                 token,
                 SemanticTokenType::KEYWORD,
@@ -784,13 +785,43 @@ fn build_node_semantic_token(
             }
         }
         LuaAst::LuaDocTagAttributeUse(tag_use) => {
-            // 给 `@[]` 染色, @已经染色过了
+            // 给 `@[` 染色
             if let Some(token) = tag_use.token_by_kind(LuaTokenKind::TkDocAttributeUse) {
                 builder.push(token.syntax(), SemanticTokenType::KEYWORD);
             }
+            // `]`染色
             if let Some(token) = tag_use.syntax().last_token() {
                 builder.push(&token, SemanticTokenType::KEYWORD);
             }
+            // 名称染色
+            for attribute_use in tag_use.get_attribute_uses() {
+                if let Some(token) = attribute_use.get_type()?.get_name_token() {
+                    builder.push_with_modifiers(
+                        token.syntax(),
+                        SemanticTokenType::DECORATOR,
+                        &[
+                            SemanticTokenModifier::DECLARATION,
+                            SemanticTokenModifier::DEFAULT_LIBRARY,
+                        ],
+                    );
+                }
+            }
+        }
+        LuaAst::LuaDocTagAttribute(tag_attribute) => {
+            if let Some(name) = tag_attribute.get_name_token() {
+                builder.push_with_modifier(
+                    name.syntax(),
+                    SemanticTokenType::TYPE,
+                    SemanticTokenModifier::DECLARATION,
+                );
+            }
+            if let Some(LuaDocType::Attribute(attribute)) = tag_attribute.get_type() {
+                for param in attribute.get_params() {
+                    if let Some(name) = param.get_name_token() {
+                        builder.push(name.syntax(), SemanticTokenType::PARAMETER);
+                    }
+                }
+            }
         }
         _ => {}
     }

crates/emmylua_ls/src/util/mod.rs

@@ -3,5 +3,5 @@ mod module_name_convert;
 mod time_cancel_token;
 
 pub use desc::*;
-pub use module_name_convert::{key_name_convert, module_name_convert};
+pub use module_name_convert::{flie_name_convert, module_name_convert};
 pub use time_cancel_token::time_cancel_token;

crates/emmylua_ls/src/util/module_name_convert.rs

@@ -29,30 +29,30 @@ pub fn module_name_convert(
     module_name
 }
 
-pub fn key_name_convert(
+pub fn flie_name_convert(
     key: &str,
     typ: &LuaType,
     file_conversion: EmmyrcFilenameConvention,
 ) -> String {
-    let mut key_name = key.to_string();
+    let mut flie_name = key.to_string();
     match file_conversion {
         EmmyrcFilenameConvention::SnakeCase => {
-            key_name = to_snake_case(&key_name);
+            flie_name = to_snake_case(&flie_name);
         }
         EmmyrcFilenameConvention::CamelCase => {
-            key_name = to_camel_case(&key_name);
+            flie_name = to_camel_case(&flie_name);
         }
         EmmyrcFilenameConvention::PascalCase => {
-            key_name = to_pascal_case(&key_name);
+            flie_name = to_pascal_case(&flie_name);
         }
         EmmyrcFilenameConvention::Keep => {}
         EmmyrcFilenameConvention::KeepClass => {
             if let LuaType::Def(id) = typ {
-                key_name = id.get_simple_name().to_string();
+                flie_name = id.get_simple_name().to_string();
             }
         }
     }
-    key_name
+    flie_name
 }
 
 fn to_snake_case(s: &str) -> String {

crates/emmylua_parser/src/lexer/lua_doc_lexer.rs

@@ -619,10 +619,6 @@ impl LuaDocLexer<'_> {
                 reader.bump();
                 LuaTokenKind::TkComma
             }
-            '=' => {
-                reader.bump();
-                LuaTokenKind::TkAssign
-            }
             ']' => {
                 reader.bump();
                 LuaTokenKind::TkRightBracket