Add Detailed Error Feedback for Unrecognized Selector

Author: fabcz

OCRunner/RunnerClasses+Execute.m

@@ -442,7 +442,7 @@ - (nullable MFValue *)execute:(MFScopeChain *)scope {
 
 @implementation ORMethodCall(Execute)
 #if DEBUG
-// 尝试寻找被重写的 getter/setter 方法
+// 尝试寻找属性被重写的 getter/setter 方法或从 methodList 查找方法
 - (NSString *)unrecognizedSelectorTip:(id)instance
 {
     NSString *currentName = self.selectorName;
@@ -451,58 +451,36 @@ - (NSString *)unrecognizedSelectorTip:(id)instance
         currentName = [currentName substringWithRange:NSMakeRange(3, currentName.length - 4)];
         currentName = [[currentName substringToIndex:1].lowercaseString stringByAppendingString:[currentName substringFromIndex:1]];
     }
-    NSMutableString *tip = [NSMutableString stringWithFormat:@"%@ Unrecognized selector '%@'", instance, currentName];
-    Class class = object_isClass(instance) ? objc_getMetaClass(class_getName(instance)) : [instance class];
+    NSMutableString *tip = [NSMutableString stringWithFormat:@"OCRunner Error: %@ Unrecognized selector '%@'", instance, currentName];
+    if (object_isClass(instance)) {
+        return tip;
+    }
+    Class class = [instance class];
 
-    // 1、先尝试通过 class_copyPropertyList 查找属性的 getter/setter 方法，如
+    // 1、先尝试通过 propertyList 查找属性的 getter/setter 方法，如
     // @property(nonatomic, assign, getter=customGetterTest, setter=customSetterTest:) BOOL test;
-    Class propertyClass = class.mutableCopy;
-    while (propertyClass && propertyClass != NSObject.class) {
-        unsigned int propertyCount;
-        objc_property_t *properties = class_copyPropertyList(propertyClass, &propertyCount);
-        for (int i = 0; i < propertyCount; i++) {
-            objc_property_t property = properties[i];
-            NSString *propertyName = [NSString stringWithUTF8String:property_getName(property)];
-            if ([propertyName isEqualToString:currentName]) {
-                NSString *foundName = [NSString stringWithUTF8String:property_copyAttributeValue(property, self.isAssignedValue ? "S" : "G")];
-                if (foundName.length && [instance respondsToSelector:NSSelectorFromString(foundName)]) {
-                    if (propertyClass == class) {
-                        [tip appendFormat:@"，but found %@ method '%@', please check if you need to call this method", self.isAssignedValue ? @"setter" : @"getter", foundName];
-                    } else {
-                        [tip appendFormat:@"，but found %@ method '%@' in parent class %@, please check if you need to call this method", self.isAssignedValue ? @"setter" : @"getter", foundName, NSStringFromClass(propertyClass)];
-                    }
-                    free(properties);
-                    return tip;
-                }
+    objc_property_t property = class_getProperty(class, currentName.UTF8String);
+    if (property) {
+        char *attributeValue = property_copyAttributeValue(property, self.isAssignedValue ? "S" : "G");
+        if (attributeValue) {
+            NSString *foundName = [NSString stringWithUTF8String:attributeValue];
+            free(attributeValue);
+            if (foundName.length && [instance respondsToSelector:NSSelectorFromString(foundName)]) {
+                [tip appendFormat:@"，but found %@ method '%@', please check if you need to call this method", self.isAssignedValue ? @"setter" : @"getter", foundName];
+                return tip;
             }
         }
-        free(properties);
-        propertyClass = class_getSuperclass(propertyClass);
     }
 
-    // 2、未找到则尝试手动拼接 getter/setter 方法名并从 class_copyMethodList 查找，如
+    // 2、未找到则尝试手动拼接 getter/setter 方法名并从 methodList 查找，如
     // @interface UIView(UIViewRendering)
     // @property(nonatomic,getter=isHidden) BOOL hidden;
     // @end
     currentName = [NSString stringWithFormat:@"%@%@%@", self.isAssignedValue ? @"set" : @"is", [[currentName substringToIndex:1] uppercaseString], [currentName substringFromIndex:1]];
-    Class methodClass = class.mutableCopy;
-    while (methodClass && methodClass != NSObject.class) {
-        unsigned int methodCount;
-        Method *methods = class_copyMethodList(methodClass, &methodCount);
-        for (int i = 0; i < methodCount; i++) {
-            Method method = methods[i];
-            SEL sel = method_getName(method);
-            NSString *methodName = NSStringFromSelector(sel);
-            if ([methodName isEqualToString:currentName]) {
-                if ([instance respondsToSelector:sel]) {
-                    [tip appendFormat:@"，but found %@ method '%@', please check if you need to call this method", self.isAssignedValue ? @"setter" : @"getter", currentName];
-                    free(methods);
-                    return tip;
-                }
-            }
-        }
-        free(methods);
-        methodClass = class_getSuperclass(methodClass);
+    Method method = class_getInstanceMethod(class, NSSelectorFromString(currentName));
+    if (method && [instance respondsToSelector:NSSelectorFromString(currentName)]) {
+        [tip appendFormat:@"，but found %@ method '%@', please check if you need to call this method", self.isAssignedValue ? @"setter" : @"getter", currentName];
+        return tip;
     }
 
     return tip;
@@ -591,6 +569,8 @@ - (nullable MFValue *)execute:(MFScopeChain *)scope {
 #if DEBUG
         NSLog(@"%@", [self unrecognizedSelectorTip:instance]);
         NSAssert(false, @"As mentioned above");
+#else
+        NSLog(@"OCRunner Error: %@ Unrecognized selector '%@'", instance, self.selectorName);
 #endif
         return [MFValue nullValue];
     }