update semantic_tokens

Author: xuhuanzy

crates/emmylua_code_analysis/src/compilation/analyzer/doc/infer_type.rs

@@ -115,7 +115,7 @@ pub fn infer_type(analyzer: &mut DocAnalyzer, node: LuaDocType) -> LuaType {
             return infer_conditional_type(analyzer, cond_type);
         }
         LuaDocType::Infer(infer_type) => {
-            if let Some(name) = infer_type.get_name_text() {
+            if let Some(name) = infer_type.get_generic_decl_name_text() {
                 return LuaType::ConditionalInfer(ArcIntern::new(SmolStr::new(&name)));
             }
         }
@@ -691,7 +691,7 @@ fn collect_cond_infer_params(doc_type: &LuaDocType) -> Vec<GenericParam> {
     let mut params = Vec::new();
     let doc_infer_types = doc_type.descendants::<LuaDocInferType>();
     for infer_type in doc_infer_types {
-        if let Some(name) = infer_type.get_name_text() {
+        if let Some(name) = infer_type.get_generic_decl_name_text() {
             params.push(GenericParam::new(SmolStr::new(&name), None));
         }
     }

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

@@ -12,8 +12,9 @@ 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,
+    LuaDocGenericDecl, LuaDocGenericDeclList, LuaDocObjectFieldKey, LuaExpr, LuaGeneralToken,
+    LuaKind, LuaLiteralToken, LuaNameToken, LuaSyntaxKind, LuaSyntaxNode, LuaSyntaxToken,
+    LuaTokenKind, LuaVarExpr,
 };
 use emmylua_parser_desc::{CodeBlockHighlightKind, DescItem, DescItemKind};
 use lsp_types::{SemanticToken, SemanticTokenModifier, SemanticTokenType};
@@ -313,15 +314,7 @@ fn build_node_semantic_token(
                 }
             }
             if let Some(generic_list) = doc_class.get_generic_decl() {
-                for generic_decl in generic_list.get_generic_decl() {
-                    if let Some(name) = generic_decl.get_name_token() {
-                        builder.push_with_modifier(
-                            name.syntax(),
-                            SemanticTokenType::CLASS,
-                            SemanticTokenModifier::DECLARATION,
-                        );
-                    }
-                }
+                render_type_parameter_list(builder, &generic_list);
             }
         }
         LuaAst::LuaDocTagEnum(doc_enum) => {
@@ -344,6 +337,9 @@ fn build_node_semantic_token(
                 SemanticTokenType::TYPE,
                 SemanticTokenModifier::DECLARATION,
             );
+            if let Some(generic_decl_list) = doc_alias.get_generic_decl_list() {
+                render_type_parameter_list(builder, &generic_decl_list);
+            }
         }
         LuaAst::LuaDocTagField(doc_field) => {
             if let Some(LuaDocFieldKey::Name(name)) = doc_field.get_field_key() {
@@ -416,15 +412,7 @@ fn build_node_semantic_token(
         }
         LuaAst::LuaDocTagGeneric(doc_generic) => {
             let type_parameter_list = doc_generic.get_generic_decl_list()?;
-            for type_decl in type_parameter_list.get_generic_decl() {
-                if let Some(name) = type_decl.get_name_token() {
-                    builder.push_with_modifier(
-                        name.syntax(),
-                        SemanticTokenType::TYPE,
-                        SemanticTokenModifier::DECLARATION,
-                    );
-                }
-            }
+            render_type_parameter_list(builder, &type_parameter_list);
         }
         LuaAst::LuaDocTagNamespace(doc_namespace) => {
             let name = doc_namespace.get_name_token()?;
@@ -784,6 +772,18 @@ fn build_node_semantic_token(
                 fun_string_highlight(builder, semantic_model, call_expr, &string_token);
             }
         }
+        LuaAst::LuaDocInferType(infer_type) => {
+            // 推断出的泛型定义
+            if let Some(gen_decl) = infer_type.get_generic_decl() {
+                render_type_parameter(builder, &gen_decl);
+            }
+            if let Some(name) = infer_type.token::<LuaNameToken>() {
+                // 应该单独设置颜色
+                if name.get_name_text() == "infer" {
+                    builder.push(name.syntax(), SemanticTokenType::COMMENT);
+                }
+            }
+        }
         _ => {}
     }
 
@@ -1159,3 +1159,22 @@ fn check_require_decl(semantic_model: &SemanticModel, decl: &LuaDecl) -> Option<
     }
     None
 }
+
+fn render_type_parameter_list(
+    builder: &mut SemanticBuilder,
+    type_parameter_list: &LuaDocGenericDeclList,
+) {
+    for type_decl in type_parameter_list.get_generic_decl() {
+        render_type_parameter(builder, &type_decl);
+    }
+}
+
+fn render_type_parameter(builder: &mut SemanticBuilder, type_decl: &LuaDocGenericDecl) {
+    if let Some(name) = type_decl.get_name_token() {
+        builder.push_with_modifier(
+            name.syntax(),
+            SemanticTokenType::TYPE,
+            SemanticTokenModifier::DECLARATION,
+        );
+    }
+}

crates/emmylua_parser/src/syntax/node/doc/types.rs

@@ -199,12 +199,9 @@ impl LuaDocInferType {
         self.child()
     }
 
-    pub fn get_name_token(&self) -> Option<LuaNameToken> {
-        self.get_generic_decl()?.get_name_token()
-    }
-
-    pub fn get_name_text(&self) -> Option<String> {
-        self.get_name_token()
+    pub fn get_generic_decl_name_text(&self) -> Option<String> {
+        self.get_generic_decl()?
+            .get_name_token()
             .map(|it| it.get_name_text().to_string())
     }
 }