diff options
Diffstat (limited to 'cli/lsp')
-rw-r--r-- | cli/lsp/config.rs | 16 | ||||
-rw-r--r-- | cli/lsp/diagnostics.rs | 7 | ||||
-rw-r--r-- | cli/lsp/documents.rs | 2 | ||||
-rw-r--r-- | cli/lsp/tsc.rs | 1 |
4 files changed, 23 insertions, 3 deletions
diff --git a/cli/lsp/config.rs b/cli/lsp/config.rs index 5fa2a00a6..304a53b8b 100644 --- a/cli/lsp/config.rs +++ b/cli/lsp/config.rs @@ -1136,7 +1136,10 @@ impl ConfigData { file_fetcher: Option<&FileFetcher>, ) -> Self { if let Some(specifier) = config_file_specifier { - match ConfigFile::from_specifier(specifier.clone()) { + match ConfigFile::from_specifier( + specifier.clone(), + &deno_config::ParseOptions::default(), + ) { Ok(config_file) => { lsp_log!( " Resolved Deno configuration file: \"{}\"", @@ -1949,7 +1952,12 @@ mod tests { config .tree .inject_config_file( - ConfigFile::new("{}", root_uri.join("deno.json").unwrap()).unwrap(), + ConfigFile::new( + "{}", + root_uri.join("deno.json").unwrap(), + &deno_config::ParseOptions::default(), + ) + .unwrap(), ) .await; assert!(config.specifier_enabled(&root_uri)); @@ -1996,6 +2004,7 @@ mod tests { }) .to_string(), root_uri.join("deno.json").unwrap(), + &deno_config::ParseOptions::default(), ) .unwrap(), ) @@ -2021,6 +2030,7 @@ mod tests { }) .to_string(), root_uri.join("deno.json").unwrap(), + &deno_config::ParseOptions::default(), ) .unwrap(), ) @@ -2038,6 +2048,7 @@ mod tests { }) .to_string(), root_uri.join("deno.json").unwrap(), + &deno_config::ParseOptions::default(), ) .unwrap(), ) @@ -2067,6 +2078,7 @@ mod tests { }) .to_string(), root_uri.join("deno.json").unwrap(), + &deno_config::ParseOptions::default(), ) .unwrap(), ) diff --git a/cli/lsp/diagnostics.rs b/cli/lsp/diagnostics.rs index 03d962741..e518f4c6e 100644 --- a/cli/lsp/diagnostics.rs +++ b/cli/lsp/diagnostics.rs @@ -1617,7 +1617,12 @@ mod tests { let config = Config::new_with_roots([resolve_url("file:///").unwrap()]); if let Some((base_url, json_string)) = maybe_import_map { let base_url = resolve_url(base_url).unwrap(); - let config_file = ConfigFile::new(json_string, base_url).unwrap(); + let config_file = ConfigFile::new( + json_string, + base_url, + &deno_config::ParseOptions::default(), + ) + .unwrap(); config.tree.inject_config_file(config_file).await; } StateSnapshot { diff --git a/cli/lsp/documents.rs b/cli/lsp/documents.rs index 7d1d89b8d..8feeab8de 100644 --- a/cli/lsp/documents.rs +++ b/cli/lsp/documents.rs @@ -1886,6 +1886,7 @@ console.log(b, "hello deno"); }) .to_string(), config.root_uri().unwrap().join("deno.json").unwrap(), + &deno_config::ParseOptions::default(), ) .unwrap(), ) @@ -1926,6 +1927,7 @@ console.log(b, "hello deno"); }) .to_string(), config.root_uri().unwrap().join("deno.json").unwrap(), + &deno_config::ParseOptions::default(), ) .unwrap(), ) diff --git a/cli/lsp/tsc.rs b/cli/lsp/tsc.rs index 691f7c91d..63c08331d 100644 --- a/cli/lsp/tsc.rs +++ b/cli/lsp/tsc.rs @@ -4711,6 +4711,7 @@ mod tests { }) .to_string(), resolve_url("file:///deno.json").unwrap(), + &deno_config::ParseOptions::default(), ) .unwrap(), ) |