summaryrefslogtreecommitdiff
path: root/cli/lsp/resolver.rs
diff options
context:
space:
mode:
authorNayeem Rahman <nayeemrmn99@gmail.com>2024-06-10 17:03:17 +0100
committerGitHub <noreply@github.com>2024-06-10 17:03:17 +0100
commit7c5dbd5d54770dba5e56442b633e9597403ef5da (patch)
tree3837f975b8d6a6615c91fd5c1e37ac2732a8aaf5 /cli/lsp/resolver.rs
parent4fd3d5a86e45c4dcbaaa277cfb7f1087ddebfa48 (diff)
feat(lsp): workspace jsr resolution (#24121)
Diffstat (limited to 'cli/lsp/resolver.rs')
-rw-r--r--cli/lsp/resolver.rs9
1 files changed, 5 insertions, 4 deletions
diff --git a/cli/lsp/resolver.rs b/cli/lsp/resolver.rs
index 348eae76f..d0a515063 100644
--- a/cli/lsp/resolver.rs
+++ b/cli/lsp/resolver.rs
@@ -5,7 +5,6 @@ use crate::args::package_json;
use crate::args::CacheSetting;
use crate::graph_util::CliJsrUrlProvider;
use crate::http_util::HttpClientProvider;
-use crate::jsr::JsrCacheResolver;
use crate::lsp::config::Config;
use crate::lsp::config::ConfigData;
use crate::npm::create_cli_npm_resolver_for_lsp;
@@ -51,6 +50,7 @@ use std::rc::Rc;
use std::sync::Arc;
use super::cache::LspCache;
+use super::jsr::JsrCacheResolver;
#[derive(Debug, Clone)]
pub struct LspResolver {
@@ -99,7 +99,8 @@ impl LspResolver {
);
let jsr_resolver = Some(Arc::new(JsrCacheResolver::new(
cache.root_vendor_or_global(),
- config_data.and_then(|d| d.lockfile.clone()),
+ config_data,
+ config,
)));
let redirect_resolver = Some(Arc::new(RedirectResolver::new(
cache.root_vendor_or_global(),
@@ -212,12 +213,12 @@ impl LspResolver {
.collect()
}
- pub fn jsr_to_registry_url(
+ pub fn jsr_to_resource_url(
&self,
req_ref: &JsrPackageReqReference,
_file_referrer: Option<&ModuleSpecifier>,
) -> Option<ModuleSpecifier> {
- self.jsr_resolver.as_ref()?.jsr_to_registry_url(req_ref)
+ self.jsr_resolver.as_ref()?.jsr_to_resource_url(req_ref)
}
pub fn jsr_lookup_export_for_path(