Merge pull request #105 from jpsim/jp-objc-ivar

add support for Objective-C ivars
jpsim · Nov 24, 2015 · af07f65 · af07f65
2 parents 2d161d8 + 042d630
commit af07f65
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -12,9 +12,10 @@ None.
 
 ##### Bug Fixes
 
-* Add support for C/C++ struct & field types.  
+* Add support for C/C++ struct, field & ivar types.  
   [JP Simard](https://github.com/jpsim)
   [jazzy#374](https://github.com/realm/jazzy/issues/374)
+  [jazzy#387](https://github.com/realm/jazzy/issues/387)
 
 * Fix issue where Swift extensions would pick up documentation from previous
   tokens.  

diff --git a/Source/SourceKittenFramework/ObjCDeclarationKind.swift b/Source/SourceKittenFramework/ObjCDeclarationKind.swift
@@ -42,6 +42,8 @@ public enum ObjCDeclarationKind: String {
     case Struct = "sourcekitten.source.lang.objc.decl.struct"
     /// `field`
     case Field = "sourcekitten.source.lang.objc.decl.field"
+    /// `ivar`
+    case Ivar = "sourcekitten.source.lang.objc.decl.ivar"
 
     public static func fromClang(kind: CXCursorKind) -> ObjCDeclarationKind {
         switch kind.rawValue {
@@ -58,6 +60,7 @@ public enum ObjCDeclarationKind: String {
         case CXCursor_FunctionDecl.rawValue: return .Function
         case CXCursor_StructDecl.rawValue: return .Struct
         case CXCursor_FieldDecl.rawValue: return .Field
+        case CXCursor_ObjCIvarDecl.rawValue: return .Ivar
         default: fatalError("Unsupported CXCursorKind: \(clang_getCursorKindSpelling(kind))")
         }
     }