Skip to content

Commit 61f716d

Browse files
committed
[NFC] Get rid of ASTContext::getModuleByName dups
This method was reimplemented three times in various source tools.
1 parent f2249e9 commit 61f716d

File tree

3 files changed

+4
-30
lines changed

3 files changed

+4
-30
lines changed

tools/SourceKit/lib/SwiftLang/SwiftDocSupport.cpp

Lines changed: 2 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -40,16 +40,6 @@ using namespace SourceKit;
4040
using namespace swift;
4141
using namespace ide;
4242

43-
static ModuleDecl *getModuleByFullName(ASTContext &Ctx, StringRef ModuleName) {
44-
ImportPath::Module::Builder modulePath;
45-
while (!ModuleName.empty()) {
46-
StringRef SubModuleName;
47-
std::tie(SubModuleName, ModuleName) = ModuleName.split('.');
48-
modulePath.push_back(Ctx.getIdentifier(SubModuleName));
49-
}
50-
return Ctx.getModule(modulePath.get());
51-
}
52-
5343
static ModuleDecl *getModuleByFullName(ASTContext &Ctx, Identifier ModuleName) {
5444
return Ctx.getModule(ImportPath::Module::Builder(ModuleName).get());
5545
}
@@ -1026,7 +1016,7 @@ static bool getModuleInterfaceInfo(ASTContext &Ctx, StringRef ModuleName,
10261016
if (!Stdlib)
10271017
return true;
10281018

1029-
auto *M = getModuleByFullName(Ctx, ModuleName);
1019+
auto *M = Ctx.getModuleByName(ModuleName);
10301020
if (!M)
10311021
return true;
10321022

@@ -1555,7 +1545,7 @@ findModuleGroups(StringRef ModuleName, ArrayRef<const char *> Args,
15551545
Receiver(RequestResult<ArrayRef<StringRef>>::fromError(Error));
15561546
return;
15571547
}
1558-
auto *M = getModuleByFullName(Ctx, ModuleName);
1548+
auto *M = Ctx.getModuleByName(ModuleName);
15591549
if (!M) {
15601550
Error = "Cannot find the module.";
15611551
Receiver(RequestResult<ArrayRef<StringRef>>::fromError(Error));

tools/SourceKit/lib/SwiftLang/SwiftEditorInterfaceGen.cpp

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -91,16 +91,6 @@ typedef SwiftInterfaceGenContext::Implementation::TextReference TextReference;
9191
typedef SwiftInterfaceGenContext::Implementation::TextDecl TextDecl;
9292
typedef SwiftInterfaceGenContext::Implementation::SourceTextInfo SourceTextInfo;
9393

94-
static ModuleDecl *getModuleByFullName(ASTContext &Ctx, StringRef ModuleName) {
95-
ImportPath::Module::Builder builder;
96-
while (!ModuleName.empty()) {
97-
StringRef SubModuleName;
98-
std::tie(SubModuleName, ModuleName) = ModuleName.split('.');
99-
builder.push_back(Ctx.getIdentifier(SubModuleName));
100-
}
101-
return Ctx.getModule(builder.get());
102-
}
103-
10494
static ModuleDecl *getModuleByFullName(ASTContext &Ctx, Identifier ModuleName) {
10595
return Ctx.getModule(ImportPath::Module::Builder(ModuleName).get());
10696
}
@@ -293,7 +283,7 @@ static bool getModuleInterfaceInfo(ASTContext &Ctx,
293283
}
294284

295285
// Get the (sub)module to generate.
296-
Mod = getModuleByFullName(Ctx, ModuleName);
286+
Mod = Ctx.getModuleByName(ModuleName);
297287
if (!Mod) {
298288
ErrMsg = "Could not load module: ";
299289
ErrMsg += ModuleName;

tools/swift-ide-test/swift-ide-test.cpp

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2111,13 +2111,7 @@ static int doInputCompletenessTest(StringRef SourceFilename) {
21112111
//===----------------------------------------------------------------------===//
21122112

21132113
static ModuleDecl *getModuleByFullName(ASTContext &Context, StringRef ModuleName) {
2114-
ImportPath::Module::Builder builder;
2115-
while (!ModuleName.empty()) {
2116-
StringRef SubModuleName;
2117-
std::tie(SubModuleName, ModuleName) = ModuleName.split('.');
2118-
builder.push_back(Context.getIdentifier(SubModuleName));
2119-
}
2120-
ModuleDecl *Result = Context.getModule(builder.get());
2114+
ModuleDecl *Result = Context.getModuleByName(ModuleName);
21212115
if (!Result || Result->failedToLoad())
21222116
return nullptr;
21232117
return Result;

0 commit comments

Comments
 (0)