From 1e47bda64ad05147499ce2e0b4507b419722ca3d Mon Sep 17 00:00:00 2001 From: JP Simard Date: Tue, 29 Mar 2016 23:47:57 -0700 Subject: [PATCH 1/2] update for Xcode 7.3 and snapshot 03/24 --- .travis.yml | 2 +- Makefile | 2 +- .../SourceLocation.swift | 2 +- .../SwiftDeclarationKind.swift | 10 +- Source/SourceKittenFramework/SyntaxMap.swift | 2 +- .../ClangTranslationUnitTests.swift | 2 +- .../Fixtures/Bicycle.json | 10 +- .../Fixtures/Commandant.json | 682 ++++++++++-------- .../SourceKittenFramework/Fixtures/Realm.json | 32 +- .../Fixtures/SimpleCodeCompletion.json | 39 +- .../Fixtures/Subscript.json | 4 +- Tests/SourceKittenFramework/ModuleTests.swift | 4 +- .../SourceKitTests.swift | 5 +- Tests/SourceKittenFramework/StringTests.swift | 2 +- .../StructureTests.swift | 4 +- Tests/SourceKittenFramework/SyntaxTests.swift | 4 +- 16 files changed, 435 insertions(+), 371 deletions(-) diff --git a/.travis.yml b/.travis.yml index f08e1cf71..330b3c8df 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,5 +1,5 @@ language: objective-c -osx_image: xcode7.2 +osx_image: xcode7.3 git: submodules: false branches: diff --git a/Makefile b/Makefile index 744700f5a..80435e844 100644 --- a/Makefile +++ b/Makefile @@ -16,7 +16,7 @@ OUTPUT_PACKAGE=SourceKitten.pkg VERSION_STRING=$(shell agvtool what-marketing-version -terse1) COMPONENTS_PLIST=Source/sourcekitten/Components.plist -SWIFT_SNAPSHOT=swift-DEVELOPMENT-SNAPSHOT-2016-03-01-a +SWIFT_SNAPSHOT=swift-DEVELOPMENT-SNAPSHOT-2016-03-24-a SWIFT_COMMAND=/Library/Developer/Toolchains/$(SWIFT_SNAPSHOT).xctoolchain/usr/bin/swift SWIFT_BUILD_COMMAND=$(SWIFT_COMMAND) build SWIFT_TEST_COMMAND=$(SWIFT_COMMAND) test diff --git a/Source/SourceKittenFramework/SourceLocation.swift b/Source/SourceKittenFramework/SourceLocation.swift index 1fb2d1c68..f0d72abd1 100644 --- a/Source/SourceKittenFramework/SourceLocation.swift +++ b/Source/SourceKittenFramework/SourceLocation.swift @@ -24,7 +24,7 @@ public struct SourceLocation { extension SourceLocation { init(clangLocation: CXSourceLocation) { - var cxfile = CXFile() + var cxfile = CXFile.alloc(1) var line: UInt32 = 0 var column: UInt32 = 0 var offset: UInt32 = 0 diff --git a/Source/SourceKittenFramework/SwiftDeclarationKind.swift b/Source/SourceKittenFramework/SwiftDeclarationKind.swift index f9f207080..b1b741f96 100644 --- a/Source/SourceKittenFramework/SwiftDeclarationKind.swift +++ b/Source/SourceKittenFramework/SwiftDeclarationKind.swift @@ -9,6 +9,8 @@ /// Swift declaration kinds. /// Found in `strings SourceKitService | grep source.lang.swift.decl.`. public enum SwiftDeclarationKind: String { + /// `associatedtype`. + case Associatedtype = "source.lang.swift.decl.associatedtype" /// `class`. case Class = "source.lang.swift.decl.class" /// `enum`. @@ -51,8 +53,12 @@ public enum SwiftDeclarationKind: String { case FunctionMethodInstance = "source.lang.swift.decl.function.method.instance" /// `function.method.static`. case FunctionMethodStatic = "source.lang.swift.decl.function.method.static" - /// `function.operator`. - case FunctionOperator = "source.lang.swift.decl.function.operator" + /// `function.operator.infix`. + case FunctionOperatorInfix = "source.lang.swift.decl.function.operator.infix" + /// `function.operator.postfix`. + case FunctionOperatorPostfix = "source.lang.swift.decl.function.operator.postfix" + /// `function.operator.prefix`. + case FunctionOperatorPrefix = "source.lang.swift.decl.function.operator.prefix" /// `function.subscript`. case FunctionSubscript = "source.lang.swift.decl.function.subscript" /// `generic_type_param`. diff --git a/Source/SourceKittenFramework/SyntaxMap.swift b/Source/SourceKittenFramework/SyntaxMap.swift index 81f63517c..5713ef66e 100644 --- a/Source/SourceKittenFramework/SyntaxMap.swift +++ b/Source/SourceKittenFramework/SyntaxMap.swift @@ -101,7 +101,7 @@ public struct SyntaxMap { return commentTokensImmediatelyPrecedingOffset.first.flatMap { firstToken in return commentTokensImmediatelyPrecedingOffset.last.map { lastToken in - return Range(start: firstToken.offset, end: lastToken.offset + lastToken.length) + return firstToken.offset...lastToken.offset + lastToken.length } } } diff --git a/Tests/SourceKittenFramework/ClangTranslationUnitTests.swift b/Tests/SourceKittenFramework/ClangTranslationUnitTests.swift index 75c911425..140514c07 100644 --- a/Tests/SourceKittenFramework/ClangTranslationUnitTests.swift +++ b/Tests/SourceKittenFramework/ClangTranslationUnitTests.swift @@ -10,7 +10,7 @@ import Foundation import SourceKittenFramework import XCTest -let fixturesDirectory = (__FILE__ as NSString).stringByDeletingLastPathComponent + "/Fixtures/" +let fixturesDirectory = (#file as NSString).stringByDeletingLastPathComponent + "/Fixtures/" class ClangTranslationUnitTests: XCTestCase { diff --git a/Tests/SourceKittenFramework/Fixtures/Bicycle.json b/Tests/SourceKittenFramework/Fixtures/Bicycle.json index fdfa63265..2450f920e 100644 --- a/Tests/SourceKittenFramework/Fixtures/Bicycle.json +++ b/Tests/SourceKittenFramework/Fixtures/Bicycle.json @@ -564,7 +564,7 @@ ], "key.doc.column" : 5, "key.parsed_scope.end" : 76, - "key.usr" : "s:FC7Bicycle7BicyclecFMS0_FT5styleOS0_5Style7gearingOS0_7Gearing9handlebarOS0_9Handlebar9frameSizeSi_S0_", + "key.usr" : "s:FC7Bicycle7BicyclecFT5styleOS0_5Style7gearingOS0_7Gearing9handlebarOS0_9Handlebar9frameSizeSi_S0_", "key.doc.file" : "Bicycle.swift", "key.nameoffset" : 1754, "key.annotated_decl" : "init(style: Style<\/Type>, gearing: Gearing<\/Type>, handlebar: Handlebar<\/Type>, frameSize centimeters: Int<\/Type>)<\/Declaration>", @@ -586,7 +586,7 @@ "key.attribute" : "source.decl.attribute.__raw_doc_comment" } ], - "key.doc.full_as_xml" : "init(style:gearing:handlebar:frameSize:)<\/Name>s:FC7Bicycle7BicyclecFMS0_FT5styleOS0_5Style7gearingOS0_7Gearing9handlebarOS0_9Handlebar9frameSizeSi_S0_<\/USR>init(style: Style, gearing: Gearing, handlebar: Handlebar, frameSize centimeters: Int)<\/Declaration>Initializes a new bicycle with the provided parts and specifications.<\/Para><\/Abstract>style<\/Name>in<\/Direction>The style of the bicycle<\/Para><\/Discussion><\/Parameter>gearing<\/Name>in<\/Direction>The gearing of the bicycle<\/Para><\/Discussion><\/Parameter>handlebar<\/Name>in<\/Direction>The handlebar of the bicycle<\/Para><\/Discussion><\/Parameter>centimeters<\/Name>in<\/Direction>The frame size of the bicycle, in centimeters<\/Para><\/Discussion><\/Parameter><\/Parameters>A beautiful, brand-new, custom built just for you.<\/Para><\/ResultDiscussion><\/Function>", + "key.doc.full_as_xml" : "init(style:gearing:handlebar:frameSize:)<\/Name>s:FC7Bicycle7BicyclecFT5styleOS0_5Style7gearingOS0_7Gearing9handlebarOS0_9Handlebar9frameSizeSi_S0_<\/USR>init(style: Style, gearing: Gearing, handlebar: Handlebar, frameSize centimeters: Int)<\/Declaration>Initializes a new bicycle with the provided parts and specifications.<\/Para><\/Abstract>style<\/Name>in<\/Direction>The style of the bicycle<\/Para><\/Discussion><\/Parameter>gearing<\/Name>in<\/Direction>The gearing of the bicycle<\/Para><\/Discussion><\/Parameter>handlebar<\/Name>in<\/Direction>The handlebar of the bicycle<\/Para><\/Discussion><\/Parameter>centimeters<\/Name>in<\/Direction>The frame size of the bicycle, in centimeters<\/Para><\/Discussion><\/Parameter><\/Parameters>A beautiful, brand-new, custom built just for you.<\/Para><\/ResultDiscussion><\/Function>", "key.doc.name" : "init(style:gearing:handlebar:frameSize:)", "key.substructure" : [ @@ -613,7 +613,7 @@ ], "key.doc.column" : 10, "key.parsed_scope.end" : 88, - "key.usr" : "s:FC7Bicycle7Bicycle6travelFS0_FT8distanceSd_T_", + "key.usr" : "s:FC7Bicycle7Bicycle6travelFT8distanceSd_T_", "key.doc.file" : "Bicycle.swift", "key.nameoffset" : 2152, "key.annotated_decl" : "func travel(distance meters: Double<\/Type>)<\/Declaration>", @@ -623,14 +623,14 @@ "key.bodyoffset" : 2185, "key.doc.declaration" : "func travel(distance meters: Double)", "key.name" : "travel(distance:)", - "key.typename" : "Bicycle -> (distance: Double) -> ()", + "key.typename" : "(Bicycle) -> (distance: Double) -> ()", "key.doc.type" : "Function", "key.attributes" : [ { "key.attribute" : "source.decl.attribute.__raw_doc_comment" } ], - "key.doc.full_as_xml" : "travel(distance:)<\/Name>s:FC7Bicycle7Bicycle6travelFS0_FT8distanceSd_T_<\/USR>func travel(distance meters: Double)<\/Declaration>Take a bike out for a spin.<\/Para><\/Abstract>meters<\/Name>in<\/Direction>The distance to travel in meters.<\/Para><\/Discussion><\/Parameter><\/Parameters><\/Function>", + "key.doc.full_as_xml" : "travel(distance:)<\/Name>s:FC7Bicycle7Bicycle6travelFT8distanceSd_T_<\/USR>func travel(distance meters: Double)<\/Declaration>Take a bike out for a spin.<\/Para><\/Abstract>meters<\/Name>in<\/Direction>The distance to travel in meters.<\/Para><\/Discussion><\/Parameter><\/Parameters><\/Function>", "key.doc.name" : "travel(distance:)", "key.substructure" : [ diff --git a/Tests/SourceKittenFramework/Fixtures/Commandant.json b/Tests/SourceKittenFramework/Fixtures/Commandant.json index 6d1890c93..74b8d9f95 100644 --- a/Tests/SourceKittenFramework/Fixtures/Commandant.json +++ b/Tests/SourceKittenFramework/Fixtures/Commandant.json @@ -45,14 +45,14 @@ "key.name" : "defaultValue", "key.doc.column" : 13, "key.parsed_scope.end" : 17, - "key.usr" : "s:vV10Commandant8Argument12defaultValueGSqq__", + "key.usr" : "s:vV10Commandant8Argument12defaultValueGSqx_", "key.doc.type" : "Other", "key.attributes" : [ { "key.attribute" : "source.decl.attribute.__raw_doc_comment" } ], - "key.doc.full_as_xml" : "defaultValue<\/Name>s:vV10Commandant8Argument12defaultValueGSqq__<\/USR>public let defaultValue: T?<\/Declaration>The default value for this argument. This is the value that will be used if the argument is never explicitly specified on the command line.<\/Para><\/Abstract>If this is nil, this argument is always required.<\/Para><\/Discussion><\/Other>", + "key.doc.full_as_xml" : "defaultValue<\/Name>s:vV10Commandant8Argument12defaultValueGSqx_<\/USR>public let defaultValue: T?<\/Declaration>The default value for this argument. This is the value that will be used if the argument is never explicitly specified on the command line.<\/Para><\/Abstract>If this is nil, this argument is always required.<\/Para><\/Discussion><\/Other>", "key.nameoffset" : 469, "key.doc.file" : "Sources\/Commandant\/Argument.swift", "key.annotated_decl" : "public let defaultValue: T?<\/Declaration>", @@ -106,9 +106,9 @@ "key.name" : "init(defaultValue:usage:)", "key.typename" : " Argument.Type -> (defaultValue: T?, usage: String) -> Argument", "key.parsed_scope.end" : 26, - "key.usr" : "s:FV10Commandant8ArgumentcurFMGS0_q__FT12defaultValueGSqq__5usageSS_GS0_q__", + "key.usr" : "s:FV10Commandant8ArgumentcFT12defaultValueGSqx_5usageSS_GS0_x_", "key.nameoffset" : 634, - "key.annotated_decl" : "public init(defaultValue: T? = default, usage: String<\/Type>)<\/Declaration>", + "key.annotated_decl" : "public init(defaultValue: T<\/Type>? = default, usage: String<\/Type>)<\/Declaration>", "key.accessibility" : "source.lang.swift.accessibility.public", "key.substructure" : [ @@ -125,9 +125,9 @@ "key.bodylength" : 109, "key.length" : 45, "key.name" : "invalidUsageError(_:)", - "key.typename" : " Argument -> (String) -> CommandantError", + "key.typename" : " (Argument) -> (String) -> CommandantError", "key.parsed_scope.end" : 31, - "key.usr" : "s:FV10Commandant8ArgumentP33_8CAE711C2CD19D07FEBBE5F857AB09FD17invalidUsageErroru__rFGS0_q__FSSGOS_15CommandantErrorqd___", + "key.usr" : "s:FV10Commandant8ArgumentP33_8CAE711C2CD19D07FEBBE5F857AB09FD17invalidUsageErrorurFSSGOS_15CommandantErrorqd___", "key.nameoffset" : 754, "key.annotated_decl" : "private func invalidUsageError<ClientError>(value: String<\/Type>) -> CommandantError<\/Type><ClientError><\/Declaration>", "key.accessibility" : "source.lang.swift.accessibility.private", @@ -150,10 +150,10 @@ "key.length" : 75, "key.doc.column" : 13, "key.parsed_scope.end" : 58, - "key.usr" : "s:ZF10Commandantoi2lou0_Rq_S_12ArgumentType_FTOS_11CommandModeGVS_8Argumentq___GO6Result6Resultq_GOS_15CommandantErrorq0___", + "key.usr" : "s:ZF10Commandantoi2lou0_RxS_12ArgumentTyperFTOS_11CommandModeGVS_8Argumentx__GO6Result6ResultxGOS_15CommandantErrorq___", "key.doc.file" : "Sources\/Commandant\/Argument.swift", "key.nameoffset" : 1145, - "key.annotated_decl" : "public func <|<T : ArgumentType<\/Type>, ClientError>(mode: CommandMode<\/Type>, argument: Argument<\/Type><T>) -> Result<\/Type><T, CommandantError<\/Type><ClientError>><\/Declaration>", + "key.annotated_decl" : "public func <|<T : ArgumentType<\/Type>, ClientError>(mode: CommandMode<\/Type>, argument: Argument<\/Type><T<\/Type>>) -> Result<\/Type><T, CommandantError<\/Type><ClientError>><\/Declaration>", "key.accessibility" : "source.lang.swift.accessibility.public", "key.parsed_scope.start" : 38, "key.filepath" : "Sources\/Commandant\/Argument.swift", @@ -169,19 +169,19 @@ ], "key.related_decls" : [ { - "key.annotated_decl" : "<|<T : ArgumentType, ClientError>(_: CommandMode, _: Argument<[T]>) -> Result<[T], CommandantError<ClientError>><\/RelatedName>" + "key.annotated_decl" : "<|<T : ArgumentType, ClientError>(_: CommandMode, _: Argument<[T]>) -> Result<[T], CommandantError<ClientError>><\/RelatedName>" }, { - "key.annotated_decl" : "<|<T : ArgumentType, ClientError>(_: CommandMode, _: Option<T>) -> Result<T, CommandantError<ClientError>><\/RelatedName>" + "key.annotated_decl" : "<|<T : ArgumentType, ClientError>(_: CommandMode, _: Option<T>) -> Result<T, CommandantError<ClientError>><\/RelatedName>" }, { - "key.annotated_decl" : "<|<ClientError>(_: CommandMode, _: Option<Bool>) -> Result<Bool, CommandantError<ClientError>><\/RelatedName>" + "key.annotated_decl" : "<|<ClientError>(_: CommandMode, _: Option<Bool>) -> Result<Bool, CommandantError<ClientError>><\/RelatedName>" }, { - "key.annotated_decl" : "<|<ClientError>(_: CommandMode, _: Switch) -> Result<Bool, CommandantError<ClientError>><\/RelatedName>" + "key.annotated_decl" : "<|<ClientError>(_: CommandMode, _: Switch) -> Result<Bool, CommandantError<ClientError>><\/RelatedName>" } ], - "key.doc.full_as_xml" : "<|(_:_:)<\/Name>s:ZF10Commandantoi2lou0_Rq_S_12ArgumentType_FTOS_11CommandModeGVS_8Argumentq___GO6Result6Resultq_GOS_15CommandantErrorq0___<\/USR>public func <|<T : ArgumentType, ClientError>(mode: CommandMode, argument: Argument<T>) -> Result.Result<T, Commandant.CommandantError<ClientError>><\/Declaration>Evaluates the given argument in the given mode.<\/Para><\/Abstract>If parsing command line arguments, and no value was specified on the command line, the argument's defaultValue<\/codeVoice> is used.<\/Para><\/Discussion><\/Function>", + "key.doc.full_as_xml" : "<|(_:_:)<\/Name>s:ZF10Commandantoi2lou0_RxS_12ArgumentTyperFTOS_11CommandModeGVS_8Argumentx__GO6Result6ResultxGOS_15CommandantErrorq___<\/USR>public func <|<T : ArgumentType, ClientError>(mode: CommandMode, argument: Argument<T>) -> Result.Result<T, Commandant.CommandantError<ClientError>><\/Declaration>Evaluates the given argument in the given mode.<\/Para><\/Abstract>If parsing command line arguments, and no value was specified on the command line, the argument's defaultValue<\/codeVoice> is used.<\/Para><\/Discussion><\/Function>", "key.doc.name" : "<|(_:_:)", "key.substructure" : [ { @@ -194,7 +194,7 @@ "key.name" : "T", "key.parsed_scope.start" : 38, "key.parsed_scope.end" : 38, - "key.usr" : "s:tZF10Commandantoi2lou0_Rq_S_12ArgumentType_FTOS_11CommandModeGVS_8Argumentq___GO6Result6Resultq_GOS_15CommandantErrorq0___L_1TMq_", + "key.usr" : "s:tZF10Commandantoi2lou0_RxS_12ArgumentTyperFTOS_11CommandModeGVS_8Argumentx__GO6Result6ResultxGOS_15CommandantErrorq___L_1TMx", "key.filepath" : "Sources\/Commandant\/Argument.swift" } ], @@ -215,10 +215,10 @@ "key.length" : 77, "key.doc.column" : 13, "key.parsed_scope.end" : 96, - "key.usr" : "s:ZF10Commandantoi2lou0_Rq_S_12ArgumentType_FTOS_11CommandModeGVS_8ArgumentGSaq____GO6Result6ResultGSaq__GOS_15CommandantErrorq0___", + "key.usr" : "s:ZF10Commandantoi2lou0_RxS_12ArgumentTyperFTOS_11CommandModeGVS_8ArgumentGSax___GO6Result6ResultGSax_GOS_15CommandantErrorq___", "key.doc.file" : "Sources\/Commandant\/Argument.swift", "key.nameoffset" : 1969, - "key.annotated_decl" : "public func <|<T : ArgumentType<\/Type>, ClientError>(mode: CommandMode<\/Type>, argument: Argument<\/Type><[T]>) -> Result<\/Type><[T], CommandantError<\/Type><ClientError>><\/Declaration>", + "key.annotated_decl" : "public func <|<T : ArgumentType<\/Type>, ClientError>(mode: CommandMode<\/Type>, argument: Argument<\/Type><[T<\/Type>]>) -> Result<\/Type><[T], CommandantError<\/Type><ClientError>><\/Declaration>", "key.accessibility" : "source.lang.swift.accessibility.public", "key.parsed_scope.start" : 64, "key.filepath" : "Sources\/Commandant\/Argument.swift", @@ -234,19 +234,19 @@ ], "key.related_decls" : [ { - "key.annotated_decl" : "<|<T : ArgumentType, ClientError>(_: CommandMode, _: Argument<T>) -> Result<T, CommandantError<ClientError>><\/RelatedName>" + "key.annotated_decl" : "<|<T : ArgumentType, ClientError>(_: CommandMode, _: Argument<T>) -> Result<T, CommandantError<ClientError>><\/RelatedName>" }, { - "key.annotated_decl" : "<|<T : ArgumentType, ClientError>(_: CommandMode, _: Option<T>) -> Result<T, CommandantError<ClientError>><\/RelatedName>" + "key.annotated_decl" : "<|<T : ArgumentType, ClientError>(_: CommandMode, _: Option<T>) -> Result<T, CommandantError<ClientError>><\/RelatedName>" }, { - "key.annotated_decl" : "<|<ClientError>(_: CommandMode, _: Option<Bool>) -> Result<Bool, CommandantError<ClientError>><\/RelatedName>" + "key.annotated_decl" : "<|<ClientError>(_: CommandMode, _: Option<Bool>) -> Result<Bool, CommandantError<ClientError>><\/RelatedName>" }, { - "key.annotated_decl" : "<|<ClientError>(_: CommandMode, _: Switch) -> Result<Bool, CommandantError<ClientError>><\/RelatedName>" + "key.annotated_decl" : "<|<ClientError>(_: CommandMode, _: Switch) -> Result<Bool, CommandantError<ClientError>><\/RelatedName>" } ], - "key.doc.full_as_xml" : "<|(_:_:)<\/Name>s:ZF10Commandantoi2lou0_Rq_S_12ArgumentType_FTOS_11CommandModeGVS_8ArgumentGSaq____GO6Result6ResultGSaq__GOS_15CommandantErrorq0___<\/USR>public func <|<T : ArgumentType, ClientError>(mode: CommandMode, argument: Argument<[T]>) -> Result.Result<[T], Commandant.CommandantError<ClientError>><\/Declaration>Evaluates the given argument list in the given mode.<\/Para><\/Abstract>If parsing command line arguments, and no value was specified on the command line, the argument's defaultValue<\/codeVoice> is used.<\/Para><\/Discussion><\/Function>", + "key.doc.full_as_xml" : "<|(_:_:)<\/Name>s:ZF10Commandantoi2lou0_RxS_12ArgumentTyperFTOS_11CommandModeGVS_8ArgumentGSax___GO6Result6ResultGSax_GOS_15CommandantErrorq___<\/USR>public func <|<T : ArgumentType, ClientError>(mode: CommandMode, argument: Argument<[T]>) -> Result.Result<[T], Commandant.CommandantError<ClientError>><\/Declaration>Evaluates the given argument list in the given mode.<\/Para><\/Abstract>If parsing command line arguments, and no value was specified on the command line, the argument's defaultValue<\/codeVoice> is used.<\/Para><\/Discussion><\/Function>", "key.doc.name" : "<|(_:_:)", "key.substructure" : [ { @@ -259,7 +259,7 @@ "key.name" : "T", "key.parsed_scope.start" : 64, "key.parsed_scope.end" : 64, - "key.usr" : "s:tZF10Commandantoi2lou0_Rq_S_12ArgumentType_FTOS_11CommandModeGVS_8ArgumentGSaq____GO6Result6ResultGSaq__GOS_15CommandantErrorq0___L_1TMq_", + "key.usr" : "s:tZF10Commandantoi2lou0_RxS_12ArgumentTyperFTOS_11CommandModeGVS_8ArgumentGSax___GO6Result6ResultGSax_GOS_15CommandantErrorq___L_1TMx", "key.filepath" : "Sources\/Commandant\/Argument.swift" } ], @@ -291,7 +291,7 @@ "key.usr" : "s:V10Commandant11HelpCommand", "key.doc.file" : "Sources\/Commandant\/HelpCommand.swift", "key.nameoffset" : 565, - "key.annotated_decl" : "public struct HelpCommand<ClientError : ErrorType<\/Type>> : CommandType<\/Type><\/Declaration>", + "key.annotated_decl" : "public struct HelpCommand<ClientError : ErrorType<\/Type>> : CommandType<\/Type><\/Declaration>", "key.accessibility" : "source.lang.swift.accessibility.public", "key.elements" : [ { @@ -312,7 +312,7 @@ "key.attribute" : "source.decl.attribute.__raw_doc_comment" } ], - "key.doc.full_as_xml" : "HelpCommand<\/Name>s:V10Commandant11HelpCommand<\/USR>public struct HelpCommand<ClientError : ErrorType> : CommandType<\/Declaration>A basic implementation of a help<\/codeVoice> command, using information available in a CommandRegistry<\/codeVoice>.<\/Para><\/Abstract>If you want to use this command, initialize it with the registry, then add it to that same registry:<\/Para> = …]]><\/zCodeLineNumbered><\/zCodeLineNumbered><\/zCodeLineNumbered><\/zCodeLineNumbered><\/CodeListing><\/Discussion><\/Class>", + "key.doc.full_as_xml" : "HelpCommand<\/Name>s:V10Commandant11HelpCommand<\/USR>public struct HelpCommand<ClientError : ErrorType> : CommandType<\/Declaration>A basic implementation of a help<\/codeVoice> command, using information available in a CommandRegistry<\/codeVoice>.<\/Para><\/Abstract>If you want to use this command, initialize it with the registry, then add it to that same registry:<\/Para> = …]]><\/zCodeLineNumbered><\/zCodeLineNumbered><\/zCodeLineNumbered><\/zCodeLineNumbered><\/CodeListing><\/Discussion><\/Class>", "key.doc.name" : "HelpCommand", "key.inheritedtypes" : [ { @@ -371,7 +371,7 @@ "key.typename" : "CommandRegistry", "key.name" : "registry", "key.parsed_scope.end" : 27, - "key.usr" : "s:vV10Commandant11HelpCommandP33_38F61CE0DF9D73793CEDF5D1C31403318registryGCS_15CommandRegistryq__", + "key.usr" : "s:vV10Commandant11HelpCommandP33_38F61CE0DF9D73793CEDF5D1C31403318registryGCS_15CommandRegistryx_", "key.nameoffset" : 776, "key.annotated_decl" : "private let registry: CommandRegistry<\/Type><ClientError><\/Declaration>", "key.accessibility" : "source.lang.swift.accessibility.private", @@ -389,10 +389,10 @@ "key.length" : 44, "key.doc.column" : 9, "key.parsed_scope.end" : 33, - "key.usr" : "s:FV10Commandant11HelpCommandcuRq_Ss9ErrorType_FMGS0_q__FT8registryGCS_15CommandRegistryq___GS0_q__", + "key.usr" : "s:FV10Commandant11HelpCommandcFT8registryGCS_15CommandRegistryx__GS0_x_", "key.doc.file" : "Sources\/Commandant\/HelpCommand.swift", "key.nameoffset" : 911, - "key.annotated_decl" : "public init(registry: CommandRegistry<\/Type><ClientError>)<\/Declaration>", + "key.annotated_decl" : "public init(registry: CommandRegistry<\/Type><ClientError<\/Type>>)<\/Declaration>", "key.accessibility" : "source.lang.swift.accessibility.public", "key.parsed_scope.start" : 31, "key.filepath" : "Sources\/Commandant\/HelpCommand.swift", @@ -406,7 +406,7 @@ "key.attribute" : "source.decl.attribute.__raw_doc_comment" } ], - "key.doc.full_as_xml" : "init(registry:)<\/Name>s:FV10Commandant11HelpCommandcuRq_Ss9ErrorType_FMGS0_q__FT8registryGCS_15CommandRegistryq___GS0_q__<\/USR>public init(registry: CommandRegistry<ClientError>)<\/Declaration>Initializes the command to provide help from the given registry of commands.<\/Para><\/Abstract><\/Function>", + "key.doc.full_as_xml" : "init(registry:)<\/Name>s:FV10Commandant11HelpCommandcFT8registryGCS_15CommandRegistryx__GS0_x_<\/USR>public init(registry: CommandRegistry<ClientError>)<\/Declaration>Initializes the command to provide help from the given registry of commands.<\/Para><\/Abstract><\/Function>", "key.doc.name" : "init(registry:)", "key.substructure" : [ @@ -421,16 +421,16 @@ "key.bodylength" : 662, "key.length" : 21, "key.name" : "run(_:)", - "key.typename" : " HelpCommand -> (HelpOptions) -> Result<(), ClientError>", + "key.typename" : " (HelpCommand) -> (HelpOptions) -> Result<(), ClientError>", "key.parsed_scope.end" : 58, - "key.usr" : "s:FV10Commandant11HelpCommand3runuRq_Ss9ErrorType_FGS0_q__FGVS_11HelpOptionsq__GO6Result6ResultT_q__", + "key.usr" : "s:FV10Commandant11HelpCommand3runFGVS_11HelpOptionsx_GO6Result6ResultT_x_", "key.overrides" : [ { - "key.usr" : "s:FP10Commandant11CommandType3runuRq_S0__Fq_Fqq_S0_7OptionsGO6Result6ResultT_qq_S0_11ClientError_" + "key.usr" : "s:FP10Commandant11CommandType3runFwx7OptionsGO6Result6ResultT_wx11ClientError_" } ], "key.nameoffset" : 1002, - "key.annotated_decl" : "public func run(options: Options<\/Type>) -> Result<\/Type><(), ClientError><\/Declaration>", + "key.annotated_decl" : "public func run(options: Options<\/Type>) -> Result<\/Type><(), ClientError><\/Declaration>", "key.accessibility" : "source.lang.swift.accessibility.public", "key.substructure" : [ @@ -466,7 +466,7 @@ "key.name" : "OptionsType" } ], - "key.annotated_decl" : "public struct HelpOptions<ClientError : ErrorType<\/Type>> : OptionsType<\/Type><\/Declaration>", + "key.annotated_decl" : "public struct HelpOptions<ClientError : ErrorType<\/Type>> : OptionsType<\/Type><\/Declaration>", "key.accessibility" : "source.lang.swift.accessibility.public", "key.substructure" : [ { @@ -496,7 +496,7 @@ "key.name" : "init(verb:)", "key.typename" : " HelpOptions.Type -> (verb: String?) -> HelpOptions", "key.parsed_scope.end" : 66, - "key.usr" : "s:FV10Commandant11HelpOptionscuRq_Ss9ErrorType_FMGS0_q__FT4verbGSqSS__GS0_q__", + "key.usr" : "s:FV10Commandant11HelpOptionscFT4verbGSqSS__GS0_x_", "key.nameoffset" : 1822, "key.annotated_decl" : "private init(verb: String<\/Type>?)<\/Declaration>", "key.accessibility" : "source.lang.swift.accessibility.private", @@ -515,9 +515,9 @@ "key.bodylength" : 54, "key.length" : 20, "key.name" : "create(_:)", - "key.typename" : " HelpOptions.Type -> (String) -> HelpOptions", + "key.typename" : " (HelpOptions.Type) -> (String) -> HelpOptions", "key.parsed_scope.end" : 70, - "key.usr" : "s:ZFV10Commandant11HelpOptionsP33_38F61CE0DF9D73793CEDF5D1C31403316createuRq_Ss9ErrorType_FMGS0_q__FSSGS0_q__", + "key.usr" : "s:ZFV10Commandant11HelpOptionsP33_38F61CE0DF9D73793CEDF5D1C31403316createFSSGS0_x_", "key.nameoffset" : 1888, "key.annotated_decl" : "private static func create(verb: String<\/Type>) -> HelpOptions<\/Type><ClientError><\/Declaration>", "key.accessibility" : "source.lang.swift.accessibility.private", @@ -536,12 +536,12 @@ "key.bodylength" : 99, "key.length" : 24, "key.name" : "evaluate(_:)", - "key.typename" : " HelpOptions.Type -> (CommandMode) -> Result, CommandantError>", + "key.typename" : " (HelpOptions.Type) -> (CommandMode) -> Result, CommandantError>", "key.parsed_scope.end" : 75, - "key.usr" : "s:ZFV10Commandant11HelpOptions8evaluateuRq_Ss9ErrorType_FMGS0_q__FOS_11CommandModeGO6Result6ResultGS0_q__GOS_15CommandantErrorq___", + "key.usr" : "s:ZFV10Commandant11HelpOptions8evaluateFOS_11CommandModeGO6Result6ResultGS0_x_GOS_15CommandantErrorx__", "key.overrides" : [ { - "key.usr" : "s:ZFP10Commandant11OptionsType8evaluateuRq_S0__FMq_FOS_11CommandModeGO6Result6Resultq_GOS_15CommandantErrorqq_S0_11ClientError__" + "key.usr" : "s:ZFP10Commandant11OptionsType8evaluateFOS_11CommandModeGO6Result6ResultxGOS_15CommandantErrorwx11ClientError__" } ], "key.nameoffset" : 2002, @@ -645,17 +645,17 @@ "key.length" : 26, "key.doc.declaration" : "static func fromString(string: String) -> Self?", "key.name" : "fromString(_:)", - "key.typename" : "<`Self` : ArgumentType> Self.Type -> (String) -> Self?", + "key.typename" : "<`Self` : ArgumentType> (Self.Type) -> (String) -> Self?", "key.doc.column" : 14, "key.parsed_scope.end" : 15, - "key.usr" : "s:ZFP10Commandant12ArgumentType10fromStringuRq_S0__FMq_FSSGSqq__", + "key.usr" : "s:ZFP10Commandant12ArgumentType10fromStringFSSGSqx_", "key.doc.type" : "Function", "key.attributes" : [ { "key.attribute" : "source.decl.attribute.__raw_doc_comment" } ], - "key.doc.full_as_xml" : "fromString(_:)<\/Name>s:ZFP10Commandant12ArgumentType10fromStringuRq_S0__FMq_FSSGSqq__<\/USR>static func fromString(string: String) -> Self?<\/Declaration>Attempts to parse a value from the given command-line argument.<\/Para><\/Abstract><\/Function>", + "key.doc.full_as_xml" : "fromString(_:)<\/Name>s:ZFP10Commandant12ArgumentType10fromStringFSSGSqx_<\/USR>static func fromString(string: String) -> Self?<\/Declaration>Attempts to parse a value from the given command-line argument.<\/Para><\/Abstract><\/Function>", "key.nameoffset" : 404, "key.doc.file" : "Sources\/Commandant\/ArgumentType.swift", "key.annotated_decl" : "static func fromString(string: String<\/Type>) -> Self?<\/Declaration>", @@ -689,7 +689,7 @@ "key.name" : "ArgumentType" } ], - "key.annotated_decl" : "struct Int : SignedIntegerType<\/Type>, Comparable<\/Type>, Equatable<\/Type><\/Declaration>", + "key.annotated_decl" : "struct Int : SignedIntegerType<\/Type>, Comparable<\/Type>, Equatable<\/Type><\/Declaration>", "key.is_system" : true, "key.substructure" : [ { @@ -722,12 +722,12 @@ "key.bodylength" : 23, "key.length" : 26, "key.name" : "fromString(_:)", - "key.typename" : "Int.Type -> (String) -> Int?", + "key.typename" : "(Int.Type) -> (String) -> Int?", "key.parsed_scope.end" : 23, - "key.usr" : "s:ZFE10CommandantSi10fromStringFMSiFSSGSqSi_", + "key.usr" : "s:ZFE10CommandantSi10fromStringFSSGSqSi_", "key.overrides" : [ { - "key.usr" : "s:ZFP10Commandant12ArgumentType10fromStringuRq_S0__FMq_FSSGSqq__" + "key.usr" : "s:ZFP10Commandant12ArgumentType10fromStringFSSGSqx_" } ], "key.nameoffset" : 530, @@ -762,7 +762,7 @@ "key.typename" : "String.Type", "key.usr" : "s:SS", "key.doc.type" : "Class", - "key.doc.full_as_xml" : "String<\/Name>s:SS<\/USR>struct String<\/Declaration>An arbitrary Unicode string value.<\/Para><\/Abstract>]]><\/rawHTML>Unicode-Correct]]><\/rawHTML>Swift strings are designed to be Unicode-correct. In particular, the APIs make it easy to write code that works correctly, and does not surprise end-users, regardless of where you venture in the Unicode character space. For example, the ==<\/codeVoice> operator checks for Unicode canonical equivalence<\/Link>, so two different representations of the same string will always compare equal.<\/Para>]]><\/rawHTML>Locale-Insensitive]]><\/rawHTML>The fundamental operations on Swift strings are not sensitive to locale settings. That's because, for example, the validity of a Dictionary<String, T><\/codeVoice> in a running program depends on a given string comparison having a single, stable result. Therefore, Swift always uses the default, un-tailored<\/Link> Unicode algorithms for basic string operations.<\/Para>Importing Foundation<\/codeVoice> endows swift strings with the full power of the NSString<\/codeVoice> API, which allows you to choose more complex locale-sensitive operations explicitly.<\/Para>]]><\/rawHTML>Value Semantics]]><\/rawHTML>Each string variable, let<\/codeVoice> binding, or stored property has an independent value, so mutations to the string are not observable through its copies:<\/Para><\/zCodeLineNumbered><\/zCodeLineNumbered><\/zCodeLineNumbered><\/zCodeLineNumbered><\/zCodeLineNumbered><\/CodeListing>Strings use Copy-on-Write so that their data is only copied lazily, upon mutation, when more than one string instance is using the same buffer. Therefore, the first in any sequence of mutating operations may cost O(N)<\/codeVoice> time and space, where N<\/codeVoice> is the length of the string's (unspecified) underlying representation.<\/Para>]]><\/rawHTML>Views]]><\/rawHTML>String<\/codeVoice> is not itself a collection of anything. Instead, it has properties that present the string's contents as meaningful collections:<\/Para>characters<\/codeVoice>: a collection of Character<\/codeVoice> (extended grapheme cluster<\/Link>) elements, a unit of text that is meaningful to most humans.<\/Para><\/Item>unicodeScalars<\/codeVoice>: a collection of UnicodeScalar<\/codeVoice> (Unicode scalar values<\/Link>) the 21-bit codes that are the basic unit of Unicode. These values are equivalent to UTF-32 code units.<\/Para><\/Item>utf16<\/codeVoice>: a collection of UTF16.CodeUnit<\/codeVoice>, the 16-bit elements of the string's UTF-16 encoding.<\/Para><\/Item>utf8<\/codeVoice>: a collection of UTF8.CodeUnit<\/codeVoice>, the 8-bit elements of the string's UTF-8 encoding.<\/Para><\/Item><\/List-Bullet>]]><\/rawHTML>Growth and Capacity]]><\/rawHTML>When a string's contiguous storage fills up, new storage must be allocated and characters must be moved to the new storage. String<\/codeVoice> uses an exponential growth strategy that makes append<\/codeVoice> a constant time operation when amortized over many invocations<\/emphasis>.<\/Para>]]><\/rawHTML>Objective-C Bridge]]><\/rawHTML>String<\/codeVoice> is bridged to Objective-C as NSString<\/codeVoice>, and a String<\/codeVoice> that originated in Objective-C may store its characters in an NSString<\/codeVoice>. Since any arbitrary subclass of NSSString<\/codeVoice> can become a String<\/codeVoice>, there are no guarantees about representation or efficiency in this case. Since NSString<\/codeVoice> is immutable, it is just as though the storage was shared by some copy: the first in any sequence of mutating operations causes elements to be copied into unique, contiguous storage which may cost O(N)<\/codeVoice> time and space, where N<\/codeVoice> is the length of the string representation (or more, if the underlying NSString<\/codeVoice> is has unusual performance characteristics).<\/Para><\/Discussion><\/Class>", + "key.doc.full_as_xml" : "String<\/Name>s:SS<\/USR>struct String<\/Declaration>An arbitrary Unicode string value.<\/Para><\/Abstract>]]><\/rawHTML>Unicode-Correct]]><\/rawHTML>Swift strings are designed to be Unicode-correct. In particular, the APIs make it easy to write code that works correctly, and does not surprise end-users, regardless of where you venture in the Unicode character space. For example, the ==<\/codeVoice> operator checks for Unicode canonical equivalence<\/Link>, so two different representations of the same string will always compare equal.<\/Para>]]><\/rawHTML>Locale-Insensitive]]><\/rawHTML>The fundamental operations on Swift strings are not sensitive to locale settings. That's because, for example, the validity of a Dictionary<String, T><\/codeVoice> in a running program depends on a given string comparison having a single, stable result. Therefore, Swift always uses the default, un-tailored<\/Link> Unicode algorithms for basic string operations.<\/Para>Importing Foundation<\/codeVoice> endows swift strings with the full power of the NSString<\/codeVoice> API, which allows you to choose more complex locale-sensitive operations explicitly.<\/Para>]]><\/rawHTML>Value Semantics]]><\/rawHTML>Each string variable, let<\/codeVoice> binding, or stored property has an independent value, so mutations to the string are not observable through its copies:<\/Para><\/zCodeLineNumbered><\/zCodeLineNumbered><\/zCodeLineNumbered><\/zCodeLineNumbered><\/zCodeLineNumbered><\/CodeListing>Strings use Copy-on-Write so that their data is only copied lazily, upon mutation, when more than one string instance is using the same buffer. Therefore, the first in any sequence of mutating operations may cost O(N)<\/codeVoice> time and space, where N<\/codeVoice> is the length of the string's (unspecified) underlying representation.<\/Para>]]><\/rawHTML>Views]]><\/rawHTML>String<\/codeVoice> is not itself a collection of anything. Instead, it has properties that present the string's contents as meaningful collections:<\/Para>characters<\/codeVoice>: a collection of Character<\/codeVoice> (extended grapheme cluster<\/Link>) elements, a unit of text that is meaningful to most humans.<\/Para><\/Item>unicodeScalars<\/codeVoice>: a collection of UnicodeScalar<\/codeVoice> (Unicode scalar values<\/Link>) the 21-bit codes that are the basic unit of Unicode. These values are equivalent to UTF-32 code units.<\/Para><\/Item>utf16<\/codeVoice>: a collection of UTF16.CodeUnit<\/codeVoice>, the 16-bit elements of the string's UTF-16 encoding.<\/Para><\/Item>utf8<\/codeVoice>: a collection of UTF8.CodeUnit<\/codeVoice>, the 8-bit elements of the string's UTF-8 encoding.<\/Para><\/Item><\/List-Bullet>]]><\/rawHTML>Growth and Capacity]]><\/rawHTML>When a string's contiguous storage fills up, new storage must be allocated and characters must be moved to the new storage. String<\/codeVoice> uses an exponential growth strategy that makes append<\/codeVoice> a constant time operation when amortized over many invocations<\/emphasis>.<\/Para>]]><\/rawHTML>Objective-C Bridge]]><\/rawHTML>String<\/codeVoice> is bridged to Objective-C as NSString<\/codeVoice>, and a String<\/codeVoice> that originated in Objective-C may store its characters in an NSString<\/codeVoice>. Since any arbitrary subclass of NSString<\/codeVoice> can become a String<\/codeVoice>, there are no guarantees about representation or efficiency in this case. Since NSString<\/codeVoice> is immutable, it is just as though the storage was shared by some copy: the first in any sequence of mutating operations causes elements to be copied into unique, contiguous storage which may cost O(N)<\/codeVoice> time and space, where N<\/codeVoice> is the length of the string representation (or more, if the underlying NSString<\/codeVoice> has unusual performance characteristics).<\/Para><\/Discussion><\/Class>", "key.nameoffset" : 604, "key.doc.name" : "String", "key.inheritedtypes" : [ @@ -803,12 +803,12 @@ "key.bodylength" : 18, "key.length" : 26, "key.name" : "fromString(_:)", - "key.typename" : "String.Type -> (String) -> String?", + "key.typename" : "(String.Type) -> (String) -> String?", "key.parsed_scope.end" : 31, - "key.usr" : "s:ZFE10CommandantSS10fromStringFMSSFSSGSqSS_", + "key.usr" : "s:ZFE10CommandantSS10fromStringFSSGSqSS_", "key.overrides" : [ { - "key.usr" : "s:ZFP10Commandant12ArgumentType10fromStringuRq_S0__FMq_FSSGSqq__" + "key.usr" : "s:ZFP10Commandant12ArgumentType10fromStringFSSGSqx_" } ], "key.nameoffset" : 683, @@ -857,7 +857,7 @@ "Para" : "When a string's contiguous storage fills up, new storage must be allocated and characters must be moved to the new storage. `String` uses an exponential growth strategy that makes `append` a constant time operation ." }, { - "Para" : "`String` is bridged to Objective-C as `NSString`, and a `String` that originated in Objective-C may store its characters in an `NSString`. Since any arbitrary subclass of `NSSString` can become a `String`, there are no guarantees about representation or efficiency in this case. Since `NSString` is immutable, it is just as though the storage was shared by some copy: the first in any sequence of mutating operations causes elements to be copied into unique, contiguous storage which may cost `O(N)` time and space, where `N` is the length of the string representation (or more, if the underlying `NSString` is has unusual performance characteristics)." + "Para" : "`String` is bridged to Objective-C as `NSString`, and a `String` that originated in Objective-C may store its characters in an `NSString`. Since any arbitrary subclass of `NSString` can become a `String`, there are no guarantees about representation or efficiency in this case. Since `NSString` is immutable, it is just as though the storage was shared by some copy: the first in any sequence of mutating operations causes elements to be copied into unique, contiguous storage which may cost `O(N)` time and space, where `N` is the length of the string representation (or more, if the underlying `NSString` has unusual performance characteristics)." } ] } @@ -898,7 +898,7 @@ "key.attribute" : "source.decl.attribute.__raw_doc_comment" } ], - "key.doc.full_as_xml" : "OptionsType<\/Name>s:P10Commandant11OptionsType<\/USR>public protocol OptionsType<\/Declaration>Represents a record of options for a command, which can be parsed from a list of command-line arguments.<\/Para><\/Abstract>This is most helpful when used in conjunction with the Option<\/codeVoice> and Switch<\/codeVoice> types, and <*><\/codeVoice> and <|<\/codeVoice> combinators.<\/Para>Example:<\/Para><\/zCodeLineNumbered><\/zCodeLineNumbered><\/zCodeLineNumbered><\/zCodeLineNumbered><\/zCodeLineNumbered> LogOptions {]]><\/zCodeLineNumbered><\/zCodeLineNumbered><\/zCodeLineNumbered><\/zCodeLineNumbered> Result> {]]><\/zCodeLineNumbered><\/zCodeLineNumbered> m <| Option(key: \"verbose\", defaultValue: 0, usage: \"the verbosity level with which to read the logs\")]]><\/zCodeLineNumbered> m <| Option(key: \"outputFilename\", defaultValue: \"\", usage: \"a file to print output to, instead of stdout\")]]><\/zCodeLineNumbered> m <| Switch(flag: \"d\", key: \"delete\", defaultValue: false, usage: \"delete the logs when finished\")]]><\/zCodeLineNumbered> m <| Option(usage: \"the log to read\")]]><\/zCodeLineNumbered><\/zCodeLineNumbered><\/zCodeLineNumbered><\/zCodeLineNumbered><\/CodeListing><\/Discussion><\/Class>", + "key.doc.full_as_xml" : "OptionsType<\/Name>s:P10Commandant11OptionsType<\/USR>public protocol OptionsType<\/Declaration>Represents a record of options for a command, which can be parsed from a list of command-line arguments.<\/Para><\/Abstract>This is most helpful when used in conjunction with the Option<\/codeVoice> and Switch<\/codeVoice> types, and <*><\/codeVoice> and <|<\/codeVoice> combinators.<\/Para>Example:<\/Para><\/zCodeLineNumbered><\/zCodeLineNumbered><\/zCodeLineNumbered><\/zCodeLineNumbered><\/zCodeLineNumbered> LogOptions {]]><\/zCodeLineNumbered><\/zCodeLineNumbered><\/zCodeLineNumbered><\/zCodeLineNumbered> Result> {]]><\/zCodeLineNumbered><\/zCodeLineNumbered> m <| Option(key: \"verbose\", defaultValue: 0, usage: \"the verbosity level with which to read the logs\")]]><\/zCodeLineNumbered> m <| Option(key: \"outputFilename\", defaultValue: \"\", usage: \"a file to print output to, instead of stdout\")]]><\/zCodeLineNumbered> m <| Switch(flag: \"d\", key: \"delete\", defaultValue: false, usage: \"delete the logs when finished\")]]><\/zCodeLineNumbered> m <| Option(usage: \"the log to read\")]]><\/zCodeLineNumbered><\/zCodeLineNumbered><\/zCodeLineNumbered><\/zCodeLineNumbered><\/CodeListing><\/Discussion><\/Class>", "key.doc.name" : "OptionsType", "key.substructure" : [ { @@ -911,7 +911,7 @@ "key.length" : 24, "key.doc.column" : 14, "key.parsed_scope.end" : 43, - "key.usr" : "s:ZFP10Commandant11OptionsType8evaluateuRq_S0__FMq_FOS_11CommandModeGO6Result6Resultq_GOS_15CommandantErrorqq_S0_11ClientError__", + "key.usr" : "s:ZFP10Commandant11OptionsType8evaluateFOS_11CommandModeGO6Result6ResultxGOS_15CommandantErrorwx11ClientError__", "key.doc.file" : "Sources\/Commandant\/Option.swift", "key.nameoffset" : 1494, "key.annotated_decl" : "static func evaluate(m: CommandMode<\/Type>) -> Result<\/Type><Self, CommandantError<\/Type><Self.ClientError>><\/Declaration>", @@ -920,14 +920,14 @@ "key.filepath" : "Sources\/Commandant\/Option.swift", "key.doc.declaration" : "static func evaluate(m: CommandMode) -> Result.Result>", "key.name" : "evaluate(_:)", - "key.typename" : "<`Self` : OptionsType> Self.Type -> (CommandMode) -> Result>", + "key.typename" : "<`Self` : OptionsType> (Self.Type) -> (CommandMode) -> Result>", "key.doc.type" : "Function", "key.attributes" : [ { "key.attribute" : "source.decl.attribute.__raw_doc_comment" } ], - "key.doc.full_as_xml" : "evaluate(_:)<\/Name>s:ZFP10Commandant11OptionsType8evaluateuRq_S0__FMq_FOS_11CommandModeGO6Result6Resultq_GOS_15CommandantErrorqq_S0_11ClientError__<\/USR>static func evaluate(m: CommandMode) -> Result.Result<Self, Commandant.CommandantError<Self.ClientError>><\/Declaration>Evaluates this set of options in the given mode.<\/Para><\/Abstract>Returns the parsed options or a UsageError<\/codeVoice>.<\/Para><\/Discussion><\/Function>", + "key.doc.full_as_xml" : "evaluate(_:)<\/Name>s:ZFP10Commandant11OptionsType8evaluateFOS_11CommandModeGO6Result6ResultxGOS_15CommandantErrorwx11ClientError__<\/USR>static func evaluate(m: CommandMode) -> Result.Result<Self, Commandant.CommandantError<Self.ClientError>><\/Declaration>Evaluates this set of options in the given mode.<\/Para><\/Abstract>Returns the parsed options or a UsageError<\/codeVoice>.<\/Para><\/Discussion><\/Function>", "key.doc.name" : "evaluate(_:)", "key.substructure" : [ @@ -965,7 +965,7 @@ "key.usr" : "s:V10Commandant9NoOptions", "key.doc.file" : "Sources\/Commandant\/Option.swift", "key.nameoffset" : 1624, - "key.annotated_decl" : "public struct NoOptions<ClientError : ErrorType<\/Type>> : OptionsType<\/Type><\/Declaration>", + "key.annotated_decl" : "public struct NoOptions<ClientError : ErrorType<\/Type>> : OptionsType<\/Type><\/Declaration>", "key.accessibility" : "source.lang.swift.accessibility.public", "key.elements" : [ { @@ -1005,7 +1005,7 @@ "key.name" : "init()", "key.typename" : " NoOptions.Type -> () -> NoOptions", "key.parsed_scope.end" : 48, - "key.usr" : "s:FV10Commandant9NoOptionscuRq_Ss9ErrorType_FMGS0_q__FT_GS0_q__", + "key.usr" : "s:FV10Commandant9NoOptionscFT_GS0_x_", "key.nameoffset" : 1682, "key.annotated_decl" : "private init()<\/Declaration>", "key.accessibility" : "source.lang.swift.accessibility.private", @@ -1021,12 +1021,12 @@ "key.bodylength" : 33, "key.length" : 24, "key.name" : "evaluate(_:)", - "key.typename" : " NoOptions.Type -> (CommandMode) -> Result, CommandantError>", + "key.typename" : " (NoOptions.Type) -> (CommandMode) -> Result, CommandantError>", "key.parsed_scope.end" : 52, - "key.usr" : "s:ZFV10Commandant9NoOptions8evaluateuRq_Ss9ErrorType_FMGS0_q__FOS_11CommandModeGO6Result6ResultGS0_q__GOS_15CommandantErrorq___", + "key.usr" : "s:ZFV10Commandant9NoOptions8evaluateFOS_11CommandModeGO6Result6ResultGS0_x_GOS_15CommandantErrorx__", "key.overrides" : [ { - "key.usr" : "s:ZFP10Commandant11OptionsType8evaluateuRq_S0__FMq_FOS_11CommandModeGO6Result6Resultq_GOS_15CommandantErrorqq_S0_11ClientError__" + "key.usr" : "s:ZFP10Commandant11OptionsType8evaluateFOS_11CommandModeGO6Result6ResultxGOS_15CommandantErrorwx11ClientError__" } ], "key.nameoffset" : 1714, @@ -1113,14 +1113,14 @@ "key.name" : "defaultValue", "key.doc.column" : 13, "key.parsed_scope.end" : 65, - "key.usr" : "s:vV10Commandant6Option12defaultValueGSqq__", + "key.usr" : "s:vV10Commandant6Option12defaultValueGSqx_", "key.doc.type" : "Other", "key.attributes" : [ { "key.attribute" : "source.decl.attribute.__raw_doc_comment" } ], - "key.doc.full_as_xml" : "defaultValue<\/Name>s:vV10Commandant6Option12defaultValueGSqq__<\/USR>public let defaultValue: T?<\/Declaration>The default value for this option. This is the value that will be used if the option is never explicitly specified on the command line.<\/Para><\/Abstract>If this is nil, this option is always required.<\/Para><\/Discussion><\/Other>", + "key.doc.full_as_xml" : "defaultValue<\/Name>s:vV10Commandant6Option12defaultValueGSqx_<\/USR>public let defaultValue: T?<\/Declaration>The default value for this option. This is the value that will be used if the option is never explicitly specified on the command line.<\/Para><\/Abstract>If this is nil, this option is always required.<\/Para><\/Discussion><\/Other>", "key.nameoffset" : 2279, "key.doc.file" : "Sources\/Commandant\/Option.swift", "key.annotated_decl" : "public let defaultValue: T?<\/Declaration>", @@ -1179,9 +1179,9 @@ "key.name" : "init(key:defaultValue:usage:)", "key.typename" : " Option.Type -> (key: String, defaultValue: T?, usage: String) -> Option", "key.parsed_scope.end" : 79, - "key.usr" : "s:FV10Commandant6OptioncurFMGS0_q__FT3keySS12defaultValueGSqq__5usageSS_GS0_q__", + "key.usr" : "s:FV10Commandant6OptioncFT3keySS12defaultValueGSqx_5usageSS_GS0_x_", "key.nameoffset" : 2637, - "key.annotated_decl" : "public init(key: String<\/Type>, defaultValue: T? = default, usage: String<\/Type>)<\/Declaration>", + "key.annotated_decl" : "public init(key: String<\/Type>, defaultValue: T<\/Type>? = default, usage: String<\/Type>)<\/Declaration>", "key.accessibility" : "source.lang.swift.accessibility.public", "key.substructure" : [ @@ -1200,7 +1200,7 @@ "key.length" : 45, "key.doc.column" : 15, "key.parsed_scope.end" : 86, - "key.usr" : "s:FV10Commandant6OptionP33_4F8DF2BC794A725A9EB7CCE887709D3217invalidUsageErroru__rFGS0_q__FSSGOS_15CommandantErrorqd___", + "key.usr" : "s:FV10Commandant6OptionP33_4F8DF2BC794A725A9EB7CCE887709D3217invalidUsageErrorurFSSGOS_15CommandantErrorqd___", "key.doc.file" : "Sources\/Commandant\/Option.swift", "key.nameoffset" : 2942, "key.annotated_decl" : "private func invalidUsageError<ClientError>(value: String<\/Type>) -> CommandantError<\/Type><ClientError><\/Declaration>", @@ -1210,14 +1210,14 @@ "key.bodyoffset" : 3021, "key.doc.declaration" : "private func invalidUsageError(value: String) -> Commandant.CommandantError", "key.name" : "invalidUsageError(_:)", - "key.typename" : " Option -> (String) -> CommandantError", + "key.typename" : " (Option) -> (String) -> CommandantError", "key.doc.type" : "Function", "key.attributes" : [ { "key.attribute" : "source.decl.attribute.__raw_doc_comment" } ], - "key.doc.full_as_xml" : "invalidUsageError(_:)<\/Name>s:FV10Commandant6OptionP33_4F8DF2BC794A725A9EB7CCE887709D3217invalidUsageErroru__rFGS0_q__FSSGOS_15CommandantErrorqd___<\/USR>private func invalidUsageError<ClientError>(value: String) -> Commandant.CommandantError<ClientError><\/Declaration>Constructs an InvalidArgument<\/codeVoice> error that describes how the option was used incorrectly. value<\/codeVoice> should be the invalid value given by the user.<\/Para><\/Abstract><\/Function>", + "key.doc.full_as_xml" : "invalidUsageError(_:)<\/Name>s:FV10Commandant6OptionP33_4F8DF2BC794A725A9EB7CCE887709D3217invalidUsageErrorurFSSGOS_15CommandantErrorqd___<\/USR>private func invalidUsageError<ClientError>(value: String) -> Commandant.CommandantError<ClientError><\/Declaration>Constructs an InvalidArgument<\/codeVoice> error that describes how the option was used incorrectly. value<\/codeVoice> should be the invalid value given by the user.<\/Para><\/Abstract><\/Function>", "key.doc.name" : "invalidUsageError(_:)", "key.substructure" : [ @@ -1264,7 +1264,7 @@ "key.usr" : "s:vV10Commandant6Option11descriptionSS", "key.overrides" : [ { - "key.usr" : "s:vPSs23CustomStringConvertible11descriptionSS" + "key.usr" : "s:vPs23CustomStringConvertible11descriptionSS" } ], "key.nameoffset" : 3191, @@ -1294,10 +1294,10 @@ "key.length" : 82, "key.doc.column" : 13, "key.parsed_scope.end" : 136, - "key.usr" : "s:ZF10Commandantoi3lmgu1_rFTFq_q0_GO6Result6Resultq_GOS_15CommandantErrorq1____GS1_q0_GS2_q1___", + "key.usr" : "s:ZF10Commandantoi3lmgu1_rFTFxq_GO6Result6ResultxGOS_15CommandantErrorq0____GS1_q_GS2_q0___", "key.doc.file" : "Sources\/Commandant\/Option.swift", "key.nameoffset" : 4729, - "key.annotated_decl" : "public func <*><T, U, ClientError>(f: T -> U, value: Result<\/Type><T, CommandantError<\/Type><ClientError>>) -> Result<\/Type><U, CommandantError<\/Type><ClientError>><\/Declaration>", + "key.annotated_decl" : "public func <*><T, U, ClientError>(f: T<\/Type> -> U<\/Type>, value: Result<\/Type><T<\/Type>, CommandantError<\/Type><ClientError<\/Type>>>) -> Result<\/Type><U, CommandantError<\/Type><ClientError>><\/Declaration>", "key.accessibility" : "source.lang.swift.accessibility.public", "key.parsed_scope.start" : 134, "key.filepath" : "Sources\/Commandant\/Option.swift", @@ -1313,10 +1313,10 @@ ], "key.related_decls" : [ { - "key.annotated_decl" : "<*><T, U, ClientError>(_: Result<(T -> U), CommandantError<ClientError>>, _: Result<T, CommandantError<ClientError>>) -> Result<U, CommandantError<ClientError>><\/RelatedName>" + "key.annotated_decl" : "<*><T, U, ClientError>(_: Result<(T -> U), CommandantError<ClientError>>, _: Result<T, CommandantError<ClientError>>) -> Result<U, CommandantError<ClientError>><\/RelatedName>" } ], - "key.doc.full_as_xml" : "<*>(_:_:)<\/Name>s:ZF10Commandantoi3lmgu1_rFTFq_q0_GO6Result6Resultq_GOS_15CommandantErrorq1____GS1_q0_GS2_q1___<\/USR>public func <*><T, U, ClientError>(f: T -> U, value: Result<T, CommandantError<ClientError>>) -> Result.Result<U, Commandant.CommandantError<ClientError>><\/Declaration>Applies f<\/codeVoice> to the value in the given result.<\/Para><\/Abstract>In the context of command-line option parsing, this is used to chain together the parsing of multiple arguments. See OptionsType for an example.<\/Para><\/Discussion><\/Function>", + "key.doc.full_as_xml" : "<*>(_:_:)<\/Name>s:ZF10Commandantoi3lmgu1_rFTFxq_GO6Result6ResultxGOS_15CommandantErrorq0____GS1_q_GS2_q0___<\/USR>public func <*><T, U, ClientError>(f: T -> U, value: Result<T, CommandantError<ClientError>>) -> Result.Result<U, Commandant.CommandantError<ClientError>><\/Declaration>Applies f<\/codeVoice> to the value in the given result.<\/Para><\/Abstract>In the context of command-line option parsing, this is used to chain together the parsing of multiple arguments. See OptionsType for an example.<\/Para><\/Discussion><\/Function>", "key.doc.name" : "<*>(_:_:)", "key.substructure" : [ { @@ -1329,7 +1329,7 @@ "key.name" : "T", "key.parsed_scope.start" : 134, "key.parsed_scope.end" : 134, - "key.usr" : "s:tZF10Commandantoi3lmgu1_rFTFq_q0_GO6Result6Resultq_GOS_15CommandantErrorq1____GS1_q0_GS2_q1___L_1TMq_", + "key.usr" : "s:tZF10Commandantoi3lmgu1_rFTFxq_GO6Result6ResultxGOS_15CommandantErrorq0____GS1_q_GS2_q0___L_1TMx", "key.filepath" : "Sources\/Commandant\/Option.swift" } ], @@ -1350,10 +1350,10 @@ "key.length" : 122, "key.doc.column" : 13, "key.parsed_scope.end" : 157, - "key.usr" : "s:ZF10Commandantoi3lmgu1_rFTGO6Result6ResultFq_q0_GOS_15CommandantErrorq1___GS1_q_GS2_q1____GS1_q0_GS2_q1___", + "key.usr" : "s:ZF10Commandantoi3lmgu1_rFTGO6Result6ResultFxq_GOS_15CommandantErrorq0___GS1_xGS2_q0____GS1_q_GS2_q0___", "key.doc.file" : "Sources\/Commandant\/Option.swift", "key.nameoffset" : 5116, - "key.annotated_decl" : "public func <*><T, U, ClientError>(f: Result<\/Type><(T -> U), CommandantError<\/Type><ClientError>>, value: Result<\/Type><T, CommandantError<\/Type><ClientError>>) -> Result<\/Type><U, CommandantError<\/Type><ClientError>><\/Declaration>", + "key.annotated_decl" : "public func <*><T, U, ClientError>(f: Result<\/Type><(T<\/Type> -> U<\/Type>), CommandantError<\/Type><ClientError<\/Type>>>, value: Result<\/Type><T<\/Type>, CommandantError<\/Type><ClientError<\/Type>>>) -> Result<\/Type><U, CommandantError<\/Type><ClientError>><\/Declaration>", "key.accessibility" : "source.lang.swift.accessibility.public", "key.parsed_scope.start" : 142, "key.filepath" : "Sources\/Commandant\/Option.swift", @@ -1369,10 +1369,10 @@ ], "key.related_decls" : [ { - "key.annotated_decl" : "<*><T, U, ClientError>(_: T -> U, _: Result<T, CommandantError<ClientError>>) -> Result<U, CommandantError<ClientError>><\/RelatedName>" + "key.annotated_decl" : "<*><T, U, ClientError>(_: T -> U, _: Result<T, CommandantError<ClientError>>) -> Result<U, CommandantError<ClientError>><\/RelatedName>" } ], - "key.doc.full_as_xml" : "<*>(_:_:)<\/Name>s:ZF10Commandantoi3lmgu1_rFTGO6Result6ResultFq_q0_GOS_15CommandantErrorq1___GS1_q_GS2_q1____GS1_q0_GS2_q1___<\/USR>public func <*><T, U, ClientError>(f: Result<(T -> U), CommandantError<ClientError>>, value: Result<T, CommandantError<ClientError>>) -> Result.Result<U, Commandant.CommandantError<ClientError>><\/Declaration>Applies the function in f<\/codeVoice> to the value in the given result.<\/Para><\/Abstract>In the context of command-line option parsing, this is used to chain together the parsing of multiple arguments. See OptionsType for an example.<\/Para><\/Discussion><\/Function>", + "key.doc.full_as_xml" : "<*>(_:_:)<\/Name>s:ZF10Commandantoi3lmgu1_rFTGO6Result6ResultFxq_GOS_15CommandantErrorq0___GS1_xGS2_q0____GS1_q_GS2_q0___<\/USR>public func <*><T, U, ClientError>(f: Result<(T -> U), CommandantError<ClientError>>, value: Result<T, CommandantError<ClientError>>) -> Result.Result<U, Commandant.CommandantError<ClientError>><\/Declaration>Applies the function in f<\/codeVoice> to the value in the given result.<\/Para><\/Abstract>In the context of command-line option parsing, this is used to chain together the parsing of multiple arguments. See OptionsType for an example.<\/Para><\/Discussion><\/Function>", "key.doc.name" : "<*>(_:_:)", "key.substructure" : [ { @@ -1385,7 +1385,7 @@ "key.name" : "T", "key.parsed_scope.start" : 142, "key.parsed_scope.end" : 142, - "key.usr" : "s:tZF10Commandantoi3lmgu1_rFTGO6Result6ResultFq_q0_GOS_15CommandantErrorq1___GS1_q_GS2_q1____GS1_q0_GS2_q1___L_1TMq_", + "key.usr" : "s:tZF10Commandantoi3lmgu1_rFTGO6Result6ResultFxq_GOS_15CommandantErrorq0___GS1_xGS2_q0____GS1_q_GS2_q0___L_1TMx", "key.filepath" : "Sources\/Commandant\/Option.swift" } ], @@ -1406,10 +1406,10 @@ "key.length" : 71, "key.doc.column" : 13, "key.parsed_scope.end" : 196, - "key.usr" : "s:ZF10Commandantoi2lou0_Rq_S_12ArgumentType_FTOS_11CommandModeGVS_6Optionq___GO6Result6Resultq_GOS_15CommandantErrorq0___", + "key.usr" : "s:ZF10Commandantoi2lou0_RxS_12ArgumentTyperFTOS_11CommandModeGVS_6Optionx__GO6Result6ResultxGOS_15CommandantErrorq___", "key.doc.file" : "Sources\/Commandant\/Option.swift", "key.nameoffset" : 5826, - "key.annotated_decl" : "public func <|<T : ArgumentType<\/Type>, ClientError>(mode: CommandMode<\/Type>, option: Option<\/Type><T>) -> Result<\/Type><T, CommandantError<\/Type><ClientError>><\/Declaration>", + "key.annotated_decl" : "public func <|<T : ArgumentType<\/Type>, ClientError>(mode: CommandMode<\/Type>, option: Option<\/Type><T<\/Type>>) -> Result<\/Type><T, CommandantError<\/Type><ClientError>><\/Declaration>", "key.accessibility" : "source.lang.swift.accessibility.public", "key.parsed_scope.start" : 163, "key.filepath" : "Sources\/Commandant\/Option.swift", @@ -1425,19 +1425,19 @@ ], "key.related_decls" : [ { - "key.annotated_decl" : "<|<T : ArgumentType, ClientError>(_: CommandMode, _: Argument<T>) -> Result<T, CommandantError<ClientError>><\/RelatedName>" + "key.annotated_decl" : "<|<T : ArgumentType, ClientError>(_: CommandMode, _: Argument<T>) -> Result<T, CommandantError<ClientError>><\/RelatedName>" }, { - "key.annotated_decl" : "<|<T : ArgumentType, ClientError>(_: CommandMode, _: Argument<[T]>) -> Result<[T], CommandantError<ClientError>><\/RelatedName>" + "key.annotated_decl" : "<|<T : ArgumentType, ClientError>(_: CommandMode, _: Argument<[T]>) -> Result<[T], CommandantError<ClientError>><\/RelatedName>" }, { - "key.annotated_decl" : "<|<ClientError>(_: CommandMode, _: Option<Bool>) -> Result<Bool, CommandantError<ClientError>><\/RelatedName>" + "key.annotated_decl" : "<|<ClientError>(_: CommandMode, _: Option<Bool>) -> Result<Bool, CommandantError<ClientError>><\/RelatedName>" }, { - "key.annotated_decl" : "<|<ClientError>(_: CommandMode, _: Switch) -> Result<Bool, CommandantError<ClientError>><\/RelatedName>" + "key.annotated_decl" : "<|<ClientError>(_: CommandMode, _: Switch) -> Result<Bool, CommandantError<ClientError>><\/RelatedName>" } ], - "key.doc.full_as_xml" : "<|(_:_:)<\/Name>s:ZF10Commandantoi2lou0_Rq_S_12ArgumentType_FTOS_11CommandModeGVS_6Optionq___GO6Result6Resultq_GOS_15CommandantErrorq0___<\/USR>public func <|<T : ArgumentType, ClientError>(mode: CommandMode, option: Option<T>) -> Result.Result<T, Commandant.CommandantError<ClientError>><\/Declaration>Evaluates the given option in the given mode.<\/Para><\/Abstract>If parsing command line arguments, and no value was specified on the command line, the option's defaultValue<\/codeVoice> is used.<\/Para><\/Discussion><\/Function>", + "key.doc.full_as_xml" : "<|(_:_:)<\/Name>s:ZF10Commandantoi2lou0_RxS_12ArgumentTyperFTOS_11CommandModeGVS_6Optionx__GO6Result6ResultxGOS_15CommandantErrorq___<\/USR>public func <|<T : ArgumentType, ClientError>(mode: CommandMode, option: Option<T>) -> Result.Result<T, Commandant.CommandantError<ClientError>><\/Declaration>Evaluates the given option in the given mode.<\/Para><\/Abstract>If parsing command line arguments, and no value was specified on the command line, the option's defaultValue<\/codeVoice> is used.<\/Para><\/Discussion><\/Function>", "key.doc.name" : "<|(_:_:)", "key.substructure" : [ { @@ -1450,7 +1450,7 @@ "key.name" : "T", "key.parsed_scope.start" : 163, "key.parsed_scope.end" : 163, - "key.usr" : "s:tZF10Commandantoi2lou0_Rq_S_12ArgumentType_FTOS_11CommandModeGVS_6Optionq___GO6Result6Resultq_GOS_15CommandantErrorq0___L_1TMq_", + "key.usr" : "s:tZF10Commandantoi2lou0_RxS_12ArgumentTyperFTOS_11CommandModeGVS_6Optionx__GO6Result6ResultxGOS_15CommandantErrorq___L_1TMx", "key.filepath" : "Sources\/Commandant\/Option.swift" } ], @@ -1471,7 +1471,7 @@ "key.length" : 57, "key.doc.column" : 13, "key.parsed_scope.end" : 216, - "key.usr" : "s:ZF10Commandantoi2lourFTOS_11CommandModeGVS_6OptionSb__GO6Result6ResultSbGOS_15CommandantErrorq___", + "key.usr" : "s:ZF10Commandantoi2lourFTOS_11CommandModeGVS_6OptionSb__GO6Result6ResultSbGOS_15CommandantErrorx__", "key.doc.file" : "Sources\/Commandant\/Option.swift", "key.nameoffset" : 6991, "key.annotated_decl" : "public func <|<ClientError>(mode: CommandMode<\/Type>, option: Option<\/Type><Bool<\/Type>>) -> Result<\/Type><Bool<\/Type>, CommandantError<\/Type><ClientError>><\/Declaration>", @@ -1490,19 +1490,19 @@ ], "key.related_decls" : [ { - "key.annotated_decl" : "<|<T : ArgumentType, ClientError>(_: CommandMode, _: Argument<T>) -> Result<T, CommandantError<ClientError>><\/RelatedName>" + "key.annotated_decl" : "<|<T : ArgumentType, ClientError>(_: CommandMode, _: Argument<T>) -> Result<T, CommandantError<ClientError>><\/RelatedName>" }, { - "key.annotated_decl" : "<|<T : ArgumentType, ClientError>(_: CommandMode, _: Argument<[T]>) -> Result<[T], CommandantError<ClientError>><\/RelatedName>" + "key.annotated_decl" : "<|<T : ArgumentType, ClientError>(_: CommandMode, _: Argument<[T]>) -> Result<[T], CommandantError<ClientError>><\/RelatedName>" }, { - "key.annotated_decl" : "<|<T : ArgumentType, ClientError>(_: CommandMode, _: Option<T>) -> Result<T, CommandantError<ClientError>><\/RelatedName>" + "key.annotated_decl" : "<|<T : ArgumentType, ClientError>(_: CommandMode, _: Option<T>) -> Result<T, CommandantError<ClientError>><\/RelatedName>" }, { - "key.annotated_decl" : "<|<ClientError>(_: CommandMode, _: Switch) -> Result<Bool, CommandantError<ClientError>><\/RelatedName>" + "key.annotated_decl" : "<|<ClientError>(_: CommandMode, _: Switch) -> Result<Bool, CommandantError<ClientError>><\/RelatedName>" } ], - "key.doc.full_as_xml" : "<|(_:_:)<\/Name>s:ZF10Commandantoi2lourFTOS_11CommandModeGVS_6OptionSb__GO6Result6ResultSbGOS_15CommandantErrorq___<\/USR>public func <|<ClientError>(mode: CommandMode, option: Option<Bool>) -> Result.Result<Bool, Commandant.CommandantError<ClientError>><\/Declaration>Evaluates the given boolean option in the given mode.<\/Para><\/Abstract>If parsing command line arguments, and no value was specified on the command line, the option's defaultValue<\/codeVoice> is used.<\/Para><\/Discussion><\/Function>", + "key.doc.full_as_xml" : "<|(_:_:)<\/Name>s:ZF10Commandantoi2lourFTOS_11CommandModeGVS_6OptionSb__GO6Result6ResultSbGOS_15CommandantErrorx__<\/USR>public func <|<ClientError>(mode: CommandMode, option: Option<Bool>) -> Result.Result<Bool, Commandant.CommandantError<ClientError>><\/Declaration>Evaluates the given boolean option in the given mode.<\/Para><\/Abstract>If parsing command line arguments, and no value was specified on the command line, the option's defaultValue<\/codeVoice> is used.<\/Para><\/Discussion><\/Function>", "key.doc.name" : "<|(_:_:)", "key.substructure" : [ { @@ -1515,7 +1515,7 @@ "key.name" : "ClientError", "key.parsed_scope.start" : 202, "key.parsed_scope.end" : 202, - "key.usr" : "s:tZF10Commandantoi2lourFTOS_11CommandModeGVS_6OptionSb__GO6Result6ResultSbGOS_15CommandantErrorq___L_11ClientErrorMq_", + "key.usr" : "s:tZF10Commandantoi2lourFTOS_11CommandModeGVS_6OptionSb__GO6Result6ResultSbGOS_15CommandantErrorx__L_11ClientErrorMx", "key.filepath" : "Sources\/Commandant\/Option.swift" } ], @@ -1526,6 +1526,23 @@ ] } ], + "key.diagnostics" : [ + { + "key.severity" : "source.diagnostic.severity.warning", + "key.column" : 2, + "key.fixits" : [ + { + "key.offset" : 1337, + "key.length" : 9, + "key.sourcetext" : "associatedtype" + } + ], + "key.diagnostic_stage" : "source.diagnostic.stage.swift.parse", + "key.description" : "use of 'typealias' to declare associated types is deprecated; use 'associatedtype' instead", + "key.line" : 38, + "key.filepath" : "Sources\/Commandant\/Option.swift" + } + ], "key.offset" : 0, "key.diagnostic_stage" : "source.diagnostic.stage.swift.parse", "key.length" : 7461 @@ -1547,7 +1564,7 @@ "key.usr" : "s:O10Commandant15CommandantError", "key.doc.file" : "Sources\/Commandant\/Errors.swift", "key.nameoffset" : 349, - "key.annotated_decl" : "public enum CommandantError<ClientError> : ErrorType<\/Type><\/Declaration>", + "key.annotated_decl" : "public enum CommandantError<ClientError> : ErrorType<\/Type><\/Declaration>", "key.accessibility" : "source.lang.swift.accessibility.public", "key.elements" : [ { @@ -1591,10 +1608,10 @@ "key.typename" : " CommandantError.Type -> (description: String) -> CommandantError", "key.doc.column" : 7, "key.parsed_scope.end" : 18, - "key.usr" : "s:FO10Commandant15CommandantError10UsageErrorurFMGS0_q__FT11descriptionSS_GS0_q__", + "key.usr" : "s:FO10Commandant15CommandantError10UsageErrorurFMGS0_x_FT11descriptionSS_GS0_x_", "key.doc.type" : "Other", "key.doc.file" : "Sources\/Commandant\/Errors.swift", - "key.doc.full_as_xml" : "UsageError<\/Name>s:FO10Commandant15CommandantError10UsageErrorurFMGS0_q__FT11descriptionSS_GS0_q__<\/USR><\/Declaration>An option was used incorrectly.<\/Para><\/Abstract><\/Other>", + "key.doc.full_as_xml" : "UsageError<\/Name>s:FO10Commandant15CommandantError10UsageErrorurFMGS0_x_FT11descriptionSS_GS0_x_<\/USR><\/Declaration>An option was used incorrectly.<\/Para><\/Abstract><\/Other>", "key.nameoffset" : 434, "key.doc.name" : "UsageError", "key.annotated_decl" : "<\/Declaration>", @@ -1624,10 +1641,10 @@ "key.typename" : " CommandantError.Type -> (ClientError) -> CommandantError", "key.doc.column" : 7, "key.parsed_scope.end" : 21, - "key.usr" : "s:FO10Commandant15CommandantError12CommandErrorurFMGS0_q__Fq_GS0_q__", + "key.usr" : "s:FO10Commandant15CommandantError12CommandErrorurFMGS0_x_FxGS0_x_", "key.doc.type" : "Other", "key.doc.file" : "Sources\/Commandant\/Errors.swift", - "key.doc.full_as_xml" : "CommandError<\/Name>s:FO10Commandant15CommandantError12CommandErrorurFMGS0_q__Fq_GS0_q__<\/USR><\/Declaration>An error occurred while running a command.<\/Para><\/Abstract><\/Other>", + "key.doc.full_as_xml" : "CommandError<\/Name>s:FO10Commandant15CommandantError12CommandErrorurFMGS0_x_FxGS0_x_<\/USR><\/Declaration>An error occurred while running a command.<\/Para><\/Abstract><\/Other>", "key.nameoffset" : 521, "key.doc.name" : "CommandError", "key.annotated_decl" : "<\/Declaration>", @@ -1672,7 +1689,7 @@ "key.name" : "CustomStringConvertible" } ], - "key.annotated_decl" : "public enum CommandantError<ClientError> : ErrorType<\/Type><\/Declaration>", + "key.annotated_decl" : "public enum CommandantError<ClientError> : ErrorType<\/Type><\/Declaration>", "key.substructure" : [ { "key.kind" : "source.lang.swift.decl.var.instance", @@ -1688,7 +1705,7 @@ "key.usr" : "s:vO10Commandant15CommandantError11descriptionSS", "key.overrides" : [ { - "key.usr" : "s:vPSs23CustomStringConvertible11descriptionSS" + "key.usr" : "s:vPs23CustomStringConvertible11descriptionSS" } ], "key.nameoffset" : 615, @@ -1723,7 +1740,7 @@ "key.length" : 55, "key.doc.column" : 15, "key.parsed_scope.end" : 41, - "key.usr" : "s:F10Commandant20missingArgumentErrorurFSSGOS_15CommandantErrorq__", + "key.usr" : "s:F10Commandant20missingArgumentErrorurFSSGOS_15CommandantErrorx_", "key.doc.file" : "Sources\/Commandant\/Errors.swift", "key.nameoffset" : 907, "key.annotated_decl" : "internal func missingArgumentError<ClientError>(argumentName: String<\/Type>) -> CommandantError<\/Type><ClientError><\/Declaration>", @@ -1740,7 +1757,7 @@ "key.attribute" : "source.decl.attribute.__raw_doc_comment" } ], - "key.doc.full_as_xml" : "missingArgumentError(_:)<\/Name>s:F10Commandant20missingArgumentErrorurFSSGOS_15CommandantErrorq__<\/USR>internal func missingArgumentError<ClientError>(argumentName: String) -> Commandant.CommandantError<ClientError><\/Declaration>Constructs an InvalidArgument<\/codeVoice> error that indicates a missing value for the argument by the given name.<\/Para><\/Abstract><\/Function>", + "key.doc.full_as_xml" : "missingArgumentError(_:)<\/Name>s:F10Commandant20missingArgumentErrorurFSSGOS_15CommandantErrorx_<\/USR>internal func missingArgumentError<ClientError>(argumentName: String) -> Commandant.CommandantError<ClientError><\/Declaration>Constructs an InvalidArgument<\/codeVoice> error that indicates a missing value for the argument by the given name.<\/Para><\/Abstract><\/Function>", "key.doc.name" : "missingArgumentError(_:)", "key.substructure" : [ @@ -1757,7 +1774,7 @@ "key.length" : 74, "key.doc.column" : 15, "key.parsed_scope.end" : 51, - "key.usr" : "s:F10Commandant21informativeUsageErrorurFTSS5usageSS_GOS_15CommandantErrorq__", + "key.usr" : "s:F10Commandant21informativeUsageErrorurFTSS5usageSS_GOS_15CommandantErrorx_", "key.doc.file" : "Sources\/Commandant\/Errors.swift", "key.nameoffset" : 1233, "key.annotated_decl" : "internal func informativeUsageError<ClientError>(keyValueExample: String<\/Type>, usage: String<\/Type>) -> CommandantError<\/Type><ClientError><\/Declaration>", @@ -1776,25 +1793,25 @@ ], "key.related_decls" : [ { - "key.annotated_decl" : "informativeUsageError(_:argument:)<\/RelatedName>" + "key.annotated_decl" : "informativeUsageError(_:argument:)<\/RelatedName>" }, { - "key.annotated_decl" : "informativeUsageError<T : ArgumentType, ClientError>(_: Argument<T>) -> CommandantError<ClientError><\/RelatedName>" + "key.annotated_decl" : "informativeUsageError<T : ArgumentType, ClientError>(_: Argument<T>) -> CommandantError<ClientError><\/RelatedName>" }, { - "key.annotated_decl" : "informativeUsageError<T : ArgumentType, ClientError>(_: Argument<[T]>) -> CommandantError<ClientError><\/RelatedName>" + "key.annotated_decl" : "informativeUsageError<T : ArgumentType, ClientError>(_: Argument<[T]>) -> CommandantError<ClientError><\/RelatedName>" }, { - "key.annotated_decl" : "informativeUsageError(_:option:)<\/RelatedName>" + "key.annotated_decl" : "informativeUsageError(_:option:)<\/RelatedName>" }, { - "key.annotated_decl" : "informativeUsageError<T : ArgumentType, ClientError>(_: Option<T>) -> CommandantError<ClientError><\/RelatedName>" + "key.annotated_decl" : "informativeUsageError<T : ArgumentType, ClientError>(_: Option<T>) -> CommandantError<ClientError><\/RelatedName>" }, { - "key.annotated_decl" : "informativeUsageError<ClientError>(_: Option<Bool>) -> CommandantError<ClientError><\/RelatedName>" + "key.annotated_decl" : "informativeUsageError<ClientError>(_: Option<Bool>) -> CommandantError<ClientError><\/RelatedName>" } ], - "key.doc.full_as_xml" : "informativeUsageError(_:usage:)<\/Name>s:F10Commandant21informativeUsageErrorurFTSS5usageSS_GOS_15CommandantErrorq__<\/USR>internal func informativeUsageError<ClientError>(keyValueExample: String, usage: String) -> Commandant.CommandantError<ClientError><\/Declaration>Constructs an error by combining the example of key (and value, if applicable) with the usage description.<\/Para><\/Abstract><\/Function>", + "key.doc.full_as_xml" : "informativeUsageError(_:usage:)<\/Name>s:F10Commandant21informativeUsageErrorurFTSS5usageSS_GOS_15CommandantErrorx_<\/USR>internal func informativeUsageError<ClientError>(keyValueExample: String, usage: String) -> Commandant.CommandantError<ClientError><\/Declaration>Constructs an error by combining the example of key (and value, if applicable) with the usage description.<\/Para><\/Abstract><\/Function>", "key.doc.name" : "informativeUsageError(_:usage:)", "key.substructure" : [ @@ -1811,10 +1828,10 @@ "key.length" : 103, "key.doc.column" : 15, "key.parsed_scope.end" : 67, - "key.usr" : "s:F10Commandant18combineUsageErrorsurFTGOS_15CommandantErrorq__GS0_q___GS0_q__", + "key.usr" : "s:F10Commandant18combineUsageErrorsurFTGOS_15CommandantErrorx_GS0_x__GS0_x_", "key.doc.file" : "Sources\/Commandant\/Errors.swift", "key.nameoffset" : 1716, - "key.annotated_decl" : "internal func combineUsageErrors<ClientError>(lhs: CommandantError<\/Type><ClientError>, _ rhs: CommandantError<\/Type><ClientError>) -> CommandantError<\/Type><ClientError><\/Declaration>", + "key.annotated_decl" : "internal func combineUsageErrors<ClientError>(lhs: CommandantError<\/Type><ClientError<\/Type>>, _ rhs: CommandantError<\/Type><ClientError<\/Type>>) -> CommandantError<\/Type><ClientError><\/Declaration>", "key.accessibility" : "source.lang.swift.accessibility.internal", "key.parsed_scope.start" : 55, "key.filepath" : "Sources\/Commandant\/Errors.swift", @@ -1828,7 +1845,7 @@ "key.attribute" : "source.decl.attribute.__raw_doc_comment" } ], - "key.doc.full_as_xml" : "combineUsageErrors(_:_:)<\/Name>s:F10Commandant18combineUsageErrorsurFTGOS_15CommandantErrorq__GS0_q___GS0_q__<\/USR>internal func combineUsageErrors<ClientError>(lhs: CommandantError<ClientError>, _ rhs: CommandantError<ClientError>) -> Commandant.CommandantError<ClientError><\/Declaration>Combines the text of the two errors, if they're both UsageError<\/codeVoice>s. Otherwise, uses whichever one is not (biased toward the left).<\/Para><\/Abstract><\/Function>", + "key.doc.full_as_xml" : "combineUsageErrors(_:_:)<\/Name>s:F10Commandant18combineUsageErrorsurFTGOS_15CommandantErrorx_GS0_x__GS0_x_<\/USR>internal func combineUsageErrors<ClientError>(lhs: CommandantError<ClientError>, _ rhs: CommandantError<ClientError>) -> Commandant.CommandantError<ClientError><\/Declaration>Combines the text of the two errors, if they're both UsageError<\/codeVoice>s. Otherwise, uses whichever one is not (biased toward the left).<\/Para><\/Abstract><\/Function>", "key.doc.name" : "combineUsageErrors(_:_:)", "key.substructure" : [ @@ -1845,7 +1862,7 @@ "key.length" : 58, "key.doc.column" : 15, "key.parsed_scope.end" : 72, - "key.usr" : "s:F10Commandant26unrecognizedArgumentsErrorurFGSaSS_GOS_15CommandantErrorq__", + "key.usr" : "s:F10Commandant26unrecognizedArgumentsErrorurFGSaSS_GOS_15CommandantErrorx_", "key.doc.file" : "Sources\/Commandant\/Errors.swift", "key.nameoffset" : 2206, "key.annotated_decl" : "internal func unrecognizedArgumentsError<ClientError>(options: [String<\/Type>]) -> CommandantError<\/Type><ClientError><\/Declaration>", @@ -1862,7 +1879,7 @@ "key.attribute" : "source.decl.attribute.__raw_doc_comment" } ], - "key.doc.full_as_xml" : "unrecognizedArgumentsError(_:)<\/Name>s:F10Commandant26unrecognizedArgumentsErrorurFGSaSS_GOS_15CommandantErrorq__<\/USR>internal func unrecognizedArgumentsError<ClientError>(options: [String]) -> Commandant.CommandantError<ClientError><\/Declaration>Constructs an error that indicates unrecognized arguments remains.<\/Para><\/Abstract><\/Function>", + "key.doc.full_as_xml" : "unrecognizedArgumentsError(_:)<\/Name>s:F10Commandant26unrecognizedArgumentsErrorurFGSaSS_GOS_15CommandantErrorx_<\/USR>internal func unrecognizedArgumentsError<ClientError>(options: [String]) -> Commandant.CommandantError<ClientError><\/Declaration>Constructs an error that indicates unrecognized arguments remains.<\/Para><\/Abstract><\/Function>", "key.doc.name" : "unrecognizedArgumentsError(_:)", "key.substructure" : [ @@ -1887,10 +1904,10 @@ "key.length" : 82, "key.doc.column" : 15, "key.parsed_scope.end" : 84, - "key.usr" : "s:F10Commandant21informativeUsageErroru0_rFTSS8argumentGVS_8Argumentq___GOS_15CommandantErrorq0__", + "key.usr" : "s:F10Commandant21informativeUsageErroru0_rFTSS8argumentGVS_8Argumentx__GOS_15CommandantErrorq__", "key.doc.file" : "Sources\/Commandant\/Errors.swift", "key.nameoffset" : 2551, - "key.annotated_decl" : "internal func informativeUsageError<T, ClientError>(valueExample: String<\/Type>, argument: Argument<\/Type><T>) -> CommandantError<\/Type><ClientError><\/Declaration>", + "key.annotated_decl" : "internal func informativeUsageError<T, ClientError>(valueExample: String<\/Type>, argument: Argument<\/Type><T<\/Type>>) -> CommandantError<\/Type><ClientError><\/Declaration>", "key.accessibility" : "source.lang.swift.accessibility.internal", "key.parsed_scope.start" : 78, "key.filepath" : "Sources\/Commandant\/Errors.swift", @@ -1906,25 +1923,25 @@ ], "key.related_decls" : [ { - "key.annotated_decl" : "informativeUsageError(_:usage:)<\/RelatedName>" + "key.annotated_decl" : "informativeUsageError(_:usage:)<\/RelatedName>" }, { - "key.annotated_decl" : "informativeUsageError<T : ArgumentType, ClientError>(_: Argument<T>) -> CommandantError<ClientError><\/RelatedName>" + "key.annotated_decl" : "informativeUsageError<T : ArgumentType, ClientError>(_: Argument<T>) -> CommandantError<ClientError><\/RelatedName>" }, { - "key.annotated_decl" : "informativeUsageError<T : ArgumentType, ClientError>(_: Argument<[T]>) -> CommandantError<ClientError><\/RelatedName>" + "key.annotated_decl" : "informativeUsageError<T : ArgumentType, ClientError>(_: Argument<[T]>) -> CommandantError<ClientError><\/RelatedName>" }, { - "key.annotated_decl" : "informativeUsageError(_:option:)<\/RelatedName>" + "key.annotated_decl" : "informativeUsageError(_:option:)<\/RelatedName>" }, { - "key.annotated_decl" : "informativeUsageError<T : ArgumentType, ClientError>(_: Option<T>) -> CommandantError<ClientError><\/RelatedName>" + "key.annotated_decl" : "informativeUsageError<T : ArgumentType, ClientError>(_: Option<T>) -> CommandantError<ClientError><\/RelatedName>" }, { - "key.annotated_decl" : "informativeUsageError<ClientError>(_: Option<Bool>) -> CommandantError<ClientError><\/RelatedName>" + "key.annotated_decl" : "informativeUsageError<ClientError>(_: Option<Bool>) -> CommandantError<ClientError><\/RelatedName>" } ], - "key.doc.full_as_xml" : "informativeUsageError(_:argument:)<\/Name>s:F10Commandant21informativeUsageErroru0_rFTSS8argumentGVS_8Argumentq___GOS_15CommandantErrorq0__<\/USR>internal func informativeUsageError<T, ClientError>(valueExample: String, argument: Argument<T>) -> Commandant.CommandantError<ClientError><\/Declaration>Constructs an error that describes how to use the argument, with the given example of value usage if applicable.<\/Para><\/Abstract><\/Function>", + "key.doc.full_as_xml" : "informativeUsageError(_:argument:)<\/Name>s:F10Commandant21informativeUsageErroru0_rFTSS8argumentGVS_8Argumentx__GOS_15CommandantErrorq__<\/USR>internal func informativeUsageError<T, ClientError>(valueExample: String, argument: Argument<T>) -> Commandant.CommandantError<ClientError><\/Declaration>Constructs an error that describes how to use the argument, with the given example of value usage if applicable.<\/Para><\/Abstract><\/Function>", "key.doc.name" : "informativeUsageError(_:argument:)", "key.substructure" : [ @@ -1941,10 +1958,10 @@ "key.length" : 74, "key.doc.column" : 15, "key.parsed_scope.end" : 102, - "key.usr" : "s:F10Commandant21informativeUsageErroru0_Rq_S_12ArgumentType_FGVS_8Argumentq__GOS_15CommandantErrorq0__", + "key.usr" : "s:F10Commandant21informativeUsageErroru0_RxS_12ArgumentTyperFGVS_8Argumentx_GOS_15CommandantErrorq__", "key.doc.file" : "Sources\/Commandant\/Errors.swift", "key.nameoffset" : 2940, - "key.annotated_decl" : "internal func informativeUsageError<T : ArgumentType<\/Type>, ClientError>(argument: Argument<\/Type><T>) -> CommandantError<\/Type><ClientError><\/Declaration>", + "key.annotated_decl" : "internal func informativeUsageError<T : ArgumentType<\/Type>, ClientError>(argument: Argument<\/Type><T<\/Type>>) -> CommandantError<\/Type><ClientError><\/Declaration>", "key.accessibility" : "source.lang.swift.accessibility.internal", "key.parsed_scope.start" : 87, "key.filepath" : "Sources\/Commandant\/Errors.swift", @@ -1960,25 +1977,25 @@ ], "key.related_decls" : [ { - "key.annotated_decl" : "informativeUsageError(_:usage:)<\/RelatedName>" + "key.annotated_decl" : "informativeUsageError(_:usage:)<\/RelatedName>" }, { - "key.annotated_decl" : "informativeUsageError(_:argument:)<\/RelatedName>" + "key.annotated_decl" : "informativeUsageError(_:argument:)<\/RelatedName>" }, { - "key.annotated_decl" : "informativeUsageError<T : ArgumentType, ClientError>(_: Argument<[T]>) -> CommandantError<ClientError><\/RelatedName>" + "key.annotated_decl" : "informativeUsageError<T : ArgumentType, ClientError>(_: Argument<[T]>) -> CommandantError<ClientError><\/RelatedName>" }, { - "key.annotated_decl" : "informativeUsageError(_:option:)<\/RelatedName>" + "key.annotated_decl" : "informativeUsageError(_:option:)<\/RelatedName>" }, { - "key.annotated_decl" : "informativeUsageError<T : ArgumentType, ClientError>(_: Option<T>) -> CommandantError<ClientError><\/RelatedName>" + "key.annotated_decl" : "informativeUsageError<T : ArgumentType, ClientError>(_: Option<T>) -> CommandantError<ClientError><\/RelatedName>" }, { - "key.annotated_decl" : "informativeUsageError<ClientError>(_: Option<Bool>) -> CommandantError<ClientError><\/RelatedName>" + "key.annotated_decl" : "informativeUsageError<ClientError>(_: Option<Bool>) -> CommandantError<ClientError><\/RelatedName>" } ], - "key.doc.full_as_xml" : "informativeUsageError(_:)<\/Name>s:F10Commandant21informativeUsageErroru0_Rq_S_12ArgumentType_FGVS_8Argumentq__GOS_15CommandantErrorq0__<\/USR>internal func informativeUsageError<T : ArgumentType, ClientError>(argument: Argument<T>) -> Commandant.CommandantError<ClientError><\/Declaration>Constructs an error that describes how to use the argument.<\/Para><\/Abstract><\/Function>", + "key.doc.full_as_xml" : "informativeUsageError(_:)<\/Name>s:F10Commandant21informativeUsageErroru0_RxS_12ArgumentTyperFGVS_8Argumentx_GOS_15CommandantErrorq__<\/USR>internal func informativeUsageError<T : ArgumentType, ClientError>(argument: Argument<T>) -> Commandant.CommandantError<ClientError><\/Declaration>Constructs an error that describes how to use the argument.<\/Para><\/Abstract><\/Function>", "key.doc.name" : "informativeUsageError(_:)", "key.substructure" : [ @@ -1995,10 +2012,10 @@ "key.length" : 76, "key.doc.column" : 15, "key.parsed_scope.end" : 120, - "key.usr" : "s:F10Commandant21informativeUsageErroru0_Rq_S_12ArgumentType_FGVS_8ArgumentGSaq___GOS_15CommandantErrorq0__", + "key.usr" : "s:F10Commandant21informativeUsageErroru0_RxS_12ArgumentTyperFGVS_8ArgumentGSax__GOS_15CommandantErrorq__", "key.doc.file" : "Sources\/Commandant\/Errors.swift", "key.nameoffset" : 3416, - "key.annotated_decl" : "internal func informativeUsageError<T : ArgumentType<\/Type>, ClientError>(argument: Argument<\/Type><[T]>) -> CommandantError<\/Type><ClientError><\/Declaration>", + "key.annotated_decl" : "internal func informativeUsageError<T : ArgumentType<\/Type>, ClientError>(argument: Argument<\/Type><[T<\/Type>]>) -> CommandantError<\/Type><ClientError><\/Declaration>", "key.accessibility" : "source.lang.swift.accessibility.internal", "key.parsed_scope.start" : 105, "key.filepath" : "Sources\/Commandant\/Errors.swift", @@ -2014,25 +2031,25 @@ ], "key.related_decls" : [ { - "key.annotated_decl" : "informativeUsageError(_:usage:)<\/RelatedName>" + "key.annotated_decl" : "informativeUsageError(_:usage:)<\/RelatedName>" }, { - "key.annotated_decl" : "informativeUsageError(_:argument:)<\/RelatedName>" + "key.annotated_decl" : "informativeUsageError(_:argument:)<\/RelatedName>" }, { - "key.annotated_decl" : "informativeUsageError<T : ArgumentType, ClientError>(_: Argument<T>) -> CommandantError<ClientError><\/RelatedName>" + "key.annotated_decl" : "informativeUsageError<T : ArgumentType, ClientError>(_: Argument<T>) -> CommandantError<ClientError><\/RelatedName>" }, { - "key.annotated_decl" : "informativeUsageError(_:option:)<\/RelatedName>" + "key.annotated_decl" : "informativeUsageError(_:option:)<\/RelatedName>" }, { - "key.annotated_decl" : "informativeUsageError<T : ArgumentType, ClientError>(_: Option<T>) -> CommandantError<ClientError><\/RelatedName>" + "key.annotated_decl" : "informativeUsageError<T : ArgumentType, ClientError>(_: Option<T>) -> CommandantError<ClientError><\/RelatedName>" }, { - "key.annotated_decl" : "informativeUsageError<ClientError>(_: Option<Bool>) -> CommandantError<ClientError><\/RelatedName>" + "key.annotated_decl" : "informativeUsageError<ClientError>(_: Option<Bool>) -> CommandantError<ClientError><\/RelatedName>" } ], - "key.doc.full_as_xml" : "informativeUsageError(_:)<\/Name>s:F10Commandant21informativeUsageErroru0_Rq_S_12ArgumentType_FGVS_8ArgumentGSaq___GOS_15CommandantErrorq0__<\/USR>internal func informativeUsageError<T : ArgumentType, ClientError>(argument: Argument<[T]>) -> Commandant.CommandantError<ClientError><\/Declaration>Constructs an error that describes how to use the argument list.<\/Para><\/Abstract><\/Function>", + "key.doc.full_as_xml" : "informativeUsageError(_:)<\/Name>s:F10Commandant21informativeUsageErroru0_RxS_12ArgumentTyperFGVS_8ArgumentGSax__GOS_15CommandantErrorq__<\/USR>internal func informativeUsageError<T : ArgumentType, ClientError>(argument: Argument<[T]>) -> Commandant.CommandantError<ClientError><\/Declaration>Constructs an error that describes how to use the argument list.<\/Para><\/Abstract><\/Function>", "key.doc.name" : "informativeUsageError(_:)", "key.substructure" : [ @@ -2057,10 +2074,10 @@ "key.length" : 81, "key.doc.column" : 15, "key.parsed_scope.end" : 132, - "key.usr" : "s:F10Commandant21informativeUsageErroru0_rFTSS6optionGVS_6Optionq___GOS_15CommandantErrorq0__", + "key.usr" : "s:F10Commandant21informativeUsageErroru0_rFTSS6optionGVS_6Optionx__GOS_15CommandantErrorq__", "key.doc.file" : "Sources\/Commandant\/Errors.swift", "key.nameoffset" : 3972, - "key.annotated_decl" : "internal func informativeUsageError<T, ClientError>(keyValueExample: String<\/Type>, option: Option<\/Type><T>) -> CommandantError<\/Type><ClientError><\/Declaration>", + "key.annotated_decl" : "internal func informativeUsageError<T, ClientError>(keyValueExample: String<\/Type>, option: Option<\/Type><T<\/Type>>) -> CommandantError<\/Type><ClientError><\/Declaration>", "key.accessibility" : "source.lang.swift.accessibility.internal", "key.parsed_scope.start" : 126, "key.filepath" : "Sources\/Commandant\/Errors.swift", @@ -2076,25 +2093,25 @@ ], "key.related_decls" : [ { - "key.annotated_decl" : "informativeUsageError(_:usage:)<\/RelatedName>" + "key.annotated_decl" : "informativeUsageError(_:usage:)<\/RelatedName>" }, { - "key.annotated_decl" : "informativeUsageError(_:argument:)<\/RelatedName>" + "key.annotated_decl" : "informativeUsageError(_:argument:)<\/RelatedName>" }, { - "key.annotated_decl" : "informativeUsageError<T : ArgumentType, ClientError>(_: Argument<T>) -> CommandantError<ClientError><\/RelatedName>" + "key.annotated_decl" : "informativeUsageError<T : ArgumentType, ClientError>(_: Argument<T>) -> CommandantError<ClientError><\/RelatedName>" }, { - "key.annotated_decl" : "informativeUsageError<T : ArgumentType, ClientError>(_: Argument<[T]>) -> CommandantError<ClientError><\/RelatedName>" + "key.annotated_decl" : "informativeUsageError<T : ArgumentType, ClientError>(_: Argument<[T]>) -> CommandantError<ClientError><\/RelatedName>" }, { - "key.annotated_decl" : "informativeUsageError<T : ArgumentType, ClientError>(_: Option<T>) -> CommandantError<ClientError><\/RelatedName>" + "key.annotated_decl" : "informativeUsageError<T : ArgumentType, ClientError>(_: Option<T>) -> CommandantError<ClientError><\/RelatedName>" }, { - "key.annotated_decl" : "informativeUsageError<ClientError>(_: Option<Bool>) -> CommandantError<ClientError><\/RelatedName>" + "key.annotated_decl" : "informativeUsageError<ClientError>(_: Option<Bool>) -> CommandantError<ClientError><\/RelatedName>" } ], - "key.doc.full_as_xml" : "informativeUsageError(_:option:)<\/Name>s:F10Commandant21informativeUsageErroru0_rFTSS6optionGVS_6Optionq___GOS_15CommandantErrorq0__<\/USR>internal func informativeUsageError<T, ClientError>(keyValueExample: String, option: Option<T>) -> Commandant.CommandantError<ClientError><\/Declaration>Constructs an error that describes how to use the option, with the given example of key (and value, if applicable) usage.<\/Para><\/Abstract><\/Function>", + "key.doc.full_as_xml" : "informativeUsageError(_:option:)<\/Name>s:F10Commandant21informativeUsageErroru0_rFTSS6optionGVS_6Optionx__GOS_15CommandantErrorq__<\/USR>internal func informativeUsageError<T, ClientError>(keyValueExample: String, option: Option<T>) -> Commandant.CommandantError<ClientError><\/Declaration>Constructs an error that describes how to use the option, with the given example of key (and value, if applicable) usage.<\/Para><\/Abstract><\/Function>", "key.doc.name" : "informativeUsageError(_:option:)", "key.substructure" : [ @@ -2111,10 +2128,10 @@ "key.length" : 70, "key.doc.column" : 15, "key.parsed_scope.end" : 150, - "key.usr" : "s:F10Commandant21informativeUsageErroru0_Rq_S_12ArgumentType_FGVS_6Optionq__GOS_15CommandantErrorq0__", + "key.usr" : "s:F10Commandant21informativeUsageErroru0_RxS_12ArgumentTyperFGVS_6Optionx_GOS_15CommandantErrorq__", "key.doc.file" : "Sources\/Commandant\/Errors.swift", "key.nameoffset" : 4358, - "key.annotated_decl" : "internal func informativeUsageError<T : ArgumentType<\/Type>, ClientError>(option: Option<\/Type><T>) -> CommandantError<\/Type><ClientError><\/Declaration>", + "key.annotated_decl" : "internal func informativeUsageError<T : ArgumentType<\/Type>, ClientError>(option: Option<\/Type><T<\/Type>>) -> CommandantError<\/Type><ClientError><\/Declaration>", "key.accessibility" : "source.lang.swift.accessibility.internal", "key.parsed_scope.start" : 135, "key.filepath" : "Sources\/Commandant\/Errors.swift", @@ -2130,25 +2147,25 @@ ], "key.related_decls" : [ { - "key.annotated_decl" : "informativeUsageError(_:usage:)<\/RelatedName>" + "key.annotated_decl" : "informativeUsageError(_:usage:)<\/RelatedName>" }, { - "key.annotated_decl" : "informativeUsageError(_:argument:)<\/RelatedName>" + "key.annotated_decl" : "informativeUsageError(_:argument:)<\/RelatedName>" }, { - "key.annotated_decl" : "informativeUsageError<T : ArgumentType, ClientError>(_: Argument<T>) -> CommandantError<ClientError><\/RelatedName>" + "key.annotated_decl" : "informativeUsageError<T : ArgumentType, ClientError>(_: Argument<T>) -> CommandantError<ClientError><\/RelatedName>" }, { - "key.annotated_decl" : "informativeUsageError<T : ArgumentType, ClientError>(_: Argument<[T]>) -> CommandantError<ClientError><\/RelatedName>" + "key.annotated_decl" : "informativeUsageError<T : ArgumentType, ClientError>(_: Argument<[T]>) -> CommandantError<ClientError><\/RelatedName>" }, { - "key.annotated_decl" : "informativeUsageError(_:option:)<\/RelatedName>" + "key.annotated_decl" : "informativeUsageError(_:option:)<\/RelatedName>" }, { - "key.annotated_decl" : "informativeUsageError<ClientError>(_: Option<Bool>) -> CommandantError<ClientError><\/RelatedName>" + "key.annotated_decl" : "informativeUsageError<ClientError>(_: Option<Bool>) -> CommandantError<ClientError><\/RelatedName>" } ], - "key.doc.full_as_xml" : "informativeUsageError(_:)<\/Name>s:F10Commandant21informativeUsageErroru0_Rq_S_12ArgumentType_FGVS_6Optionq__GOS_15CommandantErrorq0__<\/USR>internal func informativeUsageError<T : ArgumentType, ClientError>(option: Option<T>) -> Commandant.CommandantError<ClientError><\/Declaration>Constructs an error that describes how to use the option.<\/Para><\/Abstract><\/Function>", + "key.doc.full_as_xml" : "informativeUsageError(_:)<\/Name>s:F10Commandant21informativeUsageErroru0_RxS_12ArgumentTyperFGVS_6Optionx_GOS_15CommandantErrorq__<\/USR>internal func informativeUsageError<T : ArgumentType, ClientError>(option: Option<T>) -> Commandant.CommandantError<ClientError><\/Declaration>Constructs an error that describes how to use the option.<\/Para><\/Abstract><\/Function>", "key.doc.name" : "informativeUsageError(_:)", "key.substructure" : [ @@ -2165,7 +2182,7 @@ "key.length" : 56, "key.doc.column" : 15, "key.parsed_scope.end" : 161, - "key.usr" : "s:F10Commandant21informativeUsageErrorurFGVS_6OptionSb_GOS_15CommandantErrorq__", + "key.usr" : "s:F10Commandant21informativeUsageErrorurFGVS_6OptionSb_GOS_15CommandantErrorx_", "key.doc.file" : "Sources\/Commandant\/Errors.swift", "key.nameoffset" : 4847, "key.annotated_decl" : "internal func informativeUsageError<ClientError>(option: Option<\/Type><Bool<\/Type>>) -> CommandantError<\/Type><ClientError><\/Declaration>", @@ -2184,25 +2201,25 @@ ], "key.related_decls" : [ { - "key.annotated_decl" : "informativeUsageError(_:usage:)<\/RelatedName>" + "key.annotated_decl" : "informativeUsageError(_:usage:)<\/RelatedName>" }, { - "key.annotated_decl" : "informativeUsageError(_:argument:)<\/RelatedName>" + "key.annotated_decl" : "informativeUsageError(_:argument:)<\/RelatedName>" }, { - "key.annotated_decl" : "informativeUsageError<T : ArgumentType, ClientError>(_: Argument<T>) -> CommandantError<ClientError><\/RelatedName>" + "key.annotated_decl" : "informativeUsageError<T : ArgumentType, ClientError>(_: Argument<T>) -> CommandantError<ClientError><\/RelatedName>" }, { - "key.annotated_decl" : "informativeUsageError<T : ArgumentType, ClientError>(_: Argument<[T]>) -> CommandantError<ClientError><\/RelatedName>" + "key.annotated_decl" : "informativeUsageError<T : ArgumentType, ClientError>(_: Argument<[T]>) -> CommandantError<ClientError><\/RelatedName>" }, { - "key.annotated_decl" : "informativeUsageError(_:option:)<\/RelatedName>" + "key.annotated_decl" : "informativeUsageError(_:option:)<\/RelatedName>" }, { - "key.annotated_decl" : "informativeUsageError<T : ArgumentType, ClientError>(_: Option<T>) -> CommandantError<ClientError><\/RelatedName>" + "key.annotated_decl" : "informativeUsageError<T : ArgumentType, ClientError>(_: Option<T>) -> CommandantError<ClientError><\/RelatedName>" } ], - "key.doc.full_as_xml" : "informativeUsageError(_:)<\/Name>s:F10Commandant21informativeUsageErrorurFGVS_6OptionSb_GOS_15CommandantErrorq__<\/USR>internal func informativeUsageError<ClientError>(option: Option<Bool>) -> Commandant.CommandantError<ClientError><\/Declaration>Constructs an error that describes how to use the given boolean option.<\/Para><\/Abstract><\/Function>", + "key.doc.full_as_xml" : "informativeUsageError(_:)<\/Name>s:F10Commandant21informativeUsageErrorurFGVS_6OptionSb_GOS_15CommandantErrorx_<\/USR>internal func informativeUsageError<ClientError>(option: Option<Bool>) -> Commandant.CommandantError<ClientError><\/Declaration>Constructs an error that describes how to use the given boolean option.<\/Para><\/Abstract><\/Function>", "key.doc.name" : "informativeUsageError(_:)", "key.substructure" : [ @@ -2289,17 +2306,17 @@ "key.name" : "flag", "key.doc.column" : 13, "key.parsed_scope.end" : 25, - "key.usr" : "s:vV10Commandant6Switch4flagGSqVSs9Character_", + "key.usr" : "s:vV10Commandant6Switch4flagGSqVs9Character_", "key.doc.type" : "Other", "key.attributes" : [ { "key.attribute" : "source.decl.attribute.__raw_doc_comment" } ], - "key.doc.full_as_xml" : "flag<\/Name>s:vV10Commandant6Switch4flagGSqVSs9Character_<\/USR>public let flag: Character?<\/Declaration>Optional single letter flag that enables this switch. For example, -v<\/codeVoice> would be used as a shorthand for --verbose<\/codeVoice>.<\/Para><\/Abstract>Multiple flags can be grouped together as a single argument and will split when parsing (e.g. rm -rf<\/codeVoice> treats 'r' and 'f' as inidividual flags).<\/Para><\/Discussion><\/Other>", + "key.doc.full_as_xml" : "flag<\/Name>s:vV10Commandant6Switch4flagGSqVs9Character_<\/USR>public let flag: Character?<\/Declaration>Optional single letter flag that enables this switch. For example, -v<\/codeVoice> would be used as a shorthand for --verbose<\/codeVoice>.<\/Para><\/Abstract>Multiple flags can be grouped together as a single argument and will split when parsing (e.g. rm -rf<\/codeVoice> treats 'r' and 'f' as inidividual flags).<\/Para><\/Discussion><\/Other>", "key.nameoffset" : 854, "key.doc.file" : "Sources\/Commandant\/Switch.swift", - "key.annotated_decl" : "public let flag: Character<\/Type>?<\/Declaration>", + "key.annotated_decl" : "public let flag: Character<\/Type>?<\/Declaration>", "key.doc.name" : "flag", "key.accessibility" : "source.lang.swift.accessibility.public", "key.parsed_scope.start" : 25, @@ -2350,9 +2367,9 @@ "key.name" : "init(flag:key:usage:)", "key.typename" : "Switch.Type -> (flag: Character?, key: String, usage: String) -> Switch", "key.parsed_scope.end" : 35, - "key.usr" : "s:FV10Commandant6SwitchcFMS0_FT4flagGSqVSs9Character_3keySS5usageSS_S0_", + "key.usr" : "s:FV10Commandant6SwitchcFT4flagGSqVs9Character_3keySS5usageSS_S0_", "key.nameoffset" : 1017, - "key.annotated_decl" : "public init(flag: Character<\/Type>? = default, key: String<\/Type>, usage: String<\/Type>)<\/Declaration>", + "key.annotated_decl" : "public init(flag: Character<\/Type>? = default, key: String<\/Type>, usage: String<\/Type>)<\/Declaration>", "key.accessibility" : "source.lang.swift.accessibility.public", "key.substructure" : [ @@ -2406,7 +2423,7 @@ "key.usr" : "s:vV10Commandant6Switch11descriptionSS", "key.overrides" : [ { - "key.usr" : "s:vPSs23CustomStringConvertible11descriptionSS" + "key.usr" : "s:vPs23CustomStringConvertible11descriptionSS" } ], "key.nameoffset" : 1195, @@ -2441,7 +2458,7 @@ "key.length" : 52, "key.doc.column" : 13, "key.parsed_scope.end" : 64, - "key.usr" : "s:ZF10Commandantoi2lourFTOS_11CommandModeVS_6Switch_GO6Result6ResultSbGOS_15CommandantErrorq___", + "key.usr" : "s:ZF10Commandantoi2lourFTOS_11CommandModeVS_6Switch_GO6Result6ResultSbGOS_15CommandantErrorx__", "key.doc.file" : "Sources\/Commandant\/Switch.swift", "key.nameoffset" : 1527, "key.annotated_decl" : "public func <|<ClientError>(mode: CommandMode<\/Type>, option: Switch<\/Type>) -> Result<\/Type><Bool<\/Type>, CommandantError<\/Type><ClientError>><\/Declaration>", @@ -2460,19 +2477,19 @@ ], "key.related_decls" : [ { - "key.annotated_decl" : "<|<T : ArgumentType, ClientError>(_: CommandMode, _: Argument<T>) -> Result<T, CommandantError<ClientError>><\/RelatedName>" + "key.annotated_decl" : "<|<T : ArgumentType, ClientError>(_: CommandMode, _: Argument<T>) -> Result<T, CommandantError<ClientError>><\/RelatedName>" }, { - "key.annotated_decl" : "<|<T : ArgumentType, ClientError>(_: CommandMode, _: Argument<[T]>) -> Result<[T], CommandantError<ClientError>><\/RelatedName>" + "key.annotated_decl" : "<|<T : ArgumentType, ClientError>(_: CommandMode, _: Argument<[T]>) -> Result<[T], CommandantError<ClientError>><\/RelatedName>" }, { - "key.annotated_decl" : "<|<T : ArgumentType, ClientError>(_: CommandMode, _: Option<T>) -> Result<T, CommandantError<ClientError>><\/RelatedName>" + "key.annotated_decl" : "<|<T : ArgumentType, ClientError>(_: CommandMode, _: Option<T>) -> Result<T, CommandantError<ClientError>><\/RelatedName>" }, { - "key.annotated_decl" : "<|<ClientError>(_: CommandMode, _: Option<Bool>) -> Result<Bool, CommandantError<ClientError>><\/RelatedName>" + "key.annotated_decl" : "<|<ClientError>(_: CommandMode, _: Option<Bool>) -> Result<Bool, CommandantError<ClientError>><\/RelatedName>" } ], - "key.doc.full_as_xml" : "<|(_:_:)<\/Name>s:ZF10Commandantoi2lourFTOS_11CommandModeVS_6Switch_GO6Result6ResultSbGOS_15CommandantErrorq___<\/USR>public func <|<ClientError>(mode: CommandMode, option: Switch) -> Result.Result<Bool, Commandant.CommandantError<ClientError>><\/Declaration>Evaluates the given boolean switch in the given mode.<\/Para><\/Abstract>If parsing command line arguments, and no value was specified on the command line, the option's defaultValue<\/codeVoice> is used.<\/Para><\/Discussion><\/Function>", + "key.doc.full_as_xml" : "<|(_:_:)<\/Name>s:ZF10Commandantoi2lourFTOS_11CommandModeVS_6Switch_GO6Result6ResultSbGOS_15CommandantErrorx__<\/USR>public func <|<ClientError>(mode: CommandMode, option: Switch) -> Result.Result<Bool, Commandant.CommandantError<ClientError>><\/Declaration>Evaluates the given boolean switch in the given mode.<\/Para><\/Abstract>If parsing command line arguments, and no value was specified on the command line, the option's defaultValue<\/codeVoice> is used.<\/Para><\/Discussion><\/Function>", "key.doc.name" : "<|(_:_:)", "key.substructure" : [ { @@ -2485,7 +2502,7 @@ "key.name" : "ClientError", "key.parsed_scope.start" : 52, "key.parsed_scope.end" : 52, - "key.usr" : "s:tZF10Commandantoi2lourFTOS_11CommandModeVS_6Switch_GO6Result6ResultSbGOS_15CommandantErrorq___L_11ClientErrorMq_", + "key.usr" : "s:tZF10Commandantoi2lourFTOS_11CommandModeVS_6Switch_GO6Result6ResultSbGOS_15CommandantErrorx__L_11ClientErrorMx", "key.filepath" : "Sources\/Commandant\/Switch.swift" } ], @@ -2567,11 +2584,11 @@ "key.doc.name" : "verb" }, { - "key.kind" : "source.lang.swift.decl.typealias", + "key.kind" : "source.lang.swift.decl.associatedtype", "key.offset" : 337, "key.parsed_declaration" : "typealias Options: OptionsType", "key.doc.comment" : "The command's options type.", - "key.doc.declaration" : "typealias Options : OptionsType", + "key.doc.declaration" : "associatedtype Options : OptionsType", "key.doc.line" : 16, "key.length" : 7, "key.typename" : "Options.Type", @@ -2581,9 +2598,9 @@ "key.usr" : "s:P10Commandant11CommandType7Options", "key.doc.type" : "Other", "key.doc.file" : "Sources\/Commandant\/Command.swift", - "key.doc.full_as_xml" : "Options<\/Name>s:P10Commandant11CommandType7Options<\/USR>typealias Options : OptionsType<\/Declaration>The command's options type.<\/Para><\/Abstract><\/Other>", + "key.doc.full_as_xml" : "Options<\/Name>s:P10Commandant11CommandType7Options<\/USR>associatedtype Options : OptionsType<\/Declaration>The command's options type.<\/Para><\/Abstract><\/Other>", "key.doc.name" : "Options", - "key.annotated_decl" : "typealias Options : OptionsType<\/Type><\/Declaration>", + "key.annotated_decl" : "associatedtype Options : OptionsType<\/Type><\/Declaration>", "key.parsed_scope.start" : 16, "key.filepath" : "Sources\/Commandant\/Command.swift" }, @@ -2628,20 +2645,20 @@ "key.length" : 21, "key.doc.declaration" : "func run(options: Options) -> Result.Result<(), Self.ClientError>", "key.name" : "run(_:)", - "key.typename" : "<`Self` : CommandType> Self -> (Self.Options) -> Result<(), Self.ClientError>", + "key.typename" : "<`Self` : CommandType> (Self) -> (Self.Options) -> Result<(), Self.ClientError>", "key.doc.column" : 7, "key.parsed_scope.end" : 29, - "key.usr" : "s:FP10Commandant11CommandType3runuRq_S0__Fq_Fqq_S0_7OptionsGO6Result6ResultT_qq_S0_11ClientError_", + "key.usr" : "s:FP10Commandant11CommandType3runFwx7OptionsGO6Result6ResultT_wx11ClientError_", "key.doc.type" : "Function", "key.attributes" : [ { "key.attribute" : "source.decl.attribute.__raw_doc_comment" } ], - "key.doc.full_as_xml" : "run(_:)<\/Name>s:FP10Commandant11CommandType3runuRq_S0__Fq_Fqq_S0_7OptionsGO6Result6ResultT_qq_S0_11ClientError_<\/USR>func run(options: Options) -> Result.Result<(), Self.ClientError><\/Declaration>Runs this subcommand with the given options.<\/Para><\/Abstract><\/Function>", + "key.doc.full_as_xml" : "run(_:)<\/Name>s:FP10Commandant11CommandType3runFwx7OptionsGO6Result6ResultT_wx11ClientError_<\/USR>func run(options: Options) -> Result.Result<(), Self.ClientError><\/Declaration>Runs this subcommand with the given options.<\/Para><\/Abstract><\/Function>", "key.nameoffset" : 702, "key.doc.file" : "Sources\/Commandant\/Command.swift", - "key.annotated_decl" : "func run(options: Options) -> Result<\/Type><(), Self.ClientError><\/Declaration>", + "key.annotated_decl" : "func run(options: Options<\/Type>) -> Result<\/Type><(), Self.ClientError><\/Declaration>", "key.doc.name" : "run(_:)", "key.accessibility" : "source.lang.swift.accessibility.public", "key.substructure" : [ @@ -2666,7 +2683,7 @@ "key.usr" : "s:V10Commandant14CommandWrapper", "key.doc.file" : "Sources\/Commandant\/Command.swift", "key.nameoffset" : 795, - "key.annotated_decl" : "public struct CommandWrapper<ClientError : ErrorType<\/Type>><\/Declaration>", + "key.annotated_decl" : "public struct CommandWrapper<ClientError : ErrorType<\/Type>><\/Declaration>", "key.accessibility" : "source.lang.swift.accessibility.public", "key.parsed_scope.start" : 33, "key.filepath" : "Sources\/Commandant\/Command.swift", @@ -2724,7 +2741,7 @@ "key.typename" : "ArgumentParser -> Result<(), CommandantError>", "key.name" : "run", "key.parsed_scope.end" : 37, - "key.usr" : "s:vV10Commandant14CommandWrapper3runFCS_14ArgumentParserGO6Result6ResultT_GOS_15CommandantErrorq___", + "key.usr" : "s:vV10Commandant14CommandWrapper3runFCS_14ArgumentParserGO6Result6ResultT_GOS_15CommandantErrorx__", "key.nameoffset" : 904, "key.annotated_decl" : "public let run: ArgumentParser<\/Type> -> Result<\/Type><(), CommandantError<\/Type><ClientError>><\/Declaration>", "key.accessibility" : "source.lang.swift.accessibility.public", @@ -2740,7 +2757,7 @@ "key.typename" : "() -> CommandantError?", "key.name" : "usage", "key.parsed_scope.end" : 39, - "key.usr" : "s:vV10Commandant14CommandWrapper5usageFT_GSqGOS_15CommandantErrorq___", + "key.usr" : "s:vV10Commandant14CommandWrapper5usageFT_GSqGOS_15CommandantErrorx__", "key.nameoffset" : 982, "key.annotated_decl" : "public let usage: () -> CommandantError<\/Type><ClientError>?<\/Declaration>", "key.accessibility" : "source.lang.swift.accessibility.public", @@ -2758,10 +2775,10 @@ "key.length" : 107, "key.doc.column" : 10, "key.parsed_scope.end" : 65, - "key.usr" : "s:FV10Commandant14CommandWrappercu__Rqd__S_11CommandTypezq_qqqd__S1_7OptionsS_11OptionsType11ClientErrorzqqd__S1_11ClientErrorqqqd__S1_7OptionsS2_11ClientError_FMGS0_q__Fqd__GS0_q__", + "key.usr" : "s:FV10Commandant14CommandWrappercuRd__S_11CommandTypexzWd__7Options11ClientError_wd__11ClientErrorzWd__S2_S3__rFqd__GS0_x_", "key.doc.file" : "Sources\/Commandant\/Command.swift", "key.nameoffset" : 1078, - "key.annotated_decl" : "private init<C : CommandType<\/Type> where C.ClientError == ClientError, C.Options.ClientError == ClientError>(_ command: C)<\/Declaration>", + "key.annotated_decl" : "private init<C : CommandType<\/Type> where C<\/Type>.ClientError<\/Type> == ClientError<\/Type>, C<\/Type>.Options<\/Type>.ClientError<\/Type> == ClientError<\/Type>>(_ command: C<\/Type>)<\/Declaration>", "key.accessibility" : "source.lang.swift.accessibility.private", "key.parsed_scope.start" : 42, "key.filepath" : "Sources\/Commandant\/Command.swift", @@ -2775,7 +2792,7 @@ "key.attribute" : "source.decl.attribute.__raw_doc_comment" } ], - "key.doc.full_as_xml" : "init(_:)<\/Name>s:FV10Commandant14CommandWrappercu__Rqd__S_11CommandTypezq_qqqd__S1_7OptionsS_11OptionsType11ClientErrorzqqd__S1_11ClientErrorqqqd__S1_7OptionsS2_11ClientError_FMGS0_q__Fqd__GS0_q__<\/USR>private init<C : CommandType where C.ClientError == ClientError, C.Options.ClientError == ClientError>(_ command: C)<\/Declaration>Creates a command that wraps another.<\/Para><\/Abstract><\/Function>", + "key.doc.full_as_xml" : "init(_:)<\/Name>s:FV10Commandant14CommandWrappercuRd__S_11CommandTypexzWd__7Options11ClientError_wd__11ClientErrorzWd__S2_S3__rFqd__GS0_x_<\/USR>private init<C : CommandType where C.ClientError == ClientError, C.Options.ClientError == ClientError>(_ command: C)<\/Declaration>Creates a command that wraps another.<\/Para><\/Abstract><\/Function>", "key.doc.name" : "init(_:)", "key.substructure" : [ @@ -2896,7 +2913,7 @@ "key.usr" : "s:C10Commandant15CommandRegistry", "key.doc.file" : "Sources\/Commandant\/Command.swift", "key.nameoffset" : 2197, - "key.annotated_decl" : "public final class CommandRegistry<ClientError : ErrorType<\/Type>><\/Declaration>", + "key.annotated_decl" : "public final class CommandRegistry<ClientError : ErrorType<\/Type>><\/Declaration>", "key.accessibility" : "source.lang.swift.accessibility.public", "key.parsed_scope.start" : 79, "key.filepath" : "Sources\/Commandant\/Command.swift", @@ -2925,7 +2942,7 @@ "key.typename" : "[String : CommandWrapper]", "key.name" : "commandsByVerb", "key.parsed_scope.end" : 80, - "key.usr" : "s:vC10Commandant15CommandRegistryP33_1DD6990CD6DFDE28F713A55F8EE2B70E14commandsByVerbGVSs10DictionarySSGVS_14CommandWrapperq___", + "key.usr" : "s:vC10Commandant15CommandRegistryP33_1DD6990CD6DFDE28F713A55F8EE2B70E14commandsByVerbGVs10DictionarySSGVS_14CommandWrapperx__", "key.nameoffset" : 2252, "key.annotated_decl" : "private var commandsByVerb: [String<\/Type> : CommandWrapper<\/Type><ClientError>]<\/Declaration>", "key.accessibility" : "source.lang.swift.accessibility.private", @@ -2945,10 +2962,10 @@ "key.name" : "subscript(_:)", "key.doc.column" : 9, "key.parsed_scope.end" : 107, - "key.usr" : "s:sC10Commandant15CommandRegistry9subscriptFSSGSqGVS_14CommandWrapperq___", + "key.usr" : "s:iC10Commandant15CommandRegistry9subscriptFSSGSqGVS_14CommandWrapperx__", "key.doc.type" : "Other", "key.doc.file" : "Sources\/Commandant\/Command.swift", - "key.doc.full_as_xml" : "subscript(_:)<\/Name>s:sC10Commandant15CommandRegistry9subscriptFSSGSqGVS_14CommandWrapperq___<\/USR>public subscript (verb: String) -> Commandant.CommandWrapper<ClientError>? { get }<\/Declaration>Returns the command matching the given verb, or nil if no such command is registered.<\/Para><\/Abstract><\/Other>", + "key.doc.full_as_xml" : "subscript(_:)<\/Name>s:iC10Commandant15CommandRegistry9subscriptFSSGSqGVS_14CommandWrapperx__<\/USR>public subscript (verb: String) -> Commandant.CommandWrapper<ClientError>? { get }<\/Declaration>Returns the command matching the given verb, or nil if no such command is registered.<\/Para><\/Abstract><\/Other>", "key.doc.name" : "subscript(_:)", "key.annotated_decl" : "public subscript (verb: String<\/Type>) -> CommandWrapper<\/Type><ClientError>? { get }<\/Declaration>", "key.parsed_scope.start" : 107, @@ -2965,7 +2982,7 @@ "key.length" : 8, "key.doc.column" : 13, "key.parsed_scope.end" : 85, - "key.usr" : "s:vC10Commandant15CommandRegistry8commandsGSaGVS_14CommandWrapperq___", + "key.usr" : "s:vC10Commandant15CommandRegistry8commandsGSaGVS_14CommandWrapperx__", "key.doc.file" : "Sources\/Commandant\/Command.swift", "key.nameoffset" : 2354, "key.annotated_decl" : "public var commands: [CommandWrapper<\/Type><ClientError>] { get }<\/Declaration>", @@ -2982,7 +2999,7 @@ "key.attribute" : "source.decl.attribute.__raw_doc_comment" } ], - "key.doc.full_as_xml" : "commands<\/Name>s:vC10Commandant15CommandRegistry8commandsGSaGVS_14CommandWrapperq___<\/USR>public var commands: [Commandant.CommandWrapper<ClientError>] { get }<\/Declaration>All available commands.<\/Para><\/Abstract><\/Other>", + "key.doc.full_as_xml" : "commands<\/Name>s:vC10Commandant15CommandRegistry8commandsGSaGVS_14CommandWrapperx__<\/USR>public var commands: [Commandant.CommandWrapper<ClientError>] { get }<\/Declaration>All available commands.<\/Para><\/Abstract><\/Other>", "key.doc.name" : "commands" }, { @@ -2996,7 +3013,7 @@ "key.name" : "init()", "key.typename" : " CommandRegistry.Type -> () -> CommandRegistry", "key.parsed_scope.end" : 87, - "key.usr" : "s:FC10Commandant15CommandRegistrycuRq_Ss9ErrorType_FMGS0_q__FT_GS0_q__", + "key.usr" : "s:FC10Commandant15CommandRegistrycFT_GS0_x_", "key.nameoffset" : 2473, "key.annotated_decl" : "public init()<\/Declaration>", "key.accessibility" : "source.lang.swift.accessibility.public", @@ -3014,24 +3031,24 @@ "key.length" : 109, "key.doc.column" : 14, "key.parsed_scope.end" : 95, - "key.usr" : "s:FC10Commandant15CommandRegistry8registeru__Rqd__S_11CommandTypezq_qqqd__S1_7OptionsS_11OptionsType11ClientErrorzqqd__S1_11ClientErrorqqqd__S1_7OptionsS2_11ClientError_FGS0_q__Fqd__T_", + "key.usr" : "s:FC10Commandant15CommandRegistry8registeruRd__S_11CommandTypexzWd__7Options11ClientError_wd__11ClientErrorzWd__S2_S3__rFqd__T_", "key.doc.file" : "Sources\/Commandant\/Command.swift", "key.nameoffset" : 2662, - "key.annotated_decl" : "public func register<C : CommandType<\/Type> where C.ClientError == ClientError, C.Options.ClientError == ClientError>(command: C)<\/Declaration>", + "key.annotated_decl" : "public func register<C : CommandType<\/Type> where C<\/Type>.ClientError<\/Type> == ClientError<\/Type>, C<\/Type>.Options<\/Type>.ClientError<\/Type> == ClientError<\/Type>>(command: C<\/Type>)<\/Declaration>", "key.accessibility" : "source.lang.swift.accessibility.public", "key.parsed_scope.start" : 93, "key.filepath" : "Sources\/Commandant\/Command.swift", "key.bodyoffset" : 2773, "key.doc.declaration" : "public func register(command: C)", "key.name" : "register(_:)", - "key.typename" : " CommandRegistry -> (C) -> ()", + "key.typename" : " (CommandRegistry) -> (C) -> ()", "key.doc.type" : "Function", "key.attributes" : [ { "key.attribute" : "source.decl.attribute.__raw_doc_comment" } ], - "key.doc.full_as_xml" : "register(_:)<\/Name>s:FC10Commandant15CommandRegistry8registeru__Rqd__S_11CommandTypezq_qqqd__S1_7OptionsS_11OptionsType11ClientErrorzqqd__S1_11ClientErrorqqqd__S1_7OptionsS2_11ClientError_FGS0_q__Fqd__T_<\/USR>public func register<C : CommandType where C.ClientError == ClientError, C.Options.ClientError == ClientError>(command: C)<\/Declaration>Registers the given command, making it available to run.<\/Para><\/Abstract>If another command was already registered with the same verb<\/codeVoice>, it will be overwritten.<\/Para><\/Discussion><\/Function>", + "key.doc.full_as_xml" : "register(_:)<\/Name>s:FC10Commandant15CommandRegistry8registeruRd__S_11CommandTypexzWd__7Options11ClientError_wd__11ClientErrorzWd__S2_S3__rFqd__T_<\/USR>public func register<C : CommandType where C.ClientError == ClientError, C.Options.ClientError == ClientError>(command: C)<\/Declaration>Registers the given command, making it available to run.<\/Para><\/Abstract>If another command was already registered with the same verb<\/codeVoice>, it will be overwritten.<\/Para><\/Discussion><\/Function>", "key.doc.name" : "register(_:)", "key.substructure" : [ @@ -3053,7 +3070,7 @@ "key.length" : 45, "key.doc.column" : 14, "key.parsed_scope.end" : 103, - "key.usr" : "s:FC10Commandant15CommandRegistry10runCommanduRq_Ss9ErrorType_FGS0_q__FTSS9argumentsGSaSS__GSqGO6Result6ResultT_GOS_15CommandantErrorq____", + "key.usr" : "s:FC10Commandant15CommandRegistry10runCommandFTSS9argumentsGSaSS__GSqGO6Result6ResultT_GOS_15CommandantErrorx___", "key.doc.file" : "Sources\/Commandant\/Command.swift", "key.nameoffset" : 3022, "key.annotated_decl" : "public func runCommand(verb: String<\/Type>, arguments: [String<\/Type>]) -> Result<\/Type><(), CommandantError<\/Type><ClientError>>?<\/Declaration>", @@ -3063,14 +3080,14 @@ "key.bodyoffset" : 3114, "key.doc.declaration" : "public func runCommand(verb: String, arguments: [String]) -> Result.Result<(), Commandant.CommandantError>?", "key.name" : "runCommand(_:arguments:)", - "key.typename" : " CommandRegistry -> (String, arguments: [String]) -> Result<(), CommandantError>?", + "key.typename" : " (CommandRegistry) -> (String, arguments: [String]) -> Result<(), CommandantError>?", "key.doc.type" : "Function", "key.attributes" : [ { "key.attribute" : "source.decl.attribute.__raw_doc_comment" } ], - "key.doc.full_as_xml" : "runCommand(_:arguments:)<\/Name>s:FC10Commandant15CommandRegistry10runCommanduRq_Ss9ErrorType_FGS0_q__FTSS9argumentsGSaSS__GSqGO6Result6ResultT_GOS_15CommandantErrorq____<\/USR>public func runCommand(verb: String, arguments: [String]) -> Result.Result<(), Commandant.CommandantError<ClientError>>?<\/Declaration>Runs the command corresponding to the given verb, passing it the given arguments.<\/Para><\/Abstract>Returns the results of the execution, or nil if no such command exists.<\/Para><\/Discussion><\/Function>", + "key.doc.full_as_xml" : "runCommand(_:arguments:)<\/Name>s:FC10Commandant15CommandRegistry10runCommandFTSS9argumentsGSaSS__GSqGO6Result6ResultT_GOS_15CommandantErrorx___<\/USR>public func runCommand(verb: String, arguments: [String]) -> Result.Result<(), Commandant.CommandantError<ClientError>>?<\/Declaration>Runs the command corresponding to the given verb, passing it the given arguments.<\/Para><\/Abstract>Returns the results of the execution, or nil if no such command exists.<\/Para><\/Discussion><\/Function>", "key.doc.name" : "runCommand(_:arguments:)", "key.substructure" : [ @@ -3101,7 +3118,7 @@ "key.doc.full_as_xml" : "CommandRegistry<\/Name>s:C10Commandant15CommandRegistry<\/USR>public final class CommandRegistry<ClientError : ErrorType><\/Declaration>Maintains the list of commands available to run.<\/Para><\/Abstract><\/Class>", "key.nameoffset" : 3379, "key.doc.name" : "CommandRegistry", - "key.annotated_decl" : "public final class CommandRegistry<ClientError : ErrorType<\/Type>><\/Declaration>", + "key.annotated_decl" : "public final class CommandRegistry<ClientError : ErrorType<\/Type>><\/Declaration>", "key.substructure" : [ { "key.kind" : "source.lang.swift.decl.function.method.instance", @@ -3114,17 +3131,17 @@ "key.length" : 70, "key.doc.column" : 24, "key.parsed_scope.end" : 132, - "key.usr" : "s:FC10Commandant15CommandRegistry4mainuRq_Ss9ErrorType_FGS0_q__FT11defaultVerbSS12errorHandlerFq_T__T_", + "key.usr" : "s:FC10Commandant15CommandRegistry4mainFT11defaultVerbSS12errorHandlerFxT__T_", "key.doc.file" : "Sources\/Commandant\/Command.swift", "key.nameoffset" : 4214, - "key.annotated_decl" : "@noreturn public func main(defaultVerb defaultVerb: String<\/Type>, errorHandler: ClientError -> ())<\/Declaration>", + "key.annotated_decl" : "@noreturn public func main(defaultVerb defaultVerb: String<\/Type>, errorHandler: ClientError<\/Type> -> ())<\/Declaration>", "key.accessibility" : "source.lang.swift.accessibility.public", "key.parsed_scope.start" : 130, "key.filepath" : "Sources\/Commandant\/Command.swift", "key.bodyoffset" : 4286, "key.doc.declaration" : "@noreturn public func main(defaultVerb defaultVerb: String, errorHandler: ClientError -> ())", "key.name" : "main(defaultVerb:errorHandler:)", - "key.typename" : " CommandRegistry -> @noreturn (defaultVerb: String, errorHandler: ClientError -> ()) -> ()", + "key.typename" : " (CommandRegistry) -> @noreturn (defaultVerb: String, errorHandler: ClientError -> ()) -> ()", "key.doc.type" : "Function", "key.attributes" : [ { @@ -3136,10 +3153,10 @@ ], "key.related_decls" : [ { - "key.annotated_decl" : "main(arguments:defaultVerb:errorHandler:)<\/RelatedName>" + "key.annotated_decl" : "main(arguments:defaultVerb:errorHandler:)<\/RelatedName>" } ], - "key.doc.full_as_xml" : "main(defaultVerb:errorHandler:)<\/Name>s:FC10Commandant15CommandRegistry4mainuRq_Ss9ErrorType_FGS0_q__FT11defaultVerbSS12errorHandlerFq_T__T_<\/USR>@noreturn public func main(defaultVerb defaultVerb: String, errorHandler: ClientError -> ())<\/Declaration>Hands off execution to the CommandRegistry, by parsing Process.arguments and then running whichever command has been identified in the argument list.<\/Para><\/Abstract>If the chosen command executes successfully, the process will exit with a successful exit code.<\/Para>If the chosen command fails, the provided error handler will be invoked, then the process will exit with a failure exit code.<\/Para>If a matching command could not be found but there is any executable-verb<\/codeVoice> style subcommand executable in the caller's $PATH<\/codeVoice>, the subcommand will be executed.<\/Para>If a matching command could not be found or a usage error occurred, a helpful error message will be written to stderr<\/codeVoice>, then the process will exit with a failure error code.<\/Para><\/Discussion><\/Function>", + "key.doc.full_as_xml" : "main(defaultVerb:errorHandler:)<\/Name>s:FC10Commandant15CommandRegistry4mainFT11defaultVerbSS12errorHandlerFxT__T_<\/USR>@noreturn public func main(defaultVerb defaultVerb: String, errorHandler: ClientError -> ())<\/Declaration>Hands off execution to the CommandRegistry, by parsing Process.arguments and then running whichever command has been identified in the argument list.<\/Para><\/Abstract>If the chosen command executes successfully, the process will exit with a successful exit code.<\/Para>If the chosen command fails, the provided error handler will be invoked, then the process will exit with a failure exit code.<\/Para>If a matching command could not be found but there is any executable-verb<\/codeVoice> style subcommand executable in the caller's $PATH<\/codeVoice>, the subcommand will be executed.<\/Para>If a matching command could not be found or a usage error occurred, a helpful error message will be written to stderr<\/codeVoice>, then the process will exit with a failure error code.<\/Para><\/Discussion><\/Function>", "key.doc.name" : "main(defaultVerb:errorHandler:)", "key.substructure" : [ @@ -3170,17 +3187,17 @@ "key.length" : 89, "key.doc.column" : 24, "key.parsed_scope.end" : 188, - "key.usr" : "s:FC10Commandant15CommandRegistry4mainuRq_Ss9ErrorType_FGS0_q__FT9argumentsGSaSS_11defaultVerbSS12errorHandlerFq_T__T_", + "key.usr" : "s:FC10Commandant15CommandRegistry4mainFT9argumentsGSaSS_11defaultVerbSS12errorHandlerFxT__T_", "key.doc.file" : "Sources\/Commandant\/Command.swift", "key.nameoffset" : 5194, - "key.annotated_decl" : "@noreturn public func main(arguments arguments: [String<\/Type>], defaultVerb: String<\/Type>, errorHandler: ClientError -> ())<\/Declaration>", + "key.annotated_decl" : "@noreturn public func main(arguments arguments: [String<\/Type>], defaultVerb: String<\/Type>, errorHandler: ClientError<\/Type> -> ())<\/Declaration>", "key.accessibility" : "source.lang.swift.accessibility.public", "key.parsed_scope.start" : 151, "key.filepath" : "Sources\/Commandant\/Command.swift", "key.bodyoffset" : 5285, "key.doc.declaration" : "@noreturn public func main(arguments arguments: [String], defaultVerb: String, errorHandler: ClientError -> ())", "key.name" : "main(arguments:defaultVerb:errorHandler:)", - "key.typename" : " CommandRegistry -> @noreturn (arguments: [String], defaultVerb: String, errorHandler: ClientError -> ()) -> ()", + "key.typename" : " (CommandRegistry) -> @noreturn (arguments: [String], defaultVerb: String, errorHandler: ClientError -> ()) -> ()", "key.doc.type" : "Function", "key.attributes" : [ { @@ -3192,10 +3209,10 @@ ], "key.related_decls" : [ { - "key.annotated_decl" : "main(defaultVerb:errorHandler:)<\/RelatedName>" + "key.annotated_decl" : "main(defaultVerb:errorHandler:)<\/RelatedName>" } ], - "key.doc.full_as_xml" : "main(arguments:defaultVerb:errorHandler:)<\/Name>s:FC10Commandant15CommandRegistry4mainuRq_Ss9ErrorType_FGS0_q__FT9argumentsGSaSS_11defaultVerbSS12errorHandlerFq_T__T_<\/USR>@noreturn public func main(arguments arguments: [String], defaultVerb: String, errorHandler: ClientError -> ())<\/Declaration>Hands off execution to the CommandRegistry, by parsing arguments<\/codeVoice> and then running whichever command has been identified in the argument list.<\/Para><\/Abstract>If the chosen command executes successfully, the process will exit with a successful exit code.<\/Para>If the chosen command fails, the provided error handler will be invoked, then the process will exit with a failure exit code.<\/Para>If a matching command could not be found but there is any executable-verb<\/codeVoice> style subcommand executable in the caller's $PATH<\/codeVoice>, the subcommand will be executed.<\/Para>If a matching command could not be found or a usage error occurred, a helpful error message will be written to stderr<\/codeVoice>, then the process will exit with a failure error code.<\/Para><\/Discussion><\/Function>", + "key.doc.full_as_xml" : "main(arguments:defaultVerb:errorHandler:)<\/Name>s:FC10Commandant15CommandRegistry4mainFT9argumentsGSaSS_11defaultVerbSS12errorHandlerFxT__T_<\/USR>@noreturn public func main(arguments arguments: [String], defaultVerb: String, errorHandler: ClientError -> ())<\/Declaration>Hands off execution to the CommandRegistry, by parsing arguments<\/codeVoice> and then running whichever command has been identified in the argument list.<\/Para><\/Abstract>If the chosen command executes successfully, the process will exit with a successful exit code.<\/Para>If the chosen command fails, the provided error handler will be invoked, then the process will exit with a failure exit code.<\/Para>If a matching command could not be found but there is any executable-verb<\/codeVoice> style subcommand executable in the caller's $PATH<\/codeVoice>, the subcommand will be executed.<\/Para>If a matching command could not be found or a usage error occurred, a helpful error message will be written to stderr<\/codeVoice>, then the process will exit with a failure error code.<\/Para><\/Discussion><\/Function>", "key.doc.name" : "main(arguments:defaultVerb:errorHandler:)", "key.substructure" : [ @@ -3226,17 +3243,17 @@ "key.length" : 84, "key.doc.column" : 15, "key.parsed_scope.end" : 213, - "key.usr" : "s:FC10Commandant15CommandRegistryP33_1DD6990CD6DFDE28F713A55F8EE2B70E25executeSubcommandIfExistsuRq_Ss9ErrorType_FGS0_q__FTSS4verbSS9argumentsGSaSS__GSqVSs5Int32_", + "key.usr" : "s:FC10Commandant15CommandRegistryP33_1DD6990CD6DFDE28F713A55F8EE2B70E25executeSubcommandIfExistsFTSS4verbSS9argumentsGSaSS__GSqVs5Int32_", "key.doc.file" : "Sources\/Commandant\/Command.swift", "key.nameoffset" : 6353, - "key.annotated_decl" : "private func executeSubcommandIfExists(executableName: String<\/Type>, verb: String<\/Type>, arguments: [String<\/Type>]) -> Int32<\/Type>?<\/Declaration>", + "key.annotated_decl" : "private func executeSubcommandIfExists(executableName: String<\/Type>, verb: String<\/Type>, arguments: [String<\/Type>]) -> Int32<\/Type>?<\/Declaration>", "key.accessibility" : "source.lang.swift.accessibility.private", "key.parsed_scope.start" : 194, "key.filepath" : "Sources\/Commandant\/Command.swift", "key.bodyoffset" : 6449, "key.doc.declaration" : "private func executeSubcommandIfExists(executableName: String, verb: String, arguments: [String]) -> Int32?", "key.name" : "executeSubcommandIfExists(_:verb:arguments:)", - "key.typename" : " CommandRegistry -> (String, verb: String, arguments: [String]) -> Int32?", + "key.typename" : " (CommandRegistry) -> (String, verb: String, arguments: [String]) -> Int32?", "key.doc.result_discussion" : [ { "Para" : "The exit status of found subcommand or nil." @@ -3248,7 +3265,7 @@ "key.attribute" : "source.decl.attribute.__raw_doc_comment" } ], - "key.doc.full_as_xml" : "executeSubcommandIfExists(_:verb:arguments:)<\/Name>s:FC10Commandant15CommandRegistryP33_1DD6990CD6DFDE28F713A55F8EE2B70E25executeSubcommandIfExistsuRq_Ss9ErrorType_FGS0_q__FTSS4verbSS9argumentsGSaSS__GSqVSs5Int32_<\/USR>private func executeSubcommandIfExists(executableName: String, verb: String, arguments: [String]) -> Int32?<\/Declaration>Finds and executes a subcommand which exists in your $PATH. The executable name must be in the form of executable-verb<\/codeVoice>.<\/Para><\/Abstract>The exit status of found subcommand or nil.<\/Para><\/ResultDiscussion><\/Function>", + "key.doc.full_as_xml" : "executeSubcommandIfExists(_:verb:arguments:)<\/Name>s:FC10Commandant15CommandRegistryP33_1DD6990CD6DFDE28F713A55F8EE2B70E25executeSubcommandIfExistsFTSS4verbSS9argumentsGSaSS__GSqVs5Int32_<\/USR>private func executeSubcommandIfExists(executableName: String, verb: String, arguments: [String]) -> Int32?<\/Declaration>Finds and executes a subcommand which exists in your $PATH. The executable name must be in the form of executable-verb<\/codeVoice>.<\/Para><\/Abstract>The exit status of found subcommand or nil.<\/Para><\/ResultDiscussion><\/Function>", "key.doc.name" : "executeSubcommandIfExists(_:verb:arguments:)", "key.substructure" : [ { @@ -3262,9 +3279,9 @@ "key.name" : "launchTask(_:arguments:)", "key.typename" : "(String, arguments: [String]) -> Int32", "key.parsed_scope.end" : 206, - "key.usr" : "s:FFC10Commandant15CommandRegistryP33_1DD6990CD6DFDE28F713A55F8EE2B70E25executeSubcommandIfExistsuRq_Ss9ErrorType_FGS0_q__FTSS4verbSS9argumentsGSaSS__GSqVSs5Int32_L_10launchTaskFTSS9argumentsGSaSS__S2_", + "key.usr" : "s:FFC10Commandant15CommandRegistryP33_1DD6990CD6DFDE28F713A55F8EE2B70E25executeSubcommandIfExistsFTSS4verbSS9argumentsGSaSS__GSqVs5Int32_L_10launchTaskFTSS9argumentsGSaSS__S1_", "key.nameoffset" : 6537, - "key.annotated_decl" : "func launchTask(path: String<\/Type>, arguments: [String<\/Type>]) -> Int32<\/Type><\/Declaration>", + "key.annotated_decl" : "func launchTask(path: String<\/Type>, arguments: [String<\/Type>]) -> Int32<\/Type><\/Declaration>", "key.accessibility" : "source.lang.swift.accessibility.private", "key.substructure" : [ @@ -3278,6 +3295,38 @@ "key.filepath" : "Sources\/Commandant\/Command.swift" } ], + "key.diagnostics" : [ + { + "key.severity" : "source.diagnostic.severity.warning", + "key.column" : 2, + "key.fixits" : [ + { + "key.offset" : 327, + "key.length" : 9, + "key.sourcetext" : "associatedtype" + } + ], + "key.diagnostic_stage" : "source.diagnostic.stage.swift.parse", + "key.description" : "use of 'typealias' to declare associated types is deprecated; use 'associatedtype' instead", + "key.line" : 16, + "key.filepath" : "Sources\/Commandant\/Command.swift" + }, + { + "key.severity" : "source.diagnostic.severity.warning", + "key.column" : 2, + "key.fixits" : [ + { + "key.offset" : 360, + "key.length" : 9, + "key.sourcetext" : "associatedtype" + } + ], + "key.diagnostic_stage" : "source.diagnostic.stage.swift.parse", + "key.description" : "use of 'typealias' to declare associated types is deprecated; use 'associatedtype' instead", + "key.line" : 18, + "key.filepath" : "Sources\/Commandant\/Command.swift" + } + ], "key.offset" : 0, "key.diagnostic_stage" : "source.diagnostic.stage.swift.parse", "key.length" : 6935 @@ -3299,7 +3348,7 @@ "key.usr" : "s:O10CommandantP33_BA859BFBBE9DF3838A11641CB273713E11RawArgument", "key.doc.file" : "Sources\/Commandant\/ArgumentParser.swift", "key.nameoffset" : 256, - "key.annotated_decl" : "private enum RawArgument : Equatable<\/Type><\/Declaration>", + "key.annotated_decl" : "private enum RawArgument : Equatable<\/Type><\/Declaration>", "key.accessibility" : "source.lang.swift.accessibility.private", "key.elements" : [ { @@ -3409,10 +3458,10 @@ "key.typename" : "RawArgument.Type -> (Set) -> RawArgument", "key.doc.column" : 7, "key.parsed_scope.end" : 22, - "key.usr" : "s:FO10CommandantP33_BA859BFBBE9DF3838A11641CB273713E11RawArgument4FlagFMS0_FGVSs3SetVSs9Character_S0_", + "key.usr" : "s:FO10CommandantP33_BA859BFBBE9DF3838A11641CB273713E11RawArgument4FlagFMS0_FGVs3SetVs9Character_S0_", "key.doc.type" : "Other", "key.doc.file" : "Sources\/Commandant\/ArgumentParser.swift", - "key.doc.full_as_xml" : "Flag<\/Name>s:FO10CommandantP33_BA859BFBBE9DF3838A11641CB273713E11RawArgument4FlagFMS0_FGVSs3SetVSs9Character_S0_<\/USR><\/Declaration>One or more flag arguments (e.g 'r' and 'f' for -rf<\/codeVoice>)<\/Para><\/Abstract><\/Other>", + "key.doc.full_as_xml" : "Flag<\/Name>s:FO10CommandantP33_BA859BFBBE9DF3838A11641CB273713E11RawArgument4FlagFMS0_FGVs3SetVs9Character_S0_<\/USR><\/Declaration>One or more flag arguments (e.g 'r' and 'f' for -rf<\/codeVoice>)<\/Para><\/Abstract><\/Other>", "key.nameoffset" : 548, "key.doc.name" : "Flag", "key.annotated_decl" : "<\/Declaration>", @@ -3446,10 +3495,10 @@ "key.annotated_decl" : "==(_: _GenericObjCError, _: _GenericObjCError) -> Bool<\/RelatedName>" }, { - "key.annotated_decl" : "==<T : __BridgedNSError where T.RawValue : SignedIntegerType>(_: T, _: T) -> Bool<\/RelatedName>" + "key.annotated_decl" : "==<T : __BridgedNSError where T.RawValue : SignedIntegerType>(_: T, _: T) -> Bool<\/RelatedName>" }, { - "key.annotated_decl" : "==<T : __BridgedNSError where T.RawValue : UnsignedIntegerType>(_: T, _: T) -> Bool<\/RelatedName>" + "key.annotated_decl" : "==<T : __BridgedNSError where T.RawValue : UnsignedIntegerType>(_: T, _: T) -> Bool<\/RelatedName>" }, { "key.annotated_decl" : "==(_: DarwinBoolean, _: DarwinBoolean) -> Bool<\/RelatedName>" @@ -3476,178 +3525,193 @@ "key.annotated_decl" : "==(_: CGFloat, _: CGFloat) -> Bool<\/RelatedName>" }, { - "key.annotated_decl" : "==(_: _MirrorDisposition, _: _MirrorDisposition) -> Bool<\/RelatedName>" + "key.annotated_decl" : "==(_: FloatingPointClassification, _: FloatingPointClassification) -> Bool<\/RelatedName>" + }, + { + "key.annotated_decl" : "==(_: _MirrorDisposition, _: _MirrorDisposition) -> Bool<\/RelatedName>" + }, + { + "key.annotated_decl" : "==(_: Mirror.DisplayStyle, _: Mirror.DisplayStyle) -> Bool<\/RelatedName>" + }, + { + "key.annotated_decl" : "==<Element : Equatable>(_: ContiguousArray<Element>, _: ContiguousArray<Element>) -> Bool<\/RelatedName>" + }, + { + "key.annotated_decl" : "==<Element : Equatable>(_: ArraySlice<Element>, _: ArraySlice<Element>) -> Bool<\/RelatedName>" + }, + { + "key.annotated_decl" : "==<Element : Equatable>(_: Array<Element>, _: Array<Element>) -> Bool<\/RelatedName>" }, { - "key.annotated_decl" : "==(_: Mirror.DisplayStyle, _: Mirror.DisplayStyle) -> Bool<\/RelatedName>" + "key.annotated_decl" : "==(_: Bool, _: Bool) -> Bool<\/RelatedName>" }, { - "key.annotated_decl" : "==<Element : Equatable>(_: ContiguousArray<Element>, _: ContiguousArray<Element>) -> Bool<\/RelatedName>" + "key.annotated_decl" : "==<Memory>(_: AutoreleasingUnsafeMutablePointer<Memory>, _: AutoreleasingUnsafeMutablePointer<Memory>) -> Bool<\/RelatedName>" }, { - "key.annotated_decl" : "==<Element : Equatable>(_: ArraySlice<Element>, _: ArraySlice<Element>) -> Bool<\/RelatedName>" + "key.annotated_decl" : "==(_: Any.Type?, _: Any.Type?) -> Bool<\/RelatedName>" }, { - "key.annotated_decl" : "==<Element : Equatable>(_: Array<Element>, _: Array<Element>) -> Bool<\/RelatedName>" + "key.annotated_decl" : "==(_: COpaquePointer, _: COpaquePointer) -> Bool<\/RelatedName>" }, { - "key.annotated_decl" : "==(_: Bool, _: Bool) -> Bool<\/RelatedName>" + "key.annotated_decl" : "==(_: Character, _: Character) -> Bool<\/RelatedName>" }, { - "key.annotated_decl" : "==<Memory>(_: AutoreleasingUnsafeMutablePointer<Memory>, _: AutoreleasingUnsafeMutablePointer<Memory>) -> Bool<\/RelatedName>" + "key.annotated_decl" : "==<T : RawRepresentable where T.RawValue : Equatable>(_: T, _: T) -> Bool<\/RelatedName>" }, { - "key.annotated_decl" : "==(_: Any.Type?, _: Any.Type?) -> Bool<\/RelatedName>" + "key.annotated_decl" : "==<Base : CollectionType>(_: LazyFilterIndex<Base>, _: LazyFilterIndex<Base>) -> Bool<\/RelatedName>" }, { - "key.annotated_decl" : "==(_: COpaquePointer, _: COpaquePointer) -> Bool<\/RelatedName>" + "key.annotated_decl" : "==(_: UInt8, _: UInt8) -> Bool<\/RelatedName>" }, { - "key.annotated_decl" : "==(_: Character, _: Character) -> Bool<\/RelatedName>" + "key.annotated_decl" : "==(_: Int8, _: Int8) -> Bool<\/RelatedName>" }, { - "key.annotated_decl" : "==<T : RawRepresentable where T.RawValue : Equatable>(_: T, _: T) -> Bool<\/RelatedName>" + "key.annotated_decl" : "==(_: UInt16, _: UInt16) -> Bool<\/RelatedName>" }, { - "key.annotated_decl" : "==<Base : CollectionType>(_: LazyFilterIndex<Base>, _: LazyFilterIndex<Base>) -> Bool<\/RelatedName>" + "key.annotated_decl" : "==(_: Int16, _: Int16) -> Bool<\/RelatedName>" }, { - "key.annotated_decl" : "==(_: UInt8, _: UInt8) -> Bool<\/RelatedName>" + "key.annotated_decl" : "==(_: UInt32, _: UInt32) -> Bool<\/RelatedName>" }, { - "key.annotated_decl" : "==(_: Int8, _: Int8) -> Bool<\/RelatedName>" + "key.annotated_decl" : "==(_: Int32, _: Int32) -> Bool<\/RelatedName>" }, { - "key.annotated_decl" : "==(_: UInt16, _: UInt16) -> Bool<\/RelatedName>" + "key.annotated_decl" : "==(_: UInt64, _: UInt64) -> Bool<\/RelatedName>" }, { - "key.annotated_decl" : "==(_: Int16, _: Int16) -> Bool<\/RelatedName>" + "key.annotated_decl" : "==(_: Int64, _: Int64) -> Bool<\/RelatedName>" }, { - "key.annotated_decl" : "==(_: UInt32, _: UInt32) -> Bool<\/RelatedName>" + "key.annotated_decl" : "==(_: UInt, _: UInt) -> Bool<\/RelatedName>" }, { - "key.annotated_decl" : "==(_: Int32, _: Int32) -> Bool<\/RelatedName>" + "key.annotated_decl" : "==(_: Int, _: Int) -> Bool<\/RelatedName>" }, { - "key.annotated_decl" : "==(_: UInt64, _: UInt64) -> Bool<\/RelatedName>" + "key.annotated_decl" : "==<BaseElements>(_: FlattenCollectionIndex<BaseElements>, _: FlattenCollectionIndex<BaseElements>) -> Bool<\/RelatedName>" }, { - "key.annotated_decl" : "==(_: Int64, _: Int64) -> Bool<\/RelatedName>" + "key.annotated_decl" : "==<BaseElements>(_: FlattenBidirectionalCollectionIndex<BaseElements>, _: FlattenBidirectionalCollectionIndex<BaseElements>) -> Bool<\/RelatedName>" }, { - "key.annotated_decl" : "==(_: UInt, _: UInt) -> Bool<\/RelatedName>" + "key.annotated_decl" : "==(_: Float, _: Float) -> Bool<\/RelatedName>" }, { - "key.annotated_decl" : "==(_: Int, _: Int) -> Bool<\/RelatedName>" + "key.annotated_decl" : "==(_: Double, _: Double) -> Bool<\/RelatedName>" }, { - "key.annotated_decl" : "==<BaseElements>(_: FlattenCollectionIndex<BaseElements>, _: FlattenCollectionIndex<BaseElements>) -> Bool<\/RelatedName>" + "key.annotated_decl" : "==(_: Float80, _: Float80) -> Bool<\/RelatedName>" }, { - "key.annotated_decl" : "==<BaseElements>(_: FlattenBidirectionalCollectionIndex<BaseElements>, _: FlattenBidirectionalCollectionIndex<BaseElements>) -> Bool<\/RelatedName>" + "key.annotated_decl" : "==<Element : Hashable>(_: Set<Element>, _: Set<Element>) -> Bool<\/RelatedName>" }, { - "key.annotated_decl" : "==(_: Float, _: Float) -> Bool<\/RelatedName>" + "key.annotated_decl" : "==<Key : Equatable, Value : Equatable>(_: [Key : Value], _: [Key : Value]) -> Bool<\/RelatedName>" }, { - "key.annotated_decl" : "==(_: Double, _: Double) -> Bool<\/RelatedName>" + "key.annotated_decl" : "==<Element : Hashable>(_: SetIndex<Element>, _: SetIndex<Element>) -> Bool<\/RelatedName>" }, { - "key.annotated_decl" : "==(_: Float80, _: Float80) -> Bool<\/RelatedName>" + "key.annotated_decl" : "==<Key : Hashable, Value>(_: DictionaryIndex<Key, Value>, _: DictionaryIndex<Key, Value>) -> Bool<\/RelatedName>" }, { - "key.annotated_decl" : "==(_: FloatingPointClassification, _: FloatingPointClassification) -> Bool<\/RelatedName>" + "key.annotated_decl" : "==<Value, Element>(_: _HeapBuffer<Value, Element>, _: _HeapBuffer<Value, Element>) -> Bool<\/RelatedName>" }, { - "key.annotated_decl" : "==<Element : Hashable>(_: Set<Element>, _: Set<Element>) -> Bool<\/RelatedName>" + "key.annotated_decl" : "==<Bound : Comparable>(_: HalfOpenInterval<Bound>, _: HalfOpenInterval<Bound>) -> Bool<\/RelatedName>" }, { - "key.annotated_decl" : "==<Key : Equatable, Value : Equatable>(_: [Key : Value], _: [Key : Value]) -> Bool<\/RelatedName>" + "key.annotated_decl" : "==<Bound : Comparable>(_: ClosedInterval<Bound>, _: ClosedInterval<Bound>) -> Bool<\/RelatedName>" }, { - "key.annotated_decl" : "==<Element : Hashable>(_: SetIndex<Element>, _: SetIndex<Element>) -> Bool<\/RelatedName>" + "key.annotated_decl" : "==<Value, Element>(_: ManagedBufferPointer<Value, Element>, _: ManagedBufferPointer<Value, Element>) -> Bool<\/RelatedName>" }, { - "key.annotated_decl" : "==<Key : Hashable, Value>(_: DictionaryIndex<Key, Value>, _: DictionaryIndex<Key, Value>) -> Bool<\/RelatedName>" + "key.annotated_decl" : "==<T : Equatable>(_: T?, _: T?) -> Bool<\/RelatedName>" }, { - "key.annotated_decl" : "==<Value, Element>(_: _HeapBuffer<Value, Element>, _: _HeapBuffer<Value, Element>) -> Bool<\/RelatedName>" + "key.annotated_decl" : "==<T>(_: T?, _: _OptionalNilComparisonType) -> Bool<\/RelatedName>" }, { - "key.annotated_decl" : "==<Bound : Comparable>(_: HalfOpenInterval<Bound>, _: HalfOpenInterval<Bound>) -> Bool<\/RelatedName>" + "key.annotated_decl" : "==<T>(_: _OptionalNilComparisonType, _: T?) -> Bool<\/RelatedName>" }, { - "key.annotated_decl" : "==<Bound : Comparable>(_: ClosedInterval<Bound>, _: ClosedInterval<Bound>) -> Bool<\/RelatedName>" + "key.annotated_decl" : "==<Element>(_: Range<Element>, _: Range<Element>) -> Bool<\/RelatedName>" }, { - "key.annotated_decl" : "==<Value, Element>(_: ManagedBufferPointer<Value, Element>, _: ManagedBufferPointer<Value, Element>) -> Bool<\/RelatedName>" + "key.annotated_decl" : "==(_: ObjectIdentifier, _: ObjectIdentifier) -> Bool<\/RelatedName>" }, { - "key.annotated_decl" : "==<T : Equatable>(_: T?, _: T?) -> Bool<\/RelatedName>" + "key.annotated_decl" : "==<Base>(_: ReverseIndex<Base>, _: ReverseIndex<Base>) -> Bool<\/RelatedName>" }, { - "key.annotated_decl" : "==<T>(_: T?, _: _OptionalNilComparisonType) -> Bool<\/RelatedName>" + "key.annotated_decl" : "==<T : Strideable>(_: T, _: T) -> Bool<\/RelatedName>" }, { - "key.annotated_decl" : "==<T>(_: _OptionalNilComparisonType, _: T?) -> Bool<\/RelatedName>" + "key.annotated_decl" : "==(_: String, _: String) -> Bool<\/RelatedName>" }, { - "key.annotated_decl" : "==<Element>(_: Range<Element>, _: Range<Element>) -> Bool<\/RelatedName>" + "key.annotated_decl" : "==(_: Index, _: Index) -> Bool<\/RelatedName>" }, { - "key.annotated_decl" : "==(_: ObjectIdentifier, _: ObjectIdentifier) -> Bool<\/RelatedName>" + "key.annotated_decl" : "==(_: String.UnicodeScalarView.Index, _: String.UnicodeScalarView.Index) -> Bool<\/RelatedName>" }, { - "key.annotated_decl" : "==<Base>(_: ReverseIndex<Base>, _: ReverseIndex<Base>) -> Bool<\/RelatedName>" + "key.annotated_decl" : "==(_: String.UTF16View.Index, _: String.UTF16View.Index) -> Bool<\/RelatedName>" }, { - "key.annotated_decl" : "==<T : _Strideable>(_: T, _: T) -> Bool<\/RelatedName>" + "key.annotated_decl" : "==(_: String.UTF8View.Index, _: String.UTF8View.Index) -> Bool<\/RelatedName>" }, { - "key.annotated_decl" : "==(_: String, _: String) -> Bool<\/RelatedName>" + "key.annotated_decl" : "==(_: UnicodeScalar, _: UnicodeScalar) -> Bool<\/RelatedName>" }, { - "key.annotated_decl" : "==(_: Index, _: Index) -> Bool<\/RelatedName>" + "key.annotated_decl" : "==<Memory>(_: UnsafeMutablePointer<Memory>, _: UnsafeMutablePointer<Memory>) -> Bool<\/RelatedName>" }, { - "key.annotated_decl" : "==(_: String.UnicodeScalarView.Index, _: String.UnicodeScalarView.Index) -> Bool<\/RelatedName>" + "key.annotated_decl" : "==<Memory>(_: UnsafePointer<Memory>, _: UnsafePointer<Memory>) -> Bool<\/RelatedName>" }, { - "key.annotated_decl" : "==(_: String.UTF16View.Index, _: String.UTF16View.Index) -> Bool<\/RelatedName>" + "key.annotated_decl" : "==(_: _SwiftNSOperatingSystemVersion, _: _SwiftNSOperatingSystemVersion) -> Bool<\/RelatedName>" }, { - "key.annotated_decl" : "==(_: String.UTF8View.Index, _: String.UTF8View.Index) -> Bool<\/RelatedName>" + "key.annotated_decl" : "==(_: Bit, _: Bit) -> Bool<\/RelatedName>" }, { - "key.annotated_decl" : "==(_: UnicodeScalar, _: UnicodeScalar) -> Bool<\/RelatedName>" + "key.annotated_decl" : "==(_: AnyForwardIndex, _: AnyForwardIndex) -> Bool<\/RelatedName>" }, { - "key.annotated_decl" : "==<Memory>(_: UnsafeMutablePointer<Memory>, _: UnsafeMutablePointer<Memory>) -> Bool<\/RelatedName>" + "key.annotated_decl" : "==(_: AnyBidirectionalIndex, _: AnyBidirectionalIndex) -> Bool<\/RelatedName>" }, { - "key.annotated_decl" : "==<Memory>(_: UnsafePointer<Memory>, _: UnsafePointer<Memory>) -> Bool<\/RelatedName>" + "key.annotated_decl" : "==(_: AnyRandomAccessIndex, _: AnyRandomAccessIndex) -> Bool<\/RelatedName>" }, { - "key.annotated_decl" : "==(_: _SwiftNSOperatingSystemVersion, _: _SwiftNSOperatingSystemVersion) -> Bool<\/RelatedName>" + "key.annotated_decl" : "==<A : Equatable, B : Equatable>(_: (A, B), _: (A, B)) -> Bool<\/RelatedName>" }, { - "key.annotated_decl" : "==(_: Bit, _: Bit) -> Bool<\/RelatedName>" + "key.annotated_decl" : "==<A : Equatable, B : Equatable, C : Equatable>(_: (A, B, C), _: (A, B, C)) -> Bool<\/RelatedName>" }, { - "key.annotated_decl" : "==(_: AnyForwardIndex, _: AnyForwardIndex) -> Bool<\/RelatedName>" + "key.annotated_decl" : "==<A : Equatable, B : Equatable, C : Equatable, D : Equatable>(_: (A, B, C, D), _: (A, B, C, D)) -> Bool<\/RelatedName>" }, { - "key.annotated_decl" : "==(_: AnyBidirectionalIndex, _: AnyBidirectionalIndex) -> Bool<\/RelatedName>" + "key.annotated_decl" : "==<A : Equatable, B : Equatable, C : Equatable, D : Equatable, E : Equatable>(_: (A, B, C, D, E), _: (A, B, C, D, E)) -> Bool<\/RelatedName>" }, { - "key.annotated_decl" : "==(_: AnyRandomAccessIndex, _: AnyRandomAccessIndex) -> Bool<\/RelatedName>" + "key.annotated_decl" : "==<A : Equatable, B : Equatable, C : Equatable, D : Equatable, E : Equatable, F : Equatable>(_: (A, B, C, D, E, F), _: (A, B, C, D, E, F)) -> Bool<\/RelatedName>" }, { - "key.annotated_decl" : "==(_: Self, _: Self) -> Bool<\/RelatedName>" + "key.annotated_decl" : "==(_: Self, _: Self) -> Bool<\/RelatedName>" }, { - "key.annotated_decl" : "==<T : Equatable, Error : Equatable>(_: Result<T, Error>, _: Result<T, Error>) -> Bool<\/RelatedName>" + "key.annotated_decl" : "==<T : Equatable, Error : Equatable>(_: Result<T, Error>, _: Result<T, Error>) -> Bool<\/RelatedName>" } ], "key.nameoffset" : 585, @@ -3682,7 +3746,7 @@ "key.name" : "CustomStringConvertible" } ], - "key.annotated_decl" : "private enum RawArgument : Equatable<\/Type><\/Declaration>", + "key.annotated_decl" : "private enum RawArgument : Equatable<\/Type><\/Declaration>", "key.substructure" : [ { "key.kind" : "source.lang.swift.decl.var.instance", @@ -3698,7 +3762,7 @@ "key.usr" : "s:vO10CommandantP33_BA859BFBBE9DF3838A11641CB273713E11RawArgument11descriptionSS", "key.overrides" : [ { - "key.usr" : "s:vPSs23CustomStringConvertible11descriptionSS" + "key.usr" : "s:vPs23CustomStringConvertible11descriptionSS" } ], "key.nameoffset" : 937, @@ -3793,7 +3857,7 @@ "key.length" : 27, "key.doc.column" : 9, "key.parsed_scope.end" : 87, - "key.usr" : "s:FC10Commandant14ArgumentParsercFMS0_FGSaSS_S0_", + "key.usr" : "s:FC10Commandant14ArgumentParsercFGSaSS_S0_", "key.doc.file" : "Sources\/Commandant\/ArgumentParser.swift", "key.nameoffset" : 1428, "key.annotated_decl" : "public init(_ arguments: [String<\/Type>])<\/Declaration>", @@ -3810,7 +3874,7 @@ "key.attribute" : "source.decl.attribute.__raw_doc_comment" } ], - "key.doc.full_as_xml" : "init(_:)<\/Name>s:FC10Commandant14ArgumentParsercFMS0_FGSaSS_S0_<\/USR>public init(_ arguments: [String])<\/Declaration>Initializes the generator from a simple list of command-line arguments.<\/Para><\/Abstract><\/Function>", + "key.doc.full_as_xml" : "init(_:)<\/Name>s:FC10Commandant14ArgumentParsercFGSaSS_S0_<\/USR>public init(_ arguments: [String])<\/Declaration>Initializes the generator from a simple list of command-line arguments.<\/Para><\/Abstract><\/Function>", "key.doc.name" : "init(_:)", "key.substructure" : [ @@ -3858,7 +3922,7 @@ "key.length" : 30, "key.doc.column" : 16, "key.parsed_scope.end" : 115, - "key.usr" : "s:FC10Commandant14ArgumentParser17consumeBooleanKeyFS0_FSSGSqSb_", + "key.usr" : "s:FC10Commandant14ArgumentParser17consumeBooleanKeyFSSGSqSb_", "key.doc.file" : "Sources\/Commandant\/ArgumentParser.swift", "key.nameoffset" : 2563, "key.annotated_decl" : "internal func consumeBooleanKey(key: String<\/Type>) -> Bool<\/Type>?<\/Declaration>", @@ -3868,14 +3932,14 @@ "key.bodyoffset" : 2604, "key.doc.declaration" : "internal func consumeBooleanKey(key: String) -> Bool?", "key.name" : "consumeBooleanKey(_:)", - "key.typename" : "ArgumentParser -> (String) -> Bool?", + "key.typename" : "(ArgumentParser) -> (String) -> Bool?", "key.doc.type" : "Function", "key.attributes" : [ { "key.attribute" : "source.decl.attribute.__raw_doc_comment" } ], - "key.doc.full_as_xml" : "consumeBooleanKey(_:)<\/Name>s:FC10Commandant14ArgumentParser17consumeBooleanKeyFS0_FSSGSqSb_<\/USR>internal func consumeBooleanKey(key: String) -> Bool?<\/Declaration>Returns whether the given key was enabled or disabled, or nil if it was not given at all.<\/Para><\/Abstract>If the key is found, it is then removed from the list of arguments remaining to be parsed.<\/Para><\/Discussion><\/Function>", + "key.doc.full_as_xml" : "consumeBooleanKey(_:)<\/Name>s:FC10Commandant14ArgumentParser17consumeBooleanKeyFSSGSqSb_<\/USR>internal func consumeBooleanKey(key: String) -> Bool?<\/Declaration>Returns whether the given key was enabled or disabled, or nil if it was not given at all.<\/Para><\/Abstract>If the key is found, it is then removed from the list of arguments remaining to be parsed.<\/Para><\/Discussion><\/Function>", "key.doc.name" : "consumeBooleanKey(_:)", "key.substructure" : [ @@ -3897,7 +3961,7 @@ "key.length" : 31, "key.doc.column" : 16, "key.parsed_scope.end" : 148, - "key.usr" : "s:FC10Commandant14ArgumentParser18consumeValueForKeyFS0_FSSGO6Result6ResultGSqSS_GOS_15CommandantErrorOS1_7NoError__", + "key.usr" : "s:FC10Commandant14ArgumentParser18consumeValueForKeyFSSGO6Result6ResultGSqSS_GOS_15CommandantErrorOS1_7NoError__", "key.doc.file" : "Sources\/Commandant\/ArgumentParser.swift", "key.nameoffset" : 3203, "key.annotated_decl" : "internal func consumeValueForKey(key: String<\/Type>) -> Result<\/Type><String<\/Type>?, CommandantError<\/Type><NoError<\/Type>>><\/Declaration>", @@ -3907,14 +3971,14 @@ "key.bodyoffset" : 3281, "key.doc.declaration" : "internal func consumeValueForKey(key: String) -> Result.Result>", "key.name" : "consumeValueForKey(_:)", - "key.typename" : "ArgumentParser -> (String) -> Result>", + "key.typename" : "(ArgumentParser) -> (String) -> Result>", "key.doc.type" : "Function", "key.attributes" : [ { "key.attribute" : "source.decl.attribute.__raw_doc_comment" } ], - "key.doc.full_as_xml" : "consumeValueForKey(_:)<\/Name>s:FC10Commandant14ArgumentParser18consumeValueForKeyFS0_FSSGO6Result6ResultGSqSS_GOS_15CommandantErrorOS1_7NoError__<\/USR>internal func consumeValueForKey(key: String) -> Result.Result<String?, Commandant.CommandantError<Result.NoError>><\/Declaration>Returns the value associated with the given flag, or nil if the flag was not specified. If the key is presented, but no value was given, an error is returned.<\/Para><\/Abstract>If a value is found, the key and the value are both removed from the list of arguments remaining to be parsed.<\/Para><\/Discussion><\/Function>", + "key.doc.full_as_xml" : "consumeValueForKey(_:)<\/Name>s:FC10Commandant14ArgumentParser18consumeValueForKeyFSSGO6Result6ResultGSqSS_GOS_15CommandantErrorOS1_7NoError__<\/USR>internal func consumeValueForKey(key: String) -> Result.Result<String?, Commandant.CommandantError<Result.NoError>><\/Declaration>Returns the value associated with the given flag, or nil if the flag was not specified. If the key is presented, but no value was given, an error is returned.<\/Para><\/Abstract>If a value is found, the key and the value are both removed from the list of arguments remaining to be parsed.<\/Para><\/Discussion><\/Function>", "key.doc.name" : "consumeValueForKey(_:)", "key.substructure" : [ @@ -3936,7 +4000,7 @@ "key.length" : 27, "key.doc.column" : 16, "key.parsed_scope.end" : 161, - "key.usr" : "s:FC10Commandant14ArgumentParser25consumePositionalArgumentFS0_FT_GSqSS_", + "key.usr" : "s:FC10Commandant14ArgumentParser25consumePositionalArgumentFT_GSqSS_", "key.doc.file" : "Sources\/Commandant\/ArgumentParser.swift", "key.nameoffset" : 3930, "key.annotated_decl" : "internal func consumePositionalArgument() -> String<\/Type>?<\/Declaration>", @@ -3946,14 +4010,14 @@ "key.bodyoffset" : 3970, "key.doc.declaration" : "internal func consumePositionalArgument() -> String?", "key.name" : "consumePositionalArgument()", - "key.typename" : "ArgumentParser -> () -> String?", + "key.typename" : "(ArgumentParser) -> () -> String?", "key.doc.type" : "Function", "key.attributes" : [ { "key.attribute" : "source.decl.attribute.__raw_doc_comment" } ], - "key.doc.full_as_xml" : "consumePositionalArgument()<\/Name>s:FC10Commandant14ArgumentParser25consumePositionalArgumentFS0_FT_GSqSS_<\/USR>internal func consumePositionalArgument() -> String?<\/Declaration>Returns the next positional argument that hasn't yet been returned, or nil if there are no more positional arguments.<\/Para><\/Abstract><\/Function>", + "key.doc.full_as_xml" : "consumePositionalArgument()<\/Name>s:FC10Commandant14ArgumentParser25consumePositionalArgumentFT_GSqSS_<\/USR>internal func consumePositionalArgument() -> String?<\/Declaration>Returns the next positional argument that hasn't yet been returned, or nil if there are no more positional arguments.<\/Para><\/Abstract><\/Function>", "key.doc.name" : "consumePositionalArgument()", "key.substructure" : [ @@ -3970,7 +4034,7 @@ "key.length" : 23, "key.doc.column" : 16, "key.parsed_scope.end" : 170, - "key.usr" : "s:FC10Commandant14ArgumentParser10consumeKeyFS0_FSSSb", + "key.usr" : "s:FC10Commandant14ArgumentParser10consumeKeyFSSSb", "key.doc.file" : "Sources\/Commandant\/ArgumentParser.swift", "key.nameoffset" : 4261, "key.annotated_decl" : "internal func consumeKey(key: String<\/Type>) -> Bool<\/Type><\/Declaration>", @@ -3980,14 +4044,14 @@ "key.bodyoffset" : 4294, "key.doc.declaration" : "internal func consumeKey(key: String) -> Bool", "key.name" : "consumeKey(_:)", - "key.typename" : "ArgumentParser -> (String) -> Bool", + "key.typename" : "(ArgumentParser) -> (String) -> Bool", "key.doc.type" : "Function", "key.attributes" : [ { "key.attribute" : "source.decl.attribute.__raw_doc_comment" } ], - "key.doc.full_as_xml" : "consumeKey(_:)<\/Name>s:FC10Commandant14ArgumentParser10consumeKeyFS0_FSSSb<\/USR>internal func consumeKey(key: String) -> Bool<\/Declaration>Returns whether the given key was specified and removes it from the list of arguments remaining.<\/Para><\/Abstract><\/Function>", + "key.doc.full_as_xml" : "consumeKey(_:)<\/Name>s:FC10Commandant14ArgumentParser10consumeKeyFSSSb<\/USR>internal func consumeKey(key: String) -> Bool<\/Declaration>Returns whether the given key was specified and removes it from the list of arguments remaining.<\/Para><\/Abstract><\/Function>", "key.doc.name" : "consumeKey(_:)", "key.substructure" : [ @@ -4004,24 +4068,24 @@ "key.length" : 35, "key.doc.column" : 16, "key.parsed_scope.end" : 191, - "key.usr" : "s:FC10Commandant14ArgumentParser18consumeBooleanFlagFS0_FVSs9CharacterSb", + "key.usr" : "s:FC10Commandant14ArgumentParser18consumeBooleanFlagFVs9CharacterSb", "key.doc.file" : "Sources\/Commandant\/ArgumentParser.swift", "key.nameoffset" : 4563, - "key.annotated_decl" : "internal func consumeBooleanFlag(flag: Character<\/Type>) -> Bool<\/Type><\/Declaration>", + "key.annotated_decl" : "internal func consumeBooleanFlag(flag: Character<\/Type>) -> Bool<\/Type><\/Declaration>", "key.accessibility" : "source.lang.swift.accessibility.internal", "key.parsed_scope.start" : 174, "key.filepath" : "Sources\/Commandant\/ArgumentParser.swift", "key.bodyoffset" : 4608, "key.doc.declaration" : "internal func consumeBooleanFlag(flag: Character) -> Bool", "key.name" : "consumeBooleanFlag(_:)", - "key.typename" : "ArgumentParser -> (Character) -> Bool", + "key.typename" : "(ArgumentParser) -> (Character) -> Bool", "key.doc.type" : "Function", "key.attributes" : [ { "key.attribute" : "source.decl.attribute.__raw_doc_comment" } ], - "key.doc.full_as_xml" : "consumeBooleanFlag(_:)<\/Name>s:FC10Commandant14ArgumentParser18consumeBooleanFlagFS0_FVSs9CharacterSb<\/USR>internal func consumeBooleanFlag(flag: Character) -> Bool<\/Declaration>Returns whether the given flag was specified and removes it from the list of arguments remaining.<\/Para><\/Abstract><\/Function>", + "key.doc.full_as_xml" : "consumeBooleanFlag(_:)<\/Name>s:FC10Commandant14ArgumentParser18consumeBooleanFlagFVs9CharacterSb<\/USR>internal func consumeBooleanFlag(flag: Character) -> Bool<\/Declaration>Returns whether the given flag was specified and removes it from the list of arguments remaining.<\/Para><\/Abstract><\/Function>", "key.doc.name" : "consumeBooleanFlag(_:)", "key.substructure" : [ diff --git a/Tests/SourceKittenFramework/Fixtures/Realm.json b/Tests/SourceKittenFramework/Fixtures/Realm.json index 9852c05a8..35c621169 100644 --- a/Tests/SourceKittenFramework/Fixtures/Realm.json +++ b/Tests/SourceKittenFramework/Fixtures/Realm.json @@ -4,7 +4,7 @@ "key.substructure" : [ { "key.kind" : "sourcekitten.source.lang.objc.decl.class", - "key.parsed_declaration" : "@interface RLMArray < RLMObjectType : RLMObject * > : NSObject ", + "key.parsed_declaration" : "@interface RLMArray : NSObject ", "key.doc.comment" : "RLMArray is the container type in Realm used to define to-many relationships.\n\nUnlike an NSArray, RLMArrays hold a single type, specified by the `objectClassName` property.\nThis is referred to in these docs as the “type” of the array.\n\nWhen declaring an RLMArray property, the type must be marked as conforming to a\nprotocol by the same name as the objects it should contain (see the\n`RLM_ARRAY_TYPE` macro). RLMArray properties can also use Objective-C generics\nif available. For example:\n\n RLM_ARRAY_TYPE(ObjectType)\n ...\n @property RLMArray *arrayOfObjectTypes;\n\nRLMArrays can be queried with the same predicates as RLMObject and RLMResults.\n\nRLMArrays cannot be created directly. RLMArray properties on RLMObjects are\nlazily created when accessed, or can be obtained by querying a Realm.\n\n### Key-Value Observing\n\nRLMArray supports array key-value observing on RLMArray properties on RLMObject\nsubclasses, and the `invalidated` property on RLMArray instances themselves is\nkey-value observing compliant when the RLMArray is attached to a persisted\nRLMObject (RLMArrays on standalone RLMObjects will never become invalidated).\n\nBecause RLMArrays are attached to the object which they are a property of, they\ndo not require using the mutable collection proxy objects from\n`-mutableArrayValueForKey:` or KVC-compatible mutation methods on the containing\nobject. Instead, you can call the mutation methods on the RLMArray directly.", "key.doc.line" : 62, "key.name" : "RLMArray", @@ -509,7 +509,7 @@ }, { "key.kind" : "sourcekitten.source.lang.objc.decl.method.instance", - "key.parsed_declaration" : "- (nonnull RLMResults *)objectsWhere:\n (nonnull NSString *)predicateFormat, ...;", + "key.parsed_declaration" : "- (nonnull RLMResults *)objectsWhere:\n (nonnull NSString *)predicateFormat, ...;", "key.doc.comment" : "Get objects matching the given predicate in the RLMArray.\n\n- parameter: predicateFormat The predicate format string which can accept variable arguments.\n\n- returns: An RLMResults of objects that match the given predicate", "key.doc.parameters" : [ { @@ -540,7 +540,7 @@ }, { "key.kind" : "sourcekitten.source.lang.objc.decl.method.instance", - "key.parsed_declaration" : "- (nonnull RLMResults *)objectsWithPredicate:\n (nonnull NSPredicate *)predicate;", + "key.parsed_declaration" : "- (nonnull RLMResults *)objectsWithPredicate:\n (nonnull NSPredicate *)predicate;", "key.doc.comment" : "Get objects matching the given predicate in the RLMArray.\n\n- parameter: predicate The predicate to filter the objects.\n\n- returns: An RLMResults of objects that match the given predicate", "key.doc.parameters" : [ { @@ -571,7 +571,7 @@ }, { "key.kind" : "sourcekitten.source.lang.objc.decl.method.instance", - "key.parsed_declaration" : "- (nonnull RLMResults *)\n sortedResultsUsingProperty:(nonnull NSString *)property\n ascending:(BOOL)ascending;", + "key.parsed_declaration" : "- (nonnull RLMResults *)\nsortedResultsUsingProperty:(nonnull NSString *)property\n ascending:(BOOL)ascending;", "key.doc.comment" : "Get a sorted RLMResults from an RLMArray\n\n- parameter: property The property name to sort by.\n- parameter: ascending The direction to sort by.\n\n- returns: An RLMResults sorted by the specified property.", "key.doc.parameters" : [ { @@ -611,7 +611,7 @@ }, { "key.kind" : "sourcekitten.source.lang.objc.decl.method.instance", - "key.parsed_declaration" : "- (nonnull RLMResults *)sortedResultsUsingDescriptors:\n (nonnull NSArray *)properties;", + "key.parsed_declaration" : "- (nonnull RLMResults *)sortedResultsUsingDescriptors:\n (nonnull NSArray *)properties;", "key.doc.comment" : "Get a sorted RLMResults from an RLMArray\n\n- parameter: properties An array of `RLMSortDescriptor`s to sort by.\n\n- returns: An RLMResults sorted by the specified properties.", "key.doc.parameters" : [ { @@ -1179,7 +1179,7 @@ }, { "key.kind" : "sourcekitten.source.lang.objc.decl.method.instance", - "key.parsed_declaration" : "- (nonnull RLMResults *)sortedResultsUsingDescriptors:\n (nonnull NSArray *)properties;", + "key.parsed_declaration" : "- (nonnull RLMResults *)sortedResultsUsingDescriptors:\n (nonnull NSArray *)properties;", "key.doc.comment" : "Get a sorted RLMResults from an RLMCollection.\n\n- parameter: properties An array of `RLMSortDescriptor`s to sort by.\n\n- returns: An RLMResults sorted by the specified properties.", "key.doc.parameters" : [ { @@ -2851,7 +2851,7 @@ }, { "key.kind" : "sourcekitten.source.lang.objc.decl.method.instance", - "key.parsed_declaration" : "- (nullable RLMProperty *)objectForKeyedSubscript:\n (nonnull id)propertyName;", + "key.parsed_declaration" : "- (nullable RLMProperty *)objectForKeyedSubscript:\n (nonnull id)propertyName;", "key.doc.comment" : "Retrieve an RLMProperty object by name.\n\n- parameter: propertyName The property's name.\n\n- returns: RLMProperty object or nil if there is no property with the given name.", "key.doc.parameters" : [ { @@ -3136,7 +3136,7 @@ }, { "key.kind" : "sourcekitten.source.lang.objc.decl.method.class", - "key.parsed_declaration" : "+ (nullable instancetype)\n realmWithConfiguration:(nonnull RLMRealmConfiguration *)configuration\n error:(NSError *_Nullable *_Nullable)error;", + "key.parsed_declaration" : "+ (nullable instancetype)\nrealmWithConfiguration:(nonnull RLMRealmConfiguration *)configuration\n error:(NSError *_Nullable *_Nullable)error;", "key.doc.comment" : "Obtains an `RLMRealm` instance with the given configuration.\n\n- parameter: configuration The configuration for the realm.\n- parameter: error If an error occurs, upon return contains an `NSError` object\n that describes the problem. If you are not interested in\n possible errors, pass in `NULL`.\n\n- returns: An `RLMRealm` instance.", "key.doc.parameters" : [ { @@ -3311,7 +3311,7 @@ }, { "key.kind" : "sourcekitten.source.lang.objc.decl.method.instance", - "key.parsed_declaration" : "- (nonnull RLMNotificationToken *)addNotificationBlock:\n (nonnull RLMNotificationBlock)block;", + "key.parsed_declaration" : "- (nonnull RLMNotificationToken *)addNotificationBlock:\n (nonnull RLMNotificationBlock)block;", "key.doc.comment" : "Add a notification handler for changes in this RLMRealm.\n\nThe block has the following definition:\n\n typedef void(^RLMNotificationBlock)(NSString *notification, RLMRealm *realm);\n\nIt receives the following parameters:\n\n- `NSString` \\***notification**: The name of the incoming notification. See\n RLMRealmNotification for information on what\n notifications are sent.\n- `RLMRealm` \\***realm**: The realm for which this notification occurred\n\n- parameter: block A block which is called to process RLMRealm notifications.\n\n- returns: A token object which can later be passed to `-removeNotification:`\n to remove this notification.", "key.doc.parameters" : [ { @@ -3934,7 +3934,7 @@ }, { "key.kind" : "sourcekitten.source.lang.objc.decl.method.class", - "key.parsed_declaration" : "+ (nonnull NSError *)migrateRealm:\n (nonnull RLMRealmConfiguration *)configuration;", + "key.parsed_declaration" : "+ (nonnull NSError *)migrateRealm:\n (nonnull RLMRealmConfiguration *)configuration;", "key.doc.comment" : "Performs the given Realm configuration's migration block on a Realm at the given path.\n\nThis method is called automatically when opening a Realm for the first time and does\nnot need to be called explicitly. You can choose to call this method to control\nexactly when and how migrations are performed.\n\n- parameter: configuration The Realm configuration used to open and migrate the Realm.\n- returns: The error that occurred while applying the migration, if any.\n\n- see: RLMMigration", "key.doc.parameters" : [ { @@ -4222,7 +4222,7 @@ "key.substructure" : [ { "key.kind" : "sourcekitten.source.lang.objc.decl.class", - "key.parsed_declaration" : "@interface RLMResults < RLMObjectType : RLMObject * > : NSObject ", + "key.parsed_declaration" : "@interface RLMResults : NSObject ", "key.doc.comment" : "RLMResults is an auto-updating container type in Realm returned from object\nqueries.\n\nRLMResults can be queried with the same predicates as RLMObject and RLMArray\nand you can chain queries to further filter query results.\n\nRLMResults cannot be created directly.", "key.doc.line" : 36, "key.name" : "RLMResults", @@ -4464,7 +4464,7 @@ }, { "key.kind" : "sourcekitten.source.lang.objc.decl.method.instance", - "key.parsed_declaration" : "- (nonnull RLMResults *)objectsWhere:\n (nonnull NSString *)predicateFormat, ...;", + "key.parsed_declaration" : "- (nonnull RLMResults *)objectsWhere:\n (nonnull NSString *)predicateFormat, ...;", "key.doc.comment" : "Get objects matching the given predicate in the RLMResults.\n\n- parameter: predicateFormat The predicate format string which can accept variable arguments.\n\n- returns: An RLMResults of objects that match the given predicate", "key.doc.parameters" : [ { @@ -4495,7 +4495,7 @@ }, { "key.kind" : "sourcekitten.source.lang.objc.decl.method.instance", - "key.parsed_declaration" : "- (nonnull RLMResults *)objectsWithPredicate:\n (nonnull NSPredicate *)predicate;", + "key.parsed_declaration" : "- (nonnull RLMResults *)objectsWithPredicate:\n (nonnull NSPredicate *)predicate;", "key.doc.comment" : "Get objects matching the given predicate in the RLMResults.\n\n- parameter: predicate The predicate to filter the objects.\n\n- returns: An RLMResults of objects that match the given predicate", "key.doc.parameters" : [ { @@ -4526,7 +4526,7 @@ }, { "key.kind" : "sourcekitten.source.lang.objc.decl.method.instance", - "key.parsed_declaration" : "- (nonnull RLMResults *)\n sortedResultsUsingProperty:(nonnull NSString *)property\n ascending:(BOOL)ascending;", + "key.parsed_declaration" : "- (nonnull RLMResults *)\nsortedResultsUsingProperty:(nonnull NSString *)property\n ascending:(BOOL)ascending;", "key.doc.comment" : "Get a sorted `RLMResults` from an existing `RLMResults` sorted by a property.\n\n- parameter: property The property name to sort by.\n- parameter: ascending The direction to sort by.\n\n- returns: An RLMResults sorted by the specified property.", "key.doc.parameters" : [ { @@ -4566,7 +4566,7 @@ }, { "key.kind" : "sourcekitten.source.lang.objc.decl.method.instance", - "key.parsed_declaration" : "- (nonnull RLMResults *)sortedResultsUsingDescriptors:\n (nonnull NSArray *)properties;", + "key.parsed_declaration" : "- (nonnull RLMResults *)sortedResultsUsingDescriptors:\n (nonnull NSArray *)properties;", "key.doc.comment" : "Get a sorted `RLMResults` from an existing `RLMResults` sorted by an `NSArray`` of `RLMSortDescriptor`s.\n\n- parameter: properties An array of `RLMSortDescriptor`s to sort by.\n\n- returns: An RLMResults sorted by the specified properties.", "key.doc.parameters" : [ { @@ -4869,7 +4869,7 @@ }, { "key.kind" : "sourcekitten.source.lang.objc.decl.method.instance", - "key.parsed_declaration" : "- (nonnull RLMObjectSchema *)objectForKeyedSubscript:\n (nonnull id)className;", + "key.parsed_declaration" : "- (nonnull RLMObjectSchema *)objectForKeyedSubscript:\n (nonnull id)className;", "key.doc.comment" : "Look up an RLMObjectSchema for the given class name in this Realm. Throws if there\nis no object of type className in this RLMSchema instance.\n\n- parameter: className The object class name.\n- returns: RLMObjectSchema for the given class in this Realm.\n\n- see: RLMObjectSchema", "key.doc.parameters" : [ { diff --git a/Tests/SourceKittenFramework/Fixtures/SimpleCodeCompletion.json b/Tests/SourceKittenFramework/Fixtures/SimpleCodeCompletion.json index 66100320a..79be8d4d3 100644 --- a/Tests/SourceKittenFramework/Fixtures/SimpleCodeCompletion.json +++ b/Tests/SourceKittenFramework/Fixtures/SimpleCodeCompletion.json @@ -1,21 +1,21 @@ [{ "descriptionKey" : "advancedBy(n: Distance)", - "associatedUSRs" : "s:FSi10advancedByFSiFSiSi s:FPSs21RandomAccessIndexType10advancedByuRq_S__Fq_Fqq_Ss16ForwardIndexType8Distanceq_ s:FPSs16ForwardIndexType10advancedByuRq_S__Fq_Fqq_S_8Distanceq_ s:FPSs10Strideable10advancedByuRq_S__Fq_Fqq_S_6Strideq_ s:FPSs11_Strideable10advancedByuRq_S__Fq_Fqq_S_6Strideq_", + "associatedUSRs" : "s:FSi10advancedByFSiSi s:FPs21RandomAccessIndexType10advancedByFwx8Distancex s:FPs16ForwardIndexType10advancedByFwx8Distancex s:FPs10Strideable10advancedByFwx6Stridex", "kind" : "source.lang.swift.decl.function.method.instance", "sourcetext" : "advancedBy(<#T##n: Distance##Distance#>)", "context" : "source.codecompletion.context.thisclass", "typeName" : "Int", "moduleName" : "Swift", - "name" : "advancedBy(n:)" + "name" : "advancedBy(:)" }, { "descriptionKey" : "advancedBy(n: Int, limit: Int)", - "associatedUSRs" : "s:FeRq_Ss21RandomAccessIndexType_SsS_10advancedByuRq_S__Fq_FTqq_Ss16ForwardIndexType8Distance5limitq__q_", + "associatedUSRs" : "s:FEsPs21RandomAccessIndexType10advancedByFTwx8Distance5limitx_x", "kind" : "source.lang.swift.decl.function.method.instance", "sourcetext" : "advancedBy(<#T##n: Int##Int#>, limit: <#T##Int#>)", "context" : "source.codecompletion.context.superclass", "typeName" : "Int", "moduleName" : "Swift", - "name" : "advancedBy(n:limit:)" + "name" : "advancedBy(:limit:)" }, { "descriptionKey" : "bigEndian", "docBrief" : "Returns the big-endian representation of the integer, changing the byte order if necessary.", @@ -40,7 +40,7 @@ "descriptionKey" : "description", "docBrief" : "A textual representation of self.", "kind" : "source.lang.swift.decl.var.instance", - "associatedUSRs" : "s:vSi11descriptionSS s:vPSs23CustomStringConvertible11descriptionSS", + "associatedUSRs" : "s:vSi11descriptionSS s:vPs23CustomStringConvertible11descriptionSS", "sourcetext" : "description", "context" : "source.codecompletion.context.thisclass", "typeName" : "String", @@ -48,18 +48,18 @@ "name" : "description" }, { "descriptionKey" : "distanceTo(other: Int)", - "associatedUSRs" : "s:FSi10distanceToFSiFSiSi s:FPSs21RandomAccessIndexType10distanceTouRq_S__Fq_Fq_qq_Ss16ForwardIndexType8Distance s:FPSs16ForwardIndexType10distanceTouRq_S__Fq_Fq_qq_S_8Distance s:FPSs10Strideable10distanceTouRq_S__Fq_Fq_qq_S_6Stride s:FPSs11_Strideable10distanceTouRq_S__Fq_Fq_qq_S_6Stride", + "associatedUSRs" : "s:FSi10distanceToFSiSi s:FPs21RandomAccessIndexType10distanceToFxwx8Distance s:FPs16ForwardIndexType10distanceToFxwx8Distance s:FPs10Strideable10distanceToFxwx6Stride", "kind" : "source.lang.swift.decl.function.method.instance", "sourcetext" : "distanceTo(<#T##other: Int##Int#>)", "context" : "source.codecompletion.context.thisclass", "typeName" : "Distance", "moduleName" : "Swift", - "name" : "distanceTo(other:)" + "name" : "distanceTo(:)" }, { "descriptionKey" : "hashValue", "docBrief" : "The hash value.", "kind" : "source.lang.swift.decl.var.instance", - "associatedUSRs" : "s:vSi9hashValueSi s:vPSs8Hashable9hashValueSi", + "associatedUSRs" : "s:vSi9hashValueSi s:vPs8Hashable9hashValueSi", "sourcetext" : "hashValue", "context" : "source.codecompletion.context.thisclass", "typeName" : "Int", @@ -79,7 +79,7 @@ "descriptionKey" : "predecessor()", "docBrief" : "Returns the previous consecutive value before self.", "kind" : "source.lang.swift.decl.function.method.instance", - "associatedUSRs" : "s:FSi11predecessorFSiFT_Si s:FPSs22BidirectionalIndexType11predecessoruRq_S__Fq_FT_q_", + "associatedUSRs" : "s:FSi11predecessorFT_Si s:FPs22BidirectionalIndexType11predecessorFT_x", "sourcetext" : "predecessor()", "context" : "source.codecompletion.context.thisclass", "typeName" : "Int", @@ -87,9 +87,9 @@ "name" : "predecessor()" }, { "descriptionKey" : "stride(through: Int, by: Distance)", - "docBrief" : "Return the sequence of values (start, start + stride, start + stride + stride, ... last) where last is the last value in the progression less than or equal to end.", + "docBrief" : "Returns the sequence of values (self, self + stride, self + stride + stride, ... last) where last is the last value in the progression less than or equal to end.", "kind" : "source.lang.swift.decl.function.method.instance", - "associatedUSRs" : "s:FeRq_Ss10Strideable_SsS_6strideuRq_S__Fq_FT7throughq_2byqq_S_6Stride_GVSs13StrideThroughq__", + "associatedUSRs" : "s:FEsPs10Strideable6strideFT7throughx2bywx6Stride_GVs13StrideThroughx_", "sourcetext" : "stride(through: <#T##Int#>, by: <#T##Distance#>)", "context" : "source.codecompletion.context.superclass", "typeName" : "StrideThrough", @@ -97,9 +97,9 @@ "name" : "stride(through:by:)" }, { "descriptionKey" : "stride(to: Int, by: Distance)", - "docBrief" : "Return the sequence of values (self, self + stride, self + stride + stride, ... last) where last is the last value in the progression that is less than end.", + "docBrief" : "Returns the sequence of values (self, self + stride, self + stride + stride, ... last) where last is the last value in the progression that is less than end.", "kind" : "source.lang.swift.decl.function.method.instance", - "associatedUSRs" : "s:FeRq_Ss10Strideable_SsS_6strideuRq_S__Fq_FT2toq_2byqq_S_6Stride_GVSs8StrideToq__", + "associatedUSRs" : "s:FEsPs10Strideable6strideFT2tox2bywx6Stride_GVs8StrideTox_", "sourcetext" : "stride(to: <#T##Int#>, by: <#T##Distance#>)", "context" : "source.codecompletion.context.superclass", "typeName" : "StrideTo", @@ -109,7 +109,7 @@ "descriptionKey" : "successor()", "docBrief" : "Returns the next consecutive value after self.", "kind" : "source.lang.swift.decl.function.method.instance", - "associatedUSRs" : "s:FSi9successorFSiFT_Si s:FPSs14_Incrementable9successoruRq_S__Fq_FT_q_", + "associatedUSRs" : "s:FSi9successorFT_Si s:FPs14_Incrementable9successorFT_x", "sourcetext" : "successor()", "context" : "source.codecompletion.context.thisclass", "typeName" : "Int", @@ -119,19 +119,10 @@ "descriptionKey" : "toIntMax()", "docBrief" : "Represent this number using Swift's widest native signed integer type.", "kind" : "source.lang.swift.decl.function.method.instance", - "associatedUSRs" : "s:FSi8toIntMaxFSiFT_VSs5Int64 s:FPSs18_SignedIntegerType8toIntMaxuRq_S__Fq_FT_VSs5Int64 s:FPSs21IntegerArithmeticType8toIntMaxuRq_S__Fq_FT_VSs5Int64 s:FPSs17SignedIntegerType8toIntMaxuRq_S__Fq_FT_VSs5Int64", + "associatedUSRs" : "s:FSi8toIntMaxFT_Vs5Int64 s:FPs18_SignedIntegerType8toIntMaxFT_Vs5Int64 s:FPs21IntegerArithmeticType8toIntMaxFT_Vs5Int64 s:FPs17SignedIntegerType8toIntMaxFT_Vs5Int64", "sourcetext" : "toIntMax()", "context" : "source.codecompletion.context.thisclass", "typeName" : "IntMax", "moduleName" : "Swift", "name" : "toIntMax()" -}, { - "descriptionKey" : "value", - "associatedUSRs" : "s:vSi5valueBi64_", - "kind" : "source.lang.swift.decl.var.instance", - "sourcetext" : "value", - "context" : "source.codecompletion.context.thisclass", - "typeName" : "Int64", - "moduleName" : "Swift", - "name" : "value" }] diff --git a/Tests/SourceKittenFramework/Fixtures/Subscript.json b/Tests/SourceKittenFramework/Fixtures/Subscript.json index 3f0119595..fe8f4946a 100644 --- a/Tests/SourceKittenFramework/Fixtures/Subscript.json +++ b/Tests/SourceKittenFramework/Fixtures/Subscript.json @@ -29,10 +29,10 @@ "key.name" : "subscript(_:)", "key.doc.column" : 5, "key.parsed_scope.end" : 3, - "key.usr" : "s:sV9Subscript10VoidStruct9subscriptFSST_", + "key.usr" : "s:iV9Subscript10VoidStruct9subscriptFSST_", "key.doc.type" : "Other", "key.doc.file" : "Subscript.swift", - "key.doc.full_as_xml" : "subscript(_:)<\/Name>s:sV9Subscript10VoidStruct9subscriptFSST_<\/USR>subscript (key: String) -> () { get set }<\/Declaration>Returns or sets Void.<\/Para><\/Abstract><\/Other>", + "key.doc.full_as_xml" : "subscript(_:)<\/Name>s:iV9Subscript10VoidStruct9subscriptFSST_<\/USR>subscript (key: String) -> () { get set }<\/Declaration>Returns or sets Void.<\/Para><\/Abstract><\/Other>", "key.doc.name" : "subscript(_:)", "key.annotated_decl" : "subscript (key: String<\/Type>) -> () { get set }<\/Declaration>", "key.parsed_scope.start" : 3, diff --git a/Tests/SourceKittenFramework/ModuleTests.swift b/Tests/SourceKittenFramework/ModuleTests.swift index ff205db77..26b010271 100644 --- a/Tests/SourceKittenFramework/ModuleTests.swift +++ b/Tests/SourceKittenFramework/ModuleTests.swift @@ -10,7 +10,7 @@ import Foundation import SourceKittenFramework import XCTest -let projectRoot = (((__FILE__ as NSString) +let projectRoot = (((#file as NSString) .stringByDeletingLastPathComponent as NSString) .stringByDeletingLastPathComponent as NSString) .stringByDeletingLastPathComponent @@ -18,7 +18,7 @@ let projectRoot = (((__FILE__ as NSString) class ModuleTests: XCTestCase { func testModuleNilInPathWithNoXcodeProject() { - let pathWithNoXcodeProject = (__FILE__ as NSString).stringByDeletingLastPathComponent + let pathWithNoXcodeProject = (#file as NSString).stringByDeletingLastPathComponent let model = Module(xcodeBuildArguments: [], name: nil, inPath: pathWithNoXcodeProject) XCTAssert(model == nil, "model initialization without any Xcode project should fail") } diff --git a/Tests/SourceKittenFramework/SourceKitTests.swift b/Tests/SourceKittenFramework/SourceKitTests.swift index fd448eeb3..53701a7c9 100644 --- a/Tests/SourceKittenFramework/SourceKitTests.swift +++ b/Tests/SourceKittenFramework/SourceKitTests.swift @@ -100,6 +100,7 @@ class SourceKitTests: XCTestCase { func testSwiftDeclarationKind() { let expected: [SwiftDeclarationKind] = [ + .Associatedtype, .Class, .Enum, .Enumcase, @@ -121,7 +122,9 @@ class SourceKitTests: XCTestCase { .FunctionMethodClass, .FunctionMethodInstance, .FunctionMethodStatic, - .FunctionOperator, + .FunctionOperatorInfix, + .FunctionOperatorPostfix, + .FunctionOperatorPrefix, .FunctionSubscript, .GenericTypeParam, .Module, diff --git a/Tests/SourceKittenFramework/StringTests.swift b/Tests/SourceKittenFramework/StringTests.swift index 6f68f6d77..ebf26809e 100644 --- a/Tests/SourceKittenFramework/StringTests.swift +++ b/Tests/SourceKittenFramework/StringTests.swift @@ -78,7 +78,7 @@ class StringTests: XCTestCase { func testAbsolutePath() { XCTAssert(("LICENSE".absolutePathRepresentation() as NSString).absolutePath, "absolutePathRepresentation() of a relative path should be an absolute path") - XCTAssertEqual(__FILE__.absolutePathRepresentation(), __FILE__, "absolutePathRepresentation() should return the caller if it's already an absolute path") + XCTAssertEqual(#file.absolutePathRepresentation(), #file, "absolutePathRepresentation() should return the caller if it's already an absolute path") } func testIsTokenDocumentable() { diff --git a/Tests/SourceKittenFramework/StructureTests.swift b/Tests/SourceKittenFramework/StructureTests.swift index 2a8900ea8..a29bcbb32 100644 --- a/Tests/SourceKittenFramework/StructureTests.swift +++ b/Tests/SourceKittenFramework/StructureTests.swift @@ -23,8 +23,8 @@ class StructureTests: XCTestCase { } func testGenerateSameStructureFileAndContents() { - let fileContents = try! NSString(contentsOfFile: __FILE__, encoding: NSUTF8StringEncoding) as String! - XCTAssertEqual(Structure(file: File(path: __FILE__)!), + let fileContents = try! NSString(contentsOfFile: #file, encoding: NSUTF8StringEncoding) as String! + XCTAssertEqual(Structure(file: File(path: #file)!), Structure(file: File(contents: fileContents)), "should generate the same structure for a file as raw text") } diff --git a/Tests/SourceKittenFramework/SyntaxTests.swift b/Tests/SourceKittenFramework/SyntaxTests.swift index ffee6c965..8cf018560 100644 --- a/Tests/SourceKittenFramework/SyntaxTests.swift +++ b/Tests/SourceKittenFramework/SyntaxTests.swift @@ -30,8 +30,8 @@ class SyntaxTests: XCTestCase { } func testGenerateSameSyntaxMapFileAndContents() { - let fileContents = try! NSString(contentsOfFile: __FILE__, encoding: NSUTF8StringEncoding) as String! - XCTAssertEqual(SyntaxMap(file: File(path: __FILE__)!), + let fileContents = try! NSString(contentsOfFile: #file, encoding: NSUTF8StringEncoding) as String! + XCTAssertEqual(SyntaxMap(file: File(path: #file)!), SyntaxMap(file: File(contents: fileContents)), "should generate the same syntax map for a file as raw text") } From 3c319596b079eefc264f47dab74e00cc9182c019 Mon Sep 17 00:00:00 2001 From: JP Simard Date: Wed, 30 Mar 2016 14:05:54 -0700 Subject: [PATCH 2/2] go back to 03-01 snapshot --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 80435e844..744700f5a 100644 --- a/Makefile +++ b/Makefile @@ -16,7 +16,7 @@ OUTPUT_PACKAGE=SourceKitten.pkg VERSION_STRING=$(shell agvtool what-marketing-version -terse1) COMPONENTS_PLIST=Source/sourcekitten/Components.plist -SWIFT_SNAPSHOT=swift-DEVELOPMENT-SNAPSHOT-2016-03-24-a +SWIFT_SNAPSHOT=swift-DEVELOPMENT-SNAPSHOT-2016-03-01-a SWIFT_COMMAND=/Library/Developer/Toolchains/$(SWIFT_SNAPSHOT).xctoolchain/usr/bin/swift SWIFT_BUILD_COMMAND=$(SWIFT_COMMAND) build SWIFT_TEST_COMMAND=$(SWIFT_COMMAND) test