Replace referrals to options by their name to option definitions.

Now that we have a standard way of referring to an option, remove all of the places that we were referring to them by their name. Since options can have multiple names, this is more clear and provides the additional information needed to understand the option. It also stops the habit of requesting unqualified strings, which was hard to read.

RELNOTES: None.
PiperOrigin-RevId: 168254584

1 files changed, 5 insertions, 4 deletions

diff --git a/src/main/java/com/google/devtools/build/lib/runtime/BlazeCommandDispatcher.java b/src/main/java/com/google/devtools/build/lib/runtime/BlazeCommandDispatcher.java
index ea430730f8..df97889f53 100644
--- a/src/main/java/com/google/devtools/build/lib/runtime/BlazeCommandDispatcher.java
+++ b/src/main/java/com/google/devtools/build/lib/runtime/BlazeCommandDispatcher.java
@@ -14,7 +14,6 @@
 package com.google.devtools.build.lib.runtime;
 
 import com.google.common.annotations.VisibleForTesting;
-import com.google.common.base.Function;
 import com.google.common.base.Joiner;
 import com.google.common.base.Predicates;
 import com.google.common.base.Throwables;
@@ -51,6 +50,7 @@ import com.google.devtools.build.lib.vfs.FileSystemUtils;
 import com.google.devtools.build.lib.vfs.Path;
 import com.google.devtools.common.options.InvocationPolicyEnforcer;
 import com.google.devtools.common.options.OpaqueOptionsData;
+import com.google.devtools.common.options.OptionDefinition;
 import com.google.devtools.common.options.OptionPriority;
 import com.google.devtools.common.options.OptionsParser;
 import com.google.devtools.common.options.OptionsParsingException;
@@ -68,6 +68,7 @@ import java.util.List;
 import java.util.Optional;
 import java.util.Set;
 import java.util.concurrent.atomic.AtomicReference;
+import java.util.function.Function;
 import java.util.logging.Level;
 import javax.annotation.Nullable;
 
@@ -207,9 +208,9 @@ public class BlazeCommandDispatcher {
       OptionsParser optionsParser, Command commandAnnotation, List<String> args,
       List<String> rcfileNotes, ExtendedEventHandler eventHandler)
           throws OptionsParsingException {
-    Function<String, String> commandOptionSourceFunction =
-        input -> {
-          if (INTERNAL_COMMAND_OPTIONS.contains(input)) {
+    Function<OptionDefinition, String> commandOptionSourceFunction =
+        option -> {
+          if (INTERNAL_COMMAND_OPTIONS.contains(option.getOptionName())) {
             return "options generated by " + runtime.getProductName() + " launcher";
           } else {
             return "command line options";