Skip to content

Fix comment indentation in if statement without else #38

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
Arpple wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix comment indentation in if statement without else #38

Show file tree
Hide file tree
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
2 changes: 1 addition & 1 deletion src/comments.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -375,7 +375,7 @@ function handleIfStatementsWithNoBodyComments(precedingNode: luaparse.Node,
return true;
}

if (precedingNode && precedingNode.type === 'ElseClause') {
if (precedingNode && (precedingNode.type === 'ElseClause' || precedingNode.type === 'IfClause')) {
addDanglingComment(precedingNode, comment);
return true;
}
Expand Down
10 changes: 4 additions & 6 deletions src/docPrinter.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -142,12 +142,10 @@ function printDocToStringWithState(doc: Doc, state: State) {
break;

case 'indent':
{
state.indentation++;
printDocToStringWithState(doc.content, state);
state.indentation--;
break;
}
state.indentation++;
printDocToStringWithState(doc.content, state);
state.indentation--;
break;

case 'lineSuffix':
state.lineSuffixes.push(doc);
Expand Down
4 changes: 4 additions & 0 deletions test/comments/__snapshots__/comments.test.ts.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,6 +101,10 @@ else -- dangling ElseClause
-- body ElseClause
end -- dangling End IfStatement
-- trailing IfStatement

if 1 then
-- body IfClause
end
"
`;

Expand Down
4 changes: 4 additions & 0 deletions test/comments/if.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,3 +21,7 @@ else -- dangling ElseClause
-- body ElseClause
end -- dangling End IfStatement
-- trailing IfStatement

if 1 then
-- body IfClause
end