完善扩展

Author: lixiang1994

AttributedString.podspec

@@ -1,7 +1,7 @@
 Pod::Spec.new do |s|
 
 s.name         = "AttributedString"
-s.version      = "1.1.1"
+s.version      = "1.1.2"
 s.summary      = "基于Swift字符串插值快速构建你想要的富文本"
 
 s.homepage     = "https://github.com/lixiang1994/AttributedString"

AttributedString.xcodeproj/project.pbxproj

@@ -372,7 +372,7 @@
 					"@executable_path/Frameworks",
 					"@loader_path/Frameworks",
 				);
-				MARKETING_VERSION = 1.1.1;
+				MARKETING_VERSION = 1.1.2;
 				PRODUCT_BUNDLE_IDENTIFIER = com.lee.attributedstring;
 				PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)";
 				SKIP_INSTALL = YES;
@@ -400,7 +400,7 @@
 					"@executable_path/Frameworks",
 					"@loader_path/Frameworks",
 				);
-				MARKETING_VERSION = 1.1.1;
+				MARKETING_VERSION = 1.1.2;
 				PRODUCT_BUNDLE_IDENTIFIER = com.lee.attributedstring;
 				PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)";
 				SKIP_INSTALL = YES;

Sources/Extension/Extension.swift

@@ -49,25 +49,34 @@ extension AttributedString {
     /// Add a AttributedString to another AttributedString and return a new AttributedString instance.
     ///
     /// - Parameters:
-    ///   - lhs: NSAttributedString to add.
-    ///   - rhs: NSAttributedString to add.
-    /// - Returns: New instance with added NSAttributedString.
+    ///   - lhs: AttributedString to add.
+    ///   - rhs: AttributedString to add.
+    /// - Returns: New instance with added AttributedString.
     public static func + (lhs: AttributedString, rhs: AttributedString) -> AttributedString {
         let string = NSMutableAttributedString(attributedString: lhs.value)
         string.append(rhs.value)
         return .init(string)
     }
 
-    /// Add a AttributedString to another AttributedString.
+    /// Add a String to another AttributedString.
     ///
     /// - Parameters:
-    ///   - lhs: NSAttributedString to add to.
+    ///   - lhs: AttributedString to add to.
     ///   - rhs: String to add.
     public static func += (lhs: inout AttributedString, rhs: String) {
         lhs += AttributedString(.init(string: rhs))
     }
+    
+    /// Add a AttributedString to another String.
+    ///
+    /// - Parameters:
+    ///   - lhs: String to add to.
+    ///   - rhs: AttributedString to add.
+    public static func += (lhs: inout String, rhs: AttributedString) {
+        lhs += rhs.value.string
+    }
 
-    /// Add a NSAttributedString to another AttributedString and return a new AttributedString instance.
+    /// Add a String to another AttributedString and return a new AttributedString instance.
     ///
     /// - Parameters:
     ///   - lhs: AttributedString to add.
@@ -76,4 +85,91 @@ extension AttributedString {
     public static func + (lhs: AttributedString, rhs: String) -> AttributedString {
         return lhs + AttributedString(.init(string: rhs))
     }
+    
+    /// Add a NSAttributedString to another AttributedString.
+    ///
+    /// - Parameters:
+    ///   - lhs: AttributedString to add to.
+    ///   - rhs: NSAttributedString to add.
+    public static func += (lhs: inout AttributedString, rhs: NSAttributedString) {
+        lhs += AttributedString(rhs)
+    }
+    
+    /// Add a AttributedString to another NSMutableAttributedString.
+    ///
+    /// - Parameters:
+    ///   - lhs: NSMutableAttributedString to add to.
+    ///   - rhs: AttributedString to add.
+    public static func += (lhs: inout NSMutableAttributedString, rhs: AttributedString) {
+        lhs.append(rhs.value)
+    }
+
+    /// Add a NSAttributedString to another AttributedString and return a new AttributedString instance.
+    ///
+    /// - Parameters:
+    ///   - lhs: AttributedString to add.
+    ///   - rhs: NSAttributedString to add.
+    /// - Returns: New instance with added NSAttributedString.
+    public static func + (lhs: AttributedString, rhs: NSAttributedString) -> AttributedString {
+        return lhs + AttributedString(rhs)
+    }
+    
+    /// Add a AttributedString.Style to another AttributedString.
+    ///
+    /// - Parameters:
+    ///   - lhs: AttributedString to add to.
+    ///   - rhs: AttributedString.Style to add.
+    public static func += (lhs: inout AttributedString, rhs: AttributedString.Style) {
+        lhs += (rhs, .init(location: 0, length: lhs.value.string.count))
+    }
+    
+    /// Add a AttributedString.Style to another AttributedString.
+    ///
+    /// - Parameters:
+    ///   - lhs: AttributedString to add to.
+    ///   - rhs: AttributedString.Style to add.
+    public static func += (lhs: inout AttributedString, rhs: (AttributedString.Style, NSRange)) {
+        lhs += ([rhs.0], rhs.1)
+    }
+    
+    /// Add a AttributedString.Style to another AttributedString.
+    ///
+    /// - Parameters:
+    ///   - lhs: AttributedString to add to.
+    ///   - rhs: AttributedString.Style to add.
+    public static func += (lhs: inout AttributedString, rhs: ([AttributedString.Style], NSRange)) {
+        lhs = lhs + rhs
+    }
+    
+    /// Add a AttributedString.Style to another AttributedString and return a new AttributedString instance.
+    ///
+    /// - Parameters:
+    ///   - lhs: AttributedString to add.
+    ///   - rhs: AttributedString.Style to add.
+    /// - Returns: New instance with added AttributedString.Style.
+    public static func + (lhs: AttributedString, rhs: AttributedString.Style) -> AttributedString {
+        return lhs + (rhs, .init(location: 0, length: lhs.value.string.count))
+    }
+    
+    /// Add a AttributedString.Style to another AttributedString and return a new AttributedString instance.
+    ///
+    /// - Parameters:
+    ///   - lhs: AttributedString to add.
+    ///   - rhs: AttributedString.Style to add.
+    /// - Returns: New instance with added AttributedString.Style.
+    public static func + (lhs: AttributedString, rhs: (AttributedString.Style, NSRange)) -> AttributedString {
+        return lhs + ([rhs.0], rhs.1)
+    }
+    
+    /// Add a AttributedString.Style to another AttributedString and return a new AttributedString instance.
+    ///
+    /// - Parameters:
+    ///   - lhs: AttributedString to add.
+    ///   - rhs: AttributedString.Style to add.
+    /// - Returns: New instance with added AttributedString.Style.
+    public static func + (lhs: AttributedString, rhs: ([AttributedString.Style], NSRange)) -> AttributedString {
+        let string = NSMutableAttributedString(attributedString: lhs.value)
+        rhs.0.forEach { string.addAttributes($0.attributes, range: rhs.1) }
+        return .init(string)
+    }
 }