Skip to content

Mention --replace instead of --in-place in the dry-run error #1451

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
rootkiller6788 wants to merge 1 commit into
base: master
Choose a base branch
from
+11 −2
Open

Mention --replace instead of --in-place in the dry-run error #1451

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 core/src/main/java/com/google/googlejavaformat/java/Main.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -277,7 +277,7 @@ static CommandLineOptions processArgs(String... args) throws UsageException {
"--assume-filename is only supported when formatting standard input");
}
if (parameters.dryRun() && parameters.inPlace()) {
throw new UsageException("cannot use --dry-run and --in-place at the same time");
throw new UsageException("cannot use --dry-run and --replace at the same time");
}
return parameters;
}
Expand Down
11 changes: 10 additions & 1 deletion core/src/test/java/com/google/googlejavaformat/java/CommandLineFlagsTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -150,13 +150,22 @@ public void inPlaceStdin() {

@Test
public void inPlaceDryRun() {
try {
Main.processArgs("--replace", "--dry-run", "A.java");
fail();
} catch (UsageException e) {
assertThat(e)
.hasMessageThat()
.contains("cannot use --dry-run and --replace at the same time");
}

try {
Main.processArgs("-i", "-n", "A.java");
fail();
} catch (UsageException e) {
assertThat(e)
.hasMessageThat()
.contains("cannot use --dry-run and --in-place at the same time");
.contains("cannot use --dry-run and --replace at the same time");
}
}

Expand Down