support luajit-ext formatter

Author: CppCXY

README.md

@@ -198,7 +198,6 @@ emmylua_doc_cli ./src --output ./docs
 - [**Configuration**](./docs/config/emmyrc_json_EN.md) - Advanced configuration options
 - [**Formatter Guide**](./docs/emmylua_formatter/README_EN.md) - Formatter behavior, options, and usage guide
 - [**Annotations Reference**](./docs/emmylua_doc/annotations_EN/README.md) - Detailed annotation documentation
-- [**Old Formatter**](https://github.com/CppCXY/EmmyLuaCodeStyle/blob/master/README_EN.md) - Formatting and style guidelines
 - [**External Formatter Integration**](./docs/external_format/external_formatter_options_EN.md) - Using external formatters
 
 ---

crates/emmylua_formatter/src/config/mod.rs

@@ -427,6 +427,7 @@ pub enum LuaSyntaxLevel {
     #[default]
     Lua55,
     LuaJIT,
+    LuaJITExt,
 }
 
 impl From<LuaSyntaxLevel> for emmylua_parser::LuaLanguageLevel {
@@ -438,6 +439,7 @@ impl From<LuaSyntaxLevel> for emmylua_parser::LuaLanguageLevel {
             LuaSyntaxLevel::Lua54 => emmylua_parser::LuaLanguageLevel::Lua54,
             LuaSyntaxLevel::Lua55 => emmylua_parser::LuaLanguageLevel::Lua55,
             LuaSyntaxLevel::LuaJIT => emmylua_parser::LuaLanguageLevel::LuaJIT,
+            LuaSyntaxLevel::LuaJITExt => emmylua_parser::LuaLanguageLevel::LuaJITExt,
         }
     }
 }

crates/emmylua_formatter/src/formatter/expr.rs

@@ -586,6 +586,10 @@ fn format_call_expr(ctx: &FormatContext, plan: &FormatPlan, expr: &LuaCallExpr)
         .map(|prefix| format_expr(ctx, plan, &prefix))
         .unwrap_or_default();
 
+    if expr.has_safe_navigation() {
+        docs.push(ir::syntax_token(LuaTokenKind::TkSafeNavigation));
+    }
+
     let Some(args_list) = expr.get_args_list() else {
         return docs;
     };

crates/emmylua_formatter/src/formatter/spacing.rs

@@ -1,8 +1,8 @@
 use crate::config::LuaFormatConfig;
 use crate::ir::{self, DocIR};
 use emmylua_parser::{
-    BinaryOperator, LuaAstNode, LuaChunk, LuaKind, LuaSyntaxId, LuaSyntaxKind, LuaSyntaxToken,
-    LuaTokenKind,
+    BinaryOperator, LuaAstNode, LuaChunk, LuaKind, LuaOpKind, LuaSyntaxId, LuaSyntaxKind,
+    LuaSyntaxToken, LuaTokenKind,
 };
 use smol_str::SmolStr;
 
