summaryrefslogtreecommitdiff
path: root/cli/tools/coverage
diff options
context:
space:
mode:
authorDavid Sherret <dsherret@users.noreply.github.com>2024-03-27 14:25:39 -0400
committerGitHub <noreply@github.com>2024-03-27 14:25:39 -0400
commit68fecc6de4b2e6556adeb2730798bf42017c4be6 (patch)
treeed7b7644221e4a53f30df3e33d41e7994e10b169 /cli/tools/coverage
parent0e4d1cb5f9a3645f6da480b2b8540568fa69d675 (diff)
fix: less aggressive vendor folder ignoring (#23100)
This is slightly breaking as some users want the `vendor` folder excluded and may not have that specified in their deno.json. Closes #22833
Diffstat (limited to 'cli/tools/coverage')
-rw-r--r--cli/tools/coverage/mod.rs11
1 files changed, 8 insertions, 3 deletions
diff --git a/cli/tools/coverage/mod.rs b/cli/tools/coverage/mod.rs
index b07689570..67fe979b5 100644
--- a/cli/tools/coverage/mod.rs
+++ b/cli/tools/coverage/mod.rs
@@ -1,5 +1,6 @@
// Copyright 2018-2024 the Deno authors. All rights reserved. MIT license.
+use crate::args::CliOptions;
use crate::args::CoverageFlags;
use crate::args::FileFlags;
use crate::args::Flags;
@@ -376,6 +377,7 @@ fn range_to_src_line_index(
}
fn collect_coverages(
+ cli_options: &CliOptions,
files: FileFlags,
initial_cwd: &Path,
) -> Result<Vec<cdp::ScriptCoverage>, AnyError> {
@@ -405,7 +407,7 @@ fn collect_coverages(
})
.ignore_git_folder()
.ignore_node_modules()
- .ignore_vendor_folder()
+ .set_vendor_folder(cli_options.vendor_dir_path().map(ToOwned::to_owned))
.collect_file_patterns(file_patterns)?;
for file_path in file_paths {
@@ -474,8 +476,11 @@ pub async fn cover_files(
let coverage_root = cli_options
.initial_cwd()
.join(&coverage_flags.files.include[0]);
- let script_coverages =
- collect_coverages(coverage_flags.files, cli_options.initial_cwd())?;
+ let script_coverages = collect_coverages(
+ cli_options,
+ coverage_flags.files,
+ cli_options.initial_cwd(),
+ )?;
if script_coverages.is_empty() {
return Err(generic_error("No coverage files found"));
}