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

Fix bad merge

Browse Source
This commit is contained in:
David Goldman
2019-05-03 15:44:14 -04:00
parent 9a9854b291
commit 6d59776e0d
2 changed files with 1 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -834,12 +834,7 @@ void SwiftLangSupport::editorOpenHeaderInterface(EditorConsumer &Consumer,
void SwiftLangSupport::findInterfaceDocument(StringRef ModuleName,
ArrayRef<const char *> Args,
<<<<<<< HEAD
std::function<void(const RequestResult<InterfaceDocInfo> &)> Receiver) {
=======
std::function<void(const InterfaceDocInfo &,
StringRef Error)> Receiver) {
>>>>>>> aad86098551240bff9af8aa6617861fdd0619c22
InterfaceDocInfo Info;
CompilerInstance CI;
@@ -851,11 +846,7 @@ void SwiftLangSupport::findInterfaceDocument(StringRef ModuleName,
std::string Error;
if (getASTManager()->initCompilerInvocation(Invocation, Args, CI.getDiags(),
StringRef(), Error)) {
<<<<<<< HEAD
return Receiver(RequestResult<InterfaceDocInfo>::fromError(Error));
=======
return Receiver({}, Error);
>>>>>>> aad86098551240bff9af8aa6617861fdd0619c22
}
if (auto IFaceGenRef = IFaceGenContexts.find(ModuleName, Invocation))
@@ -913,9 +904,5 @@ void SwiftLangSupport::findInterfaceDocument(StringRef ModuleName,
}
Info.CompilerArgs = NewArgs;
<<<<<<< HEAD
return Receiver(RequestResult<InterfaceDocInfo>::fromResult(Info));
=======
return Receiver(Info, "");
>>>>>>> aad86098551240bff9af8aa6617861fdd0619c22
}