@@ -234,10 +234,14 @@ fn analyze_token_spacing(ctx: &FormatContext, spacing: &mut SpacingModel, token:
         | LuaTokenKind::TkElse
         | LuaTokenKind::TkThen
         | LuaTokenKind::TkUntil
-        | LuaTokenKind::TkIn
-        | LuaTokenKind::TkNot => {
+        | LuaTokenKind::TkNot
+        | LuaTokenKind::TkIn => {
             apply_space_rule(spacing, syntax_id, SpaceRule::Space);
         }
+        LuaTokenKind::TkToggle => {
+            spacing.add_token_left_expected(syntax_id, TokenSpacingExpected::Space(1));
+            spacing.add_token_right_expected(syntax_id, TokenSpacingExpected::Space(0));
+        }
         LuaTokenKind::TkDocQuestion => {
             spacing.add_token_left_expected(syntax_id, TokenSpacingExpected::Space(0));
             spacing.add_token_right_expected(syntax_id, TokenSpacingExpected::Space(1));
@@ -434,31 +438,7 @@ fn comment_start_looks_like_long_comment_prefix(token: &LuaSyntaxToken) -> bool
 }
 
 fn binary_space_rule_for_token(ctx: &FormatContext, token: &LuaSyntaxToken) -> Option<SpaceRule> {
-    let op = match token.kind().to_token() {
-        LuaTokenKind::TkPlus => BinaryOperator::OpAdd,
-        LuaTokenKind::TkMinus => BinaryOperator::OpSub,
-        LuaTokenKind::TkMul => BinaryOperator::OpMul,
-        LuaTokenKind::TkDiv => BinaryOperator::OpDiv,
-        LuaTokenKind::TkIDiv => BinaryOperator::OpIDiv,
-        LuaTokenKind::TkMod => BinaryOperator::OpMod,
-        LuaTokenKind::TkPow => BinaryOperator::OpPow,
-        LuaTokenKind::TkConcat => BinaryOperator::OpConcat,
-        LuaTokenKind::TkBitAnd => BinaryOperator::OpBAnd,
-        LuaTokenKind::TkBitOr => BinaryOperator::OpBOr,
-        LuaTokenKind::TkBitXor => BinaryOperator::OpBXor,
-        LuaTokenKind::TkShl => BinaryOperator::OpShl,
-        LuaTokenKind::TkShr => BinaryOperator::OpShr,
-        LuaTokenKind::TkEq => BinaryOperator::OpEq,
-        LuaTokenKind::TkGe => BinaryOperator::OpGe,
-        LuaTokenKind::TkGt => BinaryOperator::OpGt,
-        LuaTokenKind::TkLe => BinaryOperator::OpLe,
-        LuaTokenKind::TkLt => BinaryOperator::OpLt,
-        LuaTokenKind::TkNe => BinaryOperator::OpNe,
-        LuaTokenKind::TkAnd => BinaryOperator::OpAnd,
-        LuaTokenKind::TkOr => BinaryOperator::OpOr,
-        _ => return None,
-    };
-
+    let op = LuaOpKind::to_binary_operator(token.kind().to_token());
     Some(space_around_binary_op(op, ctx.config))
 }
 

crates/emmylua_formatter/src/test/statement_tests.rs

@@ -2002,4 +2002,15 @@ end
         let result = format_text(input, LuaLanguageLevel::LuaJITExt, &config).formatted;
         assert_eq!(result, expected);
     }
+
+    #[test]
+    fn test_safe_call_format() {
+        use crate::format_text;
+        use emmylua_parser::LuaLanguageLevel;
+        let config = LuaFormatConfig::default();
+        let input = "self.call?.()\n";
+        let expected = "self.call?.()\n";
+        let result = format_text(input, LuaLanguageLevel::LuaJITExt, &config).formatted;
+        assert_eq!(result, expected);
+    }
 }

crates/emmylua_ls/src/handlers/completion/data/keywords.rs

@@ -121,6 +121,12 @@ pub const KEYWORD_COMPLETIONS: &[KeywordCompletionInfo] = &[
         insert_text: "local",
         kind: CompletionItemKind::KEYWORD,
     },
+    KeywordCompletionInfo {
+        label: "const",
+        detail: " name = value",
+        insert_text: "const ${1:name} = ${2:value}",
+        kind: CompletionItemKind::SNIPPET,
+    },
     KeywordCompletionInfo {
         label: "local function",
         detail: " name(...) .. end",
@@ -184,4 +190,10 @@ pub const KEYWORD_EXPR_COMPLETIONS: &[KeywordCompletionInfo] = &[
         insert_text: "${1:a} and ${2:b} or ${3:c}",
         kind: CompletionItemKind::SNIPPET,
     },
+    KeywordCompletionInfo {
+        label: "continue",
+        detail: "",
+        insert_text: "continue",
+        kind: CompletionItemKind::KEYWORD,
+    },
 ];

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

@@ -1,3 +1,4 @@
+use emmylua_code_analysis::EmmyrcLuaVersion::LuaJITExt;
 use emmylua_parser::{LuaAstNode, LuaKind, LuaNameExpr, LuaSyntaxKind, LuaTokenKind};
 use lsp_types::{CompletionItem, CompletionItemLabelDetails, InsertTextFormat, InsertTextMode};
 
