diff options
Diffstat (limited to 'cli/args/mod.rs')
| -rw-r--r-- | cli/args/mod.rs | 24 |
1 files changed, 11 insertions, 13 deletions
diff --git a/cli/args/mod.rs b/cli/args/mod.rs index f82ed9a71..e6ada9453 100644 --- a/cli/args/mod.rs +++ b/cli/args/mod.rs @@ -1398,20 +1398,18 @@ fn resolve_files( let mut result = maybe_files_config.unwrap_or_default(); if let Some(file_flags) = maybe_file_flags { if !file_flags.include.is_empty() { - result.include = file_flags.include; + result.include = Some(file_flags.include); } if !file_flags.ignore.is_empty() { result.exclude = file_flags.ignore; } } // Now expand globs if there are any - if !result.include.is_empty() { - result.include = expand_globs(result.include)?; - } - - if !result.exclude.is_empty() { - result.exclude = expand_globs(result.exclude)?; - } + result.include = match result.include { + Some(include) => Some(expand_globs(include)?), + None => None, + }; + result.exclude = expand_globs(result.exclude)?; Ok(result) } @@ -1624,7 +1622,7 @@ mod test { let temp_dir_path = temp_dir.path().as_path(); let error = resolve_files( Some(FilesConfig { - include: vec![temp_dir_path.join("data/**********.ts")], + include: Some(vec![temp_dir_path.join("data/**********.ts")]), exclude: vec![], }), None, @@ -1634,12 +1632,12 @@ mod test { let resolved_files = resolve_files( Some(FilesConfig { - include: vec![ + include: Some(vec![ temp_dir_path.join("data/test1.?s"), temp_dir_path.join("nested/foo/*.ts"), temp_dir_path.join("nested/fizz/*.ts"), temp_dir_path.join("pages/[id].ts"), - ], + ]), exclude: vec![temp_dir_path.join("nested/**/*bazz.ts")], }), None, @@ -1648,7 +1646,7 @@ mod test { assert_eq!( resolved_files.include, - vec![ + Some(vec![ temp_dir_path.join("data/test1.js"), temp_dir_path.join("data/test1.ts"), temp_dir_path.join("nested/foo/bar.ts"), @@ -1660,7 +1658,7 @@ mod test { temp_dir_path.join("nested/fizz/fizz.ts"), temp_dir_path.join("nested/fizz/foo.ts"), temp_dir_path.join("pages/[id].ts"), - ] + ]) ); assert_eq!( resolved_files.exclude, |