Address review requests

Author: gedare

clang/lib/Format/TokenAnnotator.cpp

@@ -4006,9 +4006,9 @@ bool TokenAnnotator::spaceRequiredBetween(const AnnotatedLine &Line,
     const auto AddSpace = [&](FormatStyle::SpacesInParensCustomStyle Option) {
       if (Option == FormatStyle::SIPCS_Always)
         return true;
-      if (Option == FormatStyle::SIPCS_NonConsecutive) {
-        if (NotConsecutiveParens(LeftParen, RightParen))
-          return true;
+      if (Option == FormatStyle::SIPCS_NonConsecutive &&
+          NotConsecutiveParens(LeftParen, RightParen)) {
+        return true;
       }
       return false;
     };

clang/unittests/Format/FormatTest.cpp

@@ -17078,22 +17078,24 @@ TEST_F(FormatTest, ConfigurableSpacesInParens) {
   verifyFormat("SomeType *__attribute__( ( attr ) ) *a = NULL;", Spaces);
   verifyFormat("void __attribute__( ( naked ) ) foo(int bar)", Spaces);
   verifyFormat("void f() __attribute__( ( asdf ) );", Spaces);
+
   Spaces.SpacesInParensOptions.InAttributeSpecifiers =
       FormatStyle::SIPCS_NonConsecutive;
   verifyFormat("SomeType *__attribute__(( attr )) *a = NULL;", Spaces);
   verifyFormat("void __attribute__(( naked )) foo(int bar)", Spaces);
   verifyFormat("void f() __attribute__(( asdf ));", Spaces);
-  Spaces.SpacesInParensOptions.InAttributeSpecifiers = FormatStyle::SIPCS_Never;
 
   Spaces.SpacesInParens = FormatStyle::SIPO_Custom;
   Spaces.SpacesInParensOptions = {};
   Spaces.SpacesInParensOptions.InCStyleCasts = FormatStyle::SIPCS_Always;
   verifyFormat("x = ( int32 )y;", Spaces);
   verifyFormat("y = (( int (*)(int) )foo)(x);", Spaces);
+
   Spaces.SpacesInParensOptions.InCStyleCasts =
       FormatStyle::SIPCS_NonConsecutive;
   verifyFormat("x = ( int32 )y;", Spaces);
   verifyFormat("y = ((int (*)(int))foo)(x);", Spaces);
+
   Spaces.SpacesInParensOptions.InCStyleCasts = FormatStyle::SIPCS_Never;
   verifyFormat("x = (int32)y;", Spaces);
   verifyFormat("y = ((int (*)(int))foo)(x);", Spaces);
@@ -17133,6 +17135,7 @@ TEST_F(FormatTest, ConfigurableSpacesInParens) {
                "  break;\n"
                "}",
                Spaces);
+
   Spaces.SpacesInParensOptions.InConditionalStatements =
       FormatStyle::SIPCS_NonConsecutive;
   verifyFormat("while ((bool)1)\n"
@@ -17166,6 +17169,7 @@ TEST_F(FormatTest, ConfigurableSpacesInParens) {
                "  break;\n"
                "}",
                Spaces);
+
   Spaces.SpacesInParensOptions.InConditionalStatements =
       FormatStyle::SIPCS_Never;
   verifyFormat("while ((bool)1)\n"
@@ -17208,12 +17212,14 @@ TEST_F(FormatTest, ConfigurableSpacesInParens) {
   verifyFormat("decltype( ( foo() ) ) a = foo();", Spaces);
   verifyFormat("decltype( ( bar( 10 ) ) ) a = bar( 11 );", Spaces);
   verifyFormat("x = foo( ( a * ( b - c ) ) );", Spaces);
+
   Spaces.SpacesInParensOptions.Other = FormatStyle::SIPCS_NonConsecutive;
   verifyFormat("decltype( x ) y = 42;", Spaces);
   verifyFormat("decltype(( x )) y = z;", Spaces);
   verifyFormat("decltype((foo())) a = foo();", Spaces);
   verifyFormat("decltype((bar( 10 ))) a = bar( 11 );", Spaces);
   verifyFormat("x = foo((a * ( b - c )));", Spaces);
+
   Spaces.SpacesInParensOptions.Other = FormatStyle::SIPCS_Never;
   verifyFormat("decltype(x) y = 42;", Spaces);
   verifyFormat("decltype((x)) y = z;", Spaces);