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/js/ops/errors.ts | 24 ++++++++++-------------- 1 file changed, 10 insertions(+), 14 deletions(-) (limited to 'cli/js/ops/errors.ts') diff --git a/cli/js/ops/errors.ts b/cli/js/ops/errors.ts index 5b65d102a..bd3e6d809 100644 --- a/cli/js/ops/errors.ts +++ b/cli/js/ops/errors.ts @@ -7,25 +7,21 @@ export function formatDiagnostics(items: DiagnosticItem[]): string { } export interface Location { - filename: string; - - line: number; - - column: number; + fileName: string; + lineNumber: number; + columnNumber: number; } export function applySourceMap(location: Location): Location { - const { filename, line, column } = location; - // On this side, line/column are 1 based, but in the source maps, they are - // 0 based, so we have to convert back and forth + const { fileName, lineNumber, columnNumber } = location; const res = sendSync("op_apply_source_map", { - filename, - line: line - 1, - column: column - 1, + fileName, + lineNumber: lineNumber, + columnNumber: columnNumber, }); return { - filename: res.filename, - line: res.line + 1, - column: res.column + 1, + fileName: res.fileName, + lineNumber: res.lineNumber, + columnNumber: res.columnNumber, }; } -- cgit v1.2.3