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

Swif-ide-test: add a parameter to specify the group names to print.

Browse Source
This commit is contained in:
Xi Ge
2016-02-19 11:36:50 -08:00
parent 41f0489b12
commit 1872214d40
4 changed files with 29 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
lib/IDE/ModuleInterfacePrinting.cpp
View File

@@ -129,8 +129,9 @@ void swift::ide::printModuleInterface(Module *M,
ASTPrinter &Printer,
const PrintOptions &Options,
const bool PrintSynthesizedExtensions) {
printSubmoduleInterface(M, M->getName().str(), None, TraversalOptions, Printer,
Options, PrintSynthesizedExtensions);
printSubmoduleInterface(M, M->getName().str(), ArrayRef<StringRef>(),
TraversalOptions, Printer, Options,
PrintSynthesizedExtensions);
}
static void adjustPrintOptions(PrintOptions &AdjustedOptions) {
@@ -178,7 +179,7 @@ void findExtensionsFromConformingProtocols(Decl *D,
void swift::ide::printSubmoduleInterface(
Module *M,
ArrayRef<StringRef> FullModuleName,
Optional<StringRef> GroupName,
ArrayRef<StringRef> GroupNames,
ModuleTraversalOptions TraversalOptions,
ASTPrinter &Printer,
const PrintOptions &Options,
@@ -321,9 +322,14 @@ void swift::ide::printSubmoduleInterface(
}
if (FullModuleName.empty()) {
// If group name is given and the decl does not belong to the group, skip it.
if (GroupName && (!D->getGroupName() ||
D->getGroupName().getValue() != GroupName.getValue()))
if (!GroupNames.empty()){
if (auto Target = D->getGroupName()) {
if (std::find(GroupNames.begin(), GroupNames.end(),
Target.getValue()) != GroupNames.end())
SwiftDecls.push_back(D);
}
continue;
}
// Add Swift decls if we are printing the top-level module.
SwiftDecls.push_back(D);
}
@@ -361,7 +367,7 @@ void swift::ide::printSubmoduleInterface(
// If the group name is specified, we sort them according to their source order,
// which is the order preserved by getTopLeveDecls.
if (!GroupName) {
if (GroupNames.empty()) {
std::sort(SwiftDecls.begin(), SwiftDecls.end(),
[&](Decl *LHS, Decl *RHS) -> bool {
auto *LHSValue = dyn_cast<ValueDecl>(LHS);