From 35c1652f56f2a83380080b2c9942c595f80bd14d Mon Sep 17 00:00:00 2001 From: David Sherret Date: Thu, 18 Jan 2024 15:57:30 -0500 Subject: 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 --- cli/tools/vendor/mod.rs | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'cli/tools/vendor') 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")) -- cgit v1.2.3