---

yaml
---
r: 341999
b: refs/heads/rxwei-patch-1
c: f47f5c4
h: refs/heads/master
i:
  341997: ce736e0
  341995: 372d6df
  341991: a386ffb
  341983: d929c74

Author: theblixguy

[refs]

@@ -1015,7 +1015,7 @@ refs/tags/swift-DEVELOPMENT-SNAPSHOT-2018-08-18-a: b10b1fce14385faa6d44f6b933e95
 refs/heads/rdar-43033749-fix-batch-mode-no-diags-swift-5.0-branch: a14e64eaad30de89f0f5f0b2a782eed7ecdcb255
 refs/heads/revert-19006-error-bridging-integer-type: 8a9065a3696535305ea53fe9b71f91cbe6702019
 refs/heads/revert-19050-revert-19006-error-bridging-integer-type: ecf752d54b05dd0a20f510f0bfa54a3fec3bcaca
-refs/heads/rxwei-patch-1: 5e528de547398ae35ddea5c4b3b74d41a0e7db03
+refs/heads/rxwei-patch-1: f47f5c44e4580fe21e8a41d3fe36f705bff0962d
 refs/heads/shahmishal-patch-1: e58ec0f7488258d42bef51bc3e6d7b3dc74d7b2a
 refs/heads/typelist-existential: 4046359efd541fb5c72d69a92eefc0a784df8f5e
 refs/tags/swift-4.2-DEVELOPMENT-SNAPSHOT-2018-08-20-a: 4319ba09e4fb8650ee86061075c74a016b6baab9

branches/rxwei-patch-1/include/swift/AST/DiagnosticsSema.def

@@ -4521,6 +4521,9 @@ WARNING(property_wrapper_init_initialValue,none,
         ())
 ERROR(property_wrapper_projection_value_missing,none,
       "could not find projection value property %0", (Identifier))
+ERROR(property_wrapper_missing_arg_init, none, "missing argument for parameter "
+      "%0 in property wrapper initializer; add 'wrappedValue' and %0 "
+      "arguments in '@%1(...)'", (Identifier, StringRef))
 
 //------------------------------------------------------------------------------
 // MARK: function builder diagnostics

branches/rxwei-patch-1/lib/Sema/CSDiag.cpp

@@ -3241,13 +3241,8 @@ class ArgumentMatcher : public MatchCallArgumentListener {
     SmallString<32> insertBuf;
     llvm::raw_svector_ostream insertText(insertBuf);
 
-    if (argIdx != 0) {
-      if (isPropertyWrapperImplicitInit()) {
-        insertText << "(";
-      } else {
-        insertText << ", ";
-      }
-    }
+    if (argIdx != 0)
+      insertText << ", ";
     if (!name.empty())
       insertText << name.str() << ": ";
     Type Ty = param.getOldType();
@@ -3262,9 +3257,6 @@ class ArgumentMatcher : public MatchCallArgumentListener {
     insertText << "<#" << Ty << "#>";
     if (argIdx == 0 && insertableEndIdx != 0)
       insertText << ", ";
-    if (isPropertyWrapperImplicitInit()) {
-      insertText << ")";
-    }
 
     SourceLoc insertLoc;
     if (argIdx > insertableEndIdx) {
@@ -3275,9 +3267,6 @@ class ArgumentMatcher : public MatchCallArgumentListener {
       //   fn(x: 1) { return 1 }
       // is diagnosed as "missing argument for 'y'" (missingParamIdx 1).
       // It should be "missing argument for 'z'" (missingParamIdx 2).
-    } else if (isPropertyWrapperImplicitInit()) {
-      insertLoc =
-          Lexer::getLocForEndOfToken(TC.Context.SourceMgr, FnExpr->getLoc());
     } else if (auto *TE = dyn_cast<TupleExpr>(ArgExpr)) {
       // fn():
       //   fn([argMissing])
@@ -3340,13 +3329,20 @@ class ArgumentMatcher : public MatchCallArgumentListener {
 
     assert(insertLoc.isValid() && "missing argument after trailing closure?");
 
-    if (name.empty())
+    if (name.empty()) {
       TC.diagnose(insertLoc, diag::missing_argument_positional,
                   missingParamIdx + 1)
           .fixItInsert(insertLoc, insertText.str());
-    else
-      TC.diagnose(insertLoc, diag::missing_argument_named, name)
-          .fixItInsert(insertLoc, insertText.str());
+    } else {
+      if (isPropertyWrapperImplicitInit()) {
+        auto TE = cast<TypeExpr>(FnExpr);
+        TC.diagnose(TE->getLoc(), diag::property_wrapper_missing_arg_init, name,
+                    TE->getInstanceType()->getString());
+      } else {
+        TC.diagnose(insertLoc, diag::missing_argument_named, name)
+            .fixItInsert(insertLoc, insertText.str());
+      }
+    }
 
     auto candidate = CandidateInfo[0];
     if (candidate.getDecl())

branches/rxwei-patch-1/test/decl/var/property_wrappers.swift

@@ -1095,7 +1095,7 @@ struct InvalidPropertyDelegateUse {
 // SR-11060
 
 class SR_11060_Class {
-  @SR_11060_Wrapper var property: Int = 1234 // expected-error {{missing argument for parameter 'string' in call}}{{20-20=(string: <#String#>)}}
+  @SR_11060_Wrapper var property: Int = 1234 // expected-error {{missing argument for parameter 'string' in property wrapper initializer; add 'wrappedValue' and 'string' arguments in '@SR_11060_Wrapper(...)'}}
 }
 
 @propertyWrapper
@@ -1106,3 +1106,4 @@ struct SR_11060_Wrapper {
     self.wrappedValue = wrappedValue
   }
 }
+