Skip to content

Allow multiple args to format #2757

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
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Allow multiple args to format #2757

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
28 changes: 16 additions & 12 deletions smithy-cli/src/main/java/software/amazon/smithy/cli/commands/FormatCommand.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,8 @@
import java.nio.file.Path;
import java.nio.file.Paths;
import java.nio.file.StandardOpenOption;
import java.util.ArrayList;
import java.util.List;
import software.amazon.smithy.cli.ArgumentReceiver;
import software.amazon.smithy.cli.Arguments;
import software.amazon.smithy.cli.CliError;
Expand Down Expand Up @@ -44,8 +46,8 @@ public String getSummary() {
private static final class Options implements ArgumentReceiver {
@Override
public void registerHelp(HelpPrinter printer) {
printer.positional("<MODEL>",
"A single `.smithy` model file or a directory of model files to recursively format.");
printer.positional("<MODELS>",
"`.smithy` model files and directories of model files to recursively format.");
}
}

Expand All @@ -58,6 +60,7 @@ public int execute(Arguments arguments, Env env) {
buffer.println("Examples:");
buffer.println(" smithy format model-file.smithy", ColorTheme.LITERAL);
buffer.println(" smithy format model/", ColorTheme.LITERAL);
buffer.println(" smithy format model-file.smithy model/", ColorTheme.LITERAL);
return buffer.toString();
}, this::run);
return action.apply(arguments, env);
Expand All @@ -66,22 +69,23 @@ public int execute(Arguments arguments, Env env) {
private int run(Arguments arguments, Env env) {
if (arguments.getPositional().isEmpty()) {
throw new CliError("No .smithy model or directory was provided as a positional argument");
} else if (arguments.getPositional().size() > 1) {
throw new CliError("Only a single .smithy model or directory can be provided as a positional argument");
}

String filename = arguments.getPositional().get(0);
Path path = Paths.get(filename);
List<Path> paths = new ArrayList<>(arguments.getPositional().size());
for (String filename : arguments.getPositional()) {
Path path = Paths.get(filename);
paths.add(path);

if (Files.isRegularFile(path)) {
if (!filename.endsWith(".smithy")) {
throw new CliError("`" + filename + "` is not a .smithy model file");
if (Files.isRegularFile(path)) {
if (!filename.endsWith(".smithy")) {
throw new CliError("`" + filename + "` is not a .smithy model file");
}
} else if (!Files.isDirectory(path)) {
throw new CliError("`" + filename + "` is not a valid file or directory");
}
} else if (!Files.isDirectory(path)) {
throw new CliError("`" + filename + "` is not a valid file or directory");
}

formatFile(path);
paths.forEach(this::formatFile);
return 0;
}

Expand Down
Loading