[clang-tidy] avoid diagnosing std::array initializations for modernize-use-designated-initializers when IgnoreSingleElementAggregates is false

Author: RiverDave

clang-tools-extra/clang-tidy/modernize/UseDesignatedInitializersCheck.cpp

@@ -120,17 +120,16 @@ void UseDesignatedInitializersCheck::registerMatchers(MatchFinder *Finder) {
   const auto HasBaseWithFields =
       hasAnyBase(hasType(cxxRecordDecl(has(fieldDecl()))));
 
-  // see #133715
-  const auto IsSTLArray =
-      hasType(qualType(hasDeclaration(recordDecl(hasName("::std::array")))));
-
   Finder->addMatcher(
       initListExpr(
           hasType(cxxRecordDecl(RestrictToPODTypes ? isPOD() : isAggregate(),
-                                unless(HasBaseWithFields))
+                                unless(anyOf(HasBaseWithFields,
+                                             IgnoreSingleElementAggregates
+                                                 ? hasName("::std::array")
+                                                 : anything())))
                       .bind("type")),
           IgnoreSingleElementAggregates ? hasMoreThanOneElement() : anything(),
-          unless(anyOf(isFullyDesignated(), IsSTLArray)))
+          unless(isFullyDesignated()))
           .bind("init"),
       this);
 }

clang-tools-extra/docs/ReleaseNotes.rst

@@ -173,7 +173,8 @@ Changes in existing checks
 
 - Improved :doc:`modernize-use-designated-initializers
   <clang-tidy/checks/modernize/use-designated-initializers>` check by avoiding
-  diagnosing designated initializers for ``std::array`` initializations.
+  diagnosing designated initializers for ``std::array`` initializations when
+  `IgnoreSingleElementAggregates` is false.
 
 - Improved :doc:`modernize-use-ranges
   <clang-tidy/checks/modernize/use-ranges>` check by updating suppress