commit fbbccd8f64ec2da2f22586d099f721c0da1d6f4c
author scottmg <scottmg@chromium.org> Wed Dec 03 15:19:31 2014 -0800
committer Commit bot <commit-bot@chromium.org> Wed Dec 03 23:19:47 2014 +0000
tree 6c37125929eac40ede5bf219297fba05f44379dc
parent 4f460ae84c460f9dc1f830f59ed223dea92314d4

gn format: cosmetic changes to AnnotatePreferredMultilineAssignment

No intended functionality change.

R=tfarina@chromium.org
BUG=348474

Review URL: https://codereview.chromium.org/778833002

Cr-Original-Commit-Position: refs/heads/master@{#306705}
Cr-Mirrored-From: https://chromium.googlesource.com/chromium/src
Cr-Mirrored-Commit: eafa81ac5ab4a6870f6e4297c7beebc684a9c6d5

tools/gn/command_format.cc

diff --git a/tools/gn/command_format.cc b/tools/gn/command_format.cc
index 456ea0f..7128577 100644
--- a/tools/gn/command_format.cc
+++ b/tools/gn/command_format.cc
@@ -118,7 +118,7 @@
   bool HaveBlankLine();
 
   // Flag assignments to sources, deps, etc. to make their RHSs multiline.
-  void AnnotatePreferedMultilineAssignment(const BinaryOpNode* binop);
+  void AnnotatePreferredMultilineAssignment(const BinaryOpNode* binop);
 
   // Heuristics to decide if there should be a blank line added between two
   // items. For various "small" items, it doesn't look nice if there's too much
@@ -281,20 +281,18 @@
   return n > 2 && output_[n - 1] == '\n' && output_[n - 2] == '\n';
 }
 
-void Printer::AnnotatePreferedMultilineAssignment(const BinaryOpNode* binop) {
+void Printer::AnnotatePreferredMultilineAssignment(const BinaryOpNode* binop) {
   const IdentifierNode* ident = binop->left()->AsIdentifier();
   const ListNode* list = binop->right()->AsList();
   // This is somewhat arbitrary, but we include the 'deps'- and 'sources'-like
   // things, but not flags things.
-  if (binop->op().value() == "=" && ident && list &&
-      (ident->value().value() == "data" ||
-       ident->value().value() == "datadeps" ||
-       ident->value().value() == "deps" || ident->value().value() == "inputs" ||
-       ident->value().value() == "outputs" ||
-       ident->value().value() == "public" ||
-       ident->value().value() == "public_deps" ||
-       ident->value().value() == "sources")) {
-    const_cast<ListNode*>(list)->set_prefer_multiline(true);
+  if (binop->op().value() == "=" && ident && list) {
+    const base::StringPiece lhs = ident->value().value();
+    if (lhs == "data" || lhs == "datadeps" || lhs == "deps" ||
+        lhs == "inputs" || lhs == "outputs" || lhs == "public" ||
+        lhs == "public_deps" || lhs == "sources") {
+      const_cast<ListNode*>(list)->set_prefer_multiline(true);
+    }
   }
 }
 
@@ -432,7 +430,7 @@
     }
   } else if (const BinaryOpNode* binop = root->AsBinaryOp()) {
     CHECK(precedence_.find(binop->op().value()) != precedence_.end());
-    AnnotatePreferedMultilineAssignment(binop);
+    AnnotatePreferredMultilineAssignment(binop);
 
     Precedence prec = precedence_[binop->op().value()];