Adding no corrections diagnostic for dynamic member

Author: LucianoPAlmeida

include/swift/AST/DiagnosticsSema.def

@@ -84,6 +84,9 @@ ERROR(could_not_find_value_member_corrected,none,
 ERROR(could_not_find_value_dynamic_member_corrected,none,
       "value of type %0 has no dynamic member %2 using key path from root type %1; did you mean %3?",
       (Type, Type, DeclName, DeclName))
+ERROR(could_not_find_value_dynamic_member,none,
+      "value of type %0 has no dynamic member %2 using key path from root type %1",
+      (Type, Type, DeclName))
 
 ERROR(could_not_find_type_member,none,
       "type %0 has no member %1", (Type, DeclName))

lib/Sema/CSDiagnostics.cpp

@@ -2208,7 +2208,6 @@ bool MissingMemberFailure::diagnoseAsError() {
   }
 
   auto baseType = resolveType(getBaseType())->getWithoutSpecifierType();
-  auto baseExprType = getType(baseExpr)->getWithoutSpecifierType();
 
   DeclNameLoc nameLoc(anchor->getStartLoc());
   if (auto *UDE = dyn_cast<UnresolvedDotExpr>(anchor)) {
@@ -2234,16 +2233,9 @@ bool MissingMemberFailure::diagnoseAsError() {
   };
 
   TypoCorrectionResults corrections(TC, getName(), nameLoc);
-  auto tryTypoCorrection = [&] {
-    TC.performTypoCorrection(getDC(), DeclRefKind::Ordinary, baseType,
+  auto tryTypoCorrection = [&] (Type type) {
+    TC.performTypoCorrection(getDC(), DeclRefKind::Ordinary, type,
                              defaultMemberLookupOptions, corrections);
-    // 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,
-                               corrections);
-    }
   };
 
   if (getName().getBaseName().getKind() == DeclBaseName::Kind::Subscript) {
@@ -2262,7 +2254,7 @@ bool MissingMemberFailure::diagnoseAsError() {
         .highlight(baseExpr->getSourceRange());
   } else if (auto metatypeTy = baseType->getAs<MetatypeType>()) {
     auto instanceTy = metatypeTy->getInstanceType();
-    tryTypoCorrection();
+    tryTypoCorrection(baseType);
 
     if (DeclName rightName =
             findCorrectEnumCaseName(instanceTy, corrections, getName())) {
@@ -2306,11 +2298,17 @@ bool MissingMemberFailure::diagnoseAsError() {
           .fixItInsertAfter(baseExpr->getEndLoc(), " as AnyObject)");
       return true;
     }
-
-    tryTypoCorrection();
-
-    if (auto correction = corrections.claimUniqueCorrection()) {
-      if (getLocator()->isForKeyPathDynamicMemberLookup()) {
+    
+    tryTypoCorrection(baseType);
+    
+    // If locator points to the member found via key path dynamic member lookup,
+    // we provide a custom diagnostic and emit typo corrections for the wrapper type too.
+    if (getLocator()->isForKeyPathDynamicMemberLookup()) {
+      auto baseExprType = getType(baseExpr)->getWithoutSpecifierType();
+      
+      tryTypoCorrection(baseExprType);
+      
+      if (auto correction = corrections.claimUniqueCorrection()) {
         auto diagnostic = emitDiagnostic(
             anchor->getLoc(),
             diag::could_not_find_value_dynamic_member_corrected,
@@ -2320,6 +2318,15 @@ bool MissingMemberFailure::diagnoseAsError() {
             .highlight(nameLoc.getSourceRange());
         correction->addFixits(diagnostic);
       } else {
+        auto diagnostic = emitDiagnostic(
+            anchor->getLoc(),
+            diag::could_not_find_value_dynamic_member,
+            baseExprType, baseType, getName());
+        diagnostic.highlight(baseExpr->getSourceRange())
+        .highlight(nameLoc.getSourceRange());
+      }
+    } else {
+      if (auto correction = corrections.claimUniqueCorrection()) {
         auto diagnostic = emitDiagnostic(
             anchor->getLoc(),
             diag::could_not_find_value_member_corrected,
@@ -2328,9 +2335,9 @@ bool MissingMemberFailure::diagnoseAsError() {
         diagnostic.highlight(baseExpr->getSourceRange())
             .highlight(nameLoc.getSourceRange());
         correction->addFixits(diagnostic);
+      } else {
+        emitBasicError(baseType);
       }
-    } else {
-      emitBasicError(baseType);
     }
   }
 

test/attr/attr_dynamic_member_lookup.swift

@@ -705,6 +705,7 @@ struct SR10597_W<T> {
 }
 
 _ = SR10597_W<SR10597>(SR10597()).wooooo // expected-error {{value of type 'SR10597_W<SR10597>' has no dynamic member 'wooooo' using key path from root type 'SR10597'; did you mean 'wooo'?}}
+_ = SR10597_W<SR10597>(SR10597()).bla // expected-error {{value of type 'SR10597_W<SR10597>' has no dynamic member 'bla' using key path from root type 'SR10597'}}
 
 final class SR10597_1 {
     var woo: Int? // expected-note 2 {{'woo' declared here}}
@@ -719,4 +720,5 @@ struct SR10597_1_W<T> {
   }
 }
 
-_ = SR10597_1_W<SR10597_1>(SR10597_1()).wooo // expected-error {{value of type 'SR10597_1_W<SR10597_1>' has no dynamic member 'wooo' using key path from root type 'SR10597_1'; did you mean 'woo'?}}
+_ = SR10597_1_W<SR10597_1>(SR10597_1()).wooo // expected-error {{value of type 'SR10597_1_W<SR10597_1>' has no dynamic member 'wooo' using key path from root type 'SR10597_1'; did you mean 'woo'?}}
+_ = SR10597_1_W<SR10597_1>(SR10597_1()).bla // expected-error {{value of type 'SR10597_1_W<SR10597_1>' has no dynamic member 'bla' using key path from root type 'SR10597_1'}}