summaryrefslogtreecommitdiff
path: root/cli
diff options
context:
space:
mode:
authorSatya Rohith <me@satyarohith.com>2021-05-19 02:18:11 +0530
committerGitHub <noreply@github.com>2021-05-18 16:48:11 -0400
commit19e4080fa201cb837cf910d53bf949d017c17fb6 (patch)
tree1c3587e87539458ecda6cf95b6a5a72765b25707 /cli
parentcda09c166fd075590c1f8dd313d4f57a560ecbd8 (diff)
fix(lsp): make failed to load config error descriptive (#10685)
Diffstat (limited to 'cli')
-rw-r--r--cli/config_file.rs6
-rw-r--r--cli/lsp/language_server.rs4
2 files changed, 7 insertions, 3 deletions
diff --git a/cli/config_file.rs b/cli/config_file.rs
index 41d9bbbec..a7fe7f2de 100644
--- a/cli/config_file.rs
+++ b/cli/config_file.rs
@@ -340,6 +340,12 @@ mod tests {
}
#[test]
+ fn include_config_path_on_error() {
+ let error = ConfigFile::read("404.json").err().unwrap();
+ assert!(error.to_string().contains("404.json"));
+ }
+
+ #[test]
fn test_json_merge() {
let mut value_a = json!({
"a": true,
diff --git a/cli/lsp/language_server.rs b/cli/lsp/language_server.rs
index fcf28dbf7..f9bb52cbe 100644
--- a/cli/lsp/language_server.rs
+++ b/cli/lsp/language_server.rs
@@ -2,7 +2,6 @@
use deno_core::error::anyhow;
use deno_core::error::AnyError;
-use deno_core::error::Context;
use deno_core::resolve_url;
use deno_core::serde::Deserialize;
use deno_core::serde::Serialize;
@@ -432,8 +431,7 @@ impl Inner {
))
}?;
- let config_file = ConfigFile::read(config_url.path())
- .context("Failed to load configuration file")?;
+ let config_file = ConfigFile::read(config_url.path())?;
let (value, maybe_ignored_options) = config_file.as_compiler_options()?;
tsconfig.merge(&value);
self.maybe_config_uri = Some(config_url);