Merge pull request #61959 from xedin/type-wrappers-improve-multi-wrapper-error

[Sema] TypeWrappers: Improve use of multiple type wrappers diagnostic

Author: xedin

include/swift/AST/DiagnosticsSema.def

@@ -6613,7 +6613,8 @@ ERROR(type_wrapper_requires_two_generic_params,none,
       "wrapped and storage types", ())
 
 ERROR(cannot_use_multiple_type_wrappers,none,
-      "type %0 cannot use more than one type wrapper", ())
+      "%0 %1 cannot use more than one type wrapper",
+      (DescriptiveDeclKind, DeclName))
 
 ERROR(type_wrapper_requires_memberwise_init,none,
       "type wrapper type %0 does not contain a required initializer"

lib/Sema/TypeCheckTypeWrapper.cpp

@@ -116,7 +116,14 @@ NominalTypeDecl *GetTypeWrapper::evaluate(Evaluator &evaluator,
     return nullptr;
 
   if (typeWrappers.size() != 1) {
-    ctx.Diags.diagnose(decl, diag::cannot_use_multiple_type_wrappers);
+    ctx.Diags.diagnose(decl, diag::cannot_use_multiple_type_wrappers,
+                       decl->getDescriptiveKind(), decl->getName());
+
+    for (const auto &attr : typeWrappers) {
+      ctx.Diags.diagnose(attr.first->getLocation(), diag::decl_declared_here,
+                         attr.second->getName());
+    }
+
     return nullptr;
   }
 

test/type/type_wrapper.swift

@@ -641,3 +641,15 @@ do {
   // expected-error@-1 {{missing arguments for parameters 'a', 'b' in call}}
   // expected-error@-2 {{extra argument 'storageWrapper' in call}}
 }
+
+func test_multiple_wrapper_attributes() {
+  @Parent.Wrapper @NoopWrapper
+  // expected-note@-1 {{'Wrapper' declared here}}
+  // expected-note@-2 {{'NoopWrapper' declared here}}
+  struct Test1 {} // expected-error {{struct 'Test1' cannot use more than one type wrapper}}
+
+  @Parent.Wrapper @NoopWrapper
+  // expected-note@-1 {{'Wrapper' declared here}}
+  // expected-note@-2 {{'NoopWrapper' declared here}}
+  class Test2 {} // expected-error {{class 'Test2' cannot use more than one type wrapper}}
+}