Track Option placement within a priority category.

An option has precedence over previous options at the same enum-valued priority. Track its placement in this ordering explicitly.

This will allow after-the-fact expansion of expansion options such that they correctly take precedence or not compared to other mentions of the same flag. This is needed to fix --config's expansion.

RELNOTES: None.
PiperOrigin-RevId: 172367996

2 files changed, 18 insertions, 18 deletions

diff --git a/src/test/java/com/google/devtools/build/lib/runtime/CommandLineEventTest.java b/src/test/java/com/google/devtools/build/lib/runtime/CommandLineEventTest.java
index 44724f1166..aaeec5b094 100644
--- a/src/test/java/com/google/devtools/build/lib/runtime/CommandLineEventTest.java
+++ b/src/test/java/com/google/devtools/build/lib/runtime/CommandLineEventTest.java
@@ -27,7 +27,7 @@ import com.google.devtools.build.lib.runtime.proto.CommandLineOuterClass.Command
 import com.google.devtools.build.lib.runtime.proto.CommandLineOuterClass.CommandLineSection.SectionTypeCase;
 import com.google.devtools.build.lib.runtime.proto.CommandLineOuterClass.OptionList;
 import com.google.devtools.build.lib.util.Pair;
-import com.google.devtools.common.options.OptionPriority;
+import com.google.devtools.common.options.OptionPriority.PriorityCategory;
 import com.google.devtools.common.options.OptionsParser;
 import com.google.devtools.common.options.OptionsParsingException;
 import com.google.devtools.common.options.TestOptions;
