---

yaml
---
r: 315262
b: refs/heads/master-next
c: a5db6bf
h: refs/heads/master

Author: LucianoPAlmeida

[refs]

@@ -1,6 +1,6 @@
 ---
 refs/heads/master: 3fe9333052029c114ef816ea805c335eb1ee8a99
-refs/heads/master-next: 6d40a96c0a96c9691a9b39bfa1fcc6e219ce8079
+refs/heads/master-next: a5db6bf0a5f96be5f6fcb05101e06ed6246f7044
 refs/tags/osx-passed: b6b74147ef8a386f532cf9357a1bde006e552c54
 refs/tags/swift-2.2-SNAPSHOT-2015-12-01-a: 6bb18e013c2284f2b45f5f84f2df2887dc0f7dea
 refs/tags/swift-2.2-SNAPSHOT-2015-12-01-b: 66d897bfcf64a82cb9a87f5e663d889189d06d07

branches/master-next/include/swift/AST/DiagnosticsSema.def

@@ -83,7 +83,7 @@ ERROR(could_not_find_value_member_corrected,none,
       (Type, DeclName, DeclName))
 ERROR(could_not_find_value_dynamic_member_corrected,none,
       "neither the value type %0 and dynamic key path subscript of type %1 has a member %2; did you mean %3?",
-      (Type,Type, DeclName, DeclName))
+      (Type, Type, DeclName, DeclName))
 
 ERROR(could_not_find_type_member,none,
       "type %0 has no member %1", (Type, DeclName))

branches/master-next/lib/Sema/CSDiagnostics.cpp

@@ -2237,8 +2237,8 @@ bool MissingMemberFailure::diagnoseAsError() {
   auto tryTypoCorrection = [&] {
     TC.performTypoCorrection(getDC(), DeclRefKind::Ordinary, baseType,
                              defaultMemberLookupOptions, corrections);
-    // If isForKeyPathDynamicMemberLookup we are including the
-    // typo corrections to the wrapper type too.
+    // If locator points to the member found via key path dynamic member lookup,
+    // emit typo corrections for the wrapper type too.
     if (getLocator()->isForKeyPathDynamicMemberLookup()) {
       TC.performTypoCorrection(getDC(), DeclRefKind::Ordinary,
                                baseExprType, defaultMemberLookupOptions,
@@ -2312,22 +2312,22 @@ bool MissingMemberFailure::diagnoseAsError() {
     if (auto correction = corrections.claimUniqueCorrection()) {
       if (getLocator()->isForKeyPathDynamicMemberLookup()) {
         auto diagnostic = emitDiagnostic(
-            anchor->getLoc(),
-            diag::could_not_find_value_dynamic_member_corrected,
-            baseExprType, baseType, getName(),
-            correction->CorrectedName);
+                                         anchor->getLoc(),
+                                         diag::could_not_find_value_dynamic_member_corrected,
+                                         baseExprType, baseType, getName(),
+                                         correction->CorrectedName);
         diagnostic.highlight(baseExpr->getSourceRange())
-        .highlight(nameLoc.getSourceRange());
+            .highlight(nameLoc.getSourceRange());
         correction->addFixits(diagnostic);
 
       } else {
         auto diagnostic = emitDiagnostic(
-            anchor->getLoc(),
-            diag::could_not_find_value_member_corrected,
-            baseType, getName(),
-            correction->CorrectedName);
+                                         anchor->getLoc(),
+                                         diag::could_not_find_value_member_corrected,
+                                         baseType, getName(),
+                                         correction->CorrectedName);
         diagnostic.highlight(baseExpr->getSourceRange())
-        .highlight(nameLoc.getSourceRange());
+            .highlight(nameLoc.getSourceRange());
         correction->addFixits(diagnostic);
       }
     } else {