averello/swift-mirror
1
0
Fork 0
mirror of https://github.com/apple/swift.git synced 2025-12-21 12:14:44 +01:00
Code Issues Packages Projects Releases Wiki Activity

[SourceKit] Update cursor info to report symbols from cross-import overlays as coming from the underylying module.

Browse Source 
Also refactor some of the interface generation cross-import support code to be
shared.
This commit is contained in:
Nathan Hawes
2020-03-20 18:48:54 -07:00
parent b3f296d590
commit a7e1cb3925
15 changed files with 423 additions and 345 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
tools/SourceKit/lib/SwiftLang/SwiftSourceDocInfo.cpp
View File

@@ -716,7 +716,7 @@ getParamParentNameOffset(const ValueDecl *VD, SourceLoc Cursor) {
/// Returns true on success, false on error (and sets `Diagnostic` accordingly).
static bool passCursorInfoForDecl(SourceFile* SF,
const ValueDecl *VD,
const ModuleDecl *MainModule,
ModuleDecl *MainModule,
const Type ContainerTy,
bool IsRef,
bool RetrieveRefactoring,
@@ -906,7 +906,26 @@ static bool passCursorInfoForDecl(SourceFile* SF,
if (ClangMod)
ModuleName = ClangMod->getFullModuleName();
} else if (VD->getModuleContext() != MainModule) {
ModuleName = VD->getModuleContext()->getName().str().str();
ModuleDecl *MD = VD->getModuleContext();
// If the decl is from a cross-import overlay module, report the overlay's
// underlying module as the owning module.
if (SF) {
// In a source file we map the imported overlays to the underlying
// modules they shadow.
while (MD->getNameStr().startswith("_")) {
auto *Underlying = SF->getModuleShadowedBySeparatelyImportedOverlay(MD);
if (!Underlying)
break;
MD = Underlying;
}
} else if (MainModule) {
// In a module interface we need to map the declared overlays of the main
// module (which are included in its generated interface) back to the main
// module itself.
if (MainModule->isUnderlyingModuleOfCrossImportOverlay(MD))
MD = MainModule;
}
ModuleName = MD->getName().str().str();
}
StringRef ModuleInterfaceName;
if (auto IFaceGenRef = Lang.getIFaceGenContexts().find(ModuleName, Invok))
@@ -1642,10 +1661,9 @@ void SwiftLangSupport::getCursorInfo(
Receiver);
} else {
std::string Diagnostic; // Unused.
// FIXME: Should pass the main module for the interface but currently
// it's not necessary.
ModuleDecl *MainModule = IFaceGenRef->getModuleDecl();
passCursorInfoForDecl(
/*SourceFile*/nullptr, Entity.Dcl, /*MainModule*/ nullptr,
/*SourceFile*/nullptr, Entity.Dcl, MainModule,
Type(), Entity.IsRef, Actionables, ResolvedCursorInfo(),
/*OrigBufferID=*/None, SourceLoc(),
{}, *this, Invok, Diagnostic, {}, Receiver);