From 0ea6eb83a906bff543be4c3301f23444986b022b Mon Sep 17 00:00:00 2001 From: Nayeem Rahman Date: Mon, 13 Apr 2020 15:54:16 +0100 Subject: refactor(core/js_error): Align JSStackFrame with CallSite (#4715) Renames and adds missing fields to JSStackFrame from CallSite. Fixes #4705. Cleans up base changes for line and column numbers. --- cli/ops/errors.rs | 28 +++++++++++++++------------- 1 file changed, 15 insertions(+), 13 deletions(-) (limited to 'cli/ops/errors.rs') diff --git a/cli/ops/errors.rs b/cli/ops/errors.rs index 4d2ce1bef..2eab3a953 100644 --- a/cli/ops/errors.rs +++ b/cli/ops/errors.rs @@ -20,10 +20,11 @@ pub fn init(i: &mut Isolate, s: &State) { } #[derive(Deserialize)] +#[serde(rename_all = "camelCase")] struct ApplySourceMap { - filename: String, - line: i32, - column: i32, + file_name: String, + line_number: i32, + column_number: i32, } fn op_apply_source_map( @@ -34,18 +35,19 @@ fn op_apply_source_map( let args: ApplySourceMap = serde_json::from_value(args)?; let mut mappings_map: CachedMaps = HashMap::new(); - let (orig_filename, orig_line, orig_column) = get_orig_position( - args.filename, - args.line.into(), - args.column.into(), - &mut mappings_map, - &state.borrow().global_state.ts_compiler, - ); + let (orig_file_name, orig_line_number, orig_column_number) = + get_orig_position( + args.file_name, + args.line_number.into(), + args.column_number.into(), + &mut mappings_map, + &state.borrow().global_state.ts_compiler, + ); Ok(JsonOp::Sync(json!({ - "filename": orig_filename, - "line": orig_line as u32, - "column": orig_column as u32, + "fileName": orig_file_name, + "lineNumber": orig_line_number as u32, + "columnNumber": orig_column_number as u32, }))) } -- cgit v1.2.3