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

[timwoj]

Summary

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

[MyDeveloperDay]

LGTM

[timwoj]

I know that 10.0 was branch recently. Any chance this can make it over?

[MyDeveloperDay]

In D72793#1828625, @timwoj wrote:

I know that 10.0 was branch recently. Any chance this can make it over?

I don't personally ever do this because I only use the snapshot builds. I think if you need it in 10 then you need to ask @hans what the process is and how they decide what makes it in?

[hans]

In D72793#1828870, @MyDeveloperDay wrote:

In D72793#1828625, @timwoj wrote:

I know that 10.0 was branch recently. Any chance this can make it over?

I don't personally ever do this because I only use the snapshot builds. I think if you need it in 10 then you need to ask @hans what the process is and how they decide what makes it in?

I've cherry-picked it in 587b3b2a13d27c50006607a6b7e7458e6d7cc3fa

clang/lib/Format/TokenAnnotator.cpp

return Style.SpaceBeforeParens == FormatStyle::SBPO_Always ||
          (Style.SpaceBeforeParens == FormatStyle::SBPO_NonEmptyParentheses &&
           Right.ParameterCount > 0);
 }
 
 /// Returns \c true if the token is followed by a boolean condition, \c false
 /// 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,
                                           const FormatToken &Left,
                                           const FormatToken &Right) {
   if (Left.is(tok::kw_return) && Right.isNot(tok::semi))
     return true;
   if (Left.is(Keywords.kw_assert) && Style.Language == FormatStyle::LK_Java)

clang/unittests/Format/FormatTest.cpp

TEST_F(FormatTest, SpacesInConditionalStatement) {
   verifyFormat("for ( int i = 0; i; i++ )\n  continue;", Spaces);
   verifyFormat("if ( !a )\n  return;", Spaces);
   verifyFormat("if ( a )\n  return;", Spaces);
   verifyFormat("if constexpr ( a )\n  return;", Spaces);
   verifyFormat("switch ( a )\ncase 1:\n  return;", Spaces);
   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);
 }
 
 TEST_F(FormatTest, AlternativeOperators) {
   // Test case for ensuring alternate operators are not
   // combined with their right most neighbour.