Skip to content

convertFunctionToEs6Class: Combine deletes and deletedNodes #22742

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
1 commit merged into from
Mar 22, 2018
Merged

convertFunctionToEs6Class: Combine deletes and deletedNodes #22742

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
25 changes: 11 additions & 14 deletions src/services/codefixes/convertFunctionToEs6Class.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,7 @@ namespace ts.codefix {
});

function doChange(changes: textChanges.ChangeTracker, sourceFile: SourceFile, position: number, checker: TypeChecker): void {
const deletedNodes: Node[] = [];
const deletes: (() => void)[] = [];
const deletedNodes: { node: Node, inList: boolean }[] = [];
const ctorSymbol = checker.getSymbolAtLocation(getTokenAtPosition(sourceFile, position, /*includeJsDocComment*/ false));

if (!ctorSymbol || !(ctorSymbol.flags & (SymbolFlags.Function | SymbolFlags.Variable))) {
Expand Down Expand Up @@ -51,21 +50,19 @@ namespace ts.codefix {

// Because the preceding node could be touched, we need to insert nodes before delete nodes.
changes.insertNodeAfter(sourceFile, precedingNode, newClassDeclaration);
for (const deleteCallback of deletes) {
deleteCallback();
}

function deleteNode(node: Node, inList = false) {
if (deletedNodes.some(n => isNodeDescendantOf(node, n))) {
// Parent node has already been deleted; do nothing
return;
}
deletedNodes.push(node);
for (const { node, inList } of deletedNodes) {
if (inList) {
deletes.push(() => changes.deleteNodeInList(sourceFile, node));
changes.deleteNodeInList(sourceFile, node);
}
else {
deletes.push(() => changes.deleteNode(sourceFile, node));
changes.deleteNode(sourceFile, node);
}
}

function deleteNode(node: Node, inList = false) {
// If parent node has already been deleted, do nothing
if (!deletedNodes.some(n => isNodeDescendantOf(node, n.node))) {
deletedNodes.push({ node, inList });
}
}

Expand Down