Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(415)

Unified Diff: tools/gn/command_format.cc

Issue 1284833004: Remove remaining legacy SplitString calls. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « tools/gn/command_clean.cc ('k') | tools/gn/command_refs.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: tools/gn/command_format.cc
diff --git a/tools/gn/command_format.cc b/tools/gn/command_format.cc
index a8143ffb8eb24585c35a8481638bb1ae39dfe109..81424ab7a445a291b02ba0caefc2b5a21d7a573b 100644
--- a/tools/gn/command_format.cc
+++ b/tools/gn/command_format.cc
@@ -80,9 +80,8 @@ enum Precedence {
};
int CountLines(const std::string& str) {
- std::vector<std::string> lines;
- base::SplitStringDontTrim(str, '\n', &lines);
- return static_cast<int>(lines.size());
+ return static_cast<int>(base::SplitStringPiece(
+ str, "\n", base::KEEP_WHITESPACE, base::SPLIT_WANT_ALL).size());
}
class Printer {
@@ -394,8 +393,8 @@ void Printer::Block(const ParseNode* root) {
int Printer::AssessPenalty(const std::string& output) {
int penalty = 0;
- std::vector<std::string> lines;
- base::SplitStringDontTrim(output, '\n', &lines);
+ std::vector<std::string> lines = base::SplitString(
+ output, "\n", base::KEEP_WHITESPACE, base::SPLIT_WANT_ALL);
penalty += static_cast<int>(lines.size() - 1) * GetPenaltyForLineBreak();
for (const auto& line : lines) {
if (line.size() > kMaximumWidth)
@@ -405,9 +404,8 @@ int Printer::AssessPenalty(const std::string& output) {
}
bool Printer::ExceedsMaximumWidth(const std::string& output) {
- std::vector<std::string> lines;
- base::SplitStringDontTrim(output, '\n', &lines);
- for (const auto& line : lines) {
+ for (const auto& line : base::SplitString(
+ output, "\n", base::KEEP_WHITESPACE, base::SPLIT_WANT_ALL)) {
if (line.size() > kMaximumWidth)
return true;
}
« no previous file with comments | « tools/gn/command_clean.cc ('k') | tools/gn/command_refs.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698