[xtro] Report missing-protocol-conformance when protocols are defined…

src/avfoundation.cs

@@ -4205,11 +4205,7 @@ interface AVAssetCache
 	[BaseType (typeof (AVAsset), Name="AVURLAsset")]
 	// 'init' returns NIL
 	[DisableDefaultCtor]
-	interface AVUrlAsset {
-
-		[TV (10, 2), Mac (10, 12, 4), iOS (10, 3)]
-		[Export ("mayRequireContentKeysForMediaDataProcessing")]
-		bool MayRequireContentKeysForMediaDataProcessing { get; }
+	interface AVUrlAsset : AVContentKeyRecipient {
 
 		[Export ("URL", ArgumentSemantic.Copy)]
 		NSUrl Url { get;  }
@@ -11517,7 +11513,13 @@ interface AVSampleBufferDisplayLayer {
 		bool ReadyForMoreMediaData { [Bind ("isReadyForMoreMediaData")] get; }
 
 		[Export ("enqueueSampleBuffer:")]
+		void Enqueue (CMSampleBuffer sampleBuffer);
+
+#if !XAMCORE_4_0
+		[Wrap ("Enqueue (sampleBuffer)", IsVirtual = true)]
+		[Obsolete ("Use the 'Enqueue' method instead.")]
 		void EnqueueSampleBuffer (CMSampleBuffer sampleBuffer);
+#endif
 
 		[Export ("flush")]
 		void Flush ();
@@ -11526,11 +11528,22 @@ interface AVSampleBufferDisplayLayer {
 		void FlushAndRemoveImage ();
 
 		[Export ("requestMediaDataWhenReadyOnQueue:usingBlock:")]
+		void RequestMediaData (DispatchQueue queue, Action handler);
+
+#if !XAMCORE_4_0
+		[Wrap ("RequestMediaData (queue, enqueuer)", IsVirtual = true)]
+		[Obsolete ("Use the 'RequestMediaData' method instead.")]
 		void RequestMediaDataWhenReadyOnQueue (DispatchQueue queue, Action enqueuer);
+#endif
 
 		[Export ("stopRequestingMediaData")]
 		void StopRequestingMediaData ();
-
+
+		// TODO: Remove (alongside others) when https://github.com/xamarin/xamarin-macios/issues/3213 is fixed and conformance to 'AVQueuedSampleBufferRendering' is restored.
+		[TV (11,0), Mac (10,13), iOS (11,0)]
+		[Export ("timebase", ArgumentSemantic.Retain)]
+		CMTimebase Timebase { get; }
+
 		[iOS (8, 0), Mac (10,10)]
 		[Field ("AVSampleBufferDisplayLayerFailedToDecodeNotification")]
 		[Notification]

src/cloudkit.cs

@@ -12,7 +12,7 @@ namespace XamCore.CloudKit {
 	[iOS (8,0), Mac (10,10, onlyOn64 : true)]
 	[DisableDefaultCtor] // NSInvalidArgumentException Reason: You must call -[CKAsset initWithFileURL:] or -[CKAsset initWithData:]
 	[BaseType (typeof (NSObject))]
-	interface CKAsset : NSCoding, NSSecureCoding {
+	interface CKAsset : NSCoding, NSSecureCoding, CKRecordValue {
 
 		[Export ("initWithFileURL:")]
 		IntPtr Constructor (NSUrl fileUrl);
@@ -1511,7 +1511,7 @@ interface CKRecordZoneID : NSSecureCoding, NSCopying {
 	[iOS (8,0), Mac (10,10, onlyOn64 : true)]
 	[DisableDefaultCtor] // NSInvalidArgumentException Reason: You must call -[CKReference initWithRecordID:] or -[CKReference initWithRecord:] or -[CKReference initWithAsset:]
 	[BaseType (typeof (NSObject))]
-	interface CKReference : NSSecureCoding, NSCopying {
+	interface CKReference : NSSecureCoding, NSCopying, CKRecordValue {
 
 		[DesignatedInitializer]
 		[Export ("initWithRecordID:action:")]

src/coreaudiokit.cs

@@ -28,7 +28,7 @@ namespace XamCore.CoreAudioKit {
 #if XAMCORE_2_0 || !MONOMAC
 	[iOS (9,0)][Mac (10,11, onlyOn64 : true)]
 	[BaseType (typeof(AUViewControllerBase))]
-	interface AUViewController : NSExtensionRequestHandling {
+	interface AUViewController {
 		[Export ("initWithNibName:bundle:")]
 		[PostGet ("NibBundle")]
 		IntPtr Constructor ([NullAllowed] string nibName, [NullAllowed] NSBundle bundle);

src/coredata.cs

@@ -727,7 +727,7 @@ interface NSIncrementalStoreNode {
 	// 'init' issues a warning: CoreData: error: Failed to call designated initializer on NSManagedObject class 'NSManagedObject' 
 	// then crash while disposing the instance
 	[DisableDefaultCtor]
-	interface NSManagedObject {
+	interface NSManagedObject : NSFetchRequestResult {
 		[DesignatedInitializer]
 		[Export ("initWithEntity:insertIntoManagedObjectContext:")]
 		IntPtr Constructor (NSEntityDescription entity, [NullAllowed] NSManagedObjectContext context);
@@ -1145,7 +1145,7 @@ interface NSManagedObjectChangeEventArgs {
 	[BaseType (typeof (NSObject))]
 	// Objective-C exception thrown.  Name: NSInvalidArgumentException Reason: *** -URIRepresentation cannot be sent to an abstract object of class NSManagedObjectID: Create a concrete instance!
 	[DisableDefaultCtor]
-	interface NSManagedObjectID : NSCopying {
+	interface NSManagedObjectID : NSCopying, NSFetchRequestResult {
 
 		[Export ("entity", ArgumentSemantic.Strong)]
 		NSEntityDescription Entity { get; }

src/corelocation.cs

@@ -11,6 +11,7 @@
 //
 using XamCore.ObjCRuntime;
 using XamCore.Foundation;
+using XamCore.CloudKit;
 using XamCore.CoreGraphics;
 using XamCore.CoreLocation;
 #if !MONOMAC
@@ -70,7 +71,7 @@ partial interface CLHeading : NSSecureCoding, NSCopying {
 	}
 
 	[BaseType (typeof (NSObject))]
-	partial interface CLLocation : NSSecureCoding, NSCopying {
+	partial interface CLLocation : NSSecureCoding, NSCopying, CKRecordValue {
 		[Export ("coordinate")]
 		CLLocationCoordinate2D Coordinate { get;  }
 

src/foundation.cs

@@ -32,13 +32,21 @@
 //
 #define DOUBLE_BLOCKS
 using XamCore.ObjCRuntime;
+using XamCore.CloudKit;
+using XamCore.CoreData;
 using XamCore.CoreFoundation;
 using XamCore.Foundation;
 using XamCore.CoreGraphics;
+#if IOS
+using XamCore.QuickLook;
+#endif
+#if !TVOS
+using XamCore.Contacts;
+#endif
 #if !WATCH
+using XamCore.CoreAnimation;
 using XamCore.CoreMedia;
 using XamCore.CoreSpotlight;
-using XamCore.CloudKit;
 #endif
 using XamCore.SceneKit;
 using XamCore.Security;
@@ -48,6 +56,7 @@
 
 #if MONOMAC
 using XamCore.AppKit;
+using XamCore.QuickLookUI;
 #else
 using XamCore.CoreLocation;
 using XamCore.UIKit;
@@ -102,7 +111,7 @@ namespace XamCore.Foundation
 	interface NSArray<TValue> : NSArray {}
 
 	[BaseType (typeof (NSObject))]
-	interface NSArray : NSSecureCoding, NSMutableCopying, INSFastEnumeration {
+	interface NSArray : NSSecureCoding, NSMutableCopying, INSFastEnumeration, CKRecordValue {
 		[Export ("count")]
 		nuint Count { get; }
 
@@ -1372,7 +1381,7 @@ interface NSCompoundPredicate : NSCoding {
 	delegate void NSDataByteRangeEnumerator (IntPtr bytes, NSRange range, ref bool stop);
 
 	[BaseType (typeof (NSObject))]
-	interface NSData : NSSecureCoding, NSMutableCopying {
+	interface NSData : NSSecureCoding, NSMutableCopying, CKRecordValue {
 		[Export ("dataWithContentsOfURL:")]
 		[Static]
 		NSData FromUrl (NSUrl url);
@@ -3495,7 +3504,7 @@ interface NSMutableData {
 	}
 
 	[BaseType (typeof (NSObject))]
-	interface NSDate : NSSecureCoding, NSCopying {
+	interface NSDate : NSSecureCoding, NSCopying, CKRecordValue {
 		[Export ("timeIntervalSinceReferenceDate")]
 		double SecondsSinceReferenceDate { get; }
 
@@ -3542,7 +3551,7 @@ interface NSDate : NSSecureCoding, NSCopying {
 	}
 
 	[BaseType (typeof (NSObject))]
-	interface NSDictionary : NSSecureCoding, NSMutableCopying {
+	interface NSDictionary : NSSecureCoding, NSMutableCopying, NSFetchRequestResult, INSFastEnumeration {
 		[Export ("dictionaryWithContentsOfFile:")]
 		[Static]
 		NSDictionary FromFile (string path);
@@ -4069,7 +4078,11 @@ partial interface NSExtensionItem : NSCopying, NSSecureCoding {
 	}
 
 	[BaseType (typeof (NSObject))]
-	interface NSNull : NSSecureCoding, NSCopying {
+	interface NSNull : NSSecureCoding, NSCopying
+#if !WATCH
+	, CAAction
+#endif
+	{
 		[Export ("null"), Static]
 		NSNull Null { get; }
 	}
@@ -5264,6 +5277,9 @@ partial interface NSUrl : NSSecureCoding, NSCopying
 #endif
 #if !(MONOMAC && !XAMCORE_2_0) // exclude Classic/XM
 	, NSItemProviderWriting, NSItemProviderReading
+#endif
+#if IOS || MONOMAC
+	, QLPreviewItem
 #endif
 	{
 		[Export ("initWithScheme:host:path:")]
@@ -7726,7 +7742,7 @@ interface NSStreamDelegate {
 	}
 
 	[BaseType (typeof (NSObject)), Bind ("NSString")]
-	interface NSString2 : NSSecureCoding, NSMutableCopying
+	interface NSString2 : NSSecureCoding, NSMutableCopying, CKRecordValue
 	#if MONOMAC
 		, NSPasteboardReading, NSPasteboardWriting // Documented that it implements NSPasteboard protocols even if header doesn't show it
 	#endif
@@ -10522,7 +10538,7 @@ interface NSValueTransformer {
 	[BaseType (typeof (NSValue))]
 	// init returns NIL
 	[DisableDefaultCtor]
-	interface NSNumber {
+	interface NSNumber : CKRecordValue, NSFetchRequestResult {
 		[Export ("charValue")]
 		sbyte SByteValue { get; }
 

src/gamekit.cs

@@ -696,7 +696,11 @@ interface GKLeaderboardViewController : UIAppearance
 	[Watch (3,0)]
 	[Mac (10, 8)]
 	[BaseType (typeof (GKPlayer))]
-	interface GKLocalPlayer {
+	interface GKLocalPlayer
+#if !TVOS && !WATCH
+	: GKSavedGameListener
+#endif
+	{
 		[Export ("authenticated")]
 		bool Authenticated { [Bind ("isAuthenticated")] get;  }
 

src/mapkit.cs

@@ -279,9 +279,9 @@ interface MKDirectionsRequest {
 	[iOS (6,0)]
 	[TV (9,2)]
 	[Mac (10,9, onlyOn64 : true)]
-	interface MKMapItem 
+	interface MKMapItem : NSSecureCoding
 #if IOS // #if TARGET_OS_IOS
-		: NSItemProviderReading, NSItemProviderWriting
+		, NSItemProviderReading, NSItemProviderWriting
 #endif
 	{
 		[Export ("placemark", ArgumentSemantic.Retain)]

src/uikit.cs

@@ -13596,7 +13596,7 @@ interface UILayoutGuide_UIConstraintBasedLayoutDebugging {
 	interface IUIContentContainer {}
 
 	[BaseType (typeof (UIResponder))]
-	interface UIViewController : NSCoding, UIAppearanceContainer, UIContentContainer, UITraitEnvironment, UIFocusEnvironment {
+	interface UIViewController : NSCoding, UIAppearanceContainer, UIContentContainer, UITraitEnvironment, UIFocusEnvironment, NSExtensionRequestHandling {
 		[DesignatedInitializer]
 		[Export ("initWithNibName:bundle:")]
 		[PostGet ("NibBundle")]

src/webkit.cs

@@ -2426,7 +2426,11 @@ partial interface WebScriptObject {
 			   "WeakUIDelegate",
 			   "WeakPolicyDelegate" }
 		   )]
-	partial interface WebView {
+	partial interface WebView
+#if MONOMAC
+		: NSUserInterfaceValidations
+#endif
+	{
 		[Static]
 		[Export ("canShowMIMEType:")]
 		bool CanShowMimeType (string MimeType);

src/wkwebkit.cs

@@ -539,7 +539,11 @@ interface WKUserScript : NSCopying {
 #endif
 	)]
 	[DisableDefaultCtor ()] // Crashes during deallocation in Xcode 6 beta 2. radar 17377712.
-	interface WKWebView {
+	interface WKWebView
+#if MONOMAC
+		: NSUserInterfaceValidations
+#endif
+	{
 
 		[DesignatedInitializer]
 		[Export ("initWithFrame:configuration:")]

tests/introspection/ApiSelectorTest.cs

@@ -175,6 +175,21 @@ protected virtual bool Skip (Type type, string selectorName)
 					return !TestRuntime.CheckXcodeVersion (9, 0);
 				}
 				break;
+#if !XAMCORE_4_0
+			case "NSUrl":
+				switch (selectorName) {
+				case "previewItemTitle":
+					// 'previewItemTitle' should be optional (fixed in XAMCORE_4_0)
+					return true;
+				}
+				break;
+#endif
+			case "MKMapItem": // Selector not available on iOS 32-bit
+				switch (selectorName) {
+				case "encodeWithCoder:":
+					return !TestRuntime.CheckXcodeVersion (9, 0);
+				}
+				break;
 #if !MONOMAC
 			case "MTLCaptureManager":
 			case "NEHotspotEapSettings": // Wireless Accessory Configuration is not supported in the simulator.

tests/introspection/iOS/iOSApiProtocolTest.cs

@@ -681,6 +681,12 @@ protected override bool Skip (Type type, string protocolName)
 
 			case "UIPasteConfigurationSupporting": // types do not conform to protocol but protocol methods work on those types (base type tests in monotouch-test)
 				return true; // Skip everything because 'UIResponder' implements 'UIPasteConfigurationSupporting' and that's 130+ types
+
+#if !__WATCHOS__
+			// Undocumented conformance (members were inlinded in 'UIViewController' before so all subtypes should conform)
+			case "UIStateRestoring":
+				return type.Name == "UIViewController" || type.IsSubclassOf (typeof (UIViewController));
+#endif
 			}
 			return base.Skip (type, protocolName);
 		}

tests/xtro-sharpie/ObjCInterfaceCheck.cs

@@ -10,6 +10,7 @@ namespace Extrospection {
 	public class ObjCInterfaceCheck : BaseVisitor {
 
 		Dictionary<string, TypeDefinition> type_map = new Dictionary<string, TypeDefinition> ();
+		Dictionary<string, TypeDefinition> type_map_copy = new Dictionary<string, TypeDefinition> ();
 
 		public override void VisitManagedType (TypeDefinition type)
 		{
@@ -49,9 +50,10 @@ public override void VisitManagedType (TypeDefinition type)
 			}
 			if (!skip && wrapper && !String.IsNullOrEmpty (rname)) {
 				TypeDefinition td;
-				if (!type_map.TryGetValue (rname, out td))
+				if (!type_map.TryGetValue (rname, out td)) {
 					type_map.Add (rname, type);
-				else {
+					type_map_copy.Add (rname, type);
+				} else {
 					// always report in the same order (for unique error messages)
 					var sorted = Helpers.Sort (type, td);
 					var framework = Helpers.GetFramework (sorted.Item1);
@@ -60,6 +62,37 @@ public override void VisitManagedType (TypeDefinition type)
 			}
 		}
 
+		public override void VisitObjCCategoryDecl (ObjCCategoryDecl decl, VisitKind visitKind)
+		{
+			if (visitKind != VisitKind.Enter)
+				return;
+
+			var categoryName = decl.Name;
+			if (categoryName == null)
+				return;
+
+			// check availability macros to see if the API is available on the OS and not deprecated
+			if (!decl.IsAvailable ())
+				return;
+
+			var framework = Helpers.GetFramework (decl);
+			if (framework == null)
+				return;
+
+			var ciName = decl.ClassInterface.Name;
+			if (!type_map_copy.TryGetValue (ciName, out var td)) {
+				// other checks can't be done without an actual type to inspect
+				return;
+			}
+
+			// check protocols
+			foreach (var protocol in decl.Protocols) {
+				var pname = protocol.Name;
+				if (!ImplementProtocol (pname, td))
+					Log.On (framework).Add ($"!missing-protocol-conformance! {ciName} should conform to {pname} (defined in '{categoryName}' category)");
+			}
+		}
+
 		public override void VisitObjCInterfaceDecl (ObjCInterfaceDecl decl, VisitKind visitKind)
 		{
 			if (visitKind != VisitKind.Enter)
@@ -68,8 +101,6 @@ public override void VisitObjCInterfaceDecl (ObjCInterfaceDecl decl, VisitKind v
 				return;
 
 			var name = decl.Name;
-			if (name.EndsWith ("Internal", StringComparison.Ordinal))
-				return;
 
 			// check availability macros to see if the API is available on the OS and not deprecated
 			if (!decl.IsAvailable ())

tests/xtro-sharpie/common-Foundation.ignore

@@ -884,3 +884,6 @@
 !unknown-native-enum! NSUbiquitousKeyValueStoreChangeReason bound
 !unknown-protocol! NSObject bound
 !unknown-type! NSObject bound
+
+## Used 'INSFastEnumeration' placeholer (just so we can start flagging things)
+!missing-protocol-conformance! NSDictionary should conform to NSFastEnumeration (defined in 'NSGenericFastEnumeraiton' category)

tests/xtro-sharpie/iOS-AVFoundation.ignore

@@ -23,3 +23,6 @@
 !missing-selector! AVCapturePhotoOutput::setDualCameraDualPhotoDeliveryEnabled: not bound
 !missing-selector! AVCaptureResolvedPhotoSettings::embeddedThumbnailDimensions not bound
 !missing-selector! AVCaptureResolvedPhotoSettings::expectedPhotoCount not bound
+
+## https://github.com/xamarin/xamarin-macios/issues/3213 should be fixed before conformance to 'AVQueuedSampleBufferRendering' is restored.
+!missing-protocol-conformance! AVSampleBufferDisplayLayer should conform to AVQueuedSampleBufferRendering (defined in 'AVSampleBufferDisplayLayerQueueManagement' category)