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

Adjust printing to take into account special DeclNames

Browse Source 
Print DeclBaseNames using a new userFacingStr() method to prepare for
DeclBaseNames that are not backed by Identifiers
This commit is contained in:
Alex Hoppen
2017-05-30 15:04:48 +02:00
parent 2fe2328436
commit 949968a182
23 changed files with 83 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
lib/IDE/SwiftSourceDocInfo.cpp
View File

@@ -291,7 +291,7 @@ void ResolvedRangeInfo::print(llvm::raw_ostream &OS) {
}
for (auto &VD : DeclaredDecls) {
OS << "<Declared>" << VD.VD->getNameStr() << "</Declared>";
OS << "<Declared>" << VD.VD->getBaseName() << "</Declared>";
OS << "<OutscopeReference>";
if (VD.ReferredAfterRange)
OS << "true";
@@ -300,7 +300,7 @@ void ResolvedRangeInfo::print(llvm::raw_ostream &OS) {
OS << "</OutscopeReference>\n";
}
for (auto &RD : ReferencedDecls) {
OS << "<Referenced>" << RD.VD->getNameStr() << "</Referenced>";
OS << "<Referenced>" << RD.VD->getBaseName() << "</Referenced>";
OS << "<Type>";
RD.Ty->print(OS);
OS << "</Type>\n";
@@ -1023,8 +1023,7 @@ void swift::ide::getLocationInfo(const ValueDecl *VD,
NameLen = getCharLength(SM, R);
} else {
if (VD->hasName()) {
// TODO: Handle special names
NameLen = VD->getBaseName().getIdentifier().getLength();
NameLen = VD->getBaseName().userFacingName().size();
} else {
NameLen = getCharLength(SM, VD->getLoc());
}