@@ -89,6 +90,7 @@ fn add_stat_keyword_completions(
     builder: &mut CompletionBuilder,
     name_expr: Option<LuaNameExpr>,
 ) -> Option<()> {
+    let level = builder.semantic_model.get_emmyrc().runtime.version;
     if let Some(name_expr) = name_expr
         && name_expr.syntax().parent()?.parent()?.kind() != LuaSyntaxKind::Block.into()
     {
@@ -114,6 +116,9 @@ fn add_stat_keyword_completions(
                     keyword_info.insert_text.to_string(),
                 )
             };
+        if level != LuaJITExt && keyword_info.label == "continue" {
+            continue;
+        }
 
         let item = CompletionItem {
             label: keyword_info.label.to_string(),

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

@@ -115,6 +115,7 @@ fn build_tokens_semantic_token(
         | LuaTokenKind::TkTernary
         | LuaTokenKind::TkSafeNavigation
         | LuaTokenKind::TkShrArithmetic
+        | LuaTokenKind::TkToggle
         | LuaTokenKind::TkNilCoalescing => {
             builder.push(token, SemanticTokenTypeKind::Operator);
         }
@@ -292,6 +293,9 @@ fn build_tokens_semantic_token(
         LuaTokenKind::TkDocStart | LuaTokenKind::TkDocContinue | LuaTokenKind::TkDocContinueOr => {
             render_doc_at(builder, token)
         }
+        ch if ch.is_assign_op() => {
+            builder.push(token, SemanticTokenTypeKind::Operator);
+        }
         _ => {}
     }
 }

crates/emmylua_parser/src/kind/lua_features.rs

@@ -26,6 +26,7 @@ pub enum LuaFeatures {
     ShiftLeftAssign,        // "<<="
     ShiftRightAssign,       // ">>="
     ShrArithmeticAssign,    // "~>>="
+    ConcatAssign,           // "..="
     DoublePipe,             // "||"
     DoubleAmp,              // "&&"
     Exclamation,            // "!"
@@ -92,7 +93,6 @@ impl LuaFeaturesSet {
         // lua5.3+
         set.add(LuaFeatures::IntegerFloorDivision);
         // luajit-extension
-        set.add(LuaFeatures::DoubleSlash);
         set.add(LuaFeatures::PlusAssign);
         set.add(LuaFeatures::MinusAssign);
         set.add(LuaFeatures::StarAssign);
@@ -109,6 +109,7 @@ impl LuaFeaturesSet {
         set.add(LuaFeatures::NotEqual);
         set.add(LuaFeatures::ShiftRightArithmetic);
         set.add(LuaFeatures::ShrArithmeticAssign);
+        set.add(LuaFeatures::ConcatAssign);
         set.add(LuaFeatures::Continue);
         set.add(LuaFeatures::Ternary);
         set.add(LuaFeatures::SafeNavigationOperator);

crates/emmylua_parser/src/kind/lua_token_kind.rs

@@ -32,6 +32,7 @@ pub enum LuaTokenKind {
     // extension keywords
     TkContinue, // continue
     TkConst,    // const
+    TkToggle,   // !
 
     TkWhitespace,    // whitespace
     TkEndOfLine,     // end of line
@@ -77,6 +78,7 @@ pub enum LuaTokenKind {
     TkShiftLeftAssign,     // <<=
     TkShiftRightAssign,    // >>=
     TkShrArithmeticAssign, // ~>>=
+    TkConcatAssign,        // ..=
 
     TkNilCoalescing,  // ??
     TkSafeNavigation, // ?.
@@ -201,6 +203,7 @@ impl LuaTokenKind {
             LuaTokenKind::TkLocal => "local",
             LuaTokenKind::TkNil => "nil",
             LuaTokenKind::TkNot => "not",
+            LuaTokenKind::TkToggle => "!",
             LuaTokenKind::TkOr => "or",
             LuaTokenKind::TkRepeat => "repeat",
             LuaTokenKind::TkReturn => "return",
@@ -258,6 +261,7 @@ impl LuaTokenKind {
             LuaTokenKind::TkSafeNavigation => "?.",
             LuaTokenKind::TkTernary => "?",
             LuaTokenKind::TkShrArithmeticAssign => "~>>=",
+            LuaTokenKind::TkConcatAssign => "..=",
             _ => return None,
         })
     }
@@ -307,6 +311,7 @@ impl LuaTokenKind {
                 | LuaTokenKind::TkShiftLeftAssign
                 | LuaTokenKind::TkShiftRightAssign
                 | LuaTokenKind::TkShrArithmeticAssign
+                | LuaTokenKind::TkConcatAssign
         )
     }
 }