优化富文本嵌套插值方法

Author: lixiang1994

AttributedString.podspec

@@ -1,7 +1,7 @@
 Pod::Spec.new do |s|
 
 s.name         = "AttributedString"
-s.version      = "2.0.0"
+s.version      = "2.1.0"
 s.summary      = "基于Swift字符串插值快速构建你想要的富文本, 支持点击按住等事件获取, 支持多种类型过滤"
 
 s.homepage     = "https://github.com/lixiang1994/AttributedString"

Demo-Watch/Demo-Watch.xcodeproj/xcshareddata/xcschemes/Demo-Watch WatchKit App.xcscheme

@@ -54,33 +54,46 @@
       debugDocumentVersioning = "YES"
       debugServiceExtension = "internal"
       allowLocationSimulation = "YES">
-      <BuildableProductRunnable
-         runnableDebuggingMode = "0">
+      <RemoteRunnable
+         runnableDebuggingMode = "2"
+         BundleIdentifier = "com.apple.Carousel"
+         RemotePath = "/Demo-Watch WatchKit App">
          <BuildableReference
             BuildableIdentifier = "primary"
             BlueprintIdentifier = "9B267B4D24405CFA002F571E"
             BuildableName = "Demo-Watch WatchKit App.app"
             BlueprintName = "Demo-Watch WatchKit App"
             ReferencedContainer = "container:Demo-Watch.xcodeproj">
          </BuildableReference>
-      </BuildableProductRunnable>
+      </RemoteRunnable>
    </LaunchAction>
    <ProfileAction
       buildConfiguration = "Release"
       shouldUseLaunchSchemeArgsEnv = "YES"
       savedToolIdentifier = ""
       useCustomWorkingDirectory = "NO"
       debugDocumentVersioning = "YES">
-      <BuildableProductRunnable
-         runnableDebuggingMode = "0">
+      <RemoteRunnable
+         runnableDebuggingMode = "2"
+         BundleIdentifier = "com.apple.Carousel"
+         RemotePath = "/Demo-Watch WatchKit App">
          <BuildableReference
             BuildableIdentifier = "primary"
             BlueprintIdentifier = "9B267B4D24405CFA002F571E"
             BuildableName = "Demo-Watch WatchKit App.app"
             BlueprintName = "Demo-Watch WatchKit App"
             ReferencedContainer = "container:Demo-Watch.xcodeproj">
          </BuildableReference>
-      </BuildableProductRunnable>
+      </RemoteRunnable>
+      <MacroExpansion>
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "9B267B4D24405CFA002F571E"
+            BuildableName = "Demo-Watch WatchKit App.app"
+            BlueprintName = "Demo-Watch WatchKit App"
+            ReferencedContainer = "container:Demo-Watch.xcodeproj">
+         </BuildableReference>
+      </MacroExpansion>
    </ProfileAction>
    <AnalyzeAction
       buildConfiguration = "Debug">

Sources/Action.swift

@@ -155,7 +155,7 @@ extension ASAttributedString {
     }
 }
 
-extension AttributedStringInterpolation {
+extension ASAttributedStringInterpolation {
 
     public typealias Action = ASAttributedString.Action
     public typealias Result = Action.Result

Sources/Attachment.swift

@@ -211,7 +211,7 @@ extension ASAttributedString.Attachment {
     }
 }
 
-extension AttributedStringInterpolation {
+extension ASAttributedStringInterpolation {
 
     public typealias Attachment = ASAttributedString.Attachment
     public typealias ImageAttachment = ASAttributedString.ImageAttachment

Sources/Attribute.swift

@@ -147,26 +147,40 @@ extension ASAttributedString.Attribute {
     }
 }
 
-extension AttributedStringInterpolation {
+extension ASAttributedStringInterpolation {
 
     public typealias Attribute = ASAttributedString.Attribute
     public typealias WrapMode = ASAttributedString.WrapMode
 
     public mutating func appendInterpolation<T>(_ value: T, _ attributes: Attribute...) {
         appendInterpolation(value, with: attributes)
     }
-    
     public mutating func appendInterpolation<T>(_ value: T, with attributes: [Attribute]) {
         self.value.append(ASAttributedString("\(value)", with: attributes).value)
     }
 
+    public mutating func appendInterpolation(_ value: NSAttributedString, _ attributes: Attribute...) {
+        appendInterpolation(value, with: attributes)
+    }
+    public mutating func appendInterpolation(_ value: NSAttributedString, with attributes: [Attribute]) {
+        self.value.append(ASAttributedString(value, with: attributes).value)
+    }
+    
+    public mutating func appendInterpolation(_ value: ASAttributedString, _ attributes: Attribute...) {
+        appendInterpolation(value, with: attributes)
+    }
+    public mutating func appendInterpolation(_ value: ASAttributedString, with attributes: [Attribute]) {
+        self.value.append(ASAttributedString(value, with: attributes).value)
+    }
+    
     // 嵌套包装
     public mutating func appendInterpolation(wrap string: ASAttributedString, _ attributes: Attribute...) {
         appendInterpolation(wrap: string, with: attributes)
     }
     public mutating func appendInterpolation(wrap string: ASAttributedString, with attributes: [Attribute]) {
-        self.value.append(ASAttributedString(wrap: .embedding(string), with: attributes).value)
+        self.value.append(ASAttributedString(string, with: attributes).value)
     }
+    
     public mutating func appendInterpolation(wrap mode: WrapMode, _ attributes: Attribute...) {
         appendInterpolation(wrap: mode, with: attributes)
     }

Sources/Interpolation.swift

@@ -19,12 +19,12 @@ import UIKit
 
 extension ASAttributedString: ExpressibleByStringInterpolation {
 
-    public init(stringInterpolation: AttributedStringInterpolation) {
+    public init(stringInterpolation: ASAttributedStringInterpolation) {
         self.value = .init(attributedString: stringInterpolation.value)
     }
 }
 
-public struct AttributedStringInterpolation : StringInterpolationProtocol {
+public struct ASAttributedStringInterpolation : StringInterpolationProtocol {
 
     let value: NSMutableAttributedString
 
@@ -40,6 +40,10 @@ public struct AttributedStringInterpolation : StringInterpolationProtocol {
         self.value.append(value)
     }
 
+    public mutating func appendInterpolation(_ value: ASAttributedString) {
+        self.value.append(value.value)
+    }
+    
     /// Interpolates the given value's textual representation into the
     /// attributed string literal being created.
     ///