fix(doc): allow mapped type trailing semicolon omission

Author: xuhuanzy

crates/emmylua_code_analysis/src/db_index/type/humanize_type.rs

@@ -5,9 +5,9 @@ use itertools::Itertools;
 
 use crate::{
     AsyncState, DbIndex, LuaAliasCallType, LuaConditionalType, LuaFunctionType, LuaGenericType,
-    LuaIntersectionType, LuaMemberKey, LuaMemberOwner, LuaObjectType, LuaSignatureId,
-    LuaStringTplType, LuaTupleType, LuaType, LuaTypeDeclId, LuaUnionType, TypeSubstitutor,
-    VariadicType,
+    LuaIntersectionType, LuaMappedType, LuaMemberKey, LuaMemberOwner, LuaObjectType,
+    LuaSignatureId, LuaStringTplType, LuaTupleType, LuaType, LuaTypeDeclId, LuaUnionType,
+    TypeSubstitutor, VariadicType,
 };
 
 use super::{LuaAliasCallKind, LuaMultiLineUnion};
@@ -217,9 +217,9 @@ impl<'a> TypeHumanizer<'a> {
             }
             LuaType::Language(s) => w.write_str(s),
             LuaType::Conditional(c) => self.write_conditional_type(c, w),
+            LuaType::Mapped(mapped) => self.write_mapped_type(mapped, w),
             LuaType::Never => w.write_str("never"),
             LuaType::ModuleRef(file_id) => self.write_module_ref(*file_id, w),
-            _ => w.write_str("unknown"),
         }
     }
 
@@ -1082,6 +1082,36 @@ impl<'a> TypeHumanizer<'a> {
         Ok(())
     }
 
+    // ─── Mapped ─────────────────────────────────────────────────────
+
+    fn write_mapped_type<W: Write>(&mut self, mapped: &LuaMappedType, w: &mut W) -> fmt::Result {
+        w.write_str("{ ")?;
+        if mapped.is_readonly {
+            w.write_str("readonly ")?;
+        }
+
+        w.write_char('[')?;
+        w.write_str(mapped.param.1.name.as_str())?;
+        w.write_str(" in ")?;
+
+        let saved = self.level;
+        self.level = self.child_level();
+        if let Some(constraint) = &mapped.param.1.constraint {
+            self.write_type(constraint, w)?;
+        } else {
+            w.write_str("unknown")?;
+        }
+        w.write_char(']')?;
+        if mapped.is_optional {
+            w.write_char('?')?;
+        }
+        w.write_str(": ")?;
+        self.write_type(&mapped.value, w)?;
+        self.level = saved;
+
+        w.write_str("; }")
+    }
+
     // ─── ModuleRef ──────────────────────────────────────────────────
 
     fn write_module_ref<W: Write>(&mut self, file_id: crate::FileId, w: &mut W) -> fmt::Result {

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

@@ -361,6 +361,18 @@ mod tests {
             },
         ));
 
+        check!(
+            ws.check_hover(
+                r#"
+                ---@alias Co<??>py<T> { readonly [K in keyof T]?: T[K] }
+            "#,
+                VirtualHoverResult {
+                    value: "```lua\n(alias) Copy<T> = { readonly [K in keyof T]?: T[K]; }\n```"
+                        .to_string(),
+                },
+            )
+        );
+
         check!(
             ws.check_hover(
                 r#"

crates/emmylua_parser/src/grammar/doc/test.rs

@@ -3268,6 +3268,14 @@ Syntax(Chunk)@0..110
         assert_ast_eq!(code, result);
     }
 
+    #[test]
+    fn test_mapped_type_omits_trailing_semicolon_before_close_brace() {
+        let code = r#"---@alias Copy<T> { [K in keyof T]: T[K] }"#;
+        let tree = LuaParser::parse(code, ParserConfig::default());
+
+        assert_eq!(tree.get_errors(), &[]);
+    }
+
     #[test]
     fn test_alias_conditional_infer_dots() {
         let code = r#"

crates/emmylua_parser/src/grammar/doc/types.rs

@@ -248,7 +248,11 @@ fn parse_mapped_type(p: &mut LuaDocParser, m: Marker) -> DocParseResult {
 
     parse_type(p)?;
 
-    expect_token(p, LuaTokenKind::TkSemicolon)?;
+    if p.current_token() == LuaTokenKind::TkSemicolon {
+        p.bump();
+    } else if p.current_token() != LuaTokenKind::TkRightBrace {
+        expect_token(p, LuaTokenKind::TkSemicolon)?;
+    }
     expect_token(p, LuaTokenKind::TkRightBrace)?;
 
     p.set_parser_state(LuaDocParserState::Normal);