Skip to content

Better display of localVariableDeclarationStatement modifiers #283

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

Merged
clementdessoude merged 1 commit into from
Oct 15, 2019
Merged

Better display of localVariableDeclarationStatement modifiers #283

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
20 changes: 13 additions & 7 deletions packages/prettier-plugin-java/src/printers/blocks-and-statements.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,8 @@ const {
rejectSeparators,
putIntoBraces,
putIntoCurlyBraces,
isStatementEmptyStatement
isStatementEmptyStatement,
sortModifiers
} = require("./printer-utils");

class BlocksAndStatementPrettierVisitor {
Expand Down Expand Up @@ -54,15 +55,20 @@ class BlocksAndStatementPrettierVisitor {
}

localVariableDeclaration(ctx) {
const variableModifiers = this.mapVisit(ctx.variableModifier);
const modifiers = sortModifiers(ctx.variableModifier);
const firstAnnotations = this.mapVisit(modifiers[0]);
const finalModifiers = this.mapVisit(modifiers[1]);

const localVariableType = this.visit(ctx.localVariableType);
const variableDeclaratorList = this.visit(ctx.variableDeclaratorList);
return group(
rejectAndJoin(line, [
rejectAndJoin(" ", variableModifiers),
rejectAndJoin(" ", [localVariableType, variableDeclaratorList])
return rejectAndJoin(hardline, [
rejectAndJoin(hardline, firstAnnotations),
rejectAndJoin(" ", [
rejectAndJoin(" ", finalModifiers),
localVariableType,
variableDeclaratorList
])
);
]);
}

localVariableType(ctx) {
Expand Down
21 changes: 21 additions & 0 deletions packages/prettier-plugin-java/test/unit-test/variables/_input.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,4 +52,25 @@ public void multipleVariableDeclaration() {
Map<String, String> map = new HashMap<>();
}

public boolean localVariableDeclarationWhichBreak() {
@Nullable final BackupStatus lastStatus = BackupStatus.fromDbValue(backupRepository.getLastStatus());

final BackupStatus lastStatus = BackupStatus.fromDbValue(backupRepository.getLastStatus());

@Nullable
BackupStatus lastStatus = BackupStatus.fromDbValue(backupRepository.getLastStatus());

BackupStatus lastStatus = BackupStatus.fromDbValue(backupRepository.getLastStatus());
}

public boolean localVariableDeclarationWhichDoNotBreak() {
@Nullable final BackupStatus lastStatus = value;

final BackupStatus lastStatus = value;

@Nullable BackupStatus lastStatus = value;

BackupStatus lastStatus = value;
}

}
32 changes: 32 additions & 0 deletions packages/prettier-plugin-java/test/unit-test/variables/_output.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,4 +65,36 @@ public void multipleVariableDeclaration() {
String str = new String();
Map<String, String> map = new HashMap<>();
}

public boolean localVariableDeclarationWhichBreak() {
@Nullable
final BackupStatus lastStatus = BackupStatus.fromDbValue(
backupRepository.getLastStatus()
);

final BackupStatus lastStatus = BackupStatus.fromDbValue(
backupRepository.getLastStatus()
);

@Nullable
BackupStatus lastStatus = BackupStatus.fromDbValue(
backupRepository.getLastStatus()
);

BackupStatus lastStatus = BackupStatus.fromDbValue(
backupRepository.getLastStatus()
);
}

public boolean localVariableDeclarationWhichDoNotBreak() {
@Nullable
final BackupStatus lastStatus = value;

final BackupStatus lastStatus = value;

@Nullable
BackupStatus lastStatus = value;

BackupStatus lastStatus = value;
}
}