Skip to content

Commit

Permalink
Merge pull request #207 from realm/sourcekitten-0.3.2
Browse files Browse the repository at this point in the history 
Updated SourceKitten to 0.3.2
  • Loading branch information
@jpsim
jpsim committed Apr 7, 2015
2 parents 5ed6b30 + bd1366a commit 3e9d7bd
Show file tree
Hide file tree
Showing 25 changed files with 43 additions and 23 deletions.
19 changes: 19 additions & 0 deletions CHANGELOG.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,25 @@
* Fixed installation issues on case-sensitive file systems.
[kishikawakatsumi](https://github.com/kishikawakatsumi)

* Fixed out-of-bounds exception when parsing the declaration in files starting
with a declaration.
[JP Simard](https://github.com/jpsim)
[#30](https://github.com/jpsim/SourceKitten/issues/30)

* Fixed out-of-bounds exception and inaccurate parsed declarations when using
multibyte characters.
[JP Simard](https://github.com/jpsim)
[#35](https://github.com/jpsim/SourceKitten/issues/35)

* Fixed parsing issues with keyword functions such as `subscript`, `init` and
`deinit`.
[JP Simard](https://github.com/jpsim)
[#27](https://github.com/jpsim/SourceKitten/issues/27)

* Fixed issues where USR wasn't accurate because dependencies couldn't be
resolved.
[JP Simard](https://github.com/jpsim)


## 0.1.4

Expand Down
2 changes: 1 addition & 1 deletion SourceKitten
Submodule SourceKitten updated 51 files
+1 −0 .gitattributes
+0 −6 .gitmodules
+4 −0 .travis.yml
+41 −0 CHANGELOG.md
+1 −3 Cartfile
+2 −1 Cartfile.private
+3 −5 Cartfile.resolved
+1 −1 Carthage/Checkouts/Commandant
+0 −1 Carthage/Checkouts/Nimble
+0 −1 Carthage/Checkouts/Quick
+1 −1 Carthage/Checkouts/SwiftXPC
+1 −1 Carthage/Checkouts/xcconfigs
+4 −2 README.md
+0 −22 Source/SourceKittenFramework/Array+Compact.swift
+29 −0 Source/SourceKittenFramework/Array+SourceKitten.swift
+4 −13 Source/SourceKittenFramework/ClangTranslationUnit.swift
+1 −1 Source/SourceKittenFramework/Dictionary+Merge.swift
+157 −78 Source/SourceKittenFramework/File.swift
+21 −9 Source/SourceKittenFramework/Language.swift
+5 −5 Source/SourceKittenFramework/Module.swift
+0 −100 Source/SourceKittenFramework/NSString+SourceKitten.swift
+5 −3 Source/SourceKittenFramework/OffsetMap.swift
+15 −0 Source/SourceKittenFramework/Optional+SourceKitten.swift
+7 −11 Source/SourceKittenFramework/Request.swift
+387 −0 Source/SourceKittenFramework/SWXMLHash.swift
+0 −27 Source/SourceKittenFramework/SequenceType+IndexBefore.swift
+22 −0 Source/SourceKittenFramework/SequenceType+SourceKitten.swift
+299 −0 Source/SourceKittenFramework/String+SourceKitten.swift
+2 −2 Source/SourceKittenFramework/Structure.swift
+63 −52 Source/SourceKittenFramework/SwiftDeclarationKind.swift
+86 −41 Source/SourceKittenFramework/SwiftDocKey.swift
+5 −3 Source/SourceKittenFramework/SwiftDocs.swift
+39 −19 Source/SourceKittenFramework/SyntaxKind.swift
+18 −0 Source/SourceKittenFramework/SyntaxMap.swift
+7 −0 Source/SourceKittenFramework/SyntaxToken.swift
+10 −10 Source/SourceKittenFramework/sourcekitd.swift
+240 −68 Source/SourceKittenFrameworkTests/Fixtures/Bicycle.json
+1 −1 Source/SourceKittenFrameworkTests/Fixtures/Bicycle.swift
+48 −0 Source/SourceKittenFrameworkTests/Fixtures/Subscript.json
+7 −0 Source/SourceKittenFrameworkTests/Fixtures/Subscript.swift
+110 −37 Source/SourceKittenFrameworkTests/StringTests.swift
+29 −0 Source/SourceKittenFrameworkTests/StructureTests.swift
+46 −9 Source/SourceKittenFrameworkTests/SwiftDocsTests.swift
+34 −17 Source/SourceKittenFrameworkTests/SyntaxTests.swift
+13 −13 Source/sourcekitten/Doc.swift
+4 −4 Source/sourcekitten/Errors.swift
+2 −2 Source/sourcekitten/Module+MultiProcess.swift
+9 −9 Source/sourcekitten/Structure.swift
+9 −9 Source/sourcekitten/Syntax.swift
+2 −2 Source/sourcekitten/Version.swift
+40 −12 sourcekitten.xcodeproj/project.pbxproj
Binary file modified lib/jazzy/SourceKitten/Commandant.framework/Versions/A/Commandant
View file
Binary file not shown.
Binary file modified ...eKitten/Commandant.framework/Versions/A/Modules/Commandant.swiftmodule/x86_64.swiftmodule
View file
Binary file not shown.
10 changes: 5 additions & 5 deletions lib/jazzy/SourceKitten/Commandant.framework/Versions/A/Resources/Info.plist
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<plist version="1.0">
<dict>
<key>BuildMachineOSBuild</key>
<string>14B25</string>
<string>14C1514</string>
<key>CFBundleDevelopmentRegion</key>
<string>en</string>
<key>CFBundleExecutable</key>
Expand All @@ -25,17 +25,17 @@
<key>DTCompiler</key>
<string>com.apple.compilers.llvm.clang.1_0</string>
<key>DTPlatformBuild</key>
<string>6A2008a</string>
<string>6C131e</string>
<key>DTPlatformVersion</key>
<string>GM</string>
<key>DTSDKBuild</key>
<string>14A382</string>
<string>14A383</string>
<key>DTSDKName</key>
<string>macosx10.10</string>
<key>DTXcode</key>
<string>0611</string>
<string>0620</string>
<key>DTXcodeBuild</key>
<string>6A2008a</string>
<string>6C131e</string>
<key>NSHumanReadableCopyright</key>
<string>Copyright © 2014 Carthage. All rights reserved.</string>
</dict>
Expand Down
Binary file modified lib/jazzy/SourceKitten/LlamaKit.framework/Versions/A/LlamaKit
View file
Binary file not shown.
Binary file modified ...ourceKitten/LlamaKit.framework/Versions/A/Modules/LlamaKit.swiftmodule/x86_64.swiftmodule
View file
Binary file not shown.
10 changes: 5 additions & 5 deletions lib/jazzy/SourceKitten/LlamaKit.framework/Versions/A/Resources/Info.plist
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<plist version="1.0">
<dict>
<key>BuildMachineOSBuild</key>
<string>14B25</string>
<string>14C1514</string>
<key>CFBundleDevelopmentRegion</key>
<string>en</string>
<key>CFBundleExecutable</key>
Expand All @@ -25,17 +25,17 @@
<key>DTCompiler</key>
<string>com.apple.compilers.llvm.clang.1_0</string>
<key>DTPlatformBuild</key>
<string>6A2008a</string>
<string>6C131e</string>
<key>DTPlatformVersion</key>
<string>GM</string>
<key>DTSDKBuild</key>
<string>14A382</string>
<string>14A383</string>
<key>DTSDKName</key>
<string>macosx10.10</string>
<key>DTXcode</key>
<string>0611</string>
<string>0620</string>
<key>DTXcodeBuild</key>
<string>6A2008a</string>
<string>6C131e</string>
<key>NSHumanReadableCopyright</key>
<string>Copyright © 2014 Rob Napier. All rights reserved.</string>
<key>UIDeviceFamily</key>
Expand Down
Binary file modified .../Frameworks/SwiftXPC.framework/Versions/A/Modules/SwiftXPC.swiftmodule/x86_64.swiftmodule
View file
Binary file not shown.
10 changes: 5 additions & 5 deletions ...mework.framework/Versions/A/Frameworks/SwiftXPC.framework/Versions/A/Resources/Info.plist
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<plist version="1.0">
<dict>
<key>BuildMachineOSBuild</key>
<string>14B25</string>
<string>14C1514</string>
<key>CFBundleDevelopmentRegion</key>
<string>en</string>
<key>CFBundleExecutable</key>
Expand All @@ -25,17 +25,17 @@
<key>DTCompiler</key>
<string>com.apple.compilers.llvm.clang.1_0</string>
<key>DTPlatformBuild</key>
<string>6A2008a</string>
<string>6C131e</string>
<key>DTPlatformVersion</key>
<string>GM</string>
<key>DTSDKBuild</key>
<string>14A382</string>
<string>14A383</string>
<key>DTSDKName</key>
<string>macosx10.10</string>
<key>DTXcode</key>
<string>0611</string>
<string>0620</string>
<key>DTXcodeBuild</key>
<string>6A2008a</string>
<string>6C131e</string>
<key>NSHumanReadableCopyright</key>
<string>Copyright © 2014 JP Simard. All rights reserved.</string>
</dict>
Expand Down
Binary file modified ...rceKittenFramework.framework/Versions/A/Frameworks/SwiftXPC.framework/Versions/A/SwiftXPC
View file
Binary file not shown.
Binary file modified ...zzy/SourceKitten/SourceKittenFramework.framework/Versions/A/Frameworks/libswiftCore.dylib
View file
Binary file not shown.
Binary file modified ...ceKitten/SourceKittenFramework.framework/Versions/A/Frameworks/libswiftCoreGraphics.dylib
View file
Binary file not shown.
Binary file modified ...y/SourceKitten/SourceKittenFramework.framework/Versions/A/Frameworks/libswiftDarwin.dylib
View file
Binary file not shown.
Binary file modified ...SourceKitten/SourceKittenFramework.framework/Versions/A/Frameworks/libswiftDispatch.dylib
View file
Binary file not shown.
Binary file modified ...urceKitten/SourceKittenFramework.framework/Versions/A/Frameworks/libswiftFoundation.dylib
View file
Binary file not shown.
Binary file modified ...urceKitten/SourceKittenFramework.framework/Versions/A/Frameworks/libswiftObjectiveC.dylib
View file
Binary file not shown.
Binary file modified ...SourceKitten/SourceKittenFramework.framework/Versions/A/Frameworks/libswiftSecurity.dylib
View file
Binary file not shown.
Binary file modified ...nFramework.framework/Versions/A/Modules/SourceKittenFramework.swiftmodule/x86_64.swiftdoc
View file
Binary file not shown.
Binary file modified ...amework.framework/Versions/A/Modules/SourceKittenFramework.swiftmodule/x86_64.swiftmodule
View file
Binary file not shown.
10 changes: 5 additions & 5 deletions lib/jazzy/SourceKitten/SourceKittenFramework.framework/Versions/A/Resources/Info.plist
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<plist version="1.0">
<dict>
<key>BuildMachineOSBuild</key>
<string>14B25</string>
<string>14C1514</string>
<key>CFBundleDevelopmentRegion</key>
<string>en</string>
<key>CFBundleExecutable</key>
Expand All @@ -25,17 +25,17 @@
<key>DTCompiler</key>
<string>com.apple.compilers.llvm.clang.1_0</string>
<key>DTPlatformBuild</key>
<string>6A2008a</string>
<string>6C131e</string>
<key>DTPlatformVersion</key>
<string>GM</string>
<key>DTSDKBuild</key>
<string>14A382</string>
<string>14A383</string>
<key>DTSDKName</key>
<string>macosx10.10</string>
<key>DTXcode</key>
<string>0611</string>
<string>0620</string>
<key>DTXcodeBuild</key>
<string>6A2008a</string>
<string>6C131e</string>
<key>NSHumanReadableCopyright</key>
<string>Copyright © 2015 SourceKitten. All rights reserved.</string>
</dict>
Expand Down
Binary file modified lib/jazzy/SourceKitten/SourceKittenFramework.framework/Versions/A/SourceKittenFramework
View file
Binary file not shown.
Binary file modified lib/jazzy/SourceKitten/sourcekitten
View file
Binary file not shown.
3 changes: 2 additions & 1 deletion spec/integration_spec.rb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@
behaves_like cli_spec 'document_alamofire',
'-m Alamofire -a Alamofire ' \
'-u https://nshipster.com/alamofire ' \
'-x -project,Alamofire.xcodeproj ' \
'-x -project,Alamofire.xcodeproj,-dry-run ' \
'-g https://github.com/Alamofire/Alamofire ' \
'--github-file-prefix https://github.com/' \
'Alamofire/Alamofire/blob/1.1.0 ' \
Expand All @@ -107,6 +107,7 @@
'-m MiscJazzyFeatures -a Realm ' \
'-u https://github.com/realm/jazzy ' \
'-g https://github.com/realm/jazzy ' \
'-x -dry-run ' \
'--min-acl private'
end
end
Expand Down
2 changes: 1 addition & 1 deletion spec/integration_specs
Submodule integration_specs updated 30 files
+4 −4 document_alamofire/after/docs/Classes/Request.html
+1 −1 document_alamofire/after/docs/Protocols/URLRequestConvertible.html
+1 −1 document_alamofire/after/docs/Protocols/URLStringConvertible.html
+4 −4 document_alamofire/after/docs/docsets/Alamofire.docset/Contents/Resources/Documents/Classes/Request.html
+1 −1 ...ofire/after/docs/docsets/Alamofire.docset/Contents/Resources/Documents/Protocols/URLRequestConvertible.html
+1 −1 ...mofire/after/docs/docsets/Alamofire.docset/Contents/Resources/Documents/Protocols/URLStringConvertible.html
+2 −2 document_alamofire/after/execution_output.txt
+2 −2 document_moya_podspec/after/docs/Classes/Moya/Method.html
+2 −2 document_moya_podspec/after/docs/Classes/Moya/ParameterEncoding.html
+58 −4 document_moya_podspec/after/docs/Classes/ReactiveMoyaProvider.html
+13 −3 document_moya_podspec/after/docs/Extensions.html
+13 −13 document_moya_podspec/after/docs/Extensions/RACSignal.html
+2 −2 document_moya_podspec/after/docs/docsets/Moya.docset/Contents/Resources/Documents/Classes/Moya/Method.html
+2 −2 ...oya_podspec/after/docs/docsets/Moya.docset/Contents/Resources/Documents/Classes/Moya/ParameterEncoding.html
+58 −4 ..._moya_podspec/after/docs/docsets/Moya.docset/Contents/Resources/Documents/Classes/ReactiveMoyaProvider.html
+13 −3 document_moya_podspec/after/docs/docsets/Moya.docset/Contents/Resources/Documents/Extensions.html
+13 −13 document_moya_podspec/after/docs/docsets/Moya.docset/Contents/Resources/Documents/Extensions/RACSignal.html
+9 −9 document_moya_podspec/after/docs/docsets/Moya.docset/Contents/Resources/Documents/undocumented.txt
+53 −50 document_moya_podspec/after/docs/docsets/Moya.docset/Contents/Resources/docSet.dsidx.csv
+9 −9 document_moya_podspec/after/docs/undocumented.txt
+3 −3 document_moya_podspec/after/execution_output.txt
+6 −6 misc_jazzy_features/after/docs/Classes.html
+2 −2 misc_jazzy_features/after/docs/Classes/ClassWithInitializers.html
+1 −1 misc_jazzy_features/after/docs/Classes/ImplicitlyInternalTopLevelClass.html
+6 −6 misc_jazzy_features/after/docs/docsets/MiscJazzyFeatures.docset/Contents/Resources/Documents/Classes.html
+2 −2 ...after/docs/docsets/MiscJazzyFeatures.docset/Contents/Resources/Documents/Classes/ClassWithInitializers.html
+1 −1 .../docsets/MiscJazzyFeatures.docset/Contents/Resources/Documents/Classes/ImplicitlyInternalTopLevelClass.html
+2 −2 misc_jazzy_features/after/docs/docsets/MiscJazzyFeatures.docset/Contents/Resources/Documents/undocumented.txt
+2 −2 misc_jazzy_features/after/docs/undocumented.txt
+2 −2 misc_jazzy_features/after/execution_output.txt

0 comments on commit 3e9d7bd

Please sign in to comment.