fix safe nav format

Author: CppCXY

crates/emmylua_formatter/src/formatter/expr.rs

@@ -3258,17 +3258,27 @@ fn format_index_access_ir(
     expr: &LuaIndexExpr,
 ) -> Vec<DocIR> {
     let mut docs = Vec::new();
+    let is_safe = expr.is_safe_index();
     if let Some(index_token) = expr.get_index_token() {
         if index_token.is_dot() {
+            if is_safe {
+                docs.push(ir::syntax_token(LuaTokenKind::TkSafeNavigation));
+            }
             docs.push(ir::syntax_token(LuaTokenKind::TkDot));
             docs.extend(format_named_index_key_ir(expr));
         } else if index_token.is_colon() {
+            if is_safe {
+                docs.push(ir::syntax_token(LuaTokenKind::TkSafeNavigation));
+            }
             docs.push(ir::syntax_token(LuaTokenKind::TkColon));
             docs.extend(format_named_index_key_ir(expr));
         } else if index_token.is_safe_navigation() {
             docs.push(ir::syntax_token(LuaTokenKind::TkSafeNavigation));
             docs.extend(format_named_index_key_ir(expr));
         } else if index_token.is_left_bracket() {
+            if is_safe {
+                docs.push(ir::syntax_token(LuaTokenKind::TkSafeNavigation));
+            }
             docs.push(ir::syntax_token(LuaTokenKind::TkLeftBracket));
             if ctx.config.spacing.space_inside_brackets {
                 docs.push(ir::space());

crates/emmylua_formatter/src/formatter/render/control.rs

@@ -693,8 +693,12 @@ fn render_named_function_stat_source_order(
                             kind
                         ),
                         (
-                            Some(LuaTokenKind::TkLocal | LuaTokenKind::TkGlobal),
-                            LuaTokenKind::TkFunction
+                            Some(
+                                LuaTokenKind::TkLocal
+                                    | LuaTokenKind::TkGlobal
+                                    | LuaTokenKind::TkConst,
+                            ),
+                            LuaTokenKind::TkFunction,
                         )
                     )
                 {

crates/emmylua_formatter/src/test/statement_tests.rs

@@ -2013,4 +2013,15 @@ end
         let result = format_text(input, LuaLanguageLevel::LuaJITExt, &config).formatted;
         assert_eq!(result, expected);
     }
+
+    #[test]
+    fn test_safe_method_colon_format() {
+        use crate::format_text;
+        use emmylua_parser::LuaLanguageLevel;
+        let config = LuaFormatConfig::default();
+        let input = "local x = MyClass.myField?.:byte(1)\n";
+        let expected = "local x = MyClass.myField?.:byte(1)\n";
+        let result = format_text(input, LuaLanguageLevel::LuaJITExt, &config).formatted;
+        assert_eq!(result, expected);
+    }
 }

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

@@ -1282,6 +1282,43 @@ Syntax(Chunk)@0..27
         );
     }
 
+    #[test]
+    fn test_safe_method_colon() {
+        let code = "local x = a?.field?.:method()\n";
+        let result = r#"
+Syntax(Chunk)@0..30
+  Syntax(Block)@0..30
+    Syntax(LocalStat)@0..29
+      Token(TkLocal)@0..5 "local"
+      Token(TkWhitespace)@5..6 " "
+      Syntax(LocalName)@6..7
+        Token(TkName)@6..7 "x"
+      Token(TkWhitespace)@7..8 " "
+      Token(TkAssign)@8..9 "="
+      Token(TkWhitespace)@9..10 " "
+      Syntax(CallExpr)@10..29
+        Syntax(SafeIndexExpr)@10..27
+          Syntax(SafeIndexExpr)@10..18
+            Syntax(NameExpr)@10..11
+              Token(TkName)@10..11 "a"
+            Token(TkSafeNavigation)@11..13 "?."
+            Token(TkName)@13..18 "field"
+          Token(TkSafeNavigation)@18..20 "?."
+          Token(TkColon)@20..21 ":"
+          Token(TkName)@21..27 "method"
+        Syntax(CallArgList)@27..29
+          Token(TkLeftParen)@27..28 "("
+          Token(TkRightParen)@28..29 ")"
+    Token(TkEndOfLine)@29..30 "\n"
+        "#;
+
+        assert_ast_eq!(
+            code,
+            result,
+            ParserConfig::with_level(LuaLanguageLevel::LuaJITExt)
+        );
+    }
+
     #[test]
     fn test_safe_navigation_dot() {
         let code = "local x = obj?.field\n";