--- a/java.source.base/src/org/netbeans/modules/java/source/save/Reformatter.java +++ a/java.source.base/src/org/netbeans/modules/java/source/save/Reformatter.java @@ -2321,7 +2321,7 @@ StatementTree elseStat = node.getElseStatement(); CodeStyle.BracesGenerationStyle redundantIfBraces = cs.redundantIfBraces(); if ((elseStat != null && redundantIfBraces == CodeStyle.BracesGenerationStyle.ELIMINATE && danglingElseChecker.hasDanglingElse(node.getThenStatement())) || - (redundantIfBraces == CodeStyle.BracesGenerationStyle.GENERATE && (startOffset > sp.getStartPosition(root, node) || endOffset < sp.getEndPosition(root, node) || node.getCondition().getKind() == Tree.Kind.ERRONEOUS))) + (redundantIfBraces == CodeStyle.BracesGenerationStyle.GENERATE && (startOffset > sp.getStartPosition(root, node) || endOffset <= sp.getEndPosition(root, node) || node.getCondition().getKind() == Tree.Kind.ERRONEOUS))) redundantIfBraces = CodeStyle.BracesGenerationStyle.LEAVE_ALONE; lastIndent = indent; boolean prevblock = wrapStatement(cs.wrapIfStatement(), redundantIfBraces, cs.spaceBeforeIfLeftBrace() ? 1 : 0, node.getThenStatement());