From 377c0d8d65ca043343d9a3c150252de892f977ce Mon Sep 17 00:00:00 2001
From: Mendy Berger <12537668+MendyBerger@users.noreply.github.com>
Date: Fri, 25 Apr 2025 08:53:27 -0400
Subject: [PATCH 1/2] fix(moonbit): Update keywords

---
 crates/moonbit/src/lib.rs | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/crates/moonbit/src/lib.rs b/crates/moonbit/src/lib.rs
index 99591e60c..bd61888c4 100644
--- a/crates/moonbit/src/lib.rs
+++ b/crates/moonbit/src/lib.rs
@@ -2871,13 +2871,16 @@ trait ToMoonBitIdent: ToOwned {
 
 impl ToMoonBitIdent for str {
     fn to_moonbit_ident(&self) -> String {
-        // Escape MoonBit keywords
+        // Escape MoonBit keywords and reserved keywords
         match self {
-            "continue" | "for" | "match" | "if" | "pub" | "priv" | "readonly" | "break"
-            | "raise" | "try" | "except" | "catch" | "else" | "enum" | "struct" | "type"
-            | "trait" | "return" | "let" | "mut" | "while" | "loop" | "extern" | "with"
-            | "throw" | "init" | "main" | "test" | "in" | "guard" | "typealias" | "const"
-            | "method" | "move" | "do" | "static" | "final" => {
+            "module" | "move" | "ref" | "static" | "super" | "unsafe" | "use" | "where"
+            | "await" | "dyn" | "abstract" | "do" | "final" | "macro" | "override" | "typeof"
+            | "virtual" | "yield" | "local" | "method" | "alias" | "assert" | "as" | "else"
+            | "extern" | "fn" | "if" | "let" | "const" | "match" | "mut" | "type" | "typealias"
+            | "struct" | "enum" | "trait" | "traitalias" | "derive" | "while" | "break"
+            | "continue" | "import" | "return" | "throw" | "raise" | "try" | "catch" | "pub"
+            | "priv" | "readonly" | "true" | "false" | "_" | "test" | "loop" | "for" | "in"
+            | "impl" | "with" | "guard" | "async" | "is" => {
                 format!("{self}_")
             }
             _ => self.to_snake_case(),

From 157f4add341a43e98fb530eb452746e895447f4b Mon Sep 17 00:00:00 2001
From: Mendy Berger <12537668+MendyBerger@users.noreply.github.com>
Date: Fri, 25 Apr 2025 09:44:01 -0400
Subject: [PATCH 2/2] fix(moonbit): init and main are reserved

---
 crates/moonbit/src/lib.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/crates/moonbit/src/lib.rs b/crates/moonbit/src/lib.rs
index bd61888c4..bed338e08 100644
--- a/crates/moonbit/src/lib.rs
+++ b/crates/moonbit/src/lib.rs
@@ -2880,7 +2880,7 @@ impl ToMoonBitIdent for str {
             | "struct" | "enum" | "trait" | "traitalias" | "derive" | "while" | "break"
             | "continue" | "import" | "return" | "throw" | "raise" | "try" | "catch" | "pub"
             | "priv" | "readonly" | "true" | "false" | "_" | "test" | "loop" | "for" | "in"
-            | "impl" | "with" | "guard" | "async" | "is" => {
+            | "impl" | "with" | "guard" | "async" | "is" | "init" | "main" => {
                 format!("{self}_")
             }
             _ => self.to_snake_case(),