diff options
Diffstat (limited to 'cli/lsp')
| -rw-r--r-- | cli/lsp/cache.rs | 4 | ||||
| -rw-r--r-- | cli/lsp/language_server.rs | 2 | ||||
| -rw-r--r-- | cli/lsp/testing/execution.rs | 8 |
3 files changed, 6 insertions, 8 deletions
diff --git a/cli/lsp/cache.rs b/cli/lsp/cache.rs index 0f7608278..fc8b50c4a 100644 --- a/cli/lsp/cache.rs +++ b/cli/lsp/cache.rs @@ -49,13 +49,13 @@ impl CacheServer { let _join_handle = thread::spawn(move || { let runtime = create_basic_runtime(); runtime.block_on(async { - let ps = ProcState::build(Arc::new(Flags { + let ps = ProcState::build(Flags { cache_path: maybe_cache_path, ca_stores: maybe_ca_stores, ca_file: maybe_ca_file, unsafely_ignore_certificate_errors, ..Default::default() - })) + }) .await .unwrap(); let maybe_import_map_resolver = diff --git a/cli/lsp/language_server.rs b/cli/lsp/language_server.rs index 4a703c719..909d17bfe 100644 --- a/cli/lsp/language_server.rs +++ b/cli/lsp/language_server.rs @@ -364,7 +364,7 @@ impl Inner { if let Some(root_uri) = &self.config.root_uri { let root_path = fs_util::specifier_to_file_path(root_uri)?; let mut checked = std::collections::HashSet::new(); - let maybe_config = crate::args::discover_from(&root_path, &mut checked)?; + let maybe_config = ConfigFile::discover_from(&root_path, &mut checked)?; Ok(maybe_config.map(|c| { lsp_log!(" Auto-resolved configuration file: \"{}\"", c.specifier); c diff --git a/cli/lsp/testing/execution.rs b/cli/lsp/testing/execution.rs index 83f74e5ed..94301e198 100644 --- a/cli/lsp/testing/execution.rs +++ b/cli/lsp/testing/execution.rs @@ -8,7 +8,6 @@ use crate::args::flags_from_vec; use crate::args::DenoSubcommand; use crate::checksum; use crate::create_main_worker; -use crate::emit; use crate::located_script_name; use crate::lsp::client::Client; use crate::lsp::client::TestingNotification; @@ -314,9 +313,9 @@ impl TestRun { let args = self.get_args(); lsp_log!("Executing test run with arguments: {}", args.join(" ")); let flags = flags_from_vec(args.into_iter().map(String::from).collect())?; - let ps = proc_state::ProcState::build(Arc::new(flags)).await?; + let ps = proc_state::ProcState::build(flags).await?; let permissions = - Permissions::from_options(&ps.flags.permissions_options()); + Permissions::from_options(&ps.config.permissions_options()); test::check_specifiers( &ps, permissions.clone(), @@ -325,7 +324,6 @@ impl TestRun { .iter() .map(|s| (s.clone(), test::TestMode::Executable)) .collect(), - emit::TypeLib::DenoWindow, ) .await?; @@ -333,7 +331,7 @@ impl TestRun { let sender = TestEventSender::new(sender); let (concurrent_jobs, fail_fast) = - if let DenoSubcommand::Test(test_flags) = &ps.flags.subcommand { + if let DenoSubcommand::Test(test_flags) = ps.config.sub_command() { ( test_flags.concurrent_jobs.into(), test_flags.fail_fast.map(|count| count.into()), |