[CodeCompletion] Plumb source locations through code completion name …

…lookup.

(cherry picked from commit 706411d)

include/swift/AST/NameLookup.h

@@ -512,7 +512,7 @@ void lookupVisibleDecls(VisibleDeclConsumer &Consumer,
 ///
 /// \param CurrDC the DeclContext from which the lookup is done.
 void lookupVisibleMemberDecls(VisibleDeclConsumer &Consumer,
-                              Type BaseTy,
+                              Type BaseTy, SourceLoc loc,
                               const DeclContext *CurrDC,
                               bool includeInstanceMembers,
                               bool includeDerivedRequirements,

lib/IDE/CompletionLookup.cpp

@@ -2262,7 +2262,7 @@ bool CompletionLookup::tryUnwrappedCompletions(Type ExprType, bool isIUO) {
   // unforced IUO.
   if (isIUO) {
     if (Type Unwrapped = ExprType->getOptionalObjectType()) {
-      lookupVisibleMemberDecls(*this, Unwrapped, CurrDeclContext,
+      lookupVisibleMemberDecls(*this, Unwrapped, DotLoc, CurrDeclContext,
                                IncludeInstanceMembers,
                                /*includeDerivedRequirements*/ false,
                                /*includeProtocolExtensionMembers*/ true);
@@ -2289,7 +2289,8 @@ bool CompletionLookup::tryUnwrappedCompletions(Type ExprType, bool isIUO) {
     if (NumBytesToEraseForOptionalUnwrap <=
         CodeCompletionResult::MaxNumBytesToErase) {
       if (!tryTupleExprCompletions(Unwrapped)) {
-        lookupVisibleMemberDecls(*this, Unwrapped, CurrDeclContext,
+        lookupVisibleMemberDecls(*this, Unwrapped, DotLoc,
+                                 CurrDeclContext,
                                  IncludeInstanceMembers,
                                  /*includeDerivedRequirements*/ false,
                                  /*includeProtocolExtensionMembers*/ true);
@@ -2370,7 +2371,7 @@ void CompletionLookup::getValueExprCompletions(Type ExprType, ValueDecl *VD) {
   // Don't check/return so we still add the members of Optional itself below
   tryUnwrappedCompletions(ExprType, isIUO);
 
-  lookupVisibleMemberDecls(*this, ExprType, CurrDeclContext,
+  lookupVisibleMemberDecls(*this, ExprType, DotLoc, CurrDeclContext,
                            IncludeInstanceMembers,
                            /*includeDerivedRequirements*/ false,
                            /*includeProtocolExtensionMembers*/ true);
@@ -2833,7 +2834,7 @@ void CompletionLookup::getUnresolvedMemberCompletions(Type T) {
   llvm::SaveAndRestore<LookupKind> SaveLook(Kind, LookupKind::ValueExpr);
   llvm::SaveAndRestore<Type> SaveType(ExprType, baseType);
   llvm::SaveAndRestore<bool> SaveUnresolved(IsUnresolvedMember, true);
-  lookupVisibleMemberDecls(consumer, baseType, CurrDeclContext,
+  lookupVisibleMemberDecls(consumer, baseType, DotLoc, CurrDeclContext,
                            /*includeInstanceMembers=*/false,
                            /*includeDerivedRequirements*/ false,
                            /*includeProtocolExtensionMembers*/ true);
@@ -2847,7 +2848,7 @@ void CompletionLookup::getEnumElementPatternCompletions(Type T) {
   llvm::SaveAndRestore<LookupKind> SaveLook(Kind, LookupKind::EnumElement);
   llvm::SaveAndRestore<Type> SaveType(ExprType, baseType);
   llvm::SaveAndRestore<bool> SaveUnresolved(IsUnresolvedMember, true);
-  lookupVisibleMemberDecls(*this, baseType, CurrDeclContext,
+  lookupVisibleMemberDecls(*this, baseType, DotLoc, CurrDeclContext,
                            /*includeInstanceMembers=*/false,
                            /*includeDerivedRequirements=*/false,
                            /*includeProtocolExtensionMembers=*/true);
@@ -2915,8 +2916,8 @@ void CompletionLookup::getTypeCompletions(Type BaseType) {
   Kind = LookupKind::Type;
   this->BaseType = BaseType;
   NeedLeadingDot = !HaveDot;
-  lookupVisibleMemberDecls(*this, MetatypeType::get(BaseType), CurrDeclContext,
-                           IncludeInstanceMembers,
+  lookupVisibleMemberDecls(*this, MetatypeType::get(BaseType), DotLoc,
+                           CurrDeclContext, IncludeInstanceMembers,
                            /*includeDerivedRequirements*/ false,
                            /*includeProtocolExtensionMembers*/ false);
   if (BaseType->isAnyExistentialType()) {
@@ -2951,8 +2952,8 @@ void CompletionLookup::getGenericRequirementCompletions(
   Kind = LookupKind::GenericRequirement;
   this->BaseType = selfTy;
   NeedLeadingDot = false;
-  lookupVisibleMemberDecls(*this, MetatypeType::get(selfTy), CurrDeclContext,
-                           IncludeInstanceMembers,
+  lookupVisibleMemberDecls(*this, MetatypeType::get(selfTy), DotLoc,
+                           CurrDeclContext, IncludeInstanceMembers,
                            /*includeDerivedRequirements*/ false,
                            /*includeProtocolExtensionMembers*/ true);
   // We not only allow referencing nested types/typealiases directly, but also

lib/IDE/CompletionOverrideLookup.cpp

@@ -541,7 +541,7 @@ void CompletionOverrideLookup::getOverrideCompletions(SourceLoc Loc) {
   if (CurrTy && !CurrTy->is<ErrorType>()) {
     // Look for overridable static members too.
     Type Meta = MetatypeType::get(CurrTy);
-    lookupVisibleMemberDecls(*this, Meta, CurrDeclContext,
+    lookupVisibleMemberDecls(*this, Meta, introducerLoc, CurrDeclContext,
                              /*includeInstanceMembers=*/true,
                              /*includeDerivedRequirements*/ true,
                              /*includeProtocolExtensionMembers*/ false);

lib/IDE/ConformingMethodList.cpp

@@ -166,7 +166,8 @@ void ConformingMethodListCallbacks::getMatchingMethods(
 
   } LocalConsumer(CurDeclContext, T, expectedTypes, result);
 
-  lookupVisibleMemberDecls(LocalConsumer, MetatypeType::get(T), CurDeclContext,
+  lookupVisibleMemberDecls(LocalConsumer, MetatypeType::get(T),
+                           Loc, CurDeclContext,
                            /*includeInstanceMembers=*/false,
                            /*includeDerivedRequirements*/false,
                            /*includeProtocolExtensionMembers*/true);

lib/IDE/TypeContextInfo.cpp

@@ -194,7 +194,8 @@ void ContextInfoCallbacks::getImplicitMembers(
 
   } LocalConsumer(CurDeclContext, T, Result);
 
-  lookupVisibleMemberDecls(LocalConsumer, MetatypeType::get(T), CurDeclContext,
+  lookupVisibleMemberDecls(LocalConsumer, MetatypeType::get(T),
+                           Loc, CurDeclContext,
                            /*includeInstanceMembers=*/false,
                            /*includeDerivedRequirements*/false,
                            /*includeProtocolExtensionMembers*/true);

lib/Sema/LookupVisibleDecls.cpp

@@ -1143,7 +1143,7 @@ struct KeyPathDynamicMemberConsumer : public VisibleDeclConsumer {
 } // end anonymous namespace
 
 static void lookupVisibleDynamicMemberLookupDecls(
-    Type baseType, KeyPathDynamicMemberConsumer &consumer,
+    Type baseType, SourceLoc loc, KeyPathDynamicMemberConsumer &consumer,
     const DeclContext *dc, LookupState LS, DeclVisibilityKind reason,
     GenericSignature Sig, VisitedSet &visited,
     llvm::DenseSet<TypeBase *> &seenDynamicLookup);
@@ -1154,13 +1154,14 @@ static void lookupVisibleDynamicMemberLookupDecls(
 /// \note This is an implementation detail of \c lookupVisibleMemberDecls and
 /// exists to create the correct recursion for dynamic member lookup.
 static void lookupVisibleMemberAndDynamicMemberDecls(
-    Type baseType, VisibleDeclConsumer &consumer,
+    Type baseType, SourceLoc loc, VisibleDeclConsumer &consumer,
     KeyPathDynamicMemberConsumer &dynamicMemberConsumer, const DeclContext *DC,
     LookupState LS, DeclVisibilityKind reason, GenericSignature Sig,
     VisitedSet &visited, llvm::DenseSet<TypeBase *> &seenDynamicLookup) {
   lookupVisibleMemberDeclsImpl(baseType, consumer, DC, LS, reason, Sig, visited);
-  lookupVisibleDynamicMemberLookupDecls(baseType, dynamicMemberConsumer, DC, LS,
-                                        reason, Sig, visited, seenDynamicLookup);
+  lookupVisibleDynamicMemberLookupDecls(baseType, loc, dynamicMemberConsumer,
+                                        DC, LS, reason, Sig, visited,
+                                        seenDynamicLookup);
 }
 
 /// Enumerates all keypath dynamic members of \c baseType, as seen from the
@@ -1170,7 +1171,7 @@ static void lookupVisibleMemberAndDynamicMemberDecls(
 /// dynamic member subscripts and looks up the members of the keypath's root
 /// type.
 static void lookupVisibleDynamicMemberLookupDecls(
-    Type baseType, KeyPathDynamicMemberConsumer &consumer,
+    Type baseType, SourceLoc loc, KeyPathDynamicMemberConsumer &consumer,
     const DeclContext *dc, LookupState LS, DeclVisibilityKind reason,
     GenericSignature Sig, VisitedSet &visited,
     llvm::DenseSet<TypeBase *> &seenDynamicLookup) {
@@ -1187,8 +1188,7 @@ static void lookupVisibleDynamicMemberLookupDecls(
       { ctx, DeclBaseName::createSubscript(), { ctx.Id_dynamicMember} });
 
   SmallVector<ValueDecl *, 2> subscripts;
-  dc->lookupQualified(baseType, subscriptName,
-                      baseType->getAnyNominal()->getLoc(),
+  dc->lookupQualified(baseType, subscriptName, loc,
                       NL_QualifiedDefault | NL_ProtocolMembers, subscripts);
 
   for (ValueDecl *VD : subscripts) {
@@ -1210,9 +1210,9 @@ static void lookupVisibleDynamicMemberLookupDecls(
     KeyPathDynamicMemberConsumer::SubscriptChange sub(consumer, subscript,
                                                       baseType);
 
-    lookupVisibleMemberAndDynamicMemberDecls(memberType, consumer, consumer, dc,
-                                             LS, reason, Sig, visited,
-                                             seenDynamicLookup);
+    lookupVisibleMemberAndDynamicMemberDecls(memberType, loc, consumer,
+                                             consumer, dc, LS, reason, Sig,
+                                             visited, seenDynamicLookup);
   }
 }
 
@@ -1223,8 +1223,9 @@ static void lookupVisibleDynamicMemberLookupDecls(
 /// where 'self' is the type of 'a'.  This operation is only valid after name
 /// binding.
 static void lookupVisibleMemberDecls(
-    Type BaseTy, VisibleDeclConsumer &Consumer, const DeclContext *CurrDC,
-    LookupState LS, DeclVisibilityKind Reason, GenericSignature Sig) {
+    Type BaseTy, SourceLoc loc, VisibleDeclConsumer &Consumer,
+    const DeclContext *CurrDC, LookupState LS,
+    DeclVisibilityKind Reason, GenericSignature Sig) {
   OverrideFilteringConsumer overrideConsumer(BaseTy, CurrDC);
   KeyPathDynamicMemberConsumer dynamicConsumer(
       Consumer,
@@ -1233,7 +1234,7 @@ static void lookupVisibleMemberDecls(
   VisitedSet Visited;
   llvm::DenseSet<TypeBase *> seenDynamicLookup;
   lookupVisibleMemberAndDynamicMemberDecls(
-      BaseTy, overrideConsumer, dynamicConsumer, CurrDC, LS, Reason,
+      BaseTy, loc, overrideConsumer, dynamicConsumer, CurrDC, LS, Reason,
       Sig, Visited, seenDynamicLookup);
 
   // Report the declarations we found to the real consumer.
@@ -1347,8 +1348,8 @@ static void lookupVisibleDeclsImpl(VisibleDeclConsumer &Consumer,
     }
 
     if (ExtendedType) {
-      ::lookupVisibleMemberDecls(ExtendedType, Consumer, DC, LS, MemberReason,
-                                 nullptr);
+      ::lookupVisibleMemberDecls(ExtendedType, Loc, Consumer, DC, LS,
+                                 MemberReason, nullptr);
 
       // Going outside the current type context.
       MemberReason = DeclVisibilityKind::MemberOfOutsideNominal;
@@ -1404,7 +1405,7 @@ void swift::lookupVisibleDecls(VisibleDeclConsumer &Consumer,
 }
 
 void swift::lookupVisibleMemberDecls(VisibleDeclConsumer &Consumer, Type BaseTy,
-                                     const DeclContext *CurrDC,
+                                     SourceLoc loc, const DeclContext *CurrDC,
                                      bool includeInstanceMembers,
                                      bool includeDerivedRequirements,
                                      bool includeProtocolExtensionMembers,
@@ -1421,7 +1422,7 @@ void swift::lookupVisibleMemberDecls(VisibleDeclConsumer &Consumer, Type BaseTy,
     ls = ls.withIncludeProtocolExtensionMembers();
   }
 
-  ::lookupVisibleMemberDecls(BaseTy, Consumer, CurrDC, ls,
+  ::lookupVisibleMemberDecls(BaseTy, loc, Consumer, CurrDC, ls,
                              DeclVisibilityKind::MemberOfCurrentNominal,
                              Sig);
 }

lib/Sema/TypeCheckNameLookup.cpp

@@ -617,7 +617,7 @@ void TypeChecker::performTypoCorrection(DeclContext *DC, DeclRefKind refKind,
   });
 
   if (baseTypeOrNull) {
-    lookupVisibleMemberDecls(consumer, baseTypeOrNull, DC,
+    lookupVisibleMemberDecls(consumer, baseTypeOrNull, SourceLoc(), DC,
                              /*includeInstanceMembers*/true,
                              /*includeDerivedRequirements*/false,
                              /*includeProtocolExtensionMembers*/true,