From 2ebd61ee1b09c8060c2da66890bf6ac024d97b67 Mon Sep 17 00:00:00 2001
From: David Sherret <dsherret@users.noreply.github.com>
Date: Thu, 25 May 2023 14:27:45 -0400
Subject: fix(compile): handle when DENO_DIR is readonly (#19257)

Closes #19253
---
 cli/lsp/language_server.rs | 19 +++----------------
 1 file changed, 3 insertions(+), 16 deletions(-)

(limited to 'cli/lsp/language_server.rs')

diff --git a/cli/lsp/language_server.rs b/cli/lsp/language_server.rs
index 594c4adbc..9a2b067c6 100644
--- a/cli/lsp/language_server.rs
+++ b/cli/lsp/language_server.rs
@@ -582,9 +582,7 @@ fn create_npm_resolver_and_resolution(
 
 impl Inner {
   fn new(client: Client) -> Self {
-    let maybe_custom_root = env::var("DENO_DIR").map(String::into).ok();
-    let dir =
-      DenoDir::new(maybe_custom_root).expect("could not access DENO_DIR");
+    let dir = DenoDir::new(None).expect("could not access DENO_DIR");
     let module_registries_location = dir.registries_folder_path();
     let http_client = Arc::new(HttpClient::new(None, None));
     let module_registries =
@@ -904,7 +902,7 @@ impl Inner {
     &mut self,
     new_cache_path: Option<PathBuf>,
   ) -> Result<(), AnyError> {
-    let dir = self.deno_dir_from_maybe_cache_path(new_cache_path.clone())?;
+    let dir = DenoDir::new(new_cache_path.clone())?;
     let workspace_settings = self.config.workspace_settings();
     let maybe_root_path = self
       .config
@@ -938,19 +936,8 @@ impl Inner {
     Ok(())
   }
 
-  fn deno_dir_from_maybe_cache_path(
-    &self,
-    cache_path: Option<PathBuf>,
-  ) -> std::io::Result<DenoDir> {
-    let maybe_custom_root =
-      cache_path.or_else(|| env::var("DENO_DIR").map(String::into).ok());
-    DenoDir::new(maybe_custom_root)
-  }
-
   async fn recreate_npm_services_if_necessary(&mut self) {
-    let deno_dir = match self
-      .deno_dir_from_maybe_cache_path(self.maybe_cache_path.clone())
-    {
+    let deno_dir = match DenoDir::new(self.maybe_cache_path.clone()) {
       Ok(deno_dir) => deno_dir,
       Err(err) => {
         lsp_warn!("Error getting deno dir: {}", err);
-- 
cgit v1.2.3