Remove InAttributeSpecifiers

Author: gedare

clang/include/clang/Format/Format.h

@@ -4661,16 +4661,6 @@ struct FormatStyle {
     ///  false:
     ///    Uses the applicable option.
     bool ExceptDoubleParentheses;
-    /// Put a space in parentheses of attribute specifiers.
-    /// \code
-    ///    true:
-    ///    __attribute__( ( noreturn ) )
-    /// \endcode
-    /// \code
-    ///    false:
-    ///    _attribute__((noreturn))
-    /// \endcode
-    bool InAttributeSpecifiers;
     /// Put a space in parentheses only inside conditional statements
     /// (``for/if/while/switch...``).
     /// \code
@@ -4704,27 +4694,25 @@ struct FormatStyle {
     ///   decltype( ( x ) )                     decltype((x))
     ///   x = ( (int32)y )                      x = ((int32))y
     ///   y = ( (int ( * )( int ))foo )( x );   y = ((int (*)(int))foo)(x);
+    ///    __attribute__( ( noreturn ) )        __attribute__((noreturn))
     /// \endcode
     bool Other;
 
     SpacesInParensCustom()
-        : ExceptDoubleParentheses(false), InAttributeSpecifiers(false),
-          InConditionalStatements(false), InCStyleCasts(false),
-          InEmptyParentheses(false), Other(false) {}
+        : ExceptDoubleParentheses(false),
+        InConditionalStatements(false), InCStyleCasts(false),
+        InEmptyParentheses(false), Other(false) {}
 
     SpacesInParensCustom(bool ExceptDoubleParentheses,
-                         bool InAttributeSpecifiers,
                          bool InConditionalStatements, bool InCStyleCasts,
                          bool InEmptyParentheses, bool Other)
         : ExceptDoubleParentheses(ExceptDoubleParentheses),
-          InAttributeSpecifiers(InAttributeSpecifiers),
           InConditionalStatements(InConditionalStatements),
           InCStyleCasts(InCStyleCasts), InEmptyParentheses(InEmptyParentheses),
           Other(Other) {}
 
     bool operator==(const SpacesInParensCustom &R) const {
       return ExceptDoubleParentheses == R.ExceptDoubleParentheses &&
-             InAttributeSpecifiers == R.InAttributeSpecifiers &&
              InConditionalStatements == R.InConditionalStatements &&
              InCStyleCasts == R.InCStyleCasts &&
              InEmptyParentheses == R.InEmptyParentheses && Other == R.Other;
@@ -4743,7 +4731,7 @@ struct FormatStyle {
   ///   # Example of usage:
   ///   SpacesInParens: Custom
   ///   SpacesInParensOptions:
-  ///     InAttributeSpecifiers: false
+  ///     ExceptDoubleParentheses: false
   ///     InConditionalStatements: true
   ///     InEmptyParentheses: true
   /// \endcode

clang/lib/Format/Format.cpp

@@ -721,7 +721,6 @@ template <> struct MappingTraits<FormatStyle::SpacesInLineComment> {
 template <> struct MappingTraits<FormatStyle::SpacesInParensCustom> {
   static void mapping(IO &IO, FormatStyle::SpacesInParensCustom &Spaces) {
     IO.mapOptional("ExceptDoubleParentheses", Spaces.ExceptDoubleParentheses);
-    IO.mapOptional("InAttributeSpecifiers", Spaces.InAttributeSpecifiers);
     IO.mapOptional("InCStyleCasts", Spaces.InCStyleCasts);
     IO.mapOptional("InConditionalStatements", Spaces.InConditionalStatements);
     IO.mapOptional("InEmptyParentheses", Spaces.InEmptyParentheses);
@@ -1178,7 +1177,6 @@ template <> struct MappingTraits<FormatStyle> {
       if (SpacesInParentheses) {
         // for backward compatibility.
         Style.SpacesInParensOptions.ExceptDoubleParentheses = false;
-        Style.SpacesInParensOptions.InAttributeSpecifiers = true;
         Style.SpacesInParensOptions.InConditionalStatements = true;
         Style.SpacesInParensOptions.InCStyleCasts =
             SpacesInCStyleCastParentheses;

clang/lib/Format/TokenAnnotator.cpp

@@ -4416,10 +4416,10 @@ bool TokenAnnotator::spaceRequiredBetween(const AnnotatedLine &Line,
     if (RightParen && RightParen->is(TT_CastRParen))
       return AddSpace(Style.SpacesInParensOptions.InCStyleCasts);
     if (IsAttributeParen(LeftParen) || IsAttributeParen(RightParen))
-      return AddSpace(Style.SpacesInParensOptions.InAttributeSpecifiers);
+      return AddSpace(Style.SpacesInParensOptions.Other);
     if ((LeftParen && IsAttributeParen(LeftParen->Previous)) ||
         (RightParen && IsAttributeParen(RightParen->Next))) {
-      return AddSpace(Style.SpacesInParensOptions.InAttributeSpecifiers);
+      return AddSpace(Style.SpacesInParensOptions.Other);
     }
     return AddSpace(Style.SpacesInParensOptions.Other);
   }

clang/unittests/Format/ConfigParseTest.cpp

@@ -236,7 +236,6 @@ TEST(ConfigParseTest, ParsesConfigurationBools) {
   CHECK_PARSE_NESTED_BOOL(SpaceBeforeParensOptions, AfterPlacementOperator);
   CHECK_PARSE_NESTED_BOOL(SpaceBeforeParensOptions, BeforeNonEmptyParentheses);
   CHECK_PARSE_NESTED_BOOL(SpacesInParensOptions, ExceptDoubleParentheses);
-  CHECK_PARSE_NESTED_BOOL(SpacesInParensOptions, InAttributeSpecifiers);
   CHECK_PARSE_NESTED_BOOL(SpacesInParensOptions, InCStyleCasts);
   CHECK_PARSE_NESTED_BOOL(SpacesInParensOptions, InConditionalStatements);
   CHECK_PARSE_NESTED_BOOL(SpacesInParensOptions, InEmptyParentheses);

clang/unittests/Format/FormatTest.cpp

@@ -17102,7 +17102,6 @@ TEST_F(FormatTest, ConfigurableSpacesInParens) {
   Spaces.SpacesInParensOptions = {};
   Spaces.SpacesInParensOptions.Other = true;
   Spaces.SpacesInParensOptions.InConditionalStatements = true;
-  Spaces.SpacesInParensOptions.InAttributeSpecifiers = true;
   verifyFormat("do_something( ::globalVar );", Spaces);
   verifyFormat("call( x, y, z );", Spaces);
   verifyFormat("call();", Spaces);
@@ -17323,7 +17322,7 @@ TEST_F(FormatTest, ConfigurableSpacesInParens) {
   Spaces.IndentWidth = 2;
   Spaces.SpacesInParens = FormatStyle::SIPO_Custom;
   Spaces.SpacesInParensOptions = {};
-  Spaces.SpacesInParensOptions.InAttributeSpecifiers = true;
+  Spaces.SpacesInParensOptions.Other = true;
   verifyFormat("SomeType *__attribute__( ( attr ) ) *a = NULL;", Spaces);
   verifyFormat("void __attribute__( ( naked ) ) foo(int bar)", Spaces);
   verifyFormat("void f() __attribute__( ( asdf ) );", Spaces);
@@ -17341,7 +17340,7 @@ TEST_F(FormatTest, ConfigurableSpacesInParens) {
   verifyFormat("class __declspec( dllimport ) X {};", Spaces);
   verifyFormat("class __declspec(( dllimport )) X {};", Spaces);
 
-  Spaces.SpacesInParensOptions.InAttributeSpecifiers = false;
+  Spaces.SpacesInParensOptions.Other = false;
   verifyFormat("SomeType *__attribute__((attr)) *a = NULL;", Spaces);
   verifyFormat("void __attribute__((naked)) foo(int bar)", Spaces);
   verifyFormat("void f() __attribute__((asdf));", Spaces);