Skip to content

Fix record reformatting for alternative brace positioning. #9480

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
neilcsmith-net wants to merge 1 commit into
base: master
Choose a base branch
from
+250 −149
Open

Fix record reformatting for alternative brace positioning. #9480

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
296 changes: 151 additions & 145 deletions java/java.source.base/src/org/netbeans/modules/java/source/save/Reformatter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1275,173 +1275,179 @@ public Boolean visitVariable(VariableTree node, Void p) {
}

private Boolean scanRecord(ClassTree node, Void p) {
boolean old = continuationIndent;
int oldIndent = indent;
try {
ModifiersTree mods = node.getModifiers();
if (mods != null) {
if (scan(mods, p)) {
continuationIndent = true;
if (cs.placeNewLineAfterModifiers()) {
newline();
} else {
space();
}
} else if (afterAnnotation) {
boolean oldContinuationIndent = continuationIndent;
ModifiersTree mods = node.getModifiers();
if (mods != null) {
if (scan(mods, p)) {
continuationIndent = true;
if (cs.placeNewLineAfterModifiers()) {
newline();
} else {
space();
}
afterAnnotation = false;
} else if (afterAnnotation) {
newline();
}
accept(IDENTIFIER);
continuationIndent = true;
space();
afterAnnotation = false;
}
accept(IDENTIFIER);
continuationIndent = true;
space();

if (!ERROR.contentEquals(node.getSimpleName())) {
accept(IDENTIFIER, UNDERSCORE);
}
if (!ERROR.contentEquals(node.getSimpleName())) {
accept(IDENTIFIER, UNDERSCORE);
}

List<? extends TypeParameterTree> tparams = node.getTypeParameters();
if (tparams != null && !tparams.isEmpty()) {
if (LT == accept(LT)) {
tpLevel++;
}
List<? extends TypeParameterTree> tparams = node.getTypeParameters();
if (tparams != null && !tparams.isEmpty()) {
if (LT == accept(LT)) {
tpLevel++;
}

for (Iterator<? extends TypeParameterTree> it = tparams.iterator(); it.hasNext();) {
TypeParameterTree tparam = it.next();
scan(tparam, p);
if (it.hasNext()) {
spaces(cs.spaceBeforeComma() ? 1 : 0);
accept(COMMA);
spaces(cs.spaceAfterComma() ? 1 : 0);
}
for (Iterator<? extends TypeParameterTree> it = tparams.iterator(); it.hasNext();) {
TypeParameterTree tparam = it.next();
scan(tparam, p);
if (it.hasNext()) {
spaces(cs.spaceBeforeComma() ? 1 : 0);
accept(COMMA);
spaces(cs.spaceAfterComma() ? 1 : 0);
}
JavaTokenId accepted;
if (tpLevel > 0 && (accepted = accept(GT, GTGT, GTGTGT)) != null) {
switch (accepted) {
case GTGTGT:
tpLevel -= 3;
break;
case GTGT:
tpLevel -= 2;
break;
case GT:
tpLevel--;
break;
}
}
JavaTokenId accepted;
if (tpLevel > 0 && (accepted = accept(GT, GTGT, GTGTGT)) != null) {
switch (accepted) {
case GTGTGT:
tpLevel -= 3;
break;
case GTGT:
tpLevel -= 2;
break;
case GT:
tpLevel--;
break;
}
spaces(0, true);
}
spaces(0, true);
}

spaces(cs.spaceBeforeMethodDeclParen() ? 1 : 0);
accept(LPAREN);
List<? extends Tree> members = node.getMembers();
List recParams = new ArrayList<Tree>();
spaces(cs.spaceBeforeMethodDeclParen() ? 1 : 0);
accept(LPAREN);

for (Tree member : members) {
if (member.getKind() == Tree.Kind.VARIABLE) {
ModifiersTree modifiers = ((VariableTree) member).getModifiers();
Set<Modifier> modifierSet = modifiers.getFlags();
List<? extends Tree> members = node.getMembers();
List recParams = new ArrayList<Tree>();

if (!modifierSet.contains(Modifier.STATIC)) {
recParams.add(member);
}
for (Tree member : members) {
if (member.getKind() == Tree.Kind.VARIABLE) {
ModifiersTree modifiers = ((VariableTree) member).getModifiers();
Set<Modifier> modifierSet = modifiers.getFlags();

if (!modifierSet.contains(Modifier.STATIC)) {
recParams.add(member);
}
}
}

if (!recParams.isEmpty()) {
spaces(cs.spaceWithinMethodDeclParens() ? 1 : 0, true);
wrapList(cs.wrapMethodParams(), cs.alignMultilineMethodParams(), false, COMMA, recParams);
spaces(cs.spaceWithinMethodDeclParens() ? 1 : 0, true); // solves #7403
}
accept(RPAREN);
List<? extends Tree> impls = node.getImplementsClause();
if (impls != null && !impls.isEmpty()) {
wrapToken(cs.wrapExtendsImplementsKeyword(), 1, IMPLEMENTS);
wrapList(cs.wrapExtendsImplementsList(), cs.alignMultilineImplements(), true, COMMA, impls);
}
int oldLastIndent = lastIndent;
int lastMaxPreservedBlankLines = maxPreservedBlankLines;
maxPreservedBlankLines = cs.getMaximumBlankLinesInDeclarations();

CodeStyle.BracePlacement bracePlacement = cs.getClassDeclBracePlacement();
boolean spaceBeforeLeftBrace = cs.spaceBeforeClassDeclLeftBrace();
switch (bracePlacement) {
case SAME_LINE:
spaces(spaceBeforeLeftBrace ? 1 : 0, tokens.offset() < startOffset);
accept(LBRACE);
if (tokens.token().id() == RBRACE) {
accept(RBRACE);
indent = oldIndent;
lastIndent = oldLastIndent;
return true;
}
indent = lastIndent + indentSize;
break;
case NEW_LINE:
newline();
accept(LBRACE);
indent = lastIndent + indentSize;
break;
case NEW_LINE_HALF_INDENTED:
int oldLast = lastIndent;
indent = lastIndent + (indentSize >> 1);
newline();
accept(LBRACE);
indent = oldLast + indentSize;
break;
case NEW_LINE_INDENTED:
indent = lastIndent + indentSize;
newline();
accept(LBRACE);
break;
}
if (!recParams.isEmpty()) {
spaces(cs.spaceWithinMethodDeclParens() ? 1 : 0, true);
wrapList(cs.wrapMethodParams(), cs.alignMultilineMethodParams(), false, COMMA, recParams);
spaces(cs.spaceWithinMethodDeclParens() ? 1 : 0, true); // solves #7403
}
accept(RPAREN);
List<? extends Tree> impls = node.getImplementsClause();
if (impls != null && !impls.isEmpty()) {
wrapToken(cs.wrapExtendsImplementsKeyword(), 1, IMPLEMENTS);
wrapList(cs.wrapExtendsImplementsList(), cs.alignMultilineImplements(), true, COMMA, impls);
}
continuationIndent = oldContinuationIndent;

continuationIndent = old;
try {
if (members != null && !members.isEmpty()) {
int lastMaxPreservedBlankLines = maxPreservedBlankLines;
maxPreservedBlankLines = cs.getMaximumBlankLinesInDeclarations();

boolean isFirstMember = true;
blankLines(node.getSimpleName().length() == 0 ? 0 : cs.getBlankLinesAfterClassHeader());
for (Tree member : members) {
if (recParams.contains(member)) {
continue;
}
blankLines(0);
switch (member.getKind()) {
case VARIABLE:
boolean b = tokens.moveNext();
if (b) {
tokens.movePrevious();
if (!isFirstMember) {
blankLines(cs.getBlankLinesBeforeFields());
}
scan(member, p);
blankLines(cs.getBlankLinesAfterFields());
}
break;
default:
if (!isFirstMember) {
blankLines(cs.getBlankLinesBeforeMethods());
}
scan(member, p);
blankLines(cs.getBlankLinesAfterMethods());
CodeStyle.BracePlacement bracePlacement = cs.getClassDeclBracePlacement();
boolean spaceBeforeLeftBrace = cs.spaceBeforeClassDeclLeftBrace();

// check for empty {} body and leave as is across all brace placement modes
int i = tokens.index();
int c = col;
Diff d = diffs.isEmpty() ? null : diffs.getFirst();
spaces(spaceBeforeLeftBrace ? 1 : 0, tokens.offset() < startOffset);
accept(LBRACE);
if (tokens.token().id() == RBRACE) {
accept(RBRACE);
return true;
} else {
// not empty body so rollback and continue
rollback(i, c, d);
}

int oldIndent = indent = lastIndent;
int halfIndent = lastIndent;
switch (bracePlacement) {
case SAME_LINE:
spaces(spaceBeforeLeftBrace ? 1 : 0, tokens.offset() < startOffset);
accept(LBRACE);
indent = lastIndent + indentSize;
break;
case NEW_LINE:
newline();
accept(LBRACE);
indent = lastIndent + indentSize;
break;
case NEW_LINE_HALF_INDENTED:
int oldLast = lastIndent;
indent = lastIndent + (indentSize >> 1);
halfIndent = indent;
newline();
accept(LBRACE);
indent = oldLast + indentSize;
break;
case NEW_LINE_INDENTED:
indent = lastIndent + indentSize;
halfIndent = indent;
newline();
accept(LBRACE);
break;
}

if (members != null && !members.isEmpty()) {

boolean isFirstMember = true;
blankLines(node.getSimpleName().length() == 0 ? 0 : cs.getBlankLinesAfterClassHeader());
for (Tree member : members) {
if (recParams.contains(member)) {
continue;
}
blankLines(0);
switch (member.getKind()) {
case VARIABLE:
boolean b = tokens.moveNext();
if (b) {
tokens.movePrevious();
if (!isFirstMember) {
blankLines(cs.getBlankLinesBeforeFields());
}
scan(member, p);
blankLines(cs.getBlankLinesAfterFields());
}
if (isFirstMember) {
isFirstMember = false;
break;
default:
if (!isFirstMember) {
blankLines(cs.getBlankLinesBeforeMethods());
}
}
scan(member, p);
blankLines(cs.getBlankLinesAfterMethods());
}
if (isFirstMember) {
isFirstMember = false;
}
} finally {
indent = oldIndent;
lastIndent = oldLastIndent;
continuationIndent = old;
maxPreservedBlankLines = lastMaxPreservedBlankLines;
}
newline();
accept(RBRACE);
} finally {
continuationIndent = old;
}
indent = halfIndent;
newline();
accept(RBRACE);
indent = lastIndent = oldIndent;
continuationIndent = oldContinuationIndent;
maxPreservedBlankLines = lastMaxPreservedBlankLines;
return true;
}

Expand Down
Loading
Loading