commit 4acb36c048a620abd7a0f5dff274851bd6dd9c28
author ccalvarin <ccalvarin@google.com> Thu Sep 21 00:35:35 2017 +0200
committer László Csomor <laszlocsomor@google.com> Thu Sep 21 11:04:27 2017 +0200
tree ab02731947235a5abc881c94a86caaead7830a77
parent 0e7051a55ab0396feeea7b6f9750594a02ef9c34

Cleanup of expansion option naming

Options that expand to other options are expansion options and the options they expand to have values that were expansions. This can be a bit confusing. Removes the isExpansion() call that is somewhat ambiguous, and forces option users to explicitly check the option definition for this information.

Also provide a parallel boolean function for implicit requirements, so that we stop querying for the length of the implicit requirement all over the place.

RELNOTES: None.
PiperOrigin-RevId: 169461566

src/main/java/com/google/devtools/common/options/OptionsUsage.java

diff --git a/src/main/java/com/google/devtools/common/options/OptionsUsage.java b/src/main/java/com/google/devtools/common/options/OptionsUsage.java
index f481734..68a460e 100644
--- a/src/main/java/com/google/devtools/common/options/OptionsUsage.java
+++ b/src/main/java/com/google/devtools/common/options/OptionsUsage.java
@@ -146,7 +146,7 @@
       usage.append(paragraphFill(expandsMsg.toString(), /*indent=*/ 6, /*width=*/ 80));
       usage.append('\n');
     }
-    if (optionDefinition.getImplicitRequirements().length > 0) {
+    if (optionDefinition.hasImplicitRequirements()) {
       StringBuilder requiredMsg = new StringBuilder("Using this option will also add: ");
       for (String req : optionDefinition.getImplicitRequirements()) {
         requiredMsg.append(req).append(" ");