Merge pull request #3307 from rjmccall/typo-correction-for-qualified-lookup

Author: swift-ci

Diff for: include/swift/AST/DiagnosticsSema.def

@@ -555,6 +555,8 @@ ERROR(use_undeclared_type_did_you_mean,none,
       "use of undeclared type %0; did you mean to use '%1'?", (Identifier, StringRef))
 NOTE(note_typo_candidate,none,
      "did you mean '%0'?", (StringRef))
+NOTE(note_typo_candidate_implicit_member,none,
+     "did you mean the implicitly-synthesized %1 '%0'?", (StringRef, StringRef))
 NOTE(note_remapped_type,none,
      "did you mean to use '%0'?", (StringRef))
 ERROR(identifier_init_failure,none,

Diff for: lib/Sema/CSDiag.cpp

@@ -2231,6 +2231,14 @@ diagnoseUnviableLookupResults(MemberLookupResult &result, Type baseObjTy,
 
   // If we found no results at all, mention that fact.
   if (result.UnviableCandidates.empty()) {
+    LookupResult correctionResults;
+    auto tryTypoCorrection = [&] {
+      CS->TC.performTypoCorrection(CS->DC, DeclRefKind::Ordinary, baseObjTy,
+                                   memberName, nameLoc.getBaseNameLoc(),
+                                   defaultMemberLookupOptions,
+                                   correctionResults);
+    };
+
     // TODO: This should handle tuple member lookups, like x.1231 as well.
     if (memberName.isSimpleName("subscript")) {
       diagnose(loc, diag::type_not_subscriptable, baseObjTy)
@@ -2239,18 +2247,29 @@ diagnoseUnviableLookupResults(MemberLookupResult &result, Type baseObjTy,
       diagnose(loc, diag::could_not_find_type_member,
                MTT->getInstanceType(), memberName)
         .highlight(baseRange).highlight(nameLoc.getSourceRange());
+      tryTypoCorrection();
     } else {
       diagnose(loc, diag::could_not_find_value_member,
                baseObjTy, memberName)
         .highlight(baseRange).highlight(nameLoc.getSourceRange());
+      tryTypoCorrection();
 
       // Check for a few common cases that can cause missing members.
       if (baseObjTy->is<EnumType>() && memberName.isSimpleName("rawValue")) {
         auto loc = baseObjTy->castTo<EnumType>()->getDecl()->getNameLoc();
-        if (loc.isValid())
+        if (loc.isValid()) {
           diagnose(loc, diag::did_you_mean_raw_type);
+          return; // Always prefer this over typo corrections.
+        }
       }
     }
+
+    // Note all the correction candidates.
+    for (auto &correction : correctionResults) {
+      CS->TC.noteTypoCorrection(memberName, nameLoc, correction);
+    }
+
+    // TODO: recover?
     return;
   }
 

Diff for: lib/Sema/TypeCheckNameLookup.cpp

@@ -557,8 +557,7 @@ void TypeChecker::performTypoCorrection(DeclContext *DC, DeclRefKind refKind,
   TypoCorrectionResolver resolver(*this, nameLoc);
   if (baseTypeOrNull) {
     lookupVisibleMemberDecls(consumer, baseTypeOrNull, DC, &resolver,
-                             /*include instance members*/
-                               !(lookupOptions & NameLookupFlags::OnlyTypes));
+                             /*include instance members*/ true);
   } else {
     lookupVisibleDecls(consumer, DC, &resolver, /*top level*/ true, nameLoc);
   }
@@ -580,6 +579,21 @@ diagnoseTypoCorrection(TypeChecker &tc, DeclNameLoc loc, ValueDecl *decl) {
                          decl->getName().str());
   }
 
+  if (!decl->getLoc().isValid() && decl->getDeclContext()->isTypeContext()) {
+    Decl *parentDecl = dyn_cast<ExtensionDecl>(decl->getDeclContext());
+    if (!parentDecl) parentDecl = cast<NominalTypeDecl>(decl->getDeclContext());
+
+    if (parentDecl->getLoc().isValid()) {
+      StringRef kind = (isa<VarDecl>(decl) ? "property" :
+                        isa<ConstructorDecl>(decl) ? "initializer" :
+                        isa<FuncDecl>(decl) ? "method" :
+                        "member");
+
+      return tc.diagnose(parentDecl, diag::note_typo_candidate_implicit_member,
+                         decl->getName().str(), kind);
+    }
+  }
+
   return tc.diagnose(decl, diag::note_typo_candidate, decl->getName().str());
 }
 

Diff for: test/Constraints/diagnostics.swift

@@ -492,7 +492,7 @@ func rdar20868864(_ s: String) {
 
 // <rdar://problem/20491794> Error message does not tell me what the problem is
 enum Color {
-  case Red
+  case Red // expected-note 2 {{did you mean 'Red'?}}
   case Unknown(description: String)
 
   static func rainbow() -> Color {}

Diff for: test/Constraints/dynamic_lookup.swift

@@ -39,7 +39,7 @@ class Y : P {
   init() {} 
 
   @objc func foo(_ s: String) { }
-  @objc func wibble() { }
+  @objc func wibble() { } // expected-note 2 {{did you mean 'wibble'?}}
 
   @objc func ovl1() -> A { }
 

Diff for: test/Generics/Inputs/associated_types_multi_file_helper.swift

@@ -1,5 +1,5 @@
 protocol Fooable {
-  associatedtype AssocType
+  associatedtype AssocType // expected-note {{did you mean 'AssocType'?}}
   func foo(x : AssocType)
 }
 

Diff for: test/NameBinding/name_lookup.swift

@@ -35,15 +35,15 @@ class ThisBase1 {
 
   class func baseStaticFunc0() {}
 
-  struct BaseNestedStruct {}
+  struct BaseNestedStruct {} // expected-note {{did you mean 'BaseNestedStruct'?}}
   class BaseNestedClass {
     init() { }
   }
   enum BaseNestedUnion {
     case BaseUnionX(Int)
   }
 
-  typealias BaseNestedTypealias = Int
+  typealias BaseNestedTypealias = Int // expected-note {{did you mean 'BaseNestedTypealias'?}}
 }
 
 class ThisDerived1 : ThisBase1 {
@@ -85,7 +85,7 @@ class ThisDerived1 : ThisBase1 {
   class DerivedNestedClass {
     init() { }
   }
-  enum DerivedNestedUnion {
+  enum DerivedNestedUnion { // expected-note {{did you mean 'DerivedNestedUnion'?}}
     case DerivedUnionX(Int)
   }
 
@@ -351,26 +351,26 @@ extension ThisBase1 {
 
   func baseExtFunc0() {}
 
-  var baseExtStaticVar: Int // expected-error {{extensions may not contain stored properties}}
+  var baseExtStaticVar: Int // expected-error {{extensions may not contain stored properties}} // expected-note 2 {{did you mean 'baseExtStaticVar'?}}
 
-  var baseExtStaticProp: Int {
+  var baseExtStaticProp: Int { // expected-note 2 {{did you mean 'baseExtStaticProp'?}}
     get {
       return 42
     }
     set {}
   }
 
-  class func baseExtStaticFunc0() {}
+  class func baseExtStaticFunc0() {} // expected-note {{did you mean 'baseExtStaticFunc0'?}}
 
-  struct BaseExtNestedStruct {}
-  class BaseExtNestedClass {
+  struct BaseExtNestedStruct {} // expected-note 2 {{did you mean 'BaseExtNestedStruct'?}}
+  class BaseExtNestedClass { // expected-note {{did you mean 'BaseExtNestedClass'?}}
     init() { }
   }
-  enum BaseExtNestedUnion {
+  enum BaseExtNestedUnion { // expected-note {{did you mean 'BaseExtNestedUnion'?}}
     case BaseExtUnionX(Int)
   }
 
-  typealias BaseExtNestedTypealias = Int
+  typealias BaseExtNestedTypealias = Int // expected-note 2 {{did you mean 'BaseExtNestedTypealias'?}}
 }
 
 extension ThisDerived1 {
@@ -398,7 +398,7 @@ extension ThisDerived1 {
   class DerivedExtNestedClass {
     init() { }
   }
-  enum DerivedExtNestedUnion {
+  enum DerivedExtNestedUnion { // expected-note {{did you mean 'DerivedExtNestedUnion'?}}
     case DerivedExtUnionX(Int)
   }
 

Diff for: test/decl/enum/enumtest.swift

@@ -305,3 +305,8 @@ enum E21269142 {  // expected-note {{did you mean to specify a raw type on the e
 
 print(E21269142.Foo.rawValue)  // expected-error {{value of type 'E21269142' has no member 'rawValue'}}
 
+// Check that typo correction does something sensible with synthesized members.
+enum SyntheticMember { // expected-note {{did you mean the implicitly-synthesized property 'hashValue'?}}
+  case Foo
+}
+print(SyntheticMember.Foo.hasValue) // expected-error {{value of type 'SyntheticMember' has no member 'hasValue'}}

Diff for: test/decl/ext/protocol_objc.swift

@@ -3,7 +3,7 @@
 // REQUIRES: objc_interop
 
 @objc protocol OP1 {
-  func reqOP1a() -> Bool
+  func reqOP1a() -> Bool // expected-note {{did you mean 'reqOP1a'?}}
 }
 
 extension OP1 {