IDE+Evaluator: refactor resolveProtocolName to using the request evaluator, NFC

include/swift/AST/ASTTypeIDZone.def

@@ -17,6 +17,7 @@
 SWIFT_TYPEID_NAMED(NominalTypeDecl *, NominalTypeDecl)
 SWIFT_TYPEID_NAMED(VarDecl *, VarDecl)
 SWIFT_TYPEID_NAMED(ValueDecl *, ValueDecl)
+SWIFT_TYPEID_NAMED(ProtocolDecl *, ProtocolDecl)
 SWIFT_TYPEID_NAMED(Decl *, Decl)
 SWIFT_TYPEID(Type)
 SWIFT_TYPEID(PropertyWrapperBackingPropertyInfo)

include/swift/IDE/IDERequestIDZone.def

@@ -18,3 +18,4 @@ SWIFT_TYPEID(CursorInfoRequest)
 SWIFT_TYPEID(RangeInfoRequest)
 SWIFT_TYPEID(ProvideDefaultImplForRequest)
 SWIFT_TYPEID(CollectOverriddenDeclsRequest)
+SWIFT_TYPEID(ResolveProtocolNameRequest)

include/swift/IDE/IDERequests.h

@@ -229,6 +229,58 @@ public:
   SourceLoc getNearestLoc() const { return SourceLoc(); };
 };
 
+//----------------------------------------------------------------------------//
+// ResolveProtocolNameRequest
+//----------------------------------------------------------------------------//
+struct ProtocolNameOwner {
+  DeclContext *DC;
+  StringRef Name;
+  ProtocolNameOwner(DeclContext *DC, StringRef Name): DC(DC), Name(Name) {}
+
+  friend llvm::hash_code hash_value(const ProtocolNameOwner &CI) {
+    return hash_value(CI.Name);
+  }
+
+  friend bool operator==(const ProtocolNameOwner &lhs,
+                         const ProtocolNameOwner &rhs) {
+    return lhs.Name == rhs.Name;
+  }
+
+  friend bool operator!=(const ProtocolNameOwner &lhs,
+                         const ProtocolNameOwner &rhs) {
+    return !(lhs == rhs);
+  }
+
+  friend void simple_display(llvm::raw_ostream &out,
+                             const ProtocolNameOwner &owner) {
+    out << "Resolve " << owner.Name << " from ";
+    simple_display(out, owner.DC);
+  }
+};
+
+/// Resolve a protocol name to the protocol decl pointer inside the ASTContext
+class ResolveProtocolNameRequest:
+    public SimpleRequest<ResolveProtocolNameRequest,
+                         ProtocolDecl*(ProtocolNameOwner),
+                         CacheKind::Cached>
+{
+public:
+  using SimpleRequest::SimpleRequest;
+
+private:
+  friend SimpleRequest;
+
+  // Evaluation.
+  llvm::Expected<ProtocolDecl*> evaluate(Evaluator &evaluator,
+    ProtocolNameOwner Input) const;
+
+public:
+  // Caching
+  bool isCached() const { return true; }
+  // Source location
+  SourceLoc getNearestLoc() const { return SourceLoc(); };
+};
+
 /// The zone number for the IDE.
 #define SWIFT_IDE_REQUESTS_TYPEID_ZONE 137
 #define SWIFT_TYPEID_ZONE SWIFT_IDE_REQUESTS_TYPEID_ZONE

include/swift/Sema/IDETypeChecking.h

@@ -207,8 +207,7 @@ namespace swift {
 
   /// Resolve a list of mangled names to accessible protocol decls from
   /// the decl context.
-  bool resolveProtocolNames(DeclContext *DC, ArrayRef<const char *> names,
-                            llvm::MapVector<ProtocolDecl*, StringRef> &result);
+  ProtocolDecl *resolveProtocolName(DeclContext *dc, StringRef Name);
 
   /// FIXME: All of the below goes away once CallExpr directly stores its
   /// arguments.