From b6e2bb696273664c2274bbcfcb40edfab981d728 Mon Sep 17 00:00:00 2001 From: Dan Zheng Date: Sat, 23 Mar 2019 03:22:05 -0700 Subject: [PATCH] [Swift] Add support for `call` declarations. Add Clang support for `call` declarations in Swift. --- include/clang/Index/IndexSymbol.h | 1 + include/indexstore/indexstore.h | 1 + lib/Index/IndexDataStoreUtils.cpp | 2 ++ lib/Index/IndexSymbol.cpp | 1 + 4 files changed, 5 insertions(+) diff --git a/include/clang/Index/IndexSymbol.h b/include/clang/Index/IndexSymbol.h index 2a29eb5a737..e3e16205644 100644 --- a/include/clang/Index/IndexSymbol.h +++ b/include/clang/Index/IndexSymbol.h @@ -94,6 +94,7 @@ enum class SymbolSubKind : uint8_t { SwiftPostfixOperator, SwiftInfixOperator, + SwiftCall, SwiftSubscript, SwiftAssociatedType, SwiftGenericTypeParam, diff --git a/include/indexstore/indexstore.h b/include/indexstore/indexstore.h index b5550b618ab..26e431e1400 100644 --- a/include/indexstore/indexstore.h +++ b/include/indexstore/indexstore.h @@ -254,6 +254,7 @@ typedef enum { INDEXSTORE_SYMBOL_SUBKIND_SWIFTGENERICTYPEPARAM = 1013, INDEXSTORE_SYMBOL_SUBKIND_SWIFTACCESSORREAD = 1014, INDEXSTORE_SYMBOL_SUBKIND_SWIFTACCESSORMODIFY = 1015, + INDEXSTORE_SYMBOL_SUBKIND_SWIFTCALL = 1016, } indexstore_symbol_subkind_t; typedef enum { diff --git a/lib/Index/IndexDataStoreUtils.cpp b/lib/Index/IndexDataStoreUtils.cpp index 39dea609c83..c8902ca06b9 100644 --- a/lib/Index/IndexDataStoreUtils.cpp +++ b/lib/Index/IndexDataStoreUtils.cpp @@ -386,6 +386,8 @@ indexstore_symbol_subkind_t index::getIndexStoreSubKind(SymbolSubKind K) { return INDEXSTORE_SYMBOL_SUBKIND_SWIFTINFIXOPERATOR; case SymbolSubKind::SwiftSubscript: return INDEXSTORE_SYMBOL_SUBKIND_SWIFTSUBSCRIPT; + case SymbolSubKind::SwiftCall: + return INDEXSTORE_SYMBOL_SUBKIND_SWIFTCALL; case SymbolSubKind::SwiftAssociatedType: return INDEXSTORE_SYMBOL_SUBKIND_SWIFTASSOCIATEDTYPE; case SymbolSubKind::SwiftGenericTypeParam: diff --git a/lib/Index/IndexSymbol.cpp b/lib/Index/IndexSymbol.cpp index 1106b640e06..f929ee16b25 100644 --- a/lib/Index/IndexSymbol.cpp +++ b/lib/Index/IndexSymbol.cpp @@ -516,6 +516,7 @@ StringRef index::getSymbolSubKindString(SymbolSubKind K) { case SymbolSubKind::SwiftPrefixOperator: return "prefix-operator"; case SymbolSubKind::SwiftPostfixOperator: return "postfix-operator"; case SymbolSubKind::SwiftInfixOperator: return "infix-operator"; + case SymbolSubKind::SwiftCall: return "call"; case SymbolSubKind::SwiftSubscript: return "subscript"; case SymbolSubKind::SwiftAssociatedType: return "associated-type"; case SymbolSubKind::SwiftGenericTypeParam: return "generic-type-param";