diff options
| author | David Sherret <dsherret@users.noreply.github.com> | 2024-07-19 15:56:07 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-07-19 15:56:07 -0400 |
| commit | afcae364beb2cffa8e583b4ffd3a55b59336cb1b (patch) | |
| tree | f98ba0e5af179b9172f130b63fb35cd77c122932 /cli/lsp/resolver.rs | |
| parent | a4c76add565b9674ef6880de88013948c61a1ce5 (diff) | |
refactor: update to deno_config 0.25 (#24645)
- Gets rid of WorkspaceMemberContext. It's now `Workspace` and
`WorkspaceDirectory`
- Uses the workspace cache in the lsp
* https://github.com/denoland/deno_config/pull/95
* https://github.com/denoland/deno_config/pull/96
Diffstat (limited to 'cli/lsp/resolver.rs')
| -rw-r--r-- | cli/lsp/resolver.rs | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/cli/lsp/resolver.rs b/cli/lsp/resolver.rs index 2f03842b1..7758bbd7c 100644 --- a/cli/lsp/resolver.rs +++ b/cli/lsp/resolver.rs @@ -115,7 +115,7 @@ impl LspScopeResolver { ))); let npm_graph_resolver = graph_resolver.create_graph_npm_resolver(); let graph_imports = config_data - .and_then(|d| d.workspace.to_compiler_option_types().ok()) + .and_then(|d| d.member_dir.workspace.to_compiler_option_types().ok()) .map(|imports| { Arc::new( imports @@ -513,9 +513,9 @@ fn create_graph_resolver( npm_resolver: Option<&Arc<dyn CliNpmResolver>>, node_resolver: Option<&Arc<CliNodeResolver>>, ) -> Arc<CliGraphResolver> { - let workspace = config_data.map(|d| &d.workspace); + let workspace = config_data.map(|d| &d.member_dir.workspace); let unstable_sloppy_imports = - workspace.is_some_and(|w| w.has_unstable("sloppy-imports")); + workspace.is_some_and(|dir| dir.has_unstable("sloppy-imports")); Arc::new(CliGraphResolver::new(CliGraphResolverOptions { node_resolver: node_resolver.cloned(), npm_resolver: npm_resolver.cloned(), @@ -530,11 +530,12 @@ fn create_graph_resolver( )) }, ), - maybe_jsx_import_source_config: workspace - .and_then(|cf| cf.to_maybe_jsx_import_source_config().ok().flatten()), + maybe_jsx_import_source_config: workspace.and_then(|workspace| { + workspace.to_maybe_jsx_import_source_config().ok().flatten() + }), maybe_vendor_dir: config_data.and_then(|d| d.vendor_dir.as_ref()), bare_node_builtins_enabled: workspace - .is_some_and(|cf| cf.has_unstable("bare-node-builtins")), + .is_some_and(|workspace| workspace.has_unstable("bare-node-builtins")), sloppy_imports_resolver: unstable_sloppy_imports.then(|| { SloppyImportsResolver::new_without_stat_cache(Arc::new(deno_fs::RealFs)) }), |