Skip to content

Fix removal of section properties when last paragraph of a section is an END-FOR command #425

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

Open
jwasnoggin wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix removal of section properties when last paragraph of a section is an END-FOR command #425

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
16 changes: 14 additions & 2 deletions src/processTemplate.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -646,7 +646,10 @@ const processCmd: CommandProcessor = async (
// END-FOR
// END-IF
} else if (cmdName === 'END-FOR' || cmdName === 'END-IF') {
processEndForIf(node, ctx, cmd, cmdName, cmdRest);
const result = processEndForIf(node, ctx, cmd, cmdName, cmdRest);
if (typeof result === 'string') {
return result;
}

// INS <expression>
} else if (cmdName === 'INS') {
Expand Down Expand Up @@ -897,7 +900,7 @@ const processEndForIf = (
cmd: string,
cmdName: string,
cmdRest: string
): void => {
): string | undefined => {
const isIf = cmdName === 'END-IF';
const curLoop = getCurLoop(ctx);
if (!curLoop)
Expand Down Expand Up @@ -957,6 +960,15 @@ const processEndForIf = (
} else {
// loop finished
ctx.loops.pop();
const paragraphPropertiesNode =
node._parent?._parent?._parent?._children[0];
if (
paragraphPropertiesNode &&
paragraphPropertiesNode._children[0] &&
(paragraphPropertiesNode._children[0] as NonTextNode)._tag === 'w:sectPr'
) {
return ''; // If this paragraph has section properties, we don't want to remove it, so we return an empty string
}
}
};

Expand Down
Loading