Bug 1555518 - Fixes original stack display for wasm files, and ref to original source. r=jlast

- Fixes expandFrames() to ensure the thread property is set
- Refactors getSourceLocationFromMouseEvent to use fromEditorLine
- Replaces dwarf_to_json (for proper DWARF conversion)

Differential Revision: https://phabricator.services.mozilla.com/D33092

--HG--
extra : moz-landing-system : lando
This commit is contained in:
Yury Delendik 2019-06-13 18:02:14 +00:00
parent c91a3fe44a
commit 827de35634
6 changed files with 9 additions and 7 deletions

View File

@ -68,7 +68,7 @@ describe("wasm source maps", () => {
expect(pos3).toHaveLength(1);
expect(pos3[0].line).toEqual(14);
expect(pos3[0].column).toEqual(0);
expect(pos3[0].lastColumn).toEqual(Infinity);
expect(pos3[0].lastColumn).toEqual(0);
});
test("content presents", async () => {

View File

@ -56,7 +56,7 @@ class WasmRemap {
column: 0,
};
if (this._computeColumnSpans) {
generatedPosition.lastColumn = Infinity;
generatedPosition.lastColumn = 0;
}
return generatedPosition;
}
@ -95,6 +95,7 @@ class WasmRemap {
source,
generatedLine: generatedColumn,
generatedColumn: 0,
lastGeneratedColumn: 0,
originalLine,
originalColumn,
name,

View File

@ -136,7 +136,7 @@ async function expandFrames(
};
originalFrames.forEach((originalFrame, j) => {
if (!originalFrame.location || !originalFrame.thread) {
if (!originalFrame.location) {
return;
}
@ -145,10 +145,10 @@ async function expandFrames(
const id = j == 0 ? frame.id : `${frame.id}-originalFrame${j}`;
result.push({
id,
thread: originalFrame.thread,
displayName: originalFrame.displayName,
location: originalFrame.location,
source: null,
thread: frame.thread,
scope: frame.scope,
this: frame.this,
isOriginal: true,

View File

@ -224,11 +224,12 @@ export function getSourceLocationFromMouseEvent(
left: e.clientX,
top: e.clientY,
});
const sourceId = source.id;
return {
sourceId: source.id,
line: line + 1,
column: ch + 1,
sourceId,
line: fromEditorLine(sourceId, line),
column: isWasm(sourceId) ? 0 : ch + 1,
};
}