@@ -217,15 +217,15 @@ public class CommandLineEventTest {
         OptionsParser.newOptionsParser(BlazeServerStartupOptions.class);
     OptionsParser fakeCommandOptions = OptionsParser.newOptionsParser(TestOptions.class);
     fakeCommandOptions.parse(
-        OptionPriority.COMMAND_LINE,
+        PriorityCategory.COMMAND_LINE,
         "command line",
         ImmutableList.of("--test_string=foo", "--test_multiple_string=bar"));
     fakeCommandOptions.parse(
-        OptionPriority.INVOCATION_POLICY,
+        PriorityCategory.INVOCATION_POLICY,
         "fake invocation policy",
         ImmutableList.of("--expanded_c=2"));
     fakeCommandOptions.parse(
-        OptionPriority.RC_FILE, "fake rc file", ImmutableList.of("--test_multiple_string=baz"));
+        PriorityCategory.RC_FILE, "fake rc file", ImmutableList.of("--test_multiple_string=baz"));
 
     CommandLine line =
         new OriginalCommandLineEvent(
@@ -260,15 +260,15 @@ public class CommandLineEventTest {
         OptionsParser.newOptionsParser(BlazeServerStartupOptions.class);
     OptionsParser fakeCommandOptions = OptionsParser.newOptionsParser(TestOptions.class);
     fakeCommandOptions.parse(
-        OptionPriority.COMMAND_LINE,
+        PriorityCategory.COMMAND_LINE,
         "command line",
         ImmutableList.of("--test_string=foo", "--test_multiple_string=bar"));
     fakeCommandOptions.parse(
-        OptionPriority.INVOCATION_POLICY,
+        PriorityCategory.INVOCATION_POLICY,
         "fake invocation policy",
         ImmutableList.of("--expanded_c=2"));
     fakeCommandOptions.parse(
-        OptionPriority.RC_FILE, "fake rc file", ImmutableList.of("--test_multiple_string=baz"));
+        PriorityCategory.RC_FILE, "fake rc file", ImmutableList.of("--test_multiple_string=baz"));
 
     CommandLine line =
         new CanonicalCommandLineEvent(
@@ -303,7 +303,7 @@ public class CommandLineEventTest {
         OptionsParser.newOptionsParser(BlazeServerStartupOptions.class);
     OptionsParser fakeCommandOptions = OptionsParser.newOptionsParser(TestOptions.class);
     fakeCommandOptions.parse(
-        OptionPriority.COMMAND_LINE, "command line", ImmutableList.of("--test_expansion"));
+        PriorityCategory.COMMAND_LINE, "command line", ImmutableList.of("--test_expansion"));
 
     CommandLine line =
         new OriginalCommandLineEvent(
@@ -335,7 +335,7 @@ public class CommandLineEventTest {
         OptionsParser.newOptionsParser(BlazeServerStartupOptions.class);
     OptionsParser fakeCommandOptions = OptionsParser.newOptionsParser(TestOptions.class);
     fakeCommandOptions.parse(
-        OptionPriority.COMMAND_LINE, "command line", ImmutableList.of("--test_expansion"));
+        PriorityCategory.COMMAND_LINE, "command line", ImmutableList.of("--test_expansion"));
 
     CommandLine line =
         new CanonicalCommandLineEvent(
@@ -375,7 +375,7 @@ public class CommandLineEventTest {
         OptionsParser.newOptionsParser(BlazeServerStartupOptions.class);
     OptionsParser fakeCommandOptions = OptionsParser.newOptionsParser(TestOptions.class);
     fakeCommandOptions.parse(
-        OptionPriority.COMMAND_LINE,
+        PriorityCategory.COMMAND_LINE,
         "command line",
         ImmutableList.of("--test_implicit_requirement=foo"));
 
@@ -409,7 +409,7 @@ public class CommandLineEventTest {
         OptionsParser.newOptionsParser(BlazeServerStartupOptions.class);
     OptionsParser fakeCommandOptions = OptionsParser.newOptionsParser(TestOptions.class);
     fakeCommandOptions.parse(
-        OptionPriority.COMMAND_LINE,
+        PriorityCategory.COMMAND_LINE,
         "command line",
         ImmutableList.of("--test_implicit_requirement=foo"));
 
diff --git a/src/test/java/com/google/devtools/build/lib/util/OptionsUtilsTest.java b/src/test/java/com/google/devtools/build/lib/util/OptionsUtilsTest.java
index aa23d2a581..ddf8dadda9 100644
--- a/src/test/java/com/google/devtools/build/lib/util/OptionsUtilsTest.java
+++ b/src/test/java/com/google/devtools/build/lib/util/OptionsUtilsTest.java
@@ -23,7 +23,7 @@ import com.google.devtools.common.options.Option;
 import com.google.devtools.common.options.OptionDocumentationCategory;
 import com.google.devtools.common.options.OptionEffectTag;
 import com.google.devtools.common.options.OptionMetadataTag;
-import com.google.devtools.common.options.OptionPriority;
+import com.google.devtools.common.options.OptionPriority.PriorityCategory;
 import com.google.devtools.common.options.OptionsBase;
 import com.google.devtools.common.options.OptionsParser;
 import java.util.Arrays;
@@ -96,8 +96,8 @@ public class OptionsUtilsTest {
   @Test
   public void asStringOfExplicitOptionsCorrectSortingByPriority() throws Exception {
     OptionsParser parser = OptionsParser.newOptionsParser(IntrospectionExample.class);
-    parser.parse(OptionPriority.COMMAND_LINE, null, Arrays.asList("--alpha=no"));
-    parser.parse(OptionPriority.COMPUTED_DEFAULT, null, Arrays.asList("--beta=no"));
+    parser.parse(PriorityCategory.COMMAND_LINE, null, Arrays.asList("--alpha=no"));
+    parser.parse(PriorityCategory.COMPUTED_DEFAULT, null, Arrays.asList("--beta=no"));
     assertThat(OptionsUtils.asShellEscapedString(parser)).isEqualTo("--beta=no --alpha=no");
     assertThat(OptionsUtils.asArgumentList(parser))
         .containsExactly("--beta=no", "--alpha=no")
@@ -127,14 +127,14 @@ public class OptionsUtilsTest {
   @Test
   public void asStringOfExplicitOptionsWithBooleans() throws Exception {
     OptionsParser parser = OptionsParser.newOptionsParser(BooleanOpts.class);
-    parser.parse(OptionPriority.COMMAND_LINE, null, Arrays.asList("--b_one", "--nob_two"));
+    parser.parse(PriorityCategory.COMMAND_LINE, null, Arrays.asList("--b_one", "--nob_two"));
     assertThat(OptionsUtils.asShellEscapedString(parser)).isEqualTo("--b_one --nob_two");
     assertThat(OptionsUtils.asArgumentList(parser))
         .containsExactly("--b_one", "--nob_two")
         .inOrder();
 
     parser = OptionsParser.newOptionsParser(BooleanOpts.class);
-    parser.parse(OptionPriority.COMMAND_LINE, null, Arrays.asList("--b_one=true", "--b_two=0"));
+    parser.parse(PriorityCategory.COMMAND_LINE, null, Arrays.asList("--b_one=true", "--b_two=0"));
     assertThat(parser.getOptions(BooleanOpts.class).bOne).isTrue();
     assertThat(parser.getOptions(BooleanOpts.class).bTwo).isFalse();
     assertThat(OptionsUtils.asShellEscapedString(parser)).isEqualTo("--b_one --nob_two");
@@ -146,8 +146,8 @@ public class OptionsUtilsTest {
   @Test
   public void asStringOfExplicitOptionsMultipleOptionsAreMultipleTimes() throws Exception {
     OptionsParser parser = OptionsParser.newOptionsParser(IntrospectionExample.class);
-    parser.parse(OptionPriority.COMMAND_LINE, null, Arrays.asList("--alpha=one"));
-    parser.parse(OptionPriority.COMMAND_LINE, null, Arrays.asList("--alpha=two"));
+    parser.parse(PriorityCategory.COMMAND_LINE, null, Arrays.asList("--alpha=one"));
+    parser.parse(PriorityCategory.COMMAND_LINE, null, Arrays.asList("--alpha=two"));
     assertThat(OptionsUtils.asShellEscapedString(parser)).isEqualTo("--alpha=one --alpha=two");
     assertThat(OptionsUtils.asArgumentList(parser))
         .containsExactly("--alpha=one", "--alpha=two")