Add IndexSymbolKind and indexstoredb_symbol_kind_t

Move forEachRelation into SymbolOccurrence.

Author: literalpie

Sources/IndexStoreDB/IndexStoreDB.swift

@@ -107,15 +107,6 @@ public final class IndexStoreDB {
     }
   }
 
-  @discardableResult public func forEachRelation(
-    of occurrence: SymbolOccurrence,
-    body: @escaping (SymbolRelation) -> Bool
-  ) -> Bool {
-    return indexstoredb_symbol_occurrence_relations(occurrence.value){ relation in
-      body(SymbolRelation(relation))
-    }
-  }
-
 }
 
 public final class SymbolRelation {
@@ -168,13 +159,91 @@ public struct SymbolRole: OptionSet {
   }
 }
 
+public enum IndexSymbolKindEnum: Int {
+  case unknown = 0,
+  module,
+  namespace,
+  namespaceAlias,
+  macro,
+  `enum`,
+  `struct`,
+  `class`,
+  `protocol`,
+  `extension`,
+  union,
+  `typealias`,
+  function,
+  variable,
+  field,
+  enumConstant,
+  instanceMethod,
+  classMethod,
+  staticMethod,
+  instanceProperty,
+  classProperty,
+  staticProperty,
+  constructor,
+  destructor,
+  conversionFunction,
+  parameter,
+  using
+
+  case commentTag = 1000
+
+  public init?(cValue: indexstoredb_symbol_kind_t) {
+    self.init(rawValue: Int(cValue.rawValue))
+  }
+}
+
+public struct IndexSymbolKind: RawRepresentable {
+    public var rawValue: Int
+
+    public static let unknown: IndexSymbolKind = IndexSymbolKind(rawValue: INDEXSTOREDB_SYMBOL_KIND_UNKNOWN)
+    public static let module: IndexSymbolKind = IndexSymbolKind(rawValue: INDEXSTOREDB_SYMBOL_KIND_MODULE)
+    public static let namespace: IndexSymbolKind = IndexSymbolKind(rawValue: INDEXSTOREDB_SYMBOL_KIND_NAMESPACE)
+    public static let namespaceAlias: IndexSymbolKind = IndexSymbolKind(rawValue: INDEXSTOREDB_SYMBOL_KIND_NAMESPACEALIAS)
+    public static let macro: IndexSymbolKind = IndexSymbolKind(rawValue: INDEXSTOREDB_SYMBOL_KIND_MACRO)
+    public static let `enum`: IndexSymbolKind = IndexSymbolKind(rawValue: INDEXSTOREDB_SYMBOL_KIND_ENUM)
+    public static let `struct`: IndexSymbolKind = IndexSymbolKind(rawValue: INDEXSTOREDB_SYMBOL_KIND_STRUCT)
+    public static let `class`: IndexSymbolKind = IndexSymbolKind(rawValue: INDEXSTOREDB_SYMBOL_KIND_CLASS)
+    public static let `protocol`: IndexSymbolKind = IndexSymbolKind(rawValue: INDEXSTOREDB_SYMBOL_KIND_PROTOCOL)
+    public static let `extension`: IndexSymbolKind = IndexSymbolKind(rawValue: INDEXSTOREDB_SYMBOL_KIND_EXTENSION)
+    public static let union: IndexSymbolKind = IndexSymbolKind(rawValue: INDEXSTOREDB_SYMBOL_KIND_UNION)
+    public static let `typealias`: IndexSymbolKind = IndexSymbolKind(rawValue: INDEXSTOREDB_SYMBOL_KIND_TYPEALIAS)
+    public static let function: IndexSymbolKind = IndexSymbolKind(rawValue: INDEXSTOREDB_SYMBOL_KIND_FUNCTION)
+    public static let variable: IndexSymbolKind = IndexSymbolKind(rawValue: INDEXSTOREDB_SYMBOL_KIND_VARIABLE)
+    public static let field: IndexSymbolKind = IndexSymbolKind(rawValue: INDEXSTOREDB_SYMBOL_KIND_FIELD)
+    public static let enumConstant: IndexSymbolKind = IndexSymbolKind(rawValue: INDEXSTOREDB_SYMBOL_KIND_ENUMCONSTANT)
+    public static let instancMmethod: IndexSymbolKind = IndexSymbolKind(rawValue: INDEXSTOREDB_SYMBOL_KIND_INSTANCEMETHOD)
+    public static let classmMethod: IndexSymbolKind = IndexSymbolKind(rawValue: INDEXSTOREDB_SYMBOL_KIND_CLASSMETHOD)
+    public static let staticMethod: IndexSymbolKind = IndexSymbolKind(rawValue: INDEXSTOREDB_SYMBOL_KIND_STATICMETHOD)
+    public static let instanceProperty: IndexSymbolKind = IndexSymbolKind(rawValue: INDEXSTOREDB_SYMBOL_KIND_INSTANCEPROPERTY)
+    public static let classProperty: IndexSymbolKind = IndexSymbolKind(rawValue: INDEXSTOREDB_SYMBOL_KIND_CLASSPROPERTY)
+    public static let staticProperty: IndexSymbolKind = IndexSymbolKind(rawValue: INDEXSTOREDB_SYMBOL_KIND_STATICPROPERTY)
+    public static let constructor: IndexSymbolKind = IndexSymbolKind(rawValue: INDEXSTOREDB_SYMBOL_KIND_CONSTRUCTOR)
+    public static let destructor: IndexSymbolKind = IndexSymbolKind(rawValue: INDEXSTOREDB_SYMBOL_KIND_DESTRUCTOR)
+    public static let conversionFunction: IndexSymbolKind = IndexSymbolKind(rawValue: INDEXSTOREDB_SYMBOL_KIND_CONVERSIONFUNCTION)
+    public static let parameter: IndexSymbolKind = IndexSymbolKind(rawValue: INDEXSTOREDB_SYMBOL_KIND_PARAMETER)
+    public static let using: IndexSymbolKind = IndexSymbolKind(rawValue: INDEXSTOREDB_SYMBOL_KIND_USING)
+
+    public static let commentTag: IndexSymbolKind = IndexSymbolKind(rawValue: INDEXSTOREDB_SYMBOL_KIND_COMMENTTAG)
+
+    public init(rawValue: Int) {
+        self.rawValue = rawValue
+    }
+
+    public init(rawValue: indexstoredb_symbol_kind_t) {
+        self.rawValue = Int(rawValue.rawValue)
+    }
+}
+
 public final class Symbol {
 
   let value: indexstoredb_symbol_t
 
   public lazy var usr: String = String(cString: indexstoredb_symbol_usr(value))
   public lazy var name: String = String(cString: indexstoredb_symbol_name(value))
-  public lazy var kind = indexstoredb_symbol_kind(value)
+  public lazy var kind = IndexSymbolKind(rawValue: indexstoredb_symbol_kind(value))
 
   init(_ value: indexstoredb_symbol_t) {
     self.value = value
@@ -225,12 +294,20 @@ public final class SymbolOccurrence {
 
   private func getRelations() -> [SymbolRelation] {
     var relations: [SymbolRelation] = []
-    indexstoredb_symbol_occurrence_relations(value){ relation in
-      relations.append(SymbolRelation(relation))
+    forEachRelation{relation in 
+      relations.append(relation)
       return true
     }
     return relations
   }
+
+  @discardableResult public func forEachRelation(
+    body: @escaping (SymbolRelation) -> Bool
+  ) -> Bool {
+    return indexstoredb_symbol_occurrence_relations(value){ relation in
+      body(SymbolRelation(relation))
+    }
+  }
 }
 
 public protocol IndexStoreLibraryProvider {

include/CIndexStoreDB/CIndexStoreDB.h

@@ -53,7 +53,6 @@ typedef indexstoredb_object_t indexstoredb_symbol_occurrence_t;
 typedef void *indexstoredb_error_t;
 typedef void *indexstoredb_symbol_location_t;
 typedef void *indexstoredb_symbol_relation_t;
-typedef void *indexstoredb_symbol_kind_t;
 
 typedef enum {
   INDEXSTOREDB_SYMBOL_ROLE_DECLARATION = 1 << 0,
@@ -81,6 +80,38 @@ typedef enum {
   INDEXSTOREDB_SYMBOL_ROLE_CANONICAL = 1 << 63,
 } indexstoredb_symbol_role_t;
 
+typedef enum {
+  INDEXSTOREDB_SYMBOL_KIND_UNKNOWN = 0,
+  INDEXSTOREDB_SYMBOL_KIND_MODULE = 1,
+  INDEXSTOREDB_SYMBOL_KIND_NAMESPACE = 2,
+  INDEXSTOREDB_SYMBOL_KIND_NAMESPACEALIAS = 3,
+  INDEXSTOREDB_SYMBOL_KIND_MACRO = 4,
+  INDEXSTOREDB_SYMBOL_KIND_ENUM = 5,
+  INDEXSTOREDB_SYMBOL_KIND_STRUCT = 6,
+  INDEXSTOREDB_SYMBOL_KIND_CLASS = 7,
+  INDEXSTOREDB_SYMBOL_KIND_PROTOCOL = 8,
+  INDEXSTOREDB_SYMBOL_KIND_EXTENSION = 9,
+  INDEXSTOREDB_SYMBOL_KIND_UNION = 10,
+  INDEXSTOREDB_SYMBOL_KIND_TYPEALIAS = 11,
+  INDEXSTOREDB_SYMBOL_KIND_FUNCTION = 12,
+  INDEXSTOREDB_SYMBOL_KIND_VARIABLE = 13,
+  INDEXSTOREDB_SYMBOL_KIND_FIELD = 14,
+  INDEXSTOREDB_SYMBOL_KIND_ENUMCONSTANT = 15,
+  INDEXSTOREDB_SYMBOL_KIND_INSTANCEMETHOD = 16,
+  INDEXSTOREDB_SYMBOL_KIND_CLASSMETHOD = 17,
+  INDEXSTOREDB_SYMBOL_KIND_STATICMETHOD = 18,
+  INDEXSTOREDB_SYMBOL_KIND_INSTANCEPROPERTY = 19,
+  INDEXSTOREDB_SYMBOL_KIND_CLASSPROPERTY = 20,
+  INDEXSTOREDB_SYMBOL_KIND_STATICPROPERTY = 21,
+  INDEXSTOREDB_SYMBOL_KIND_CONSTRUCTOR = 22,
+  INDEXSTOREDB_SYMBOL_KIND_DESTRUCTOR = 23,
+  INDEXSTOREDB_SYMBOL_KIND_CONVERSIONFUNCTION = 24,
+  INDEXSTOREDB_SYMBOL_KIND_PARAMETER = 25,
+  INDEXSTOREDB_SYMBOL_KIND_USING = 26,
+
+  INDEXSTOREDB_SYMBOL_KIND_COMMENTTAG = 1000,
+} indexstoredb_symbol_kind_t;
+
 /// Returns true on success.
 typedef _Nullable indexstoredb_indexstore_library_t(^indexstore_library_provider_t)(const char * _Nonnull);
 
@@ -224,7 +255,7 @@ indexstoredb_symbol_occurrence_relations(_Nonnull indexstoredb_symbol_occurrence
 
 /// Get the SymbolKind of a Symbol
 /// @param symbol The symbol whose kind should be found.
-INDEXSTOREDB_PUBLIC uint8_t
+INDEXSTOREDB_PUBLIC indexstoredb_symbol_kind_t
 indexstoredb_symbol_kind(_Nonnull indexstoredb_symbol_t);
 
 INDEXSTOREDB_END_DECLS

lib/CIndexStoreDB/CIndexStoreDB.cpp

@@ -144,10 +144,10 @@ indexstoredb_symbol_name(indexstoredb_symbol_t symbol) {
   return obj->value->getName().c_str();
 }
 
-uint8_t
+indexstoredb_symbol_kind_t
 indexstoredb_symbol_kind(indexstoredb_symbol_t symbol) {
   auto symbolObj = (IndexStoreDBObject<std::shared_ptr<Symbol>> *)symbol;
-  return (uint8_t) symbolObj->value->getSymbolKind();
+  return (indexstoredb_symbol_kind_t) symbolObj->value->getSymbolKind();
 }
 
 bool