This is an archive of the discontinued LLVM Phabricator instance.

Differential D91996

[clang-format] Remove double trim
ClosedPublic

Authored by HazardyKnusperkeks on Nov 23 2020, 1:29 PM.

Details

Reviewers
MyDeveloperDay
krasimir
klimek
Commits
rG36306403d492: [clang-format] Remove double trim

Diff Detail

Event Timeline

HazardyKnusperkeks created this revision.Nov 23 2020, 1:29 PM
Herald added a project: Restricted Project. · View Herald TranscriptNov 23 2020, 1:29 PM
Herald added a subscriber: cfe-commits. · View Herald Transcript
HazardyKnusperkeks requested review of this revision.Nov 23 2020, 1:29 PM
Harbormaster completed remote builds in B79862: Diff 307185.Nov 23 2020, 2:07 PM
MyDeveloperDay accepted this revision.Nov 26 2020, 12:14 AM

Can you please clang format, but apart from that this looks fine

This revision is now accepted and ready to land.Nov 26 2020, 12:14 AM
klimek added a comment.Nov 26 2020, 1:01 AM

Isn't the comment incorrect after this patch?

HazardyKnusperkeks added a comment.Nov 27 2020, 8:56 PM
In D91996#2417892, @klimek wrote:

Isn't the comment incorrect after this patch?

I actually thought the same after I saw the diff here, but had no time yet to modify it. I will now also remove the comment.

HazardyKnusperkeks updated this revision to Diff 308134.Nov 27 2020, 9:02 PM

Formatted and now superfluous comment removed.

Harbormaster completed remote builds in B80399: Diff 308134.Nov 27 2020, 9:32 PM
MyDeveloperDay accepted this revision.Nov 28 2020, 9:19 AM
In D91996#2417892, @klimek wrote:

Isn't the comment incorrect after this patch?

Closed by commit rG36306403d492: [clang-format] Remove double trim (authored by HazardyKnusperkeks). · Explain WhyDec 13 2020, 5:34 AM
This revision was automatically updated to reflect the committed changes.
HazardyKnusperkeks added a commit: rG36306403d492: [clang-format] Remove double trim.

Revision Contents

PathSize
clang/
lib/
Format/
5 lines

Diff 308134

clang/lib/Format/BreakableToken.cpp

Show First 20 Lines • Show All 767 Lines • ▼ Show 20 Lines for (const FormatToken *CurrentTok = &Tok;
Content.resize(Lines.size()); Content.resize(Lines.size());
ContentColumn.resize(Lines.size()); ContentColumn.resize(Lines.size());
OriginalContentColumn.resize(Lines.size()); OriginalContentColumn.resize(Lines.size());
Tokens.resize(Lines.size()); Tokens.resize(Lines.size());
Prefix.resize(Lines.size()); Prefix.resize(Lines.size());
OriginalPrefix.resize(Lines.size()); OriginalPrefix.resize(Lines.size());
for (size_t i = FirstLineIndex, e = Lines.size(); i < e; ++i) { for (size_t i = FirstLineIndex, e = Lines.size(); i < e; ++i) {
Lines[i] = Lines[i].ltrim(Blanks); Lines[i] = Lines[i].ltrim(Blanks);
// We need to trim the blanks in case this is not the first line in a StringRef IndentPrefix = getLineCommentIndentPrefix(Lines[i], Style);
// multiline comment. Then the indent is included in Lines[i].
StringRef IndentPrefix =
getLineCommentIndentPrefix(Lines[i].ltrim(Blanks), Style);
assert((TokenText.startswith("//") || TokenText.startswith("#")) && assert((TokenText.startswith("//") || TokenText.startswith("#")) &&
"unsupported line comment prefix, '//' and '#' are supported"); "unsupported line comment prefix, '//' and '#' are supported");
OriginalPrefix[i] = Prefix[i] = IndentPrefix; OriginalPrefix[i] = Prefix[i] = IndentPrefix;
if (Lines[i].size() > Prefix[i].size() && if (Lines[i].size() > Prefix[i].size() &&
isAlphanumeric(Lines[i][Prefix[i].size()])) { isAlphanumeric(Lines[i][Prefix[i].size()])) {
if (Prefix[i] == "//") if (Prefix[i] == "//")
Prefix[i] = "// "; Prefix[i] = "// ";
else if (Prefix[i] == "///") else if (Prefix[i] == "///")
▲ Show 20 Lines • Show All 222 Lines • Show Last 20 Lines