From 4ddc85e1daa88ef96a2fe730ccfd159c7f1dbb38 Mon Sep 17 00:00:00 2001
From: David Sherret <dsherret@users.noreply.github.com>
Date: Tue, 14 May 2024 18:01:31 -0400
Subject: [PATCH] fix(emit): regression - keep comments in emit (#23815)

Closes https://github.com/denoland/deno/discussions/23814
---
 cli/args/mod.rs                               |  2 +-
 .../specs/run/keep_comments_ts/__test__.jsonc |  4 ++++
 tests/specs/run/keep_comments_ts/main.out     |  4 ++++
 tests/specs/run/keep_comments_ts/main.ts      |  7 +++++++
 tests/testdata/coverage/complex_expected.lcov | 20 +++++++++++++++++--
 tests/testdata/coverage/complex_expected.out  |  2 +-
 6 files changed, 35 insertions(+), 4 deletions(-)
 create mode 100644 tests/specs/run/keep_comments_ts/__test__.jsonc
 create mode 100644 tests/specs/run/keep_comments_ts/main.out
 create mode 100644 tests/specs/run/keep_comments_ts/main.ts

diff --git a/cli/args/mod.rs b/cli/args/mod.rs
index bca7cc0f66..434a4fa6af 100644
--- a/cli/args/mod.rs
+++ b/cli/args/mod.rs
@@ -194,7 +194,7 @@ pub fn ts_config_to_transpile_and_emit_options(
     },
     deno_ast::EmitOptions {
       inline_sources: options.inline_sources,
-      keep_comments: false,
+      keep_comments: true,
       source_map,
       source_map_file: None,
     },
diff --git a/tests/specs/run/keep_comments_ts/__test__.jsonc b/tests/specs/run/keep_comments_ts/__test__.jsonc
new file mode 100644
index 0000000000..5517e693d6
--- /dev/null
+++ b/tests/specs/run/keep_comments_ts/__test__.jsonc
@@ -0,0 +1,4 @@
+{
+  "args": "run main.ts",
+  "output": "main.out"
+}
diff --git a/tests/specs/run/keep_comments_ts/main.out b/tests/specs/run/keep_comments_ts/main.out
new file mode 100644
index 0000000000..8cf85ee713
--- /dev/null
+++ b/tests/specs/run/keep_comments_ts/main.out
@@ -0,0 +1,4 @@
+function test() {
+  // this comment should be in output
+  return 1 + 1;
+}
diff --git a/tests/specs/run/keep_comments_ts/main.ts b/tests/specs/run/keep_comments_ts/main.ts
new file mode 100644
index 0000000000..ff58eff2e7
--- /dev/null
+++ b/tests/specs/run/keep_comments_ts/main.ts
@@ -0,0 +1,7 @@
+function test() {
+  // this comment should be in output
+  return 1 + 1;
+}
+
+// should include the comments because people rely on this behavior
+console.log(test.toString());
diff --git a/tests/testdata/coverage/complex_expected.lcov b/tests/testdata/coverage/complex_expected.lcov
index 5f0983aa8d..94b86465ae 100644
--- a/tests/testdata/coverage/complex_expected.lcov
+++ b/tests/testdata/coverage/complex_expected.lcov
@@ -11,6 +11,11 @@ FNF:4
 FNH:2
 BRF:0
 BRH:0
+DA:1,1
+DA:13,1
+DA:14,1
+DA:15,1
+DA:16,1
 DA:17,2
 DA:18,2
 DA:19,2
@@ -21,6 +26,9 @@ DA:24,2
 DA:25,2
 DA:26,2
 DA:27,2
+DA:29,1
+DA:30,1
+DA:31,1
 DA:32,1
 DA:33,1
 DA:34,1
@@ -30,6 +38,8 @@ DA:38,2
 DA:39,2
 DA:40,2
 DA:42,2
+DA:44,1
+DA:45,1
 DA:46,0
 DA:47,0
 DA:48,0
@@ -39,13 +49,19 @@ DA:52,0
 DA:53,0
 DA:54,0
 DA:56,0
+DA:58,1
+DA:59,1
 DA:60,1
+DA:62,1
+DA:63,1
 DA:64,0
 DA:65,0
 DA:66,0
 DA:68,0
+DA:70,1
 DA:71,0
+DA:73,1
 DA:74,1
-LH:21
-LF:35
+LH:37
+LF:51
 end_of_record
diff --git a/tests/testdata/coverage/complex_expected.out b/tests/testdata/coverage/complex_expected.out
index bed3d93068..3d5f6a0ab6 100644
--- a/tests/testdata/coverage/complex_expected.out
+++ b/tests/testdata/coverage/complex_expected.out
@@ -1,4 +1,4 @@
-cover [WILDCARD]/coverage/complex.ts ... 60.000% (21/35)
+cover [WILDCARD]/coverage/complex.ts ... 72.549% (37/51)
   46 | export function unused(
   47 |   foo: string,
   48 |   bar: string,