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

Cleanup: Move Swift to ObjC name translation API to libAST to allow larger audience body. NFC (#7586)

Browse Source
This commit is contained in:
Xi Ge
2017-02-17 22:09:25 -08:00
committed by GitHub
parent 71cf7d9f31
commit 03a17e1f06
6 changed files with 131 additions and 95 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -20,6 +20,7 @@
#include "swift/AST/Decl.h"
#include "swift/AST/NameLookup.h"
#include "swift/AST/SourceEntityWalker.h"
#include "swift/AST/SwiftNameTranslation.h"
#include "swift/Basic/SourceManager.h"
#include "swift/Frontend/Frontend.h"
#include "swift/Frontend/PrintingDiagnosticConsumer.h"
@@ -27,7 +28,6 @@
#include "swift/IDE/ModuleInterfacePrinting.h"
#include "swift/IDE/Utils.h"
#include "swift/Markup/XMLUtils.h"
#include "swift/PrintAsObjC/PrintAsObjC.h"
#include "swift/Sema/IDETypeChecking.h"
#include "clang/AST/ASTContext.h"
@@ -895,7 +895,8 @@ static bool passNameInfoForDecl(const ValueDecl *VD, NameTranslatingInfo &Info,
case NameKind::Swift: {
NameTranslatingInfo Result;
auto &Ctx = VD->getDeclContext()->getASTContext();
auto ResultPair = getObjCNameForSwiftDecl(VD, getSwiftDeclName(Ctx, Info));
auto ResultPair = swift::objc_translation::getObjCNameForSwiftDecl(VD,
getSwiftDeclName(Ctx, Info));
Identifier Name = ResultPair.first;
if (!Name.empty()) {
Result.NameKind = SwiftLangSupport::getUIDForNameKind(NameKind::ObjC);