Skip to content

visit: simplify handling of root node #3461

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 1 commit into from
Jan 23, 2022
Merged

visit: simplify handling of root node #3461

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
18 changes: 8 additions & 10 deletions src/language/visitor.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -192,12 +192,11 @@ export function visit(
let keys: any = [root];
let index = -1;
let edits = [];
let node: any = undefined;
let node: any = root;
let key: any = undefined;
let parent: any = undefined;
const path: any = [];
const ancestors = [];
let newRoot = root;
/* eslint-enable no-undef-init */

do {
Expand Down Expand Up @@ -237,15 +236,13 @@ export function visit(
edits = stack.edits;
inArray = stack.inArray;
stack = stack.prev;
} else {
key = parent ? (inArray ? index : keys[index]) : undefined;
node = parent ? parent[key] : newRoot;
} else if (parent) {
key = inArray ? index : keys[index];
node = parent[key];
if (node === null || node === undefined) {
continue;
}
if (parent) {
path.push(key);
}
path.push(key);
}

let result;
Expand Down Expand Up @@ -300,10 +297,11 @@ export function visit(
} while (stack !== undefined);

if (edits.length !== 0) {
newRoot = edits[edits.length - 1][1];
// New root
return edits[edits.length - 1][1];
}

return newRoot;
return root;
}

/**
Expand Down