language-servers/deno
1
0
Fork 0
mirror of https://github.com/denoland/deno.git synced 2025-08-03 18:38:33 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

refactor(runtime): split up MainWorker and WebWorker's preload_module method into two separate methods (#15451)

Browse source
This commit is contained in:
David Sherret 2022-08-10 18:10:51 -04:00 • committed by GitHub
parent 578f12d531
commit 321a42d1fb
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 40 additions and 37 deletions
Download patch file Download diff file Expand all files Collapse all files

39
runtime/worker.rs
View file

@ -217,24 +217,26 @@ impl MainWorker {
Ok(())
}
/// Loads and instantiates specified JavaScript module
/// as "main" or "side" module.
pub async fn preload_module(
/// Loads and instantiates specified JavaScript module as "main" module.
pub async fn preload_main_module(
&mut self,
module_specifier: &ModuleSpecifier,
main: bool,
) -> Result<ModuleId, AnyError> {
if main {
self
.js_runtime
.load_main_module(module_specifier, None)
.await
} else {
self
.js_runtime
.load_side_module(module_specifier, None)
.await
}
self
.js_runtime
.load_main_module(module_specifier, None)
.await
}
/// Loads and instantiates specified JavaScript module as "side" module.
pub async fn preload_side_module(
&mut self,
module_specifier: &ModuleSpecifier,
) -> Result<ModuleId, AnyError> {
self
.js_runtime
.load_side_module(module_specifier, None)
.await
}
/// Executes specified JavaScript module.
@ -242,6 +244,7 @@ impl MainWorker {
&mut self,
id: ModuleId,
) -> Result<(), AnyError> {
self.wait_for_inspector_session();
let mut receiver = self.js_runtime.mod_evaluate(id);
tokio::select! {
// Not using biased mode leads to non-determinism for relatively simple
@ -266,8 +269,7 @@ impl MainWorker {
&mut self,
module_specifier: &ModuleSpecifier,
) -> Result<(), AnyError> {
let id = self.preload_module(module_specifier, false).await?;
self.wait_for_inspector_session();
let id = self.preload_side_module(module_specifier).await?;
self.evaluate_module(id).await
}
@ -278,8 +280,7 @@ impl MainWorker {
&mut self,
module_specifier: &ModuleSpecifier,
) -> Result<(), AnyError> {
let id = self.preload_module(module_specifier, true).await?;
self.wait_for_inspector_session();
let id = self.preload_main_module(module_specifier).await?;
self.evaluate_module(id).await
}