diff options
author | David Sherret <dsherret@users.noreply.github.com> | 2023-09-28 16:43:45 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-09-28 22:43:45 +0200 |
commit | d43e48c4e96b02289d505cd2558ba85d7d6cb57b (patch) | |
tree | d69a40b3e948a5c4ea166700610e24e35ecc61c4 /cli/lsp/language_server.rs | |
parent | 0bd53fd52d8937afed401fe1c61bb2ba0b23501c (diff) |
refactor(ext/node): remove dependency on deno_npm and deno_semver (#20718)
This is required from BYONM (bring your own node_modules).
Part of #18967
Diffstat (limited to 'cli/lsp/language_server.rs')
-rw-r--r-- | cli/lsp/language_server.rs | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/cli/lsp/language_server.rs b/cli/lsp/language_server.rs index d9db2edbf..38d07fb52 100644 --- a/cli/lsp/language_server.rs +++ b/cli/lsp/language_server.rs @@ -158,6 +158,12 @@ impl LspNpmConfigHash { #[derive(Debug, Clone)] pub struct LanguageServer(Arc<tokio::sync::RwLock<Inner>>); +#[derive(Debug)] +pub struct StateNpmSnapshot { + pub node_resolver: Arc<NodeResolver>, + pub npm_resolver: Arc<CliNpmResolver>, +} + /// Snapshot of the state used by TSC. #[derive(Debug)] pub struct StateSnapshot { @@ -166,8 +172,7 @@ pub struct StateSnapshot { pub config: Arc<ConfigSnapshot>, pub documents: Documents, pub maybe_import_map: Option<Arc<ImportMap>>, - pub maybe_node_resolver: Option<Arc<NodeResolver>>, - pub maybe_npm_resolver: Option<Arc<CliNpmResolver>>, + pub npm: Option<StateNpmSnapshot>, } #[derive(Debug)] @@ -819,8 +824,10 @@ impl Inner { config: self.config.snapshot(), documents: self.documents.clone(), maybe_import_map: self.maybe_import_map.clone(), - maybe_node_resolver: Some(node_resolver), - maybe_npm_resolver: Some(npm_resolver), + npm: Some(StateNpmSnapshot { + node_resolver, + npm_resolver, + }), }) } |