commit 9911c78235919577170575f6447554927fdc4a64
author Julie Hockett <juliehockett@google.com> Tue Jul 03 11:57:43 2018 -0700
committer Commit Bot <commit-bot@chromium.org> Wed Jul 04 00:10:04 2018 +0000
tree fd92c1425d6e368253f6bfa29cae4f4b95799050
parent 39687ba9d8fbc653fcd8ef59cc080879c407d6c7

[command_args] Properly set file and line in dict

The if statement was preventing *any* files from being output in the
json. It's better to simply output the blank file string with the line
number (in the dotfile).

Change-Id: I57df561a095588a187c9b2757d417c3da4b2eab5
Reviewed-on: https://gn-review.googlesource.com/2100
Reviewed-by: Brett Wilson <brettw@chromium.org>
Commit-Queue: Brett Wilson <brettw@chromium.org>

tools/gn/command_args.cc

diff --git a/tools/gn/command_args.cc b/tools/gn/command_args.cc
index 4e3a43f..9980333 100644
--- a/tools/gn/command_args.cc
+++ b/tools/gn/command_args.cc
@@ -181,11 +181,8 @@
       std::string location, comment;
       GetContextForValue(arg.override_value, &location, &line_no, &comment,
                          /*pad_comment=*/false);
-      // Omit file and line if set with --args (i.e. no file)
-      if (!location.empty()) {
-        override_dict.SetKey("file", base::Value(location));
-        override_dict.SetKey("line", base::Value(line_no));
-      }
+      override_dict.SetKey("file", base::Value(location));
+      override_dict.SetKey("line", base::Value(line_no));
     }
     dict.SetKey("current", std::move(override_dict));
   }
@@ -199,11 +196,8 @@
     std::string location;
     GetContextForValue(arg.default_value, &location, &line_no, &comment,
                        /*pad_comment=*/false);
-    // Only emit file and line if the value is overridden.
-    if (arg.has_override) {
-      default_dict.SetKey("file", base::Value(location));
-      default_dict.SetKey("line", base::Value(line_no));
-    }
+    default_dict.SetKey("file", base::Value(location));
+    default_dict.SetKey("line", base::Value(line_no));
   }
   dict.SetKey("default", std::move(default_dict));
   if (!comment.empty() && !short_only)