diff options
| author | Bartek IwaĆczuk <biwanczuk@gmail.com> | 2021-06-22 01:45:41 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-06-22 01:45:41 +0200 |
| commit | 9105892ec8b454571c56883eace557eee25b3301 (patch) | |
| tree | 965d90e3a885c2f870f58eef921d8811a9a491b9 /cli/tsc.rs | |
| parent | a5eb2dfc93afc2899ed6e1ad2b3e029157889f7c (diff) | |
refactor: unify JavaScript script execution method (#11043)
This commit renames "JsRuntime::execute" to "JsRuntime::execute_script". Additionally
same renames were applied to methods on "deno_runtime::Worker" and
"deno_runtime::WebWorker".
A new macro was added to "deno_core" called "located_script_name" which
returns the name of Rust file alongside line no and col no of that call site.
This macro is useful in combination with "JsRuntime::execute_script"
and allows to provide accurate place where "one-off" JavaScript scripts
are executed for internal runtime functions.
Co-authored-by: Nayeem Rahman <nayeemrmn99@gmail.com>
Diffstat (limited to 'cli/tsc.rs')
| -rw-r--r-- | cli/tsc.rs | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/cli/tsc.rs b/cli/tsc.rs index bfd5e8dbe..3e7974a97 100644 --- a/cli/tsc.rs +++ b/cli/tsc.rs @@ -10,6 +10,7 @@ use deno_core::error::anyhow; use deno_core::error::bail; use deno_core::error::AnyError; use deno_core::error::Context; +use deno_core::located_script_name; use deno_core::op_sync; use deno_core::resolve_url_or_path; use deno_core::serde::de; @@ -556,9 +557,9 @@ pub fn exec(request: Request) -> Result<Response, AnyError> { let exec_source = format!("globalThis.exec({})", request_str); runtime - .execute("[native code]", startup_source) + .execute_script(&located_script_name!(), startup_source) .context("Could not properly start the compiler runtime.")?; - runtime.execute("[native_code]", &exec_source)?; + runtime.execute_script(&located_script_name!(), &exec_source)?; let op_state = runtime.op_state(); let mut op_state = op_state.borrow_mut(); @@ -672,7 +673,7 @@ mod tests { ..Default::default() }); js_runtime - .execute( + .execute_script( "<anon>", r#" if (!(startup)) { |
