Skip to content

fix(node): Record local variables with falsy values (v7) #11190

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 2 commits into from
Mar 19, 2024
Merged

fix(node): Record local variables with falsy values (v7) #11190

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
deb1d02
fix(node): Record local variables with falsy values (v7)
timfish Mar 18, 2024
318e3cf
Linting
timfish Mar 19, 2024
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
3 changes: 3 additions & 0 deletions ...ackages/node-integration-tests/suites/public-api/LocalVariables/local-variables-caught.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,9 @@ function one(name) {
name,
num: 5,
};
const bool = false;
const num = 0;
const str = '';

const ty = new Some();

Expand Down
3 changes: 3 additions & 0 deletions ...ckages/node-integration-tests/suites/public-api/LocalVariables/local-variables-caught.mjs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,9 @@ function one(name) {
functionsShouldNotBeIncluded: () => {},
functionsShouldNotBeIncluded2() {},
};
const bool = false;
const num = 0;
const str = '';

const ty = new Some();

Expand Down
3 changes: 3 additions & 0 deletions ...es/node-integration-tests/suites/public-api/LocalVariables/local-variables-memory-test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,9 @@ function one(name) {
name,
num: 5,
};
const bool = false;
const num = 0;
const str = '';

const ty = new Some();

Expand Down
3 changes: 3 additions & 0 deletions dev-packages/node-integration-tests/suites/public-api/LocalVariables/local-variables.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,9 @@ function one(name) {
name,
num: 5,
};
const bool = false;
const num = 0;
const str = '';

const ty = new Some();

Expand Down
3 changes: 3 additions & 0 deletions dev-packages/node-integration-tests/suites/public-api/LocalVariables/no-local-variables.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,9 @@ function one(name) {
name,
num: 5,
};
const bool = false;
const num = 0;
const str = '';

const ty = new Some();

Expand Down
3 changes: 3 additions & 0 deletions dev-packages/node-integration-tests/suites/public-api/LocalVariables/test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,9 @@ const EXPECTED_LOCAL_VARIABLES_EVENT = {
arr: [1, '2', null],
obj: { name: 'some name', num: 5 },
ty: '<Some>',
bool: false,
num: 0,
str: '',
},
}),
expect.objectContaining({
Expand Down
6 changes: 3 additions & 3 deletions packages/node/src/integrations/local-variables/local-variables-async.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,9 +42,9 @@ async function unrollObject(session: Session, objectId: string, name: string, va
}

function unrollOther(prop: Runtime.PropertyDescriptor, vars: Variables): void {
if (prop?.value?.value) {
if (prop?.value?.value != null) {
vars[prop.name] = prop.value.value;
} else if (prop?.value?.description && prop?.value?.type !== 'function') {
} else if (prop?.value?.description != null && prop?.value?.type !== 'function') {
vars[prop.name] = `<${prop.value.description}>`;
}
}
Expand All @@ -63,7 +63,7 @@ async function getLocalVariables(session: Session, objectId: string): Promise<Va
} else if (prop?.value?.objectId && prop?.value?.className === 'Object') {
const id = prop.value.objectId;
await unrollObject(session, id, prop.name, variables);
} else if (prop?.value?.value || prop?.value?.description) {
} else if (prop?.value?.value != null || prop?.value?.description != null) {
unrollOther(prop, variables);
}
}
Expand Down
6 changes: 3 additions & 3 deletions packages/node/src/integrations/local-variables/local-variables-sync.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,7 @@ class AsyncSession implements DebugSession {
} else if (prop?.value?.objectId && prop?.value?.className === 'Object') {
const id = prop.value.objectId;
add(vars => this._unrollObject(id, prop.name, vars, next));
} else if (prop?.value?.value || prop?.value?.description) {
} else if (prop?.value?.value != null || prop?.value?.description != null) {
add(vars => this._unrollOther(prop, vars, next));
}
}
Expand Down Expand Up @@ -192,9 +192,9 @@ class AsyncSession implements DebugSession {
* Unrolls other properties
*/
private _unrollOther(prop: Runtime.PropertyDescriptor, vars: Variables, next: (vars: Variables) => void): void {
if (prop?.value?.value) {
if (prop?.value?.value != null) {
vars[prop.name] = prop.value.value;
} else if (prop?.value?.description && prop?.value?.type !== 'function') {
} else if (prop?.value?.description != null && prop?.value?.type !== 'function') {
vars[prop.name] = `<${prop.value.description}>`;
}

Expand Down