summaryrefslogtreecommitdiff
path: root/cli/tools/fmt.rs
diff options
context:
space:
mode:
Diffstat (limited to 'cli/tools/fmt.rs')
-rw-r--r--cli/tools/fmt.rs15
1 files changed, 9 insertions, 6 deletions
diff --git a/cli/tools/fmt.rs b/cli/tools/fmt.rs
index 241648d98..b16639f99 100644
--- a/cli/tools/fmt.rs
+++ b/cli/tools/fmt.rs
@@ -71,8 +71,8 @@ pub async fn format(flags: Flags, fmt_flags: FmtFlags) -> Result<(), AnyError> {
let factory = CliFactory::from_flags(flags)?;
let cli_options = factory.cli_options();
let fmt_options = cli_options.resolve_fmt_options(fmt_flags)?;
- let files =
- collect_fmt_files(fmt_options.files.clone()).and_then(|files| {
+ let files = collect_fmt_files(cli_options, fmt_options.files.clone())
+ .and_then(|files| {
if files.is_empty() {
Err(generic_error("No target files found."))
} else {
@@ -116,8 +116,8 @@ pub async fn format(flags: Flags, fmt_flags: FmtFlags) -> Result<(), AnyError> {
let factory = CliFactory::from_flags(flags)?;
let cli_options = factory.cli_options();
let fmt_options = cli_options.resolve_fmt_options(fmt_flags)?;
- let files =
- collect_fmt_files(fmt_options.files.clone()).and_then(|files| {
+ let files = collect_fmt_files(cli_options, fmt_options.files.clone())
+ .and_then(|files| {
if files.is_empty() {
Err(generic_error("No target files found."))
} else {
@@ -153,11 +153,14 @@ async fn format_files(
Ok(())
}
-fn collect_fmt_files(files: FilePatterns) -> Result<Vec<PathBuf>, AnyError> {
+fn collect_fmt_files(
+ cli_options: &CliOptions,
+ files: FilePatterns,
+) -> Result<Vec<PathBuf>, AnyError> {
FileCollector::new(|e| is_supported_ext_fmt(e.path))
.ignore_git_folder()
.ignore_node_modules()
- .ignore_vendor_folder()
+ .set_vendor_folder(cli_options.vendor_dir_path().map(ToOwned::to_owned))
.collect_file_patterns(files)
}