Skip to content

Fix displaying of VM_unknown calls in Call Stack for Hermes debugger #1187

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

Merged
merged 6 commits into from
Dec 25, 2019
Merged

Fix displaying of VM_unknown calls in Call Stack for Hermes debugger #1187

Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
ce88d13
Fix VM_unknown calls in Call Stack issue
RedMickey Dec 25, 2019
bed065d
Minor fix
RedMickey Dec 25, 2019
ef7c10a
Minor fix2
RedMickey Dec 25, 2019
9e8a9d1
Update comments
RedMickey Dec 25, 2019
09fbe80
Update src/debugger/direct/directDebugAdapter.ts
SounD120 Dec 25, 2019
3e0411b
Update src/debugger/direct/directDebugAdapter.ts
SounD120 Dec 25, 2019
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
24 changes: 23 additions & 1 deletion src/debugger/direct/directDebugAdapter.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import { Telemetry } from "../../common/telemetry";
import { OutputEvent, Logger } from "vscode-debugadapter";
import { TelemetryHelper } from "../../common/telemetryHelper";
import { RemoteTelemetryReporter } from "../../common/telemetryReporters";
import { ChromeDebugAdapter, ChromeDebugSession, IChromeDebugSessionOpts, IAttachRequestArgs, logger } from "vscode-chrome-debug-core";
import { ChromeDebugAdapter, ChromeDebugSession, IChromeDebugSessionOpts, IAttachRequestArgs, logger, IOnPausedResult, Crdp } from "vscode-chrome-debug-core";
import { InternalErrorCode } from "../../common/error/internalErrorCode";
import { RemoteExtension } from "../../common/remoteExtension";
import { DebugProtocol } from "vscode-debugprotocol";
Expand All @@ -29,6 +29,18 @@ export interface IDirectLaunchRequestArgs extends DebugProtocol.LaunchRequestArg

export class DirectDebugAdapter extends ChromeDebugAdapter {

/**
* @description The Hermes native functions calls mark in call stack
* @type {string}
*/
private static HERMES_NATIVE_FUNCTION_NAME: string = "(native)";

/**
* @description Equals to 0xfffffff - the scriptId returned by Hermes debugger, that means "invalid script ID"
* @type {string}
*/
private static HERMES_NATIVE_FUNCTION_SCRIPT_ID: string = "4294967295";

private outputLogger: (message: string, error?: boolean | string) => void;
private projectRootPath: string;
private remoteExtension: RemoteExtension;
Expand Down Expand Up @@ -156,6 +168,16 @@ export class DirectDebugAdapter extends ChromeDebugAdapter {
super.disconnect(args);
}

protected async onPaused(notification: Crdp.Debugger.PausedEvent, expectingStopReason = this._expectingStopReason): Promise<IOnPausedResult> {
// Excluding Hermes native function calls from call stack, since VS Code can't process them properly
// More info: https://github.com/facebook/hermes/issues/168
notification.callFrames = notification.callFrames.filter(callFrame =>
callFrame.functionName !== DirectDebugAdapter.HERMES_NATIVE_FUNCTION_NAME &&
callFrame.location.scriptId !== DirectDebugAdapter.HERMES_NATIVE_FUNCTION_SCRIPT_ID
);
return super.onPaused(notification, expectingStopReason);
}

private initializeSettings(args: any): Q.Promise<any> {
if (!this.isSettingsInitialized) {
let chromeDebugCoreLogs = getLoggingDirectory();
Expand Down