Point to type to initialize

Author: SimplyDanny

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

@@ -110,17 +110,21 @@ void UseDesignatedInitializersCheck::check(
         LazyDesignators()->size()) {
       return;
     }
-    DiagnosticBuilder Diag =
-        diag(InitList->getLBraceLoc(), "use designated initializer list");
-    Diag << InitList->getSourceRange();
-    for (const Stmt *InitExpr : *SyntacticInitList) {
-      const std::string Designator =
-          LazyDesignators()->at(InitExpr->getBeginLoc());
-      if (!Designator.empty()) {
-        Diag << FixItHint::CreateInsertion(InitExpr->getBeginLoc(),
-                                           Designator + "=");
+    {
+      DiagnosticBuilder Diag =
+          diag(InitList->getLBraceLoc(), "use designated initializer list");
+      Diag << InitList->getSourceRange();
+      for (const Stmt *InitExpr : *SyntacticInitList) {
+        const std::string Designator =
+            LazyDesignators()->at(InitExpr->getBeginLoc());
+        if (!Designator.empty()) {
+          Diag << FixItHint::CreateInsertion(InitExpr->getBeginLoc(),
+                                             Designator + "=");
+        }
       }
     }
+    diag(Type->getBeginLoc(), "this is the type to initialize",
+         DiagnosticIDs::Note);
     return;
   }
   for (const auto *InitExpr : *SyntacticInitList) {

clang-tools-extra/test/clang-tidy/checkers/modernize/use-designated-initializers.cpp

@@ -24,12 +24,16 @@ S2 s21{.i=1, .j =2};
 
 S2 s22 = {1, 2};
 // CHECK-MESSAGES: :[[@LINE-1]]:10: warning: use designated initializer list [modernize-use-designated-initializers]
-// CHECK-MESSAGES-POD: :[[@LINE-2]]:10: warning: use designated initializer list [modernize-use-designated-initializers]
+// CHECK-MESSAGES: :[[@LINE-6]]:1: note: this is the type to initialize
+// CHECK-MESSAGES-POD: :[[@LINE-3]]:10: warning: use designated initializer list [modernize-use-designated-initializers]
+// CHECK-MESSAGES-POD: :[[@LINE-8]]:1: note: this is the type to initialize
 // CHECK-FIXES: S2 s22 = {.i=1, .j=2};
 
 S2 s23{1};
 // CHECK-MESSAGES: :[[@LINE-1]]:7: warning: use designated initializer list [modernize-use-designated-initializers]
-// CHECK-MESSAGES-POD: :[[@LINE-2]]:7: warning: use designated initializer list [modernize-use-designated-initializers]
+// CHECK-MESSAGES: :[[@LINE-13]]:1: note: this is the type to initialize
+// CHECK-MESSAGES-POD: :[[@LINE-3]]:7: warning: use designated initializer list [modernize-use-designated-initializers]
+// CHECK-MESSAGES-POD: :[[@LINE-15]]:1: note: this is the type to initialize
 // CHECK-FIXES: S2 s23{.i=1};
 
 S2 s24{.i = 1};
@@ -54,16 +58,20 @@ S3 s31 = {.s2 = 1, 2, 3.1};
 
 S3 s32 = {{.i = 1, 2}};
 // CHECK-MESSAGES: :[[@LINE-1]]:10: warning: use designated initializer list [modernize-use-designated-initializers]
-// CHECK-MESSAGES: :[[@LINE-2]]:20: warning: use designated init expression [modernize-use-designated-initializers]
-// CHECK-MESSAGES-POD: :[[@LINE-3]]:10: warning: use designated initializer list [modernize-use-designated-initializers]
-// CHECK-MESSAGES-POD: :[[@LINE-4]]:20: warning: use designated init expression [modernize-use-designated-initializers]
+// CHECK-MESSAGES: :[[@LINE-15]]:1: note: this is the type to initialize
+// CHECK-MESSAGES: :[[@LINE-3]]:20: warning: use designated init expression [modernize-use-designated-initializers]
+// CHECK-MESSAGES-POD: :[[@LINE-4]]:10: warning: use designated initializer list [modernize-use-designated-initializers]
+// CHECK-MESSAGES-POD: :[[@LINE-18]]:1: note: this is the type to initialize
+// CHECK-MESSAGES-POD: :[[@LINE-6]]:20: warning: use designated init expression [modernize-use-designated-initializers]
 // CHECK-FIXES: S3 s32 = {.s2={.i = 1, .j=2}};
 
 S3 s33 = {{2}, .d=3.1};
 // CHECK-MESSAGES: :[[@LINE-1]]:11: warning: use designated init expression [modernize-use-designated-initializers]
 // CHECK-MESSAGES: :[[@LINE-2]]:11: warning: use designated initializer list [modernize-use-designated-initializers]
-// CHECK-MESSAGES-POD: :[[@LINE-3]]:11: warning: use designated init expression [modernize-use-designated-initializers]
-// CHECK-MESSAGES-POD: :[[@LINE-4]]:11: warning: use designated initializer list [modernize-use-designated-initializers]
+// CHECK-MESSAGES: :[[@LINE-50]]:1: note: this is the type to initialize
+// CHECK-MESSAGES-POD: :[[@LINE-4]]:11: warning: use designated init expression [modernize-use-designated-initializers]
+// CHECK-MESSAGES-POD: :[[@LINE-5]]:11: warning: use designated initializer list [modernize-use-designated-initializers]
+// CHECK-MESSAGES-POD: :[[@LINE-53]]:1: note: this is the type to initialize
 // CHECK-FIXES: S3 s33 = {.s2={.i=2}, .d=3.1};
 
 struct S4 {
@@ -73,10 +81,12 @@ struct S4 {
 
 S4 s41 {2.2};
 // CHECK-MESSAGES-SINGLE-ELEMENT: :[[@LINE-1]]:8: warning: use designated initializer list [modernize-use-designated-initializers]
+// CHECK-MESSAGES-SINGLE-ELEMENT: :[[@LINE-7]]:1: note: this is the type to initialize
 // CHECK-FIXES-SINGLE-ELEMENT: S4 s41 {.d=2.2};
 
 S4 s42 = {{}};
 // CHECK-MESSAGES-SINGLE-ELEMENT: :[[@LINE-1]]:10: warning: use designated initializer list [modernize-use-designated-initializers]
+// CHECK-MESSAGES-SINGLE-ELEMENT: :[[@LINE-12]]:1: note: this is the type to initialize
 // CHECK-FIXES-SINGLE-ELEMENT: S4 s42 = {.d={}};
 
 template<typename S> S template1() { return {10, 11}; }
@@ -98,7 +108,9 @@ struct S6 {
 
 S6 s61 {1, 2};
 // CHECK-MESSAGES: :[[@LINE-1]]:8: warning: use designated initializer list [modernize-use-designated-initializers]
-// CHECK-MESSAGES-POD: :[[@LINE-2]]:8: warning: use designated initializer list [modernize-use-designated-initializers]
+// CHECK-MESSAGES: :[[@LINE-7]]:1: note: this is the type to initialize
+// CHECK-MESSAGES-POD: :[[@LINE-3]]:8: warning: use designated initializer list [modernize-use-designated-initializers]
+// CHECK-MESSAGES-POD: :[[@LINE-9]]:1: note: this is the type to initialize
 // CHECK-FIXES: S6 s61 {.i=1, .s.j=2};
 
 struct S7 {
@@ -110,6 +122,7 @@ struct S7 {
 
 S7 s71 {1};
 // CHECK-MESSAGES-SINGLE-ELEMENT: :[[@LINE-1]]:8: warning: use designated initializer list [modernize-use-designated-initializers]
+// CHECK-MESSAGES-SINGLE-ELEMENT: :[[@LINE-9]]:1: note: this is the type to initialize
 // CHECK-FIXES-SINGLE-ELEMENT: S7 s71 {.u.k=1};
 
 struct S8: S7 { int i; };
@@ -123,6 +136,7 @@ struct S9 {
 
 S9 s91{1, 2};
 // CHECK-MESSAGES: :[[@LINE-1]]:7: warning: use designated initializer list [modernize-use-designated-initializers]
+// CHECK-MESSAGES: :[[@LINE-7]]:1: note: this is the type to initialize
 // CHECK-FIXES: S9 s91{.i=1, .j=2};
 
 struct S10 { int i = 1, j = 2; };
@@ -136,6 +150,7 @@ struct S11 { int i; S10 s10; };
 S11 s111 { .i = 1 };
 S11 s112 { 1 };
 // CHECK-MESSAGES: :[[@LINE-1]]:10: warning: use designated initializer list [modernize-use-designated-initializers]
+// CHECK-MESSAGES: :[[@LINE-5]]:1: note: this is the type to initialize
 // CHECK-FIXES: S11 s112 { .i=1 };
 
 S11 s113 { .i=1, {}};
@@ -153,7 +168,9 @@ struct S12 {
 
 S12 s121 {1, 2};
 // CHECK-MESSAGES: :[[@LINE-1]]:10: warning: use designated initializer list [modernize-use-designated-initializers]
-// CHECK-MESSAGES-POD: :[[@LINE-2]]:10: warning: use designated initializer list [modernize-use-designated-initializers]
+// CHECK-MESSAGES: :[[@LINE-7]]:1: note: this is the type to initialize
+// CHECK-MESSAGES-POD: :[[@LINE-3]]:10: warning: use designated initializer list [modernize-use-designated-initializers]
+// CHECK-MESSAGES-POD: :[[@LINE-9]]:1: note: this is the type to initialize
 // CHECK-FIXES: S12 s121 {.i=1, .j=2};
 
 struct S13 {
@@ -166,7 +183,9 @@ struct S13 {
 
 S13 s131 {1, 2};
 // CHECK-MESSAGES: :[[@LINE-1]]:10: warning: use designated initializer list [modernize-use-designated-initializers]
-// CHECK-MESSAGES-POD: :[[@LINE-2]]:10: warning: use designated initializer list [modernize-use-designated-initializers]
+// CHECK-MESSAGES: :[[@LINE-10]]:1: note: this is the type to initialize
+// CHECK-MESSAGES-POD: :[[@LINE-3]]:10: warning: use designated initializer list [modernize-use-designated-initializers]
+// CHECK-MESSAGES-POD: :[[@LINE-12]]:1: note: this is the type to initialize
 // CHECK-FIXES: S13 s131 {.k=1, .i=2};
 
 #define A (3+2)
@@ -181,3 +200,4 @@ S9 s92 {A, B};
 DECLARE_S93;
 // CHECK-MESSAGES-MACROS: :[[@LINE-1]]:1: warning: use designated initializer list [modernize-use-designated-initializers]
 // CHECK-MESSAGES-MACROS: :[[@LINE-4]]:28: note: expanded from macro 'DECLARE_S93'
+// CHECK-MESSAGES-MACROS: :[[@LINE-71]]:1: note: this is the type to initialize