Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Skip range check when parsing stack trace #100

Merged
merged 1 commit into from
Aug 22, 2024
Merged

Skip range check when parsing stack trace #100

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 12 additions & 9 deletions front_end/core/sdk/DebuggerModel.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -772,16 +772,19 @@ export class DebuggerModel extends SDKModel<EventTypes> {
return this.createRawLocationByScriptId(script.scriptId, lineNumber, columnNumber, inlineFrameIndex);
}

createRawLocationByURL(sourceURL: string, lineNumber: number, columnNumber?: number, inlineFrameIndex?: number):
Location|null {
createRawLocationByURL(
sourceURL: string, lineNumber: number, columnNumber?: number, inlineFrameIndex?: number,
skipScriptRangeCheck?: boolean): Location|null {
for (const script of this.#scriptsBySourceURL.get(sourceURL) || []) {
if (script.lineOffset > lineNumber ||
(script.lineOffset === lineNumber && columnNumber !== undefined && script.columnOffset > columnNumber)) {
continue;
}
if (script.endLine < lineNumber ||
(script.endLine === lineNumber && columnNumber !== undefined && script.endColumn <= columnNumber)) {
continue;
if (!skipScriptRangeCheck) {
if (script.lineOffset > lineNumber ||
(script.lineOffset === lineNumber && columnNumber !== undefined && script.columnOffset > columnNumber)) {
continue;
}
if (script.endLine < lineNumber ||
(script.endLine === lineNumber && columnNumber !== undefined && script.endColumn <= columnNumber)) {
continue;
}
}
return new Location(this, script.scriptId, lineNumber, columnNumber, inlineFrameIndex);
}
Expand Down
4 changes: 3 additions & 1 deletion front_end/ui/legacy/components/utils/Linkifier.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -245,13 +245,15 @@ export class Linkifier extends Common.ObjectWrapper.ObjectWrapper<EventTypes> im
return fallbackAnchor;
}

// TODO(T199120793) Skipping script range check until Hermes implements script range
const skipRangeCheck = true;
Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We can make this an experiment if we want. imo I think it's an overkill

// Prefer createRawLocationByScriptId() here, since it will always produce a correct
// link, since the script ID is unique. Only fall back to createRawLocationByURL()
// when all we have is an URL, which is not guaranteed to be unique.
const rawLocation = scriptId ? debuggerModel.createRawLocationByScriptId(
scriptId, lineNumber || 0, columnNumber, linkifyURLOptions.inlineFrameIndex) :
debuggerModel.createRawLocationByURL(
sourceURL, lineNumber || 0, columnNumber, linkifyURLOptions.inlineFrameIndex);
sourceURL, lineNumber || 0, columnNumber, linkifyURLOptions.inlineFrameIndex, skipRangeCheck);
if (!rawLocation) {
return fallbackAnchor;
}
Expand Down
Loading