Skip to content
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

Patch formatting #52

Open
wants to merge 8 commits into
base: develop
Choose a base branch
from
Open

Patch formatting #52

Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
b61401f
Create fork-sync.yml
nbauma109 Feb 14, 2022
d52e076
Update fork-sync.yml
nbauma109 Feb 15, 2022
e5b1f3e
Merge pull request #2 from mstrobel/develop
github-actions[bot] Feb 15, 2022
b960098
Merge pull request #3 from mstrobel/develop
github-actions[bot] Feb 21, 2022
e8a4d90
try/catch formatting
Mar 19, 2022
b909a25
Version 1.0-SNAPSHOT
Mar 19, 2022
5961f42
try/catch/finally and if/else formatting policy
Mar 19, 2022
8f1471a
format try/finally
Mar 25, 2022
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: 22 additions & 3 deletions ....CompilerTools/src/main/java/com/strobel/decompiler/languages/java/JavaOutputVisitor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@
import com.strobel.assembler.ir.attributes.AttributeNames;
import com.strobel.assembler.ir.attributes.LineNumberTableAttribute;
import com.strobel.assembler.ir.attributes.ModuleAttribute;
import com.strobel.assembler.ir.attributes.PermittedSubclassesAttribute;
import com.strobel.assembler.ir.attributes.SourceAttribute;
import com.strobel.assembler.metadata.*;
import com.strobel.core.ArrayUtilities;
Expand Down Expand Up @@ -959,7 +958,27 @@ else if (parent instanceof WhileStatement) {
}

if (!(parent instanceof Expression || parent instanceof DoWhileStatement)) {
newLine();
if ((parent.getNextSibling() != null && parent.getNextSibling().getRole() == TryCatchStatement.FINALLY_BLOCK_ROLE) || (node.getRole() == TryCatchStatement.TRY_BLOCK_ROLE && node.getNextSibling().getRole() == TryCatchStatement.FINALLY_BLOCK_ROLE)) {
if (policy.PlaceFinallyOnNewLine) {
newLine();
} else {
space();
}
} else if (parent.getNextSibling() instanceof CatchClause || (parent instanceof TryCatchStatement && node.getNextSibling() instanceof CatchClause)) {
if (policy.PlaceCatchOnNewLine) {
newLine();
} else {
space();
}
} else if (parent instanceof IfElseStatement && node.getRole() == IfElseStatement.TRUE_ROLE && node != parent.getLastChild()) {
if (policy.PlaceElseOnNewLine) {
newLine();
} else {
space();
}
} else {
newLine();
}
}

endNode(node);
Expand Down Expand Up @@ -2695,7 +2714,7 @@ public Void visitArrayCreationExpression(final ArrayCreationExpression node, fin

boolean needType = true;

//noinspection RedundantIfStatement
// noinspection RedundantIfStatement
if (node.getDimensions().isEmpty() &&
node.getType() != null &&
(node.getParent() instanceof ArrayInitializerExpression ||
Expand Down