Use existing atom escape code

Author: LostKobrakai

compiler-core/src/codegen.rs

@@ -9,6 +9,7 @@ use crate::{
     Result,
 };
 use ecow::EcoString;
+use erlang::escape_atom_string;
 use itertools::Itertools;
 use std::fmt::Debug;
 
@@ -113,7 +114,7 @@ impl<'a> ErlangApp<'a> {
             .chain(native_modules)
             .unique()
             .sorted()
-            .map(|m| Self::format_atom(&m))
+            .map(|m| escape_atom_string((&m).clone().into()))
             .join(",\n               ");
 
         // TODO: When precompiling for production (i.e. as a precompiled hex
@@ -152,22 +153,6 @@ impl<'a> ErlangApp<'a> {
 
         writer.write(&path, &text)
     }
-
-    fn format_atom(s: &EcoString) -> EcoString {
-        let mut chars = s.chars();
-
-        let Some(first) = chars.next() else {
-            return "''".into();
-        };
-
-        let needs_escape = |c: char| !(c.is_alphanumeric() || c == '_' || c == '@');
-
-        if !first.is_ascii_lowercase() || chars.any(needs_escape) {
-            format!("'{}'", s).into()
-        } else {
-            s.clone()
-        }
-    }
 }
 
 #[derive(Debug, Clone, Copy, PartialEq, Eq)]

compiler-core/src/erlang.rs

@@ -642,7 +642,7 @@ fn atom(value: &str) -> Document<'_> {
     }
 }
 
-fn escape_atom_string(value: String) -> EcoString {
+pub fn escape_atom_string(value: String) -> EcoString {
     if is_erlang_reserved_word(&value) {
         // Escape because of keyword collision
         eco_format!("'{value}'")

test/external_only_erlang/test.sh

@@ -33,7 +33,7 @@ if g run --target=javascript; then
   exit 1
 fi
 
-echo Running erlang shippment should succeed
+echo Running erlang shipment should succeed
 g export erlang-shipment
 grep "external_only_erlang_ffi" "build/erlang-shipment/external_only_erlang/ebin/external_only_erlang.app"