From 667b026798b5284e9ec8bf47baba80f343975d2e Mon Sep 17 00:00:00 2001
From: Kitson Kelly <me@kitsonkelly.com>
Date: Wed, 28 Jul 2021 07:25:09 +1000
Subject: feat(lsp): ability to set DENO_DIR via settings (#11527)

Ref: denoland/vscode_deno#287
---
 cli/program_state.rs | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

(limited to 'cli/program_state.rs')

diff --git a/cli/program_state.rs b/cli/program_state.rs
index 264b22729..6775b2276 100644
--- a/cli/program_state.rs
+++ b/cli/program_state.rs
@@ -61,8 +61,11 @@ pub struct ProgramState {
 
 impl ProgramState {
   pub async fn build(flags: flags::Flags) -> Result<Arc<Self>, AnyError> {
-    let custom_root = env::var("DENO_DIR").map(String::into).ok();
-    let dir = deno_dir::DenoDir::new(custom_root)?;
+    let maybe_custom_root = flags
+      .cache_path
+      .clone()
+      .or_else(|| env::var("DENO_DIR").map(String::into).ok());
+    let dir = deno_dir::DenoDir::new(maybe_custom_root)?;
     let deps_cache_location = dir.root.join("deps");
     let http_cache = http_cache::HttpCache::new(&deps_cache_location);
     let ca_file = flags.ca_file.clone().or_else(|| env::var("DENO_CERT").ok());
-- 
cgit v1.2.3