gn format: fix not indenting multiline continued correctly

tools/gn/command_format.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include <sstream>
 
 #include "base/command_line.h"
 #include "base/files/file_util.h"
 #include "base/strings/string_split.h"
 #include "tools/gn/commands.h"
@@ skipping 453 matching lines @@
     int indent_column =
         (is_assignment &&
          (!right_as_list || (!right_as_list->prefer_multiline() &&
                              !ListWillBeMultiline(right_as_list->contents(),
                                                   right_as_list->End()))))
             ? margin() + kIndentSize * 2
             : start_column;
     if (stack_.back().continuation_requires_indent)
       indent_column += kIndentSize * 2;
 
-    stack_.push_back(
-        IndentState(indent_column, false, binop->op().value() == "||"));
+    stack_.push_back(IndentState(indent_column,
+                                 stack_.back().continuation_requires_indent,
+                                 binop->op().value() == "||"));
     Printer sub_left;
     InitializeSub(&sub_left);
     sub_left.Expr(binop->left(),
                   prec_left,
                   std::string(" ") + binop->op().value().as_string());
     bool left_is_multiline = CountLines(sub_left.String()) > 1;
     // Avoid walking the whole left redundantly times (see timing of Format.046)
     // so pull the output and comments from subprinter.
     Print(sub_left.String().substr(start_column));
     std::copy(sub_left.comments_.begin(),
@@ skipping 216 matching lines @@
   // 2. starting on same line, broken at each comma but paren aligned;
   // 3. broken to next line + 4, broken at each comma.
   std::string terminator = ")";
   if (have_block)
     terminator += " {";
   terminator += suffix;
 
   // Special case to make function calls of one arg taking a long list of
   // boolean operators not indent.
   bool continuation_requires_indent =
-      list.size() != 1 || !list[0]->AsBinaryOp() ||
-      (list[0]->AsBinaryOp()->op().value() != "||" &&
-       list[0]->AsBinaryOp()->op().value() != "&&");
+      list.size() != 1 || !list[0]->AsBinaryOp();
 
   // 1: Same line.
   Printer sub1;
   InitializeSub(&sub1);
   sub1.stack_.push_back(
       IndentState(CurrentColumn(), continuation_requires_indent, false));
   int penalty_one_line = 0;
   for (size_t i = 0; i < list.size(); ++i) {
     penalty_one_line += sub1.Expr(list[i], kPrecedenceLowest,
                                   i < list.size() - 1 ? ", " : std::string());
@@ skipping 280 matching lines @@
       }
     } else {
       printf("%s", output_string.c_str());
     }
   }
 
   return 0;
 }
 
 }  // namespace commands