summaryrefslogtreecommitdiff
path: root/cli/lsp/cache.rs
diff options
context:
space:
mode:
authorDavid Sherret <dsherret@users.noreply.github.com>2024-09-28 07:55:01 -0400
committerGitHub <noreply@github.com>2024-09-28 07:55:01 -0400
commitfc739dc5eb2769e4608ccf08d23ca8ff0fcc19c5 (patch)
tree9c5bca411f4b9a6aea5a190d88217f4925563ad3 /cli/lsp/cache.rs
parentb694efb3849c4737e8ad617a9a48d5488e21d5da (diff)
refactor: use deno_path_util (#25918)
Diffstat (limited to 'cli/lsp/cache.rs')
-rw-r--r--cli/lsp/cache.rs10
1 files changed, 5 insertions, 5 deletions
diff --git a/cli/lsp/cache.rs b/cli/lsp/cache.rs
index a32087842..db10dc967 100644
--- a/cli/lsp/cache.rs
+++ b/cli/lsp/cache.rs
@@ -10,7 +10,7 @@ use crate::lsp::logging::lsp_warn;
use deno_core::url::Url;
use deno_core::ModuleSpecifier;
-use deno_runtime::fs_util::specifier_to_file_path;
+use deno_path_util::url_to_file_path;
use std::collections::BTreeMap;
use std::fs;
use std::path::Path;
@@ -24,7 +24,7 @@ pub fn calculate_fs_version(
) -> Option<String> {
match specifier.scheme() {
"npm" | "node" | "data" | "blob" => None,
- "file" => specifier_to_file_path(specifier)
+ "file" => url_to_file_path(specifier)
.ok()
.and_then(|path| calculate_fs_version_at_path(&path)),
_ => calculate_fs_version_in_cache(cache, specifier, file_referrer),
@@ -82,7 +82,7 @@ impl Default for LspCache {
impl LspCache {
pub fn new(global_cache_url: Option<Url>) -> Self {
let global_cache_path = global_cache_url.and_then(|s| {
- specifier_to_file_path(&s)
+ url_to_file_path(&s)
.inspect(|p| {
lsp_log!("Resolved global cache path: \"{}\"", p.to_string_lossy());
})
@@ -165,7 +165,7 @@ impl LspCache {
&self,
specifier: &ModuleSpecifier,
) -> Option<ModuleSpecifier> {
- let path = specifier_to_file_path(specifier).ok()?;
+ let path = url_to_file_path(specifier).ok()?;
let vendor = self
.vendors_by_scope
.iter()
@@ -176,7 +176,7 @@ impl LspCache {
}
pub fn is_valid_file_referrer(&self, specifier: &ModuleSpecifier) -> bool {
- if let Ok(path) = specifier_to_file_path(specifier) {
+ if let Ok(path) = url_to_file_path(specifier) {
if !path.starts_with(&self.deno_dir().root) {
return true;
}