diff options
Diffstat (limited to 'cli/lsp/config.rs')
-rw-r--r-- | cli/lsp/config.rs | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/cli/lsp/config.rs b/cli/lsp/config.rs index 8238ae510..89b2a2e60 100644 --- a/cli/lsp/config.rs +++ b/cli/lsp/config.rs @@ -2,7 +2,7 @@ use super::logging::lsp_log; use crate::args::discover_npmrc; -use crate::args::read_lockfile_at_path; +use crate::args::CliLockfile; use crate::args::ConfigFile; use crate::args::FmtOptions; use crate::args::LintOptions; @@ -18,7 +18,6 @@ use deno_config::FmtOptionsConfig; use deno_config::TsConfig; use deno_core::anyhow::anyhow; use deno_core::normalize_path; -use deno_core::parking_lot::Mutex; use deno_core::serde::de::DeserializeOwned; use deno_core::serde::Deserialize; use deno_core::serde::Serialize; @@ -27,7 +26,6 @@ use deno_core::serde_json::json; use deno_core::serde_json::Value; use deno_core::ModuleSpecifier; use deno_lint::linter::LintConfig; -use deno_lockfile::Lockfile; use deno_npm::npm_rc::ResolvedNpmRc; use deno_runtime::deno_node::PackageJson; use deno_runtime::deno_permissions::PermissionsContainer; @@ -1111,7 +1109,7 @@ pub struct ConfigData { pub byonm: bool, pub node_modules_dir: Option<PathBuf>, pub vendor_dir: Option<PathBuf>, - pub lockfile: Option<Arc<Mutex<Lockfile>>>, + pub lockfile: Option<Arc<CliLockfile>>, pub package_json: Option<Arc<PackageJson>>, pub npmrc: Option<Arc<ResolvedNpmRc>>, pub import_map: Option<Arc<ImportMap>>, @@ -1553,7 +1551,7 @@ impl ConfigData { byonm, node_modules_dir, vendor_dir, - lockfile: lockfile.map(Mutex::new).map(Arc::new), + lockfile: lockfile.map(Arc::new), package_json: package_json.map(Arc::new), npmrc, import_map, @@ -1786,7 +1784,9 @@ impl ConfigTree { } } -fn resolve_lockfile_from_config(config_file: &ConfigFile) -> Option<Lockfile> { +fn resolve_lockfile_from_config( + config_file: &ConfigFile, +) -> Option<CliLockfile> { let lockfile_path = match config_file.resolve_lockfile_path() { Ok(Some(value)) => value, Ok(None) => return None, @@ -1824,8 +1824,8 @@ fn resolve_node_modules_dir( canonicalize_path_maybe_not_exists(&node_modules_dir).ok() } -fn resolve_lockfile_from_path(lockfile_path: PathBuf) -> Option<Lockfile> { - match read_lockfile_at_path(lockfile_path) { +fn resolve_lockfile_from_path(lockfile_path: PathBuf) -> Option<CliLockfile> { + match CliLockfile::read_from_path(lockfile_path) { Ok(value) => { if value.filename.exists() { if let Ok(specifier) = ModuleSpecifier::from_file_path(&value.filename) |