Commit ea2be452 authored by mydeveloperday's avatar mydeveloperday Committed by paulhoad
Browse files

[clang-format] Expand the SpacesAroundConditions option to include catch statements 

Summary: This diff expands the SpacesAroundConditions option added in D68346 to include adding spaces to catch statements.

Reviewed By: MyDeveloperDay

Patch by: timwoj

Differential Revision: https://reviews.llvm.org/D72793
parent 14c04475

clang/lib/Format/TokenAnnotator.cpp

+1 −1
Original line number Diff line number Diff line
@@ -2597,7 +2597,7 @@ bool TokenAnnotator::spaceRequiredBeforeParens(const FormatToken &Right) const { 
/// otherwise.

static bool isKeywordWithCondition(const FormatToken &Tok) {

  return Tok.isOneOf(tok::kw_if, tok::kw_for, tok::kw_while, tok::kw_switch,

                     tok::kw_constexpr);

                     tok::kw_constexpr, tok::kw_catch);

}



bool TokenAnnotator::spaceRequiredBetween(const AnnotatedLine &Line,

clang/unittests/Format/FormatTest.cpp

+1 −0
Original line number Diff line number Diff line
@@ -14980,6 +14980,7 @@ TEST_F(FormatTest, SpacesInConditionalStatement) { 
  verifyFormat("while ( a )\n  return;", Spaces);

  verifyFormat("while ( (a && b) )\n  return;", Spaces);

  verifyFormat("do {\n} while ( 1 != 0 );", Spaces);

  verifyFormat("try {\n} catch ( const std::exception & ) {\n}", Spaces);

  // Check that space on the left of "::" is inserted as expected at beginning

  // of condition.

  verifyFormat("while ( ::func() )\n  return;", Spaces);