<true type> else <false type> is better

Author: MillhioreBT

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

@@ -252,7 +252,7 @@ pub fn analyze_return_cast(analyzer: &mut DocAnalyzer, tag: LuaDocTagReturnCast)
         let name = name_token.get_name_text();
 
         let op_types: Vec<_> = tag.get_op_types().collect();
-        let cast_op_type = op_types.get(0)?;
+        let cast_op_type = op_types.first()?;
 
         // Bind the true condition type
         if let Some(node_type) = cast_op_type.get_type() {

crates/emmylua_code_analysis/src/compilation/test/flow.rs

@@ -1369,7 +1369,7 @@ _2 = a[1]
             ---@class Monster: Creature
 
             ---@return boolean
-            ---@return_cast creature Player, Monster
+            ---@return_cast creature Player else Monster
             local function isPlayer(creature)
                 return true
             end
@@ -1407,7 +1407,7 @@ _2 = a[1]
             local m = {}
 
             ---@return boolean
-            ---@return_cast self Player, Monster
+            ---@return_cast self Player else Monster
             function m:isPlayer()
             end
 

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

@@ -353,7 +353,7 @@ fn parse_tag_return(p: &mut LuaDocParser) -> DocParseResult {
 }
 
 // ---@return_cast <param name> <type>
-// ---@return_cast <param name> <true_type>, <false_type>
+// ---@return_cast <param name> <true_type> else <false_type>
 fn parse_tag_return_cast(p: &mut LuaDocParser) -> DocParseResult {
     p.set_state(LuaDocLexerState::Normal);
     let m = p.mark(LuaSyntaxKind::DocTagReturnCast);
@@ -362,8 +362,8 @@ fn parse_tag_return_cast(p: &mut LuaDocParser) -> DocParseResult {
 
     parse_op_type(p)?;
 
-    // Allow optional second type after comma for false condition
-    if p.current_token() == LuaTokenKind::TkComma {
+    // Allow optional second type after 'else' for false condition
+    if p.current_token() == LuaTokenKind::TkDocElse {
         p.bump();
         parse_op_type(p)?;
     }

crates/emmylua_parser/src/kind/lua_token_kind.rs

@@ -143,6 +143,7 @@ pub enum LuaTokenKind {
     TkDocAs,              // as
     TkDocIn,              // in
     TkDocInfer,           // infer
+    TkDocElse,            // else (for return_cast)
     TkDocContinue,        // ---
     TkDocContinueOr,      // ---| or ---|+  or ---|>
     TkDocDetail,          // a description

crates/emmylua_parser/src/lexer/lua_doc_lexer.rs

@@ -638,6 +638,7 @@ fn to_token_or_name(text: &str) -> LuaTokenKind {
         "as" => LuaTokenKind::TkDocAs,
         "and" => LuaTokenKind::TkAnd,
         "or" => LuaTokenKind::TkOr,
+        "else" => LuaTokenKind::TkDocElse,
         _ => LuaTokenKind::TkName,
     }
 }

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

@@ -1458,10 +1458,6 @@ impl LuaAstNode for LuaDocTagReturnCast {
 impl LuaDocDescriptionOwner for LuaDocTagReturnCast {}
 
 impl LuaDocTagReturnCast {
-    pub fn get_op_type(&self) -> Option<LuaDocOpType> {
-        self.child()
-    }
-
     pub fn get_op_types(&self) -> LuaAstChildren<LuaDocOpType> {
         self.children()
     }