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

[SourceKit] Teach module interface generator to respect the given module group name.

Browse Source 
Input:
  Request Id: 'source.request.editor.open.interface'
  Required Field: 'key.modulename'
  Optional Field: 'key.groupname'

Output:
  If the group name is specified, SourceKit generates interface for the
  module group; otherwise does for the entire module.
This commit is contained in:
Xi Ge
2016-02-09 11:31:08 -08:00
parent 7784ba959e
commit 8b6c6af573
11 changed files with 862 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
tools/SourceKit/lib/SwiftLang/SwiftEditorInterfaceGen.cpp
View File

@@ -243,6 +243,7 @@ static void reportSemanticAnnotations(const SourceTextInfo &IFaceInfo,
static bool getModuleInterfaceInfo(ASTContext &Ctx,
StringRef ModuleName,
Optional<StringRef> Group,
SwiftInterfaceGenContext::Implementation &Impl,
std::string &ErrMsg) {
Module *&Mod = Impl.Mod;
@@ -285,7 +286,7 @@ static bool getModuleInterfaceInfo(ASTContext &Ctx,
SmallString<128> Text;
llvm::raw_svector_ostream OS(Text);
AnnotatingPrinter Printer(Info, OS);
printSubmoduleInterface(Mod, SplitModuleName, None,
printSubmoduleInterface(Mod, SplitModuleName, Group,
TraversalOptions,
Printer, Options, false);
@@ -341,6 +342,7 @@ SwiftInterfaceGenContextRef
SwiftInterfaceGenContext::create(StringRef DocumentName,
bool IsModule,
StringRef ModuleOrHeaderName,
Optional<StringRef> Group,
CompilerInvocation Invocation,
std::string &ErrMsg) {
SwiftInterfaceGenContextRef IFaceGenCtx{ new SwiftInterfaceGenContext() };
@@ -370,7 +372,7 @@ SwiftInterfaceGenContext::create(StringRef DocumentName,
}
if (IsModule) {
if (getModuleInterfaceInfo(Ctx, ModuleOrHeaderName, IFaceGenCtx->Impl,
if (getModuleInterfaceInfo(Ctx, ModuleOrHeaderName, Group, IFaceGenCtx->Impl,
ErrMsg))
return nullptr;
} else {
@@ -549,6 +551,7 @@ SwiftInterfaceGenMap::find(StringRef ModuleName,
void SwiftLangSupport::editorOpenInterface(EditorConsumer &Consumer,
StringRef Name,
StringRef ModuleName,
Optional<StringRef> Group,
ArrayRef<const char *> Args) {
CompilerInstance CI;
// Display diagnostics to stderr.
@@ -580,6 +583,7 @@ void SwiftLangSupport::editorOpenInterface(EditorConsumer &Consumer,
auto IFaceGenRef = SwiftInterfaceGenContext::create(Name,
/*IsModule=*/true,
ModuleName,
Group,
Invocation,
ErrMsg);
if (!IFaceGenRef) {
@@ -683,6 +687,7 @@ void SwiftLangSupport::editorOpenHeaderInterface(EditorConsumer &Consumer,
auto IFaceGenRef = SwiftInterfaceGenContext::create(Name,
/*IsModule=*/false,
HeaderName,
None,
Invocation,
Error);
if (!IFaceGenRef) {