From 3f08a40412d89bd54222ad51fc1aaeb508e2e5e7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bartek=20Iwa=C5=84czuk?= Date: Tue, 3 May 2022 19:45:57 +0200 Subject: refactor: add core.formatLocationFilename, remove op_format_filename (#14474) This commit moves "op_format_location" to "core/ops_builtin.rs" and removes "Deno.core.createPrepareStackTrace" in favor of "Deno.core.prepareStackTrace". Co-authored-by: Aaron O'Mullan --- cli/fmt_errors.rs | 31 +++---------------------------- 1 file changed, 3 insertions(+), 28 deletions(-) (limited to 'cli/fmt_errors.rs') diff --git a/cli/fmt_errors.rs b/cli/fmt_errors.rs index b29b97ea2..6f3a02f9e 100644 --- a/cli/fmt_errors.rs +++ b/cli/fmt_errors.rs @@ -4,36 +4,11 @@ use crate::colors::cyan; use crate::colors::italic_bold; use crate::colors::red; use crate::colors::yellow; -use deno_core::error::{JsError, JsStackFrame}; -use deno_core::url::Url; +use deno_core::error::format_file_name; +use deno_core::error::JsError; +use deno_core::error::JsStackFrame; const SOURCE_ABBREV_THRESHOLD: usize = 150; -const DATA_URL_ABBREV_THRESHOLD: usize = 150; - -pub fn format_file_name(file_name: &str) -> String { - if file_name.len() > DATA_URL_ABBREV_THRESHOLD { - if let Ok(url) = Url::parse(file_name) { - if url.scheme() == "data" { - let data_path = url.path(); - if let Some(data_pieces) = data_path.split_once(',') { - let data_length = data_pieces.1.len(); - if let Some(data_start) = data_pieces.1.get(0..20) { - if let Some(data_end) = data_pieces.1.get(data_length - 20..) { - return format!( - "{}:{},{}......{}", - url.scheme(), - data_pieces.0, - data_start, - data_end - ); - } - } - } - } - } - } - file_name.to_string() -} // Keep in sync with `/core/error.js`. pub fn format_location(frame: &JsStackFrame) -> String { -- cgit v1.2.3