[SE-0112] Associate various error-code enums with their error domains in the SDK.

DougGregor · DougGregor · commit 00bb9d10378a · 2016-07-13T11:15:01.000-07:00
diff --git a/apinotes/AVKit.apinotes b/apinotes/AVKit.apinotes
@@ -0,0 +1,6 @@
+---
+Name: AVKit
+Tags:
+- Name: AVKitError
+  NSErrorDomain: AVKitErrorDomain
+
diff --git a/apinotes/CMakeLists.txt b/apinotes/CMakeLists.txt
@@ -1,5 +1,6 @@
 set(SWIFT_API_NOTES_INPUTS
   AVFoundation
+  AVKit
   AppKit
   AudioToolbox
   CallKit
@@ -9,28 +10,39 @@ set(SWIFT_API_NOTES_INPUTS
   CoreData
   CoreGraphics
   CoreLocation
+  CoreSpotlight
   CoreText
   Dispatch
   EventKit
+  ExternalAccessory
   Foundation
   GameKit
+  GLKit
+  HealthKit
   HomeKit
+  iAd
   Intents
   LocalAuthentication
+  MapKit
   MediaPlayer
+  MessageUI
   Metal
   MultipeerConnectivity
+  NetworkExtension
   NotificationCenter
   ObjectiveC
   PassKit
   QuartzCore
   QuickLook
+  SafariServices
   SceneKit
   SpriteKit
   StoreKit
   TVMLKit
   TVServices
   UIKit
+  UserNotifications
+  VideoSubscriberAccount
   WatchConnectivity
   WatchKit
   WebKit
diff --git a/apinotes/CoreSpotlight.apinotes b/apinotes/CoreSpotlight.apinotes
@@ -0,0 +1,7 @@
+---
+Name: CoreSpotlight
+Tags:
+- Name: CSIndexErrorCode
+  NSErrorDomain: CSIndexErrorDomain
+- Name: CSSearchQueryErrorCode
+  NSErrorDomain: CSSearchQueryErrorDomain
diff --git a/apinotes/CoreText.apinotes b/apinotes/CoreText.apinotes
@@ -1,6 +1,8 @@
 ---
 Name: CoreText
-
+Tags:
+- Name: CTFontManagerError
+  NSErrorDomain: kCTFontManagerErrorDomain
 Enumerators:
 - Name: kCTUnderlinePatternSolid
   SwiftName: patternSolid
diff --git a/apinotes/ExternalAccessory.apinotes b/apinotes/ExternalAccessory.apinotes
@@ -0,0 +1,5 @@
+---
+Name: ExternalAccessory
+Tags:
+- Name: EABluetoothAccessoryPickerErrorCode
+  NSErrorDomain: EABluetoothAccessoryPickerErrorDomain
diff --git a/apinotes/GLKit.apinotes b/apinotes/GLKit.apinotes
@@ -0,0 +1,5 @@
+---
+Name: GLKit
+Tags:
+- Name: GLKTextureLoaderError
+  NSErrorDomain: GLKTextureLoaderErrorDomain
diff --git a/apinotes/GameKit.apinotes b/apinotes/GameKit.apinotes
@@ -9,3 +9,9 @@ Classes:
 Tags:
 - Name: GKErrorCode
   NSErrorDomain: GKErrorDomain
+- Name: GKGameSessionErrorCode
+  NSErrorDomain: GKGameSessionErrorDomain
+- Name: GKSessionError
+  NSErrorDomain: GKSessionErrorDomain
+- Name: GKVoiceChatServiceError
+  NSErrorDomain: GKVoiceChatServiceErrorDomain
diff --git a/apinotes/HealthKit.apinotes b/apinotes/HealthKit.apinotes
@@ -0,0 +1,5 @@
+---
+Name:            HealthKit
+Tags:
+- Name: HKErrorCode
+  NSErrorDomain: HKErrorDomain
diff --git a/apinotes/MapKit.apinotes b/apinotes/MapKit.apinotes
@@ -0,0 +1,5 @@
+---
+Name:            MapKit
+Tags:
+- Name: MKErrorCode
+  NSErrorDomain: MKErrorDomain
diff --git a/apinotes/MediaPlayer.apinotes b/apinotes/MediaPlayer.apinotes
@@ -19,3 +19,6 @@ Classes:
   - Selector: 'getPlaylistWithUUID:creationMetadata:completionHandler:'
     SwiftName: 'getPlaylist(with:creationMetadata:completionHandler:)'
     MethodKind: Instance
+Tags:
+- Name: MPErrorCode
+  NSErrorDomain: MPErrorDomain
diff --git a/apinotes/MessageUI.apinotes b/apinotes/MessageUI.apinotes
@@ -0,0 +1,5 @@
+---
+Name:            MessageUI
+Tags:
+- Name: MFMailComposeErrorCode
+  NSErrorDomain: MFMailComposeErrorDomain
diff --git a/apinotes/Metal.apinotes b/apinotes/Metal.apinotes
@@ -1,5 +1,12 @@
 ---
 Name: Metal
+Tags:
+- Name: MTLCommandBufferError
+  SwiftName: MTLCommandBufferErrorDomain
+- Name: MTLLibraryError
+  SwiftName: MTLLibraryErrorDomain
+- Name: MTLRenderPipelineError
+  SwiftName: MTLRenderPipelineErrorDomain
 Enumerators:
 - Name: MTLTextureUsageUnknown
   SwiftName: unknown
diff --git a/apinotes/NetworkExtension.apinotes b/apinotes/NetworkExtension.apinotes
@@ -0,0 +1,11 @@
+---
+Name: NetworkExtension
+Tags:
+- Name: NEAppProxyFlowError
+  SwiftName: NEAppProxyErrorDomain
+- Name: NEFilterError
+  SwiftName: NEFilterErrorDomain
+- Name: NETunnelProviderError
+  SwiftName: NETunnelProviderErrorDomain
+- Name: NEVPNError
+  SwiftName: NEVPNErrorDomain
diff --git a/apinotes/SafariServices.apinotes b/apinotes/SafariServices.apinotes
@@ -0,0 +1,7 @@
+---
+Name: SafariServices
+Tags:
+- Name: SFErrorCode
+  SwiftName: SFErrorDomain
+- Name: SSReadingListErrorCode
+  SwiftName: SSReadingListErrorDomain
diff --git a/apinotes/StoreKit.apinotes b/apinotes/StoreKit.apinotes
@@ -1,9 +1,11 @@
 ---
-Name: StoreKind
+Name: StoreKit
 Classes:
 - Name: SKPaymentQueue
   Methods:
   - Selector: 'resumeDownloads:'
     MethodKind: Instance
     SwiftName: 'resume(_:)'
-
+Tags:
+- Name: SKErrorCode
+  NSErrorDomain: SKErrorDomain
diff --git a/apinotes/UserNotifications.apinotes b/apinotes/UserNotifications.apinotes
@@ -0,0 +1,6 @@
+---
+Name: UserNotifications
+Tags:
+- Name: UNErrorCode
+  NSErrorDomain: UNErrorDomain
+
diff --git a/apinotes/VideoSubscriberAccount.apinotes b/apinotes/VideoSubscriberAccount.apinotes
@@ -0,0 +1,5 @@
+---
+Name: VideoSubscriberAccount
+Tags:
+- Name: VSErrorCode
+  NSErrorDomain: VSErrorDomain
diff --git a/apinotes/iAd.apinotes b/apinotes/iAd.apinotes
@@ -0,0 +1,7 @@
+---
+Name: iAd
+Tags:
+- Name: ADError
+  NSErrorDomain: ADErrorDomain
+- Name: ADClientError
+  NSErrorDomain: ADClientErrorDomain
diff --git a/stdlib/public/SDK/CoreData/CoreData.swift b/stdlib/public/SDK/CoreData/CoreData.swift
@@ -259,6 +259,45 @@ extension CocoaError {
   }
 }
 
+extension CocoaError {
+  /// Object that failed to validate for a validation error.
+  public var validationObject: AnyObject? {
+    return userInfo[NSValidationObjectErrorKey]
+  }
+
+  /// Key that failed to validate for a validation error.
+  public var validationKey: String? {
+    return userInfo[NSValidationKeyErrorKey] as? String
+  }
+
+  /// For predicate-based validation, the predicate for the condition
+  /// that failed to validate.
+  public var validationPredicate: Predicate? {
+    return userInfo[NSValidationPredicateErrorKey] as? Predicate
+  }
+
+  /// The value for the key that failed to validate for a validation
+  /// error.
+  public var validationValue: AnyObject? {
+    return userInfo[NSValidationValueErrorKey]
+  }
+
+  /// Stores prompting an error.
+  public var affectedStores: [AnyObject]? {
+    return userInfo[NSAffectedStoresErrorKey] as? [AnyObject]
+  }
+
+  /// Objects prompting an error.
+  public var affectedObjects: [AnyObject]? {
+    return userInfo[NSAffectedObjectsErrorKey] as? [AnyObject]
+  }
+
+  /// The conflicts that arise from a persistent store.
+  public var persistentStoreSaveConflicts: [NSMergeConflict]? {
+    return userInfo[NSPersistentStoreSaveConflictsErrorKey] as? [NSMergeConflict]
+  }
+}
+
 extension CocoaError {
   @available(*, unavailable, renamed: "managedObjectValidationError")
   public static var ManagedObjectValidationError: CocoaError.Code {
