9 files changed, 98 insertions, 0 deletions
diff --git a/cli/tests/integration/lsp_tests.rs b/cli/tests/integration/lsp_tests.rs
index 7f4f4e591..8bf019aa7 100644
--- a/cli/tests/integration/lsp_tests.rs
+++ b/cli/tests/integration/lsp_tests.rs
@@ -2526,6 +2526,96 @@ fn lsp_auto_discover_registry() {
 }
 
 #[test]
+fn lsp_cache_location() {
+  let _g = http_server();
+  let temp_dir = TempDir::new().expect("could not create temp dir");
+  let mut params: lsp::InitializeParams =
+    serde_json::from_value(load_fixture("initialize_params.json")).unwrap();
+
+  params.root_uri = Some(Url::from_file_path(temp_dir.path()).unwrap());
+  if let Some(Value::Object(mut map)) = params.initialization_options {
+    map.insert("cache".to_string(), json!(".cache"));
+    params.initialization_options = Some(Value::Object(map));
+  }
+
+  let deno_exe = deno_exe_path();
+  let mut client = LspClient::new(&deno_exe).unwrap();
+  client
+    .write_request::<_, _, Value>("initialize", params)
+    .unwrap();
+
+  client.write_notification("initialized", json!({})).unwrap();
+  did_open(
+    &mut client,
+    json!({
+      "textDocument": {
+        "uri": "file:///a/file_01.ts",
+        "languageId": "typescript",
+        "version": 1,
+        "text": "export const a = \"a\";\n",
+      }
+    }),
+  );
+  let diagnostics = did_open(
+    &mut client,
+    load_fixture("did_open_params_import_hover.json"),
+  );
+  let diagnostics = diagnostics.into_iter().flat_map(|x| x.diagnostics);
+  assert_eq!(diagnostics.count(), 12);
+  let (maybe_res, maybe_err) = client
+    .write_request::<_, _, Value>(
+      "deno/cache",
+      json!({
+        "referrer": {
+          "uri": "file:///a/file.ts",
+        },
+        "uris": [],
+      }),
+    )
+    .unwrap();
+  assert!(maybe_err.is_none());
+  assert!(maybe_res.is_some());
+  let (maybe_res, maybe_err) = client
+    .write_request(
+      "textDocument/hover",
+      json!({
+        "textDocument": {
+          "uri": "file:///a/file.ts",
+        },
+        "position": {
+          "line": 0,
+          "character": 28
+        }
+      }),
+    )
+    .unwrap();
+  assert!(maybe_err.is_none());
+  assert_eq!(
+    maybe_res,
+    Some(json!({
+      "contents": {
+        "kind": "markdown",
+        "value": "**Resolved Dependency**\n\n**Code**: http&#8203;://127.0.0.1:4545/xTypeScriptTypes.js\n"
+      },
+      "range": {
+        "start": {
+          "line": 0,
+          "character": 20
+        },
+        "end":{
+          "line": 0,
+          "character": 61
+        }
+      }
+    }))
+  );
+  let cache_path = temp_dir.path().join(".cache");
+  assert!(cache_path.is_dir());
+  assert!(cache_path.join("gen").is_dir());
+  shutdown(&mut client);
+}
+
+#[test]
 fn lsp_diagnostics_warn() {
   let _g = http_server();
   let mut client = init("initialize_params.json");
diff --git a/cli/tests/lsp/initialize_params.json b/cli/tests/lsp/initialize_params.json
index f0b2d1dad..27711efd0 100644
--- a/cli/tests/lsp/initialize_params.json
+++ b/cli/tests/lsp/initialize_params.json
@@ -7,6 +7,7 @@
   "rootUri": null,
   "initializationOptions": {
     "enable": true,
+    "cache": null,
     "codeLens": {
       "implementations": true,
       "references": true,
diff --git a/cli/tests/lsp/initialize_params_bad_config_option.json b/cli/tests/lsp/initialize_params_bad_config_option.json
index fbff31566..cfe40acec 100644
--- a/cli/tests/lsp/initialize_params_bad_config_option.json
+++ b/cli/tests/lsp/initialize_params_bad_config_option.json
@@ -7,6 +7,7 @@
   "rootUri": null,
   "initializationOptions": {
     "enable": true,
+    "cache": null,
     "codeLens": {
       "implementations": true,
       "references": true,
diff --git a/cli/tests/lsp/initialize_params_code_lens_test.json b/cli/tests/lsp/initialize_params_code_lens_test.json
index 792928462..fb803c04f 100644
--- a/cli/tests/lsp/initialize_params_code_lens_test.json
+++ b/cli/tests/lsp/initialize_params_code_lens_test.json
@@ -7,6 +7,7 @@
   "rootUri": null,
   "initializationOptions": {
     "enable": true,
+    "cache": null,
     "importMap": null,
     "lint": true,
     "suggest": {
diff --git a/cli/tests/lsp/initialize_params_code_lens_test_disabled.json b/cli/tests/lsp/initialize_params_code_lens_test_disabled.json
index febec5695..c4d5e42f8 100644
--- a/cli/tests/lsp/initialize_params_code_lens_test_disabled.json
+++ b/cli/tests/lsp/initialize_params_code_lens_test_disabled.json
@@ -7,6 +7,7 @@
   "rootUri": null,
   "initializationOptions": {
     "enable": true,
+    "cache": null,
     "codeLens": {
       "implementations": true,
       "references": true,
diff --git a/cli/tests/lsp/initialize_params_did_config_change.json b/cli/tests/lsp/initialize_params_did_config_change.json
index 02237c788..b5cec8499 100644
--- a/cli/tests/lsp/initialize_params_did_config_change.json
+++ b/cli/tests/lsp/initialize_params_did_config_change.json
@@ -7,6 +7,7 @@
   "rootUri": null,
   "initializationOptions": {
     "enable": true,
+    "cache": null,
     "codeLens": {
       "implementations": true,
       "references": true
diff --git a/cli/tests/lsp/initialize_params_disabled.json b/cli/tests/lsp/initialize_params_disabled.json
index d5e59770a..349cc6ae3 100644
--- a/cli/tests/lsp/initialize_params_disabled.json
+++ b/cli/tests/lsp/initialize_params_disabled.json
@@ -7,6 +7,7 @@
   "rootUri": null,
   "initializationOptions": {
     "enable": false,
+    "cache": null,
     "codeLens": {
       "implementations": true,
       "references": true
diff --git a/cli/tests/lsp/initialize_params_registry.json b/cli/tests/lsp/initialize_params_registry.json
index 0a19c50ec..e98a62f7f 100644
--- a/cli/tests/lsp/initialize_params_registry.json
+++ b/cli/tests/lsp/initialize_params_registry.json
@@ -7,6 +7,7 @@
   "rootUri": null,
   "initializationOptions": {
     "enable": true,
+    "cache": null,
     "codeLens": {
       "implementations": true,
       "references": true
diff --git a/cli/tests/lsp/initialize_params_unstable.json b/cli/tests/lsp/initialize_params_unstable.json
index 153e3aef1..e18b6ba8b 100644
--- a/cli/tests/lsp/initialize_params_unstable.json
+++ b/cli/tests/lsp/initialize_params_unstable.json
@@ -7,6 +7,7 @@
   "rootUri": null,
   "initializationOptions": {
     "enable": true,
+    "cache": null,
     "codeLens": {
       "implementations": true,
       "references": true