gn: handle continued suffix comments

tools/gn/tokenizer.cc

 // Copyright (c) 2013 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 "tools/gn/tokenizer.h"
 
 #include "base/logging.h"
 #include "base/strings/string_util.h"
 #include "tools/gn/input_file.h"
 
@@ skipping 102 matching lines @@
     } else if (type == Token::IDENTIFIER) {
       if (token_value == "if")
         type = Token::IF;
       else if (token_value == "else")
         type = Token::ELSE;
       else if (token_value == "true")
         type = Token::TRUE_TOKEN;
       else if (token_value == "false")
         type = Token::FALSE_TOKEN;
     } else if (type == Token::UNCLASSIFIED_COMMENT) {
-      if (AtStartOfLine(token_begin))
+      if (AtStartOfLine(token_begin) &&
+          // If it's a standalone comment, but is a continuation of a comment on
+          // a previous line, then instead make it a continued suffix comment.
+          (tokens_.empty() || tokens_.back().type() != Token::SUFFIX_COMMENT ||
+           tokens_.back().location().line_number() + 1 !=
+               location.line_number() ||
+           tokens_.back().location().char_offset() != location.char_offset())) {
         type = Token::LINE_COMMENT;
-      else
+      } else {
         type = Token::SUFFIX_COMMENT;
+      }
     }
 
     tokens_.push_back(Token(location, type, token_value));
   }
   if (err_->has_error())
     tokens_.clear();
   return tokens_;
 }
 
 // static
@@ skipping 230 matching lines @@
   } else if (cur_char() == '/' && cur_ + 1 < input_.size() &&
       (input_[cur_ + 1] == '/' || input_[cur_ + 1] == '*')) {
     // Different types of comments.
     help = "Comments should start with # instead";
   } else {
     help = "I have no idea what this is.";
   }
 
   return Err(location, "Invalid token.", help);
 }