diff options
Diffstat (limited to 'cli/lsp/documents.rs')
| -rw-r--r-- | cli/lsp/documents.rs | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/cli/lsp/documents.rs b/cli/lsp/documents.rs index d207330ad..0e9b6c3c3 100644 --- a/cli/lsp/documents.rs +++ b/cli/lsp/documents.rs @@ -1309,14 +1309,12 @@ impl Documents { workspace_files: &BTreeSet<ModuleSpecifier>, ) { let config_data = config.tree.root_data(); - let config_file = - config_data.as_ref().and_then(|d| d.config_file.as_deref()); + let config_file = config_data.and_then(|d| d.config_file.as_deref()); self.resolver = Arc::new(CliGraphResolver::new(CliGraphResolverOptions { node_resolver, npm_resolver, package_json_deps_provider: Arc::new(PackageJsonDepsProvider::new( config_data - .as_ref() .and_then(|d| d.package_json.as_ref()) .map(|package_json| { package_json::get_local_package_json_version_reqs(package_json) @@ -1324,10 +1322,8 @@ impl Documents { )), maybe_jsx_import_source_config: config_file .and_then(|cf| cf.to_maybe_jsx_import_source_config().ok().flatten()), - maybe_import_map: config_data.as_ref().and_then(|d| d.import_map.clone()), - maybe_vendor_dir: config_data - .as_ref() - .and_then(|d| d.vendor_dir.as_ref()), + maybe_import_map: config_data.and_then(|d| d.import_map.clone()), + maybe_vendor_dir: config_data.and_then(|d| d.vendor_dir.as_ref()), bare_node_builtins_enabled: config_file .map(|config| config.has_unstable("bare-node-builtins")) .unwrap_or(false), @@ -1338,7 +1334,7 @@ impl Documents { })); self.jsr_resolver = Arc::new(JsrCacheResolver::new( self.cache.clone(), - config.tree.root_lockfile(), + config.tree.root_lockfile().cloned(), )); self.redirect_resolver = Arc::new(RedirectResolver::new(self.cache.clone())); |