Use macro for echo

Author: lpil

compiler-core/src/erlang.rs

@@ -41,8 +41,6 @@ fn module_name_atom(module: &str) -> Document<'static> {
 struct Env<'a> {
     module: &'a str,
     function: &'a str,
-    src_path: &'a Utf8Path,
-    project_root: &'a Utf8Path,
     line_numbers: &'a LineNumbers,
     needs_function_docs: bool,
     echo_used: bool,
@@ -51,21 +49,13 @@ struct Env<'a> {
 }
 
 impl<'env> Env<'env> {
-    pub fn new(
-        module: &'env str,
-        src_path: &'env Utf8Path,
-        project_root: &'env Utf8Path,
-        function: &'env str,
-        line_numbers: &'env LineNumbers,
-    ) -> Self {
+    pub fn new(module: &'env str, function: &'env str, line_numbers: &'env LineNumbers) -> Self {
         let vars: im::HashMap<_, _> = std::iter::once(("_".into(), 0)).collect();
         Self {
             current_scope_vars: vars.clone(),
             erl_function_scope_vars: vars,
             needs_function_docs: false,
             echo_used: false,
-            src_path,
-            project_root,
             line_numbers,
             function,
             module,
@@ -224,7 +214,13 @@ fn module_document<'a>(
     };
 
     let src_path_full = &module.type_info.src_path;
-    let src_path_relative = src_path_full.strip_prefix(root).unwrap_or(src_path_full);
+    let src_path_relative = EcoString::from(
+        src_path_full
+            .strip_prefix(root)
+            .unwrap_or(src_path_full)
+            .as_str(),
+    )
+    .replace("\\", "\\\\");
 
     let mut needs_function_docs = false;
     let mut echo_used = false;
@@ -235,8 +231,7 @@ fn module_document<'a>(
             &module.name,
             module.type_info.is_internal,
             line_numbers,
-            src_path_relative,
-            root,
+            src_path_relative.clone(),
         ) {
             needs_function_docs = needs_function_docs || env.needs_function_docs;
             echo_used = echo_used || env.echo_used;
@@ -273,7 +268,11 @@ fn module_document<'a>(
     let module = docvec![
         header,
         "-compile([no_auto_import, nowarn_unused_vars, nowarn_unused_function, nowarn_nomatch]).",
-        lines(2),
+        line(),
+        "-define(FILEPATH, \"",
+        src_path_relative,
+        "\").",
+        line(),
         exports,
         documentation_directive,
         module_doc,
@@ -412,23 +411,17 @@ fn module_statement<'a>(
     module: &'a str,
     is_internal_module: bool,
     line_numbers: &'a LineNumbers,
-    src_path: &'a Utf8Path,
-    project_root: &'a Utf8Path,
+    src_path: EcoString,
 ) -> Option<(Document<'a>, Env<'a>)> {
     match statement {
         Definition::TypeAlias(TypeAlias { .. })
         | Definition::CustomType(CustomType { .. })
         | Definition::Import(Import { .. })
         | Definition::ModuleConstant(ModuleConstant { .. }) => None,
 
-        Definition::Function(function) => module_function(
-            function,
-            module,
-            is_internal_module,
-            line_numbers,
-            src_path,
-            project_root,
-        ),
+        Definition::Function(function) => {
+            module_function(function, module, is_internal_module, line_numbers, src_path)
+        }
     }
 }
 
@@ -437,8 +430,7 @@ fn module_function<'a>(
     module: &'a str,
     is_internal_module: bool,
     line_numbers: &'a LineNumbers,
-    src_path: &'a Utf8Path,
-    project_root: &'a Utf8Path,
+    src_path: EcoString,
 ) -> Option<(Document<'a>, Env<'a>)> {
     // Private external functions don't need to render anything, the underlying
     // Erlang implementation is used directly at the call site.
@@ -459,7 +451,7 @@ fn module_function<'a>(
     let function_name = escape_erlang_existing_name(function_name);
     let file_attribute = file_attribute(src_path, function, line_numbers);
 
-    let mut env = Env::new(module, src_path, project_root, function_name, line_numbers);
+    let mut env = Env::new(module, function_name, line_numbers);
     let var_usages = collect_type_var_usages(
         HashMap::new(),
         std::iter::once(&function.return_type).chain(function.arguments.iter().map(|a| &a.type_)),
@@ -529,12 +521,11 @@ fn module_function<'a>(
 }
 
 fn file_attribute<'a>(
-    path: &'a Utf8Path,
+    path: EcoString,
     function: &'a TypedFunction,
     line_numbers: &'a LineNumbers,
 ) -> Document<'a> {
     let line = line_numbers.line_number(function.location.start);
-    let path = EcoString::from(path.as_str()).replace("\\", "\\\\");
     docvec!["-file(\"", path, "\", ", line, ")."]
 }
 
@@ -2011,22 +2002,8 @@ fn panic<'a>(location: SrcSpan, message: Option<&'a TypedExpr>, env: &mut Env<'a
 
 fn echo<'a>(body: Document<'a>, location: &SrcSpan, env: &mut Env<'a>) -> Document<'a> {
     env.echo_used = true;
-
-    let relative_path = env
-        .src_path
-        .strip_prefix(env.project_root)
-        .unwrap_or(env.src_path)
-        .as_str();
-
-    let relative_path_doc = EcoString::from(relative_path)
-        .replace("\\", "\\\\")
-        .to_doc();
-
-    let relative_path_doc = docvec!["\"", relative_path_doc, "\""];
-
     "echo".to_doc().append(wrap_args(vec![
         body,
-        relative_path_doc,
         env.line_numbers.line_number(location.start).to_doc(),
     ]))
 }

compiler-core/src/erlang/snapshots/gleam_core__erlang__tests__allowed_string_escapes.snap

@@ -1,14 +1,16 @@
 ---
 source: compiler-core/src/erlang/tests.rs
+assertion_line: 531
 expression: "pub fn a() { \"\\n\" \"\\r\" \"\\t\" \"\\\\\" \"\\\"\" \"\\\\^\" }"
+snapshot_kind: text
 ---
 ----- SOURCE CODE
 pub fn a() { "\n" "\r" "\t" "\\" "\"" "\\^" }
 
 ----- COMPILED ERLANG
 -module(my@mod).
 -compile([no_auto_import, nowarn_unused_vars, nowarn_unused_function, nowarn_nomatch]).
-
+-define(FILEPATH, "project/test/my/mod.gleam").
 -export([a/0]).
 
 -file("project/test/my/mod.gleam", 1).

compiler-core/src/erlang/snapshots/gleam_core__erlang__tests__binop_parens.snap

@@ -1,6 +1,8 @@
 ---
 source: compiler-core/src/erlang/tests.rs
+assertion_line: 425
 expression: "\npub fn main() {\n    let a = 2 * {3 + 1} / 2\n    let b = 5 + 3 / 3 * 2 - 6 * 4\n    b\n}\n"
+snapshot_kind: text
 ---
 ----- SOURCE CODE
 
@@ -14,7 +16,7 @@ pub fn main() {
 ----- COMPILED ERLANG
 -module(my@mod).
 -compile([no_auto_import, nowarn_unused_vars, nowarn_unused_function, nowarn_nomatch]).
-
+-define(FILEPATH, "project/test/my/mod.gleam").
 -export([main/0]).
 
 -file("project/test/my/mod.gleam", 2).

compiler-core/src/erlang/snapshots/gleam_core__erlang__tests__bit_pattern_shadowing.snap

@@ -1,6 +1,8 @@
 ---
 source: compiler-core/src/erlang/tests.rs
+assertion_line: 988
 expression: "\npub fn main() {\n  let code = <<\"hello world\":utf8>>\n  let pre = 1\n  case code {\n    <<pre:bytes-size(pre), _:bytes>> -> pre\n    _ -> panic\n  }\n}        "
+snapshot_kind: text
 ---
 ----- SOURCE CODE
 
@@ -16,7 +18,7 @@ pub fn main() {
 ----- COMPILED ERLANG
 -module(my@mod).
 -compile([no_auto_import, nowarn_unused_vars, nowarn_unused_function, nowarn_nomatch]).
-
+-define(FILEPATH, "project/test/my/mod.gleam").
 -export([main/0]).
 
 -file("project/test/my/mod.gleam", 2).

compiler-core/src/erlang/snapshots/gleam_core__erlang__tests__block_assignment.snap

@@ -1,6 +1,8 @@
 ---
 source: compiler-core/src/erlang/tests.rs
+assertion_line: 469
 expression: "\npub fn main() {\n  let x = {\n    1\n    2\n  }\n  x\n}\n"
+snapshot_kind: text
 ---
 ----- SOURCE CODE
 
@@ -16,7 +18,7 @@ pub fn main() {
 ----- COMPILED ERLANG
 -module(my@mod).
 -compile([no_auto_import, nowarn_unused_vars, nowarn_unused_function, nowarn_nomatch]).
-
+-define(FILEPATH, "project/test/my/mod.gleam").
 -export([main/0]).
 
 -file("project/test/my/mod.gleam", 2).

compiler-core/src/erlang/snapshots/gleam_core__erlang__tests__constant_named_module_info.snap

@@ -1,6 +1,8 @@
 ---
 source: compiler-core/src/erlang/tests.rs
+assertion_line: 787
 expression: "\npub const module_info = 1\n\npub fn main() {\n    module_info\n}\n"
+snapshot_kind: text
 ---
 ----- SOURCE CODE
 
@@ -14,7 +16,7 @@ pub fn main() {
 ----- COMPILED ERLANG
 -module(my@mod).
 -compile([no_auto_import, nowarn_unused_vars, nowarn_unused_function, nowarn_nomatch]).
-
+-define(FILEPATH, "project/test/my/mod.gleam").
 -export([main/0]).
 
 -file("project/test/my/mod.gleam", 4).

compiler-core/src/erlang/snapshots/gleam_core__erlang__tests__constant_named_module_info_imported.snap

@@ -1,6 +1,8 @@
 ---
 source: compiler-core/src/erlang/tests.rs
+assertion_line: 801
 expression: "\nimport some_module\n\npub fn main() {\n    some_module.module_info\n}\n"
+snapshot_kind: text
 ---
 ----- SOURCE CODE
 
@@ -14,7 +16,7 @@ pub fn main() {
 ----- COMPILED ERLANG
 -module(my@mod).
 -compile([no_auto_import, nowarn_unused_vars, nowarn_unused_function, nowarn_nomatch]).
-
+-define(FILEPATH, "project/test/my/mod.gleam").
 -export([main/0]).
 
 -file("project/test/my/mod.gleam", 4).

compiler-core/src/erlang/snapshots/gleam_core__erlang__tests__constant_named_module_info_imported_qualified.snap

@@ -1,6 +1,8 @@
 ---
 source: compiler-core/src/erlang/tests.rs
+assertion_line: 822
 expression: "\nimport some_module.{module_info}\n\npub fn main() {\n    module_info\n}\n"
+snapshot_kind: text
 ---
 ----- SOURCE CODE
 
@@ -14,7 +16,7 @@ pub fn main() {
 ----- COMPILED ERLANG
 -module(my@mod).
 -compile([no_auto_import, nowarn_unused_vars, nowarn_unused_function, nowarn_nomatch]).
-
+-define(FILEPATH, "project/test/my/mod.gleam").
 -export([main/0]).
 
 -file("project/test/my/mod.gleam", 4).

compiler-core/src/erlang/snapshots/gleam_core__erlang__tests__constant_named_module_info_with_function_inside.snap

@@ -1,6 +1,8 @@
 ---
 source: compiler-core/src/erlang/tests.rs
+assertion_line: 843
 expression: "\npub fn function() {\n    1\n}\n\npub const module_info = function\n\npub fn main() {\n    module_info()\n}\n"
+snapshot_kind: text
 ---
 ----- SOURCE CODE
 
@@ -18,7 +20,7 @@ pub fn main() {
 ----- COMPILED ERLANG
 -module(my@mod).
 -compile([no_auto_import, nowarn_unused_vars, nowarn_unused_function, nowarn_nomatch]).
-
+-define(FILEPATH, "project/test/my/mod.gleam").
 -export([function/0, main/0]).
 
 -file("project/test/my/mod.gleam", 2).

compiler-core/src/erlang/snapshots/gleam_core__erlang__tests__constant_named_module_info_with_function_inside_imported.snap

@@ -1,6 +1,8 @@
 ---
 source: compiler-core/src/erlang/tests.rs
+assertion_line: 861
 expression: "\nimport some_module\n\npub fn main() {\n    some_module.module_info()\n}\n"
+snapshot_kind: text
 ---
 ----- SOURCE CODE
 
@@ -14,7 +16,7 @@ pub fn main() {
 ----- COMPILED ERLANG
 -module(my@mod).
 -compile([no_auto_import, nowarn_unused_vars, nowarn_unused_function, nowarn_nomatch]).
-
+-define(FILEPATH, "project/test/my/mod.gleam").
 -export([main/0]).
 
 -file("project/test/my/mod.gleam", 4).