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

[sourcekitd] When searching for a clang decl, look at overrides

Browse Source 
Allows us to do name-transation on an override of a clang decl.

rdar://problem/32187817
This commit is contained in:
Ben Langmuir
2017-05-14 14:40:42 -07:00
parent fb5734c24f
commit c89d024cd2
2 changed files with 31 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
test/SourceKit/NameTranslation/basic.swift
View File

@@ -18,6 +18,12 @@ func foo2 (_ a : FooClassDerived) {
_ = FooClassBase()
}
class MyDerived: FooClassDerived {
override func fooInstanceFunc0() {
self.fooInstanceFunc0()
}
}
// REQUIRES: objc_interop
// RUN: %sourcekitd-test -req=translate -objc-name FooClassDerived2 -pos=5:30 %s -- -F %S/../Inputs/libIDE-mock-sdk -I %t.tmp %mcp_opt %s | %FileCheck -check-prefix=CHECK1 %s
// RUN: %sourcekitd-test -req=translate -objc-selector FooClassDerived2 -pos=3:23 %s -- -F %S/../Inputs/libIDE-mock-sdk -I %t.tmp %mcp_opt %s | %FileCheck -check-prefix=CHECK11 %s
@@ -45,6 +51,9 @@ func foo2 (_ a : FooClassDerived) {
// RUN: %sourcekitd-test -req=translate -objc-selector iit: -pos=17:13 %s -- -F %S/../Inputs/libIDE-mock-sdk -I %t.tmp %mcp_opt %s | %FileCheck -check-prefix=CHECK13 %s
// RUN: %sourcekitd-test -req=translate -objc-selector NAME -pos=18:13 %s -- -F %S/../Inputs/libIDE-mock-sdk -I %t.tmp %mcp_opt %s | %FileCheck -check-prefix=CHECK14 %s
// RUN: %sourcekitd-test -req=translate -objc-selector fooInstanceFunc01 -pos=22:17 %s -- -F %S/../Inputs/libIDE-mock-sdk -I %t.tmp %mcp_opt %s | %FileCheck -check-prefix=CHECK5 %s
// RUN: %sourcekitd-test -req=translate -objc-selector fooInstanceFunc01 -pos=23:10 %s -- -F %S/../Inputs/libIDE-mock-sdk -I %t.tmp %mcp_opt %s | %FileCheck -check-prefix=CHECK5 %s
// CHECK1: FooClassDerived2
// CHECK-NONE: <empty name translation info>
// CHECK2: fooProperty2

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

@@ -990,7 +990,15 @@ static bool passNameInfoForDecl(const ValueDecl *VD, NameTranslatingInfo &Info,
ClangImporter *Importer = static_cast<ClangImporter *>(VD->getDeclContext()->
getASTContext().getClangModuleLoader());
if (auto *Named = dyn_cast_or_null<clang::NamedDecl>(VD->getClangDecl())) {
const clang::NamedDecl *Named = nullptr;
auto *BaseDecl = VD;
while (!Named && BaseDecl) {
Named = dyn_cast_or_null<clang::NamedDecl>(BaseDecl->getClangDecl());
BaseDecl = BaseDecl->getOverriddenDecl();
}
if (!Named)
return true;
auto ObjCName = getClangDeclarationName(Named, Info);
if (!ObjCName)
return true;
@@ -1006,8 +1014,6 @@ static bool passNameInfoForDecl(const ValueDecl *VD, NameTranslatingInfo &Info,
Receiver(Result);
return false;
}
return true;
}
}
}