support lua5.5 global grammar

Author: CppCXY

CHANGELOG.md

@@ -56,6 +56,8 @@ end
 
 `CHG` When an object returned by require function is a class/enum, defining new members on it is prohibited, while tables are not restricted
 
+`NEW` Support `Lua 5.5` global decl grammar
+
 # 0.7.2
 
 `FIX` Fix reading configuration file encoded with UTF-8 BOM

crates/emmylua_code_analysis/src/config/configs/runtime.rs

@@ -51,6 +51,9 @@ pub enum EmmyrcLuaVersion {
     /// Lua 5.4
     #[serde(rename = "Lua5.4", alias = "Lua 5.4")]
     Lua54,
+    /// Lua 5.5
+    #[serde(rename = "Lua5.5", alias = "Lua 5.5")]
+    Lua55,
     /// Lua Latest
     #[serde(rename = "LuaLatest", alias = "Lua Latest")]
     LuaLatest,
@@ -71,6 +74,7 @@ impl EmmyrcLuaVersion {
             EmmyrcLuaVersion::Lua53 => LuaVersionNumber::new(5, 3, 0),
             EmmyrcLuaVersion::Lua54 => LuaVersionNumber::new(5, 4, 0),
             EmmyrcLuaVersion::LuaLatest => LuaVersionNumber::new(5, 4, 0),
+            EmmyrcLuaVersion::Lua55 => LuaVersionNumber::new(5, 5, 0),
         }
     }
 }

crates/emmylua_code_analysis/src/config/mod.rs

@@ -70,6 +70,7 @@ impl Emmyrc {
             EmmyrcLuaVersion::Lua54 => LuaLanguageLevel::Lua54,
             EmmyrcLuaVersion::LuaJIT => LuaLanguageLevel::LuaJIT,
             EmmyrcLuaVersion::LuaLatest => LuaLanguageLevel::Lua54,
+            EmmyrcLuaVersion::Lua55 => LuaLanguageLevel::Lua55,
         };
 
         let mut special_like = HashMap::new();

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

@@ -54,6 +54,7 @@ fn parse_stat(p: &mut LuaParser) -> ParseResult {
         LuaTokenKind::TkGoto => parse_goto(p)?,
         LuaTokenKind::TkDbColon => parse_label_stat(p)?,
         LuaTokenKind::TkSemicolon => parse_empty_stat(p)?,
+        LuaTokenKind::TkGlobal => parse_global_stat(p)?,
         _ => parse_assign_or_expr_stat(p)?,
     };
 
@@ -316,6 +317,20 @@ fn parse_empty_stat(p: &mut LuaParser) -> ParseResult {
     Ok(m.complete(p))
 }
 
+fn parse_global_stat(p: &mut LuaParser) -> ParseResult {
+    let m = p.mark(LuaSyntaxKind::GlobalStat);
+    p.bump();
+    expect_token(p, LuaTokenKind::TkName)?;
+
+    while p.current_token() == LuaTokenKind::TkComma {
+        p.bump();
+        expect_token(p, LuaTokenKind::TkName)?;
+    }
+
+    if_token_bump(p, LuaTokenKind::TkSemicolon);
+    Ok(m.complete(p))
+}
+
 fn parse_assign_or_expr_stat(p: &mut LuaParser) -> ParseResult {
     let mut m = p.mark(LuaSyntaxKind::AssignStat);
     let range = p.current_token_range();

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

@@ -1,6 +1,6 @@
 #[cfg(test)]
 mod tests {
-    use crate::{parser::ParserConfig, LuaParser};
+    use crate::{parser::ParserConfig, LuaLanguageLevel, LuaParser};
 
     macro_rules! assert_ast_eq {
         ($lua_code:expr, $expected:expr) => {
@@ -9,6 +9,12 @@ mod tests {
             let expected = $expected.trim().to_string();
             assert_eq!(result, expected);
         };
+        ($lua_code:expr, $expected:expr, $config:expr) => {
+            let tree = LuaParser::parse($lua_code, $config);
+            let result = format!("{:#?}", tree.get_red_root()).trim().to_string();
+            let expected = $expected.trim().to_string();
+            assert_eq!(result, expected);
+        };
     }
 
     #[allow(unused)]
@@ -17,6 +23,12 @@ mod tests {
         println!("{:#?}", tree.get_red_root());
     }
 
+    #[allow(unused)]
+    fn print_ast_config(lua_code: &str, config: ParserConfig) {
+        let tree = LuaParser::parse(lua_code, config);
+        println!("{:#?}", tree.get_red_root());
+    }
+
     #[test]
     fn test_full_lua_syntax() {
         let code = r#"
@@ -1115,4 +1127,27 @@ Syntax(Chunk)@0..4
 
         assert_ast_eq!(code, result);
     }
+
+    #[test]
+    fn test_lua55_global_grammar() {
+        let code = "global a, b;";
+        let result = r#"
+Syntax(Chunk)@0..12
+  Syntax(Block)@0..12
+    Syntax(GlobalStat)@0..12
+      Token(TkGlobal)@0..6 "global"
+      Token(TkWhitespace)@6..7 " "
+      Token(TkName)@7..8 "a"
+      Token(TkComma)@8..9 ","
+      Token(TkWhitespace)@9..10 " "
+      Token(TkName)@10..11 "b"
+      Token(TkSemicolon)@11..12 ";"
+        "#;
+
+        assert_ast_eq!(
+            code,
+            result,
+            ParserConfig::with_level(LuaLanguageLevel::Lua55)
+        );
+    }
 }

crates/emmylua_parser/src/kind/lua_language_level.rs

@@ -7,6 +7,7 @@ pub enum LuaLanguageLevel {
     Lua53,
     Lua54,
     LuaJIT,
+    Lua55,
 }
 
 impl fmt::Display for LuaLanguageLevel {
@@ -17,6 +18,7 @@ impl fmt::Display for LuaLanguageLevel {
             LuaLanguageLevel::Lua53 => write!(f, "Lua 5.3"),
             LuaLanguageLevel::Lua54 => write!(f, "Lua 5.4"),
             LuaLanguageLevel::LuaJIT => write!(f, "LuaJIT"),
+            LuaLanguageLevel::Lua55 => write!(f, "Lua 5.5"),
         }
     }
 }

crates/emmylua_parser/src/kind/lua_syntax_kind.rs

@@ -27,6 +27,7 @@ pub enum LuaSyntaxKind {
     GotoStat,
     CallExprStat,
     AssignStat,
+    GlobalStat,
     UnknownStat,
 
     // expressions

crates/emmylua_parser/src/kind/lua_token_kind.rs

@@ -27,6 +27,7 @@ pub enum LuaTokenKind {
     TkTrue,
     TkUntil,
     TkWhile,
+    TkGlobal, // global *
 
     TkWhitespace,   // whitespace
     TkEndOfLine,    // end of line

crates/emmylua_parser/src/lexer/lexer_config.rs

@@ -44,6 +44,10 @@ impl LexerConfig {
                 | LuaLanguageLevel::LuaJIT
         )
     }
+
+    pub fn support_global_decl(&self) -> bool {
+        matches!(self.language_level, LuaLanguageLevel::Lua55)
+    }
 }
 
 impl Default for LexerConfig {

crates/emmylua_parser/src/lexer/lua_lexer.rs

@@ -66,6 +66,13 @@ impl LuaLexer<'_> {
             "true" => LuaTokenKind::TkTrue,
             "until" => LuaTokenKind::TkUntil,
             "while" => LuaTokenKind::TkWhile,
+            "global" => {
+                if self.lexer_config.support_global_decl() {
+                    LuaTokenKind::TkGlobal
+                } else {
+                    LuaTokenKind::TkName
+                }
+            }
             _ => LuaTokenKind::TkName,
         }
     }