fix(cli): ensure empty lines don't count towards coverage (#11957)

5 files changed, 31 insertions, 28 deletions

diff --git a/cli/tests/testdata/coverage/complex.ts b/cli/tests/testdata/coverage/complex.ts
index 47d4ffa79..9348df71e 100644
--- a/cli/tests/testdata/coverage/complex.ts
+++ b/cli/tests/testdata/coverage/complex.ts
@@ -69,3 +69,6 @@ export function ƒ(): number {
 
 // This arrow function should also show up as uncovered.
 console.log("%s", () => 1);
+
+// End with a newline:
+
diff --git a/cli/tests/testdata/coverage/expected_branch.lcov b/cli/tests/testdata/coverage/expected_branch.lcov
index 07e29cca5..ad247fe70 100644
--- a/cli/tests/testdata/coverage/expected_branch.lcov
+++ b/cli/tests/testdata/coverage/expected_branch.lcov
@@ -2,19 +2,18 @@ SF:[WILDCARD]branch.ts
 FN:2,branch
 FN:10,unused
 FNDA:1,branch
-FNDA:0,unused
 FNF:2
 FNH:1
-BRDA:4,1,0,0
+BRDA:5,1,0,0
 BRF:1
 BRH:0
-DA:1,1
-DA:2,2
-DA:3,2
+DA:1,4
+DA:2,4
+DA:3,4
 DA:4,0
 DA:5,0
 DA:6,0
-DA:7,1
+DA:7,2
 DA:9,0
 DA:10,0
 DA:11,0
@@ -22,6 +21,6 @@ DA:12,0
 DA:13,0
 DA:14,0
 DA:15,0
-LH:4
 LF:14
+LH:4
 end_of_record
diff --git a/cli/tests/testdata/coverage/expected_complex.lcov b/cli/tests/testdata/coverage/expected_complex.lcov
index 962ebee96..465e88986 100644
--- a/cli/tests/testdata/coverage/expected_complex.lcov
+++ b/cli/tests/testdata/coverage/expected_complex.lcov
@@ -1,12 +1,10 @@
 SF:[WILDCARD]complex.ts
-FN:22,dependency
-FN:37,complex
-FN:51,unused
+FN:18,dependency
+FN:33,complex
+FN:47,unused
 FN:65,ƒ
 FNDA:1,dependency
 FNDA:1,complex
-FNDA:0,unused
-FNDA:0,ƒ
 FNF:4
 FNH:2
 BRF:0
@@ -14,27 +12,30 @@ BRH:0
 DA:17,2
 DA:18,2
 DA:19,2
-DA:20,2
-DA:22,2
-DA:23,2
-DA:24,2
-DA:25,2
+DA:20,4
+DA:21,2
+DA:22,4
+DA:23,4
+DA:24,4
+DA:25,4
 DA:26,2
-DA:27,1
-DA:32,1
-DA:33,1
-DA:34,1
-DA:35,1
+DA:27,2
+DA:32,2
+DA:33,2
+DA:34,2
+DA:35,4
+DA:36,2
 DA:37,2
 DA:38,2
 DA:39,2
 DA:40,2
 DA:41,2
-DA:42,1
+DA:42,2
 DA:46,0
 DA:47,0
 DA:48,0
 DA:49,0
+DA:50,0
 DA:51,0
 DA:52,0
 DA:53,0
@@ -48,6 +49,6 @@ DA:66,0
 DA:67,0
 DA:68,1
 DA:71,0
-LH:22
-LF:37
+LF:40
+LH:24
 end_of_record
diff --git a/cli/tests/testdata/coverage/expected_complex.out b/cli/tests/testdata/coverage/expected_complex.out
index e9f9a453f..49d6410c1 100644
--- a/cli/tests/testdata/coverage/expected_complex.out
+++ b/cli/tests/testdata/coverage/expected_complex.out
@@ -1,9 +1,9 @@
-cover [WILDCARD]/coverage/complex.ts ... 59.459% (22/37)
+cover [WILDCARD]complex.ts ... 60.000% (24/40)
   46 | export function unused(
   47 |   foo: string,
   48 |   bar: string,
   49 |   baz: string,
------|-----
+  50 | ): Complex {
   51 |   return complex(
   52 |     foo,
   53 |     bar,
diff --git a/cli/tests/testdata/fmt/expected_fmt_check_tests_dir.out b/cli/tests/testdata/fmt/expected_fmt_check_tests_dir.out
index e2dc2b4ae..fe84cd485 100644
--- a/cli/tests/testdata/fmt/expected_fmt_check_tests_dir.out
+++ b/cli/tests/testdata/fmt/expected_fmt_check_tests_dir.out
@@ -1,2 +1,2 @@
 [WILDCARD]
-error: Found 6 not formatted files in [WILDCARD] files
+error: Found 7 not formatted files in [WILDCARD] files