summaryrefslogtreecommitdiff
path: root/cli/tools/vendor/mod.rs
diff options
context:
space:
mode:
authorDavid Sherret <dsherret@users.noreply.github.com>2024-01-18 15:57:30 -0500
committerGitHub <noreply@github.com>2024-01-18 15:57:30 -0500
commit35c1652f56f2a83380080b2c9942c595f80bd14d (patch)
tree4867dacfcbcbb01e7e1766d2fd8ce5e0a62ddf2b /cli/tools/vendor/mod.rs
parent4e3aff8400fe1e6854a27687d14a07dc837c88d9 (diff)
fix(lsp): regression - formatting was broken on windows (#21972)
~~Waiting on: https://github.com/denoland/deno_config/pull/31~~ Closes #21971 Closes https://github.com/denoland/vscode_deno/issues/1029
Diffstat (limited to 'cli/tools/vendor/mod.rs')
-rw-r--r--cli/tools/vendor/mod.rs7
1 files changed, 4 insertions, 3 deletions
diff --git a/cli/tools/vendor/mod.rs b/cli/tools/vendor/mod.rs
index 16897f1a5..e2c04305a 100644
--- a/cli/tools/vendor/mod.rs
+++ b/cli/tools/vendor/mod.rs
@@ -227,14 +227,15 @@ fn maybe_update_config_file(
return ModifiedResult::default();
}
- let fmt_config = config_file
+ let fmt_config_options = config_file
.to_fmt_config()
.ok()
- .unwrap_or_default()
+ .flatten()
+ .map(|config| config.options)
.unwrap_or_default();
let result = update_config_file(
config_file,
- &fmt_config.options,
+ &fmt_config_options,
if try_add_import_map {
Some(
ModuleSpecifier::from_file_path(output_dir.join("import_map.json"))