Shortcuts (mostly) done

Author: jacobcxdev

Classes/Editing/FLEXFieldEditorViewController.m

@@ -38,14 +38,14 @@ + (instancetype)target:(id)target property:(FLEXProperty *)property {
     }
 
     FLEXFieldEditorViewController *editor = [self target:target];
-    editor.title = [@"Property: " stringByAppendingString:property.name];
+    editor.title = [@"Property: " stringByAppendingString:property.name.string];
     editor.property = property;
     return editor;
 }
 
 + (instancetype)target:(id)target ivar:(nonnull FLEXIvar *)ivar {
     FLEXFieldEditorViewController *editor = [self target:target];
-    editor.title = [@"Ivar: " stringByAppendingString:ivar.name];
+    editor.title = [@"Ivar: " stringByAppendingString:ivar.name.string];
     editor.ivar = ivar;
     return editor;
 }

Classes/Editing/FLEXMethodCallingViewController.m

@@ -47,7 +47,7 @@ - (void)viewDidLoad {
 
     // Configure field editor view
     self.fieldEditorView.argumentInputViews = [self argumentInputViews];
-    self.fieldEditorView.fieldDescription = [NSAttributedString stringWithFormat:@"Signature:\n%@\n\nReturn Type:\n%s", self.method.description, [NSString stringWithFormat:@"%s", (char *)self.method.returnType].attributedString];
+    self.fieldEditorView.fieldDescription = [NSAttributedString stringWithFormat:@"Signature:\n%@\n\nReturn Type:\n%@", self.method.description, [NSString stringWithFormat:@"%s", (char *)self.method.returnType].attributedString];
 }
 
 - (NSArray<FLEXArgumentInputView *> *)argumentInputViews {

Classes/Utility/Categories/FLEXRuntime+Compare.m

@@ -11,7 +11,7 @@
 @implementation FLEXProperty (Compare)
 
 - (NSComparisonResult)compare:(FLEXProperty *)other {
-    NSComparisonResult r = [self.name caseInsensitiveCompare:other.name];
+    NSComparisonResult r = [self.name.string caseInsensitiveCompare:other.name.string];
     if (r == NSOrderedSame) {
         // TODO make sure empty image name sorts above an image name
         return [self.imageName ?: @"" compare:other.imageName];
@@ -25,7 +25,7 @@ - (NSComparisonResult)compare:(FLEXProperty *)other {
 @implementation FLEXIvar (Compare)
 
 - (NSComparisonResult)compare:(FLEXIvar *)other {
-    return [self.name caseInsensitiveCompare:other.name];
+    return [self.name.string caseInsensitiveCompare:other.name.string];
 }
 
 @end

Classes/Utility/Categories/NSAttributedString+FLEX.h

@@ -7,10 +7,12 @@
 //
 
 #import <Foundation/Foundation.h>
+#import "NSMutableAttributedString+FLEX.h"
 
 @interface NSAttributedString (FLEX)
 + (instancetype)stringByJoiningArray:(NSArray<NSAttributedString *> *)array withSeparator:(NSAttributedString *)separator;
 + (instancetype)stringWithFormat:(NSString *)format, ...;
 + (instancetype)stringWithAttributes:(NSDictionary *)attributes format:(NSString *)format, ...;
 - (instancetype)stringByAppendingAttributedString:(NSAttributedString *)aString;
+- (instancetype)stringByReplacingOccurrencesOfString:(NSAttributedString *)aString withString:(NSAttributedString *)replacement;
 @end

Classes/Utility/Categories/NSAttributedString+FLEX.m

@@ -62,5 +62,10 @@ - (instancetype)stringByAppendingAttributedString:(NSAttributedString *)aString
     [attributedString appendAttributedString:aString];
     return attributedString;
 }
+- (instancetype)stringByReplacingOccurrencesOfString:(NSAttributedString *)aString withString:(NSAttributedString *)replacement {
+    NSMutableAttributedString *attributedString = self.mutableCopy;
+    [attributedString replaceOccurencesOfString:aString withString:replacement];
+    return attributedString;
+}
 @end
 

Classes/Utility/Categories/NSObject+Reflection.m

@@ -424,7 +424,7 @@ + (FLEXProperty *)flex_classPropertyNamed:(NSString *)name {
 }
 
 + (void)flex_replaceProperty:(FLEXProperty *)property {
-    [self flex_replaceProperty:property.name attributes:property.attributes];
+    [self flex_replaceProperty:property.name.string attributes:property.attributes];
 }
 
 + (void)flex_replaceProperty:(NSString *)name attributes:(FLEXPropertyAttributes *)attributes {

Classes/Utility/Runtime/FLEXRuntimeUtility.h

@@ -45,7 +45,7 @@
 + (NSUInteger)fieldNameOffsetForTypeEncoding:(const FLEXTypeEncoding *)typeEncoding;
 /// Given name "foo" and type "int" this would return "int foo", but
 /// given name "foo" and type "T *" it would return "T *foo"
-+ (NSString *)appendName:(NSString *)name toType:(NSString *)typeEncoding;
++ (NSAttributedString *)appendName:(NSAttributedString *)name toType:(NSAttributedString *)typeEncoding;
 
 /// @return The class hierarchy for the given object or class,
 /// from the current class to the root-most class.
@@ -84,6 +84,6 @@
 
 #pragma mark - Metadata Helpers
 
-+ (NSString *)readableTypeForEncoding:(NSString *)encodingString;
++ (NSAttributedString *)readableTypeForEncoding:(NSString *)encodingString;
 
 @end