averello/swift-mirror
1
0
Fork 0
mirror of https://github.com/apple/swift.git synced 2025-12-14 20:36:38 +01:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Xi Ge
2019-07-22 15:35:09 -07:00
parent 344d9311a8
commit 1cb746b47c
8 changed files with 104 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
lib/IDE/ConformingMethodList.cpp
View File

@@ -33,7 +33,7 @@ class ConformingMethodListCallbacks : public CodeCompletionCallbacks {
DeclContext *CurDeclContext = nullptr;
void getMatchingMethods(Type T,
llvm::MapVector<ProtocolDecl*, StringRef> &expectedTypes,
llvm::SmallPtrSetImpl<ProtocolDecl*> &expectedTypes,
SmallVectorImpl<ValueDecl *> &result);
public:
@@ -91,8 +91,12 @@ void ConformingMethodListCallbacks::doneParsing() {
if (T->hasArchetype())
T = T->mapTypeOutOfContext();
llvm::MapVector<ProtocolDecl*, StringRef> expectedProtocols;
resolveProtocolNames(CurDeclContext, ExpectedTypeNames, expectedProtocols);
llvm::SmallPtrSet<ProtocolDecl*, 8> expectedProtocols;
for (auto Name: ExpectedTypeNames) {
if (auto *PD = resolveProtocolName(CurDeclContext, Name)) {
expectedProtocols.insert(PD);
}
}
// Collect the matching methods.
ConformingMethodListResult result(CurDeclContext, T);
@@ -102,7 +106,7 @@ void ConformingMethodListCallbacks::doneParsing() {
}
void ConformingMethodListCallbacks::getMatchingMethods(
Type T, llvm::MapVector<ProtocolDecl*, StringRef> &expectedTypes,
Type T, llvm::SmallPtrSetImpl<ProtocolDecl*> &expectedTypes,
SmallVectorImpl<ValueDecl *> &result) {
if (!T->mayHaveMembers())
return;
@@ -114,7 +118,7 @@ void ConformingMethodListCallbacks::getMatchingMethods(
Type T;
/// The list of expected types.
llvm::MapVector<ProtocolDecl*, StringRef> &ExpectedTypes;
llvm::SmallPtrSetImpl<ProtocolDecl*> &ExpectedTypes;
/// Result sink to populate.
SmallVectorImpl<ValueDecl *> &Result;
@@ -137,7 +141,7 @@ void ConformingMethodListCallbacks::getMatchingMethods(
// The return type conforms to any of the requested protocols.
for (auto Proto : ExpectedTypes) {
if (CurModule->conformsToProtocol(declTy, Proto.first))
if (CurModule->conformsToProtocol(declTy, Proto))
return true;
}
@@ -146,7 +150,7 @@ void ConformingMethodListCallbacks::getMatchingMethods(
public:
LocalConsumer(DeclContext *DC, Type T,
llvm::MapVector<ProtocolDecl*, StringRef> &expectedTypes,
llvm::SmallPtrSetImpl<ProtocolDecl*> &expectedTypes,
SmallVectorImpl<ValueDecl *> &result)
: CurModule(DC->getParentModule()), T(T), ExpectedTypes(expectedTypes),
Result(result) {}