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

[NFC] Get rid of ASTContext::getModuleByName dups

Browse Source 
This method was reimplemented three times in various source tools.
This commit is contained in:
Brent Royal-Gordon
2020-08-31 12:46:30 -07:00
parent f2249e9af5
commit 61f716d5a8
3 changed files with 4 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
tools/SourceKit/lib/SwiftLang/SwiftDocSupport.cpp
View File

@@ -40,16 +40,6 @@ using namespace SourceKit;
using namespace swift;
using namespace ide;
static ModuleDecl *getModuleByFullName(ASTContext &Ctx, StringRef ModuleName) {
ImportPath::Module::Builder modulePath;
while (!ModuleName.empty()) {
StringRef SubModuleName;
std::tie(SubModuleName, ModuleName) = ModuleName.split('.');
modulePath.push_back(Ctx.getIdentifier(SubModuleName));
}
return Ctx.getModule(modulePath.get());
}
static ModuleDecl *getModuleByFullName(ASTContext &Ctx, Identifier ModuleName) {
return Ctx.getModule(ImportPath::Module::Builder(ModuleName).get());
}
@@ -1026,7 +1016,7 @@ static bool getModuleInterfaceInfo(ASTContext &Ctx, StringRef ModuleName,
if (!Stdlib)
return true;
auto *M = getModuleByFullName(Ctx, ModuleName);
auto *M = Ctx.getModuleByName(ModuleName);
if (!M)
return true;
@@ -1555,7 +1545,7 @@ findModuleGroups(StringRef ModuleName, ArrayRef<const char *> Args,
Receiver(RequestResult<ArrayRef<StringRef>>::fromError(Error));
return;
}
auto *M = getModuleByFullName(Ctx, ModuleName);
auto *M = Ctx.getModuleByName(ModuleName);
if (!M) {
Error = "Cannot find the module.";
Receiver(RequestResult<ArrayRef<StringRef>>::fromError(Error));