Skip to content

Commit

Permalink
Support union declarations in Objective C modules (#1279)
Browse files Browse the repository at this point in the history
  • Loading branch information
johnfairh committed Sep 19, 2021
1 parent 3835314 commit 9badbe3
Show file tree
Hide file tree
Showing 5 changed files with 11 additions and 2 deletions.
4 changes: 4 additions & 0 deletions CHANGELOG.md
Expand Up @@ -13,6 +13,10 @@
* Correct line number references with Xcode 13.
[John Fairhurst](https://github.com/johnfairh)

* Support `union` declarations in Objective-C headers.
[Brian Osborn](https://github.com/bosborn)
[John Fairhurst](https://github.com/johnfairh)

##### Bug Fixes

* None.
Expand Down
2 changes: 1 addition & 1 deletion SourceKitten
Submodule SourceKitten updated 152 files
Binary file modified bin/sourcekitten
Binary file not shown.
5 changes: 5 additions & 0 deletions lib/jazzy/source_declaration/type.rb
Expand Up @@ -255,6 +255,11 @@ def ==(other)
dash: 'Struct',
global: true,
}.freeze,
'sourcekitten.source.lang.objc.decl.union' => {
jazzy: 'Union',
dash: 'Union',
global: true,
}.freeze,
'sourcekitten.source.lang.objc.decl.field' => {
jazzy: 'Field',
dash: 'Field',
Expand Down
2 changes: 1 addition & 1 deletion spec/integration_specs
Submodule integration_specs updated 77 files
+12 −1 misc_jazzy_objc_features/after/docs/Categories/NSValue(SomeAdditions).html
+12 −1 misc_jazzy_objc_features/after/docs/Categories/NSValue(SomeMoreAdditions).html
+12 −1 misc_jazzy_objc_features/after/docs/Classes/ObjCClassWithProtocol.html
+12 −1 misc_jazzy_objc_features/after/docs/Classes/ObjCDifferentlyNamed.html
+12 −1 misc_jazzy_objc_features/after/docs/Classes/ObjCDifferentlyNamedSettings.html
+12 −1 misc_jazzy_objc_features/after/docs/Classes/ObjCEmptyClass.html
+12 −1 misc_jazzy_objc_features/after/docs/Classes/ObjCLowLevelClass.html
+12 −1 misc_jazzy_objc_features/after/docs/Classes/ObjCMidLevelClass.html
+12 −1 misc_jazzy_objc_features/after/docs/Classes/ObjCTopLevelClass.html
+12 −1 misc_jazzy_objc_features/after/docs/Classes/SwiftMidLevelClass.html
+12 −1 misc_jazzy_objc_features/after/docs/Classes/TopLevelSwiftClass.html
+12 −1 misc_jazzy_objc_features/after/docs/Constants/ExtensibleEnumBar.html
+12 −1 misc_jazzy_objc_features/after/docs/Constants/ExtensibleEnumBaz.html
+12 −1 misc_jazzy_objc_features/after/docs/Constants/ExtensibleEnumFoo.html
+12 −1 misc_jazzy_objc_features/after/docs/Constants/MiscJazzyObjCFeaturesVersionNumber.html
+12 −1 misc_jazzy_objc_features/after/docs/Constants/MiscJazzyObjCFeaturesVersionString.html
+12 −1 misc_jazzy_objc_features/after/docs/Enums/SomeEnum.html
+12 −1 misc_jazzy_objc_features/after/docs/Functions/functionA.html
+12 −1 misc_jazzy_objc_features/after/docs/Functions/functionB.html
+12 −1 misc_jazzy_objc_features/after/docs/Functions/functionC.html
+12 −1 misc_jazzy_objc_features/after/docs/Other Categories.html
+12 −1 misc_jazzy_objc_features/after/docs/Other Classes.html
+12 −1 misc_jazzy_objc_features/after/docs/Other Constants.html
+12 −1 misc_jazzy_objc_features/after/docs/Other Enums.html
+12 −1 misc_jazzy_objc_features/after/docs/Other Functions.html
+12 −1 misc_jazzy_objc_features/after/docs/Other Protocols.html
+21 −1 misc_jazzy_objc_features/after/docs/Other Type Definitions.html
+205 −0 misc_jazzy_objc_features/after/docs/Other Unions.html
+12 −1 misc_jazzy_objc_features/after/docs/Protocols/ObjCEmptyProtocol.html
+12 −1 misc_jazzy_objc_features/after/docs/Protocols/ObjCTopLevelProtocol.html
+199 −0 misc_jazzy_objc_features/after/docs/Type Definitions/Data.html
+12 −1 misc_jazzy_objc_features/after/docs/Type Definitions/ExtensibleEnum.html
+272 −0 misc_jazzy_objc_features/after/docs/Unions/Data.html
+12 −1 misc_jazzy_objc_features/after/docs/Ying.html
+2 −2 misc_jazzy_objc_features/after/docs/badge.svg
+12 −1 ...ures/after/docs/docsets/JazzyKit.docset/Contents/Resources/Documents/Categories/NSValue(SomeAdditions).html
+12 −1 .../after/docs/docsets/JazzyKit.docset/Contents/Resources/Documents/Categories/NSValue(SomeMoreAdditions).html
+12 −1 ...features/after/docs/docsets/JazzyKit.docset/Contents/Resources/Documents/Classes/ObjCClassWithProtocol.html
+12 −1 ..._features/after/docs/docsets/JazzyKit.docset/Contents/Resources/Documents/Classes/ObjCDifferentlyNamed.html
+12 −1 ...s/after/docs/docsets/JazzyKit.docset/Contents/Resources/Documents/Classes/ObjCDifferentlyNamedSettings.html
+12 −1 ...y_objc_features/after/docs/docsets/JazzyKit.docset/Contents/Resources/Documents/Classes/ObjCEmptyClass.html
+12 −1 ...bjc_features/after/docs/docsets/JazzyKit.docset/Contents/Resources/Documents/Classes/ObjCLowLevelClass.html
+12 −1 ...bjc_features/after/docs/docsets/JazzyKit.docset/Contents/Resources/Documents/Classes/ObjCMidLevelClass.html
+12 −1 ...bjc_features/after/docs/docsets/JazzyKit.docset/Contents/Resources/Documents/Classes/ObjCTopLevelClass.html
+12 −1 ...jc_features/after/docs/docsets/JazzyKit.docset/Contents/Resources/Documents/Classes/SwiftMidLevelClass.html
+12 −1 ...jc_features/after/docs/docsets/JazzyKit.docset/Contents/Resources/Documents/Classes/TopLevelSwiftClass.html
+12 −1 ...c_features/after/docs/docsets/JazzyKit.docset/Contents/Resources/Documents/Constants/ExtensibleEnumBar.html
+12 −1 ...c_features/after/docs/docsets/JazzyKit.docset/Contents/Resources/Documents/Constants/ExtensibleEnumBaz.html
+12 −1 ...c_features/after/docs/docsets/JazzyKit.docset/Contents/Resources/Documents/Constants/ExtensibleEnumFoo.html
+12 −1 ...docs/docsets/JazzyKit.docset/Contents/Resources/Documents/Constants/MiscJazzyObjCFeaturesVersionNumber.html
+12 −1 ...docs/docsets/JazzyKit.docset/Contents/Resources/Documents/Constants/MiscJazzyObjCFeaturesVersionString.html
+12 −1 misc_jazzy_objc_features/after/docs/docsets/JazzyKit.docset/Contents/Resources/Documents/Enums/SomeEnum.html
+12 −1 ...azzy_objc_features/after/docs/docsets/JazzyKit.docset/Contents/Resources/Documents/Functions/functionA.html
+12 −1 ...azzy_objc_features/after/docs/docsets/JazzyKit.docset/Contents/Resources/Documents/Functions/functionB.html
+12 −1 ...azzy_objc_features/after/docs/docsets/JazzyKit.docset/Contents/Resources/Documents/Functions/functionC.html
+12 −1 misc_jazzy_objc_features/after/docs/docsets/JazzyKit.docset/Contents/Resources/Documents/Other Categories.html
+12 −1 misc_jazzy_objc_features/after/docs/docsets/JazzyKit.docset/Contents/Resources/Documents/Other Classes.html
+12 −1 misc_jazzy_objc_features/after/docs/docsets/JazzyKit.docset/Contents/Resources/Documents/Other Constants.html
+12 −1 misc_jazzy_objc_features/after/docs/docsets/JazzyKit.docset/Contents/Resources/Documents/Other Enums.html
+12 −1 misc_jazzy_objc_features/after/docs/docsets/JazzyKit.docset/Contents/Resources/Documents/Other Functions.html
+12 −1 misc_jazzy_objc_features/after/docs/docsets/JazzyKit.docset/Contents/Resources/Documents/Other Protocols.html
+21 −1 ...y_objc_features/after/docs/docsets/JazzyKit.docset/Contents/Resources/Documents/Other Type Definitions.html
+205 −0 misc_jazzy_objc_features/after/docs/docsets/JazzyKit.docset/Contents/Resources/Documents/Other Unions.html
+12 −1 ...c_features/after/docs/docsets/JazzyKit.docset/Contents/Resources/Documents/Protocols/ObjCEmptyProtocol.html
+12 −1 ...eatures/after/docs/docsets/JazzyKit.docset/Contents/Resources/Documents/Protocols/ObjCTopLevelProtocol.html
+199 −0 ...zy_objc_features/after/docs/docsets/JazzyKit.docset/Contents/Resources/Documents/Type Definitions/Data.html
+12 −1 ...atures/after/docs/docsets/JazzyKit.docset/Contents/Resources/Documents/Type Definitions/ExtensibleEnum.html
+272 −0 misc_jazzy_objc_features/after/docs/docsets/JazzyKit.docset/Contents/Resources/Documents/Unions/Data.html
+12 −1 misc_jazzy_objc_features/after/docs/docsets/JazzyKit.docset/Contents/Resources/Documents/Ying.html
+12 −1 misc_jazzy_objc_features/after/docs/docsets/JazzyKit.docset/Contents/Resources/Documents/index.html
+1 −1 misc_jazzy_objc_features/after/docs/docsets/JazzyKit.docset/Contents/Resources/Documents/search.json
+58 −53 misc_jazzy_objc_features/after/docs/docsets/JazzyKit.docset/Contents/Resources/docSet.dsidx.csv
+12 −1 misc_jazzy_objc_features/after/docs/index.html
+1 −1 misc_jazzy_objc_features/after/docs/search.json
+14 −0 misc_jazzy_objc_features/after/docs/undocumented.json
+2 −2 misc_jazzy_objc_features/after/execution_output.txt
+11 −0 misc_jazzy_objc_features/before/MiscJazzyObjCFeatures/ExternalFunctions.h

0 comments on commit 9badbe3

Please sign in to comment.