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] When reporting the cursor info for parameter decls, report the locations of the function-like entities they belong to. rdar://30702790 (#8541)

Browse Source
This commit is contained in:
Xi Ge
2017-04-04 15:24:36 -07:00
committed by GitHub
parent bd1920ba67
commit f669afff50
7 changed files with 71 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -610,6 +610,29 @@ static bool passCursorInfoForModule(ModuleEntity Mod,
return false;
}
static bool getParamParentNameLoc(const ValueDecl *VD, unsigned &Line,
unsigned &Column) {
SourceLoc Loc;
if (auto PD = dyn_cast<ParamDecl>(VD)) {
auto *DC = PD->getDeclContext();
switch (DC->getContextKind()) {
case DeclContextKind::SubscriptDecl:
Loc = cast<SubscriptDecl>(DC)->getNameLoc();
break;
case DeclContextKind::AbstractFunctionDecl:
Loc = cast<AbstractFunctionDecl>(DC)->getNameLoc();
break;
default:
return false;
}
}
if (Loc.isInvalid())
return false;
auto &SM = VD->getASTContext().SourceMgr;
std::tie(Line, Column) = SM.getLineAndColumn(Loc);
return true;
}
/// Returns true for failure to resolve.
static bool passCursorInfoForDecl(const ValueDecl *VD,
const ModuleDecl *MainModule,
@@ -830,6 +853,12 @@ static bool passCursorInfoForDecl(const ValueDecl *VD,
bool IsSystem = VD->getModuleContext()->isSystemModule();
std::string TypeInterface;
unsigned ParentLine, ParentCol;
llvm::Optional<std::pair<unsigned, unsigned>> ParentLoc;
if (getParamParentNameLoc(VD, ParentLine, ParentCol)) {
ParentLoc.emplace(ParentLine, ParentCol);
}
CursorInfo Info;
Info.Kind = Kind;
Info.Name = Name;
@@ -850,6 +879,7 @@ static bool passCursorInfoForDecl(const ValueDecl *VD,
Info.LocalizationKey = LocalizationKey;
Info.IsSystem = IsSystem;
Info.TypeInterface = StringRef();
Info.ParentNameLoc = ParentLoc;
Receiver(Info);
return false;
}
@@ -1020,6 +1050,7 @@ public:
return false;
}
};
static void resolveCursor(SwiftLangSupport &Lang,
StringRef InputFile, unsigned Offset,
unsigned Length, bool Actionables,