summaryrefslogtreecommitdiff
path: root/cli/lsp/resolver.rs
diff options
context:
space:
mode:
authorBartek IwaƄczuk <biwanczuk@gmail.com>2024-07-01 23:14:17 +0100
committerGitHub <noreply@github.com>2024-07-01 22:14:17 +0000
commitb0cd43b5f3d4af8a6dca9d7a3fbeb281a9c39c19 (patch)
tree34094fb364e5d8ef6a779c6e7c03ac5e92393c8e /cli/lsp/resolver.rs
parent38a6be2e8e68c662dd25abff62e6f440bd27fd77 (diff)
fix(lsp): use CliLockfile (#24387)
The build broke in https://github.com/denoland/deno/pull/24365.
Diffstat (limited to 'cli/lsp/resolver.rs')
-rw-r--r--cli/lsp/resolver.rs7
1 files changed, 3 insertions, 4 deletions
diff --git a/cli/lsp/resolver.rs b/cli/lsp/resolver.rs
index 1ec93bab3..5cf7f82b1 100644
--- a/cli/lsp/resolver.rs
+++ b/cli/lsp/resolver.rs
@@ -3,6 +3,7 @@
use crate::args::create_default_npmrc;
use crate::args::package_json;
use crate::args::CacheSetting;
+use crate::args::CliLockfile;
use crate::graph_util::CliJsrUrlProvider;
use crate::http_util::HttpClientProvider;
use crate::lsp::config::Config;
@@ -26,12 +27,10 @@ use dashmap::DashMap;
use deno_ast::MediaType;
use deno_cache_dir::HttpCache;
use deno_core::error::AnyError;
-use deno_core::parking_lot::Mutex;
use deno_core::url::Url;
use deno_graph::source::Resolver;
use deno_graph::GraphImport;
use deno_graph::ModuleSpecifier;
-use deno_lockfile::Lockfile;
use deno_npm::NpmSystemInfo;
use deno_runtime::deno_fs;
use deno_runtime::deno_node::NodeResolution;
@@ -110,7 +109,7 @@ impl LspScopeResolver {
)));
let redirect_resolver = Some(Arc::new(RedirectResolver::new(
cache.for_specifier(config_data.map(|d| &d.scope)),
- config_data.and_then(|d| d.lockfile.as_deref()),
+ config_data.and_then(|d| d.lockfile.clone()),
)));
let npm_graph_resolver = graph_resolver.create_graph_npm_resolver();
let graph_imports = config_data
@@ -552,7 +551,7 @@ impl std::fmt::Debug for RedirectResolver {
impl RedirectResolver {
fn new(
cache: Arc<dyn HttpCache>,
- lockfile: Option<&Mutex<Lockfile>>,
+ lockfile: Option<Arc<CliLockfile>>,
) -> Self {
let entries = DashMap::new();
if let Some(lockfile) = lockfile {