Simplify changes to beam compiler shell communication handling

Author: LostKobrakai

compiler-cli/src/beam_compiler.rs

@@ -66,33 +66,26 @@ impl BeamCompiler {
         let mut buf = String::new();
         let mut accumulated_modules: Vec<String> = Vec::new();
         while let (Ok(_), Ok(None)) = (inner.stdout.read_line(&mut buf), inner.process.try_wait()) {
-            let trimmed = buf.trim();
-
-            if trimmed.starts_with("gleam-compile") {
-                match trimmed {
-                    "gleam-compile-result-ok" => {
-                        // Return Ok with the accumulated modules
-                        return Ok(accumulated_modules);
-                    }
-                    "gleam-compile-result-error" => {
-                        return Err(Error::ShellCommand {
-                            program: "escript".into(),
-                            err: None,
-                        });
-                    }
-                    _ => {}
+            match buf.trim() {
+                "gleam-compile-result-ok" => {
+                    // Return Ok with the accumulated modules
+                    return Ok(accumulated_modules);
                 }
-            } else if trimmed.starts_with("module:") {
-                if let Some(module_content) = trimmed.strip_prefix("module:") {
-                    accumulated_modules.push(module_content.to_string());
+                "gleam-compile-result-error" => {
+                    return Err(Error::ShellCommand {
+                        program: "escript".into(),
+                        err: None,
+                    })
                 }
-            } else {
-                match stdio {
-                    Stdio::Inherit => {
-                        print!("{}", buf);
+                s if s.starts_with("gleam-compile-module:") => {
+                    if let Some(module_content) = s.strip_prefix("gleam-compile-module:") {
+                        accumulated_modules.push(module_content.to_string());
                     }
-                    Stdio::Null => {}
                 }
+                _ => match stdio {
+                    Stdio::Inherit => print!("{}", buf),
+                    Stdio::Null => {}
+                },
             }
 
             buf.clear()

compiler-cli/templates/gleam@@compile.erl

@@ -16,7 +16,7 @@ compile_package_loop() ->
             case compile_package(Lib, Out, Modules) of
                 {ok, ModuleNames} ->
                     PrintModuleName = fun(ModuleName) ->
-                        io:put_chars("module:" ++ atom_to_list(ModuleName) ++ "\n")
+                        io:put_chars("gleam-compile-module:" ++ atom_to_list(ModuleName) ++ "\n")
                     end,
                     lists:map(PrintModuleName, ModuleNames),
                     io:put_chars("gleam-compile-result-ok\n");