From cbb78e138ffbfc92ca64f2cce56dd5c629e4f142 Mon Sep 17 00:00:00 2001 From: Nayeem Rahman Date: Tue, 7 May 2024 03:20:15 +0100 Subject: refactor(lsp): reland move resolver fields to LspResolver (#23685) --- cli/lsp/analysis.rs | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'cli/lsp/analysis.rs') diff --git a/cli/lsp/analysis.rs b/cli/lsp/analysis.rs index 63d39ad6e..23b6bb099 100644 --- a/cli/lsp/analysis.rs +++ b/cli/lsp/analysis.rs @@ -259,8 +259,7 @@ impl<'a> TsResponseImportMapper<'a> { let version = Version::parse_standard(segments.next()?).ok()?; let nv = PackageNv { name, version }; let path = segments.collect::>().join("/"); - let jsr_resolver = self.documents.get_jsr_resolver(); - let export = jsr_resolver.lookup_export_for_path(&nv, &path)?; + let export = self.resolver.jsr_lookup_export_for_path(&nv, &path)?; let sub_path = (export != ".").then_some(export); let mut req = None; req = req.or_else(|| { @@ -282,7 +281,7 @@ impl<'a> TsResponseImportMapper<'a> { } None }); - req = req.or_else(|| jsr_resolver.lookup_req_for_nv(&nv)); + req = req.or_else(|| self.resolver.jsr_lookup_req_for_nv(&nv)); let spec_str = if let Some(req) = req { let req_ref = PackageReqReference { req, sub_path }; JsrPackageReqReference::new(req_ref).to_string() -- cgit v1.2.3