[PATCH] D121756: [clang-format] Clean up code looking for if statements

owenpan added inline comments. Comment at: clang/lib/Format/TokenAnnotator.cpp:133-136 -(isKeywordWithCondition(*Line.First) || - CurrentToken->getStartOfNonWhitespace() == - CurrentToken->Next->getStartOfNonWhitespace().getLocWithOffset(

[PATCH] D121756: [clang-format] Clean up code looking for if statements

owenpan added a comment. Please see D123741 . It should make it easier to see if you are making NFC changes at other places as well. Comment at: clang/lib/Format/TokenAnnotator.cpp:252-256 +} else if

[PATCH] D121756: [clang-format] Clean up code looking for if statements

sstwcw marked 2 inline comments as done. sstwcw added inline comments. Comment at: clang/lib/Format/TokenAnnotator.cpp:252-256 +} else if (OpeningParen.isConditionLParen(/*IncludeFor=*/false) || + (OpeningParen.Previous && +

[PATCH] D121756: [clang-format] Clean up code looking for if statements

sstwcw updated this revision to Diff 420031. sstwcw retitled this revision from "[clang-format] Clean up code looking for if statements NFC" to "[clang-format] Clean up code looking for if statements". sstwcw edited the summary of this revision. Repository: rG LLVM Github Monorepo CHANGES

[PATCH] D121756: [clang-format] Clean up code looking for if statements NFC

owenpan added inline comments. Comment at: clang/lib/Format/TokenAnnotator.cpp:252-256 +} else if (OpeningParen.isConditionLParen(/*IncludeFor=*/false) || + (OpeningParen.Previous && +OpeningParen.Previous->isOneOf(TT_BinaryOperator,

[PATCH] D121756: [clang-format] Clean up code looking for if statements NFC

owenpan requested changes to this revision. owenpan added inline comments. This revision now requires changes to proceed. Comment at: clang/lib/Format/TokenAnnotator.cpp:252-256 +} else if (OpeningParen.isConditionLParen(/*IncludeFor=*/false) || +

[PATCH] D121756: [clang-format] Clean up code looking for if statements NFC

sstwcw updated this revision to Diff 419006. sstwcw retitled this revision from "[clang-format] Clean up code looking for if statements" to "[clang-format] Clean up code looking for if statements NFC". Repository: rG LLVM Github Monorepo CHANGES SINCE LAST ACTION

[PATCH] D121756: [clang-format] Clean up code looking for if statements

HazardyKnusperkeks added a comment. In D121756#3407320 , @owenpan wrote: > In D121756#3398165 , @sstwcw wrote: > >> It turned out this patch does change behavior. >> >> - while ( >> -

[PATCH] D121756: [clang-format] Clean up code looking for if statements

owenpan added a comment. In D121756#3398165 , @sstwcw wrote: > It turned out this patch does change behavior. > > - while ( > - FormatTok->isOneOf(tok::identifier, tok::kw_requires, > tok::coloncolon)) { > + while

[PATCH] D121756: [clang-format] Clean up code looking for if statements

sstwcw marked 2 inline comments as done. sstwcw added a comment. This is how checking for `while` changes behavior. diff --git a/flang/lib/Evaluate/tools.cpp b/flang/lib/Evaluate/tools.cpp index 68b2a40d48c5..3f811fee9bad 100644 --- a/flang/lib/Evaluate/tools.cpp +++

[PATCH] D121756: [clang-format] Clean up code looking for if statements

sstwcw updated this revision to Diff 418073. sstwcw marked an inline comment as done. Repository: rG LLVM Github Monorepo CHANGES SINCE LAST ACTION https://reviews.llvm.org/D121756/new/ https://reviews.llvm.org/D121756 Files: clang/lib/Format/ContinuationIndenter.cpp

[PATCH] D121756: [clang-format] Clean up code looking for if statements

sstwcw marked 5 inline comments as done. sstwcw added inline comments. Comment at: clang/lib/Format/ContinuationIndenter.cpp:749 + if (Current.isNot(tok::comment) && + Previous.isConditionLParen(/*IncludeSpecial=*/true)) { // Treat the condition inside an if as if it

[PATCH] D121756: [clang-format] Clean up code looking for if statements

sstwcw updated this revision to Diff 418071. Repository: rG LLVM Github Monorepo CHANGES SINCE LAST ACTION https://reviews.llvm.org/D121756/new/ https://reviews.llvm.org/D121756 Files: clang/lib/Format/ContinuationIndenter.cpp clang/lib/Format/FormatToken.h

[PATCH] D121756: [clang-format] Clean up code looking for if statements

HazardyKnusperkeks requested changes to this revision. HazardyKnusperkeks added a comment. Just a formality. Repository: rG LLVM Github Monorepo CHANGES SINCE LAST ACTION https://reviews.llvm.org/D121756/new/ https://reviews.llvm.org/D121756

[PATCH] D121756: [clang-format] Clean up code looking for if statements

owenpan requested changes to this revision. owenpan added inline comments. Comment at: clang/lib/Format/ContinuationIndenter.cpp:749 + if (Current.isNot(tok::comment) && + Previous.isConditionLParen(/*IncludeSpecial=*/true)) { // Treat the condition inside an if as if

[PATCH] D121756: [clang-format] Clean up code looking for if statements

MyDeveloperDay added a comment. FWIW I'm not a fan of the `while( \n` case, so assuming this fix, fixes that then that would be good I think. - while ( - FormatTok->isOneOf(tok::identifier, tok::kw_requires, tok::coloncolon)) { + while (FormatTok->isOneOf(tok::identifier,

[PATCH] D121756: [clang-format] Clean up code looking for if statements

MyDeveloperDay added a comment. In D121756#3398165 , @sstwcw wrote: > It turned out this patch does change behavior. > > - while ( > - FormatTok->isOneOf(tok::identifier, tok::kw_requires, > tok::coloncolon)) { > + while

[PATCH] D121756: [clang-format] Clean up code looking for if statements

MyDeveloperDay added a comment. > It turned out this patch does change behavior. i.e. now your function is considering more things, the formatted code is different, do you think the new formatting is more correct? (I mean it feels like it should be right? assuming we want to consider whiles in

[PATCH] D121756: [clang-format] Clean up code looking for if statements

sstwcw marked 2 inline comments as done. sstwcw added a comment. It turned out this patch does change behavior. - while ( - FormatTok->isOneOf(tok::identifier, tok::kw_requires, tok::coloncolon)) { + while (FormatTok->isOneOf(tok::identifier, tok::kw_requires, +

[PATCH] D121756: [clang-format] Clean up code looking for if statements

MyDeveloperDay requested changes to this revision. MyDeveloperDay added a comment. This revision now requires changes to proceed. Sorry I don't believe we've covered the changes with unit tests. Comment at: clang/lib/Format/FormatToken.h:528 + /// to be handled separately. +

[PATCH] D121756: [clang-format] Clean up code looking for if statements

HazardyKnusperkeks accepted this revision. HazardyKnusperkeks added inline comments. This revision is now accepted and ready to land. Comment at: clang/lib/Format/TokenAnnotator.cpp:1431-1442 +TT_AttributeMacro, TT_BracedListLBrace, TT_ClassLBrace, +

[PATCH] D121756: [clang-format] Clean up code looking for if statements

sstwcw marked 4 inline comments as done. sstwcw added inline comments. Comment at: clang/lib/Format/TokenAnnotator.cpp:133 Left->ParentBracket != tok::less && -(isKeywordWithCondition(*Line.First) || - CurrentToken->getStartOfNonWhitespace()

[PATCH] D121756: [clang-format] Clean up code looking for if statements

sstwcw updated this revision to Diff 416052. sstwcw edited the summary of this revision. Repository: rG LLVM Github Monorepo CHANGES SINCE LAST ACTION https://reviews.llvm.org/D121756/new/ https://reviews.llvm.org/D121756 Files: clang/lib/Format/ContinuationIndenter.cpp

[PATCH] D121756: [clang-format] Clean up code looking for if statements

HazardyKnusperkeks added a comment. Please add tests in TokenAnnotatorTests for `TT_ConditionLParen`. Comment at: clang/lib/Format/FormatToken.h:521 + /// statement's condition like if or while. + bool isConditionLParen(bool IncludeSpecial) const { +if

[PATCH] D121756: [clang-format] Clean up code looking for if statements

sstwcw created this revision. sstwcw added a reviewer: clang-format. sstwcw added a project: clang-format. Herald added a project: All. sstwcw requested review of this revision. Herald added a project: clang. Herald added a subscriber: cfe-commits. Previously several places had code to determine