[SourceKit] Remove UnresolvedLoc.ResolveArgLocs

AFAICT we can just infer whether to resolve arguments based on the presence of arguments. We don’t need the information to be passed in.

Author: ahoppen

include/swift/IDE/Utils.h

@@ -302,7 +302,6 @@ void simple_display(llvm::raw_ostream &out, ResolvedCursorInfoPtr info);
 
 struct UnresolvedLoc {
   SourceLoc Loc;
-  bool ResolveArgLocs;
 };
 
 enum class LabelRangeType {

lib/IDE/SwiftSourceDocInfo.cpp

@@ -625,13 +625,11 @@ bool NameMatcher::tryResolve(ASTWalker::ParentTy Node, DeclNameLoc NameLoc,
     return Resolved;
   }
 
-  if (LocsToResolve.back().ResolveArgLocs) {
-    if (Args) {
-      auto Labels = getCallArgLabelRanges(getSourceMgr(), Args,
-                                          LabelRangeEndAt::BeforeElemStart);
-      return tryResolve(Node, NameLoc.getBaseNameLoc(), LabelRangeType::CallArg,
-                        Labels.first, Labels.second);
-    }
+  if (Args) {
+    auto Labels = getCallArgLabelRanges(getSourceMgr(), Args,
+                                        LabelRangeEndAt::BeforeElemStart);
+    return tryResolve(Node, NameLoc.getBaseNameLoc(), LabelRangeType::CallArg,
+                      Labels.first, Labels.second);
   }
 
   return tryResolve(Node, NameLoc.getBaseNameLoc());

lib/Refactoring/ExtractFunction.cpp

@@ -102,7 +102,7 @@ static std::vector<NoteRegion> getNotableRegions(StringRef SourceText,
   SourceLoc NameLoc = SM.getLocForOffset(BufferId, NameOffset);
   auto LineAndCol = SM.getLineAndColumnInBuffer(NameLoc);
 
-  UnresolvedLoc UnresoledName{NameLoc, true};
+  UnresolvedLoc UnresoledName{NameLoc};
 
   NameMatcher Matcher(*Instance->getPrimarySourceFile());
   auto Resolved =

lib/Refactoring/LocalRename.cpp

@@ -89,7 +89,7 @@ renameAvailabilityInfo(const ValueDecl *VD,
 
       if (RefInfo && !RefInfo->IsArgLabel) {
         NameMatcher Matcher(*(RefInfo->SF));
-        auto Resolved = Matcher.resolve({RefInfo->Loc, /*ResolveArgs*/ true});
+        auto Resolved = Matcher.resolve({RefInfo->Loc});
         if (Resolved.LabelRanges.empty())
           return llvm::None;
       }
@@ -105,7 +105,7 @@ renameAvailabilityInfo(const ValueDecl *VD,
 
         if (RefInfo && !RefInfo->IsArgLabel) {
           NameMatcher Matcher(*(RefInfo->SF));
-          auto Resolved = Matcher.resolve({RefInfo->Loc, /*ResolveArgs*/ true});
+          auto Resolved = Matcher.resolve({RefInfo->Loc});
           if (Resolved.LabelRanges.empty())
             return llvm::None;
         }

lib/Refactoring/SyntacticRename.cpp

@@ -195,9 +195,7 @@ swift::ide::resolveRenameLocations(ArrayRef<RenameLoc> RenameLocs,
     }
 
     bool isOperator = Lexer::isOperator(OldName.base());
-    UnresolvedLocs.push_back(
-        {Location, (RenameLoc.Usage == NameUsage::Unknown ||
-                    (RenameLoc.Usage == NameUsage::Call && !isOperator))});
+    UnresolvedLocs.push_back({Location});
   }
 
   NameMatcher Resolver(SF);