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

Merge remote-tracking branch 'origin/master' into master-next

Browse Source
This commit is contained in:
swift_jenkins
2020-06-15 14:39:00 -07:00
parent aa0df2d113 80e2b48d36
commit 2b1bf9ffd3
29 changed files with 4420 additions and 189 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
tools/SourceKit/lib/SwiftLang/SwiftLangSupport.cpp
View File

@@ -82,6 +82,10 @@ static UIdent Attr_Setter_FilePrivate("source.decl.attribute.setter_access.filep
static UIdent Attr_Setter_Internal("source.decl.attribute.setter_access.internal");
static UIdent Attr_Setter_Public("source.decl.attribute.setter_access.public");
static UIdent Attr_Setter_Open("source.decl.attribute.setter_access.open");
static UIdent EffectiveAccess_Public("source.decl.effective_access.public");
static UIdent EffectiveAccess_Internal("source.decl.effective_access.internal");
static UIdent EffectiveAccess_FilePrivate("source.decl.effective_access.fileprivate");
static UIdent EffectiveAccess_LessThanFilePrivate("source.decl.effective_access.less_than_fileprivate");
std::unique_ptr<LangSupport>
SourceKit::createSwiftLangSupport(SourceKit::Context &SKCtx) {
@@ -808,6 +812,20 @@ Optional<UIdent> SwiftLangSupport::getUIDForDeclAttribute(const swift::DeclAttri
return None;
}
UIdent SwiftLangSupport::getUIDForFormalAccessScope(const swift::AccessScope Scope) {
if (Scope.isPublic()) {
return EffectiveAccess_Public;
} else if (Scope.isInternal()) {
return EffectiveAccess_Internal;
} else if (Scope.isFileScope()) {
return EffectiveAccess_FilePrivate;
} else if (Scope.isPrivate()) {
return EffectiveAccess_LessThanFilePrivate;
} else {
llvm_unreachable("Unsupported access scope");
}
}
std::vector<UIdent> SwiftLangSupport::UIDsFromDeclAttributes(const DeclAttributes &Attrs) {
std::vector<UIdent> AttrUIDs;