Cleanup: Prefix & Suffix, misc

Author: oscbyspro

Sources/DiffableTextKit/Models/Context.swift

@@ -118,21 +118,21 @@ extension Context {
     // MARK: Storage
     //=------------------------------------------------------------------------=
 
-    @inlinable @inline(__always) var status: Status  { storage.status }
+    @inlinable var status: Status  { storage.status }
 
-    @inlinable @inline(__always) var layout: Layout? { storage.layout }
+    @inlinable var layout: Layout? { storage.layout }
 
-    @inlinable @inline(__always) var backup: String? { storage.backup }
+    @inlinable var backup: String? { storage.backup }
 
     //=------------------------------------------------------------------------=
     // MARK: Status
     //=------------------------------------------------------------------------=
 
-    @inlinable @inline(__always) public var style: Style { status.style }
+    @inlinable public var style: Style { status.style }
 
-    @inlinable @inline(__always) public var value: Value { status.value }
+    @inlinable public var value: Value { status.value }
 
-    @inlinable @inline(__always) public var focus: Focus { status.focus }
+    @inlinable public var focus: Focus { status.focus }
 
     //=------------------------------------------------------------------------=
     // MARK: Layout
@@ -268,7 +268,7 @@ extension Context {
         // Update
         //=--------------------------------------=
         self.unique()
-        self.storage.layout!.merge(selection: selection,momentums: momentums)
+        self.storage.layout!.merge(selection: selection, momentums: momentums)
         //=--------------------------------------=
         // Return
         //=--------------------------------------=

Sources/DiffableTextKit/Styles/Prefix.swift

@@ -41,11 +41,11 @@ public struct PrefixTextStyle<Base: DiffableTextStyle>: WrapperTextStyle {
     }
 
     @inlinable public func interpret(_ value: Value, with cache: inout Cache) -> Commit<Value> {
-        var S0 = base.interpret(value, with: &cache); label(&S0); return S0
+        var S0 = base.interpret(value, with: &cache); label(&S0.snapshot); return S0
     }
 
     @inlinable public func resolve(_ proposal: Proposal, with cache: inout Cache) throws -> Commit<Value> {
-        var S0 = try base.resolve(proposal, with: &cache); label(&S0); return S0
+        var S0 = try base.resolve(proposal, with: &cache); label(&S0.snapshot); return S0
     }
 
     //=------------------------------------------------------------------------=
@@ -57,18 +57,18 @@ public struct PrefixTextStyle<Base: DiffableTextStyle>: WrapperTextStyle {
         text = prefix + text
     }
 
-    @inlinable func label(_ commit: inout Commit<Value>) {
+    @inlinable func label(_ snapshot: inout Snapshot) {
         guard !prefix.isEmpty else { return }
-        let base = commit.snapshot
-        commit.snapshot = Snapshot(prefix, as: .phantom)
-        let size = commit.snapshot.count
-        commit.snapshot.append(contentsOf: base)
+        let base = snapshot
+        snapshot = Snapshot(prefix, as: .phantom)
+        let size = snapshot.count
+        snapshot.append(contentsOf: base)
 
         guard let selection = base.selection else { return }
         let offsets = selection.map({ size + $0.attribute })
-        let lower = commit.snapshot.index(commit.snapshot.startIndex, offsetBy: offsets.lower)
-        let upper = commit.snapshot.index(lower, offsetBy: /**/ offsets.upper - offsets.lower)
-        commit.snapshot.select(Range(uncheckedBounds: (lower, upper)))
+        let lower = snapshot.index(snapshot.startIndex, offsetBy:   offsets.lower)
+        let upper = snapshot.index(lower, offsetBy: offsets.upper - offsets.lower)
+        snapshot.select(Range(uncheckedBounds: (lower, upper)))
     }
 }
 

Sources/DiffableTextKit/Styles/Suffix.swift

@@ -41,11 +41,11 @@ public struct SuffixTextStyle<Base: DiffableTextStyle>: WrapperTextStyle {
     }
 
     @inlinable public func interpret(_ value: Value, with cache: inout Cache) -> Commit<Value> {
-        var S0 = base.interpret(value, with: &cache); label(&S0); return S0
+        var S0 = base.interpret(value, with: &cache); label(&S0.snapshot); return S0
     }
 
     @inlinable public func resolve(_ proposal: Proposal, with cache: inout Cache) throws -> Commit<Value> {
-        var S0 = try base.resolve(proposal, with: &cache); label(&S0); return S0
+        var S0 = try base.resolve(proposal, with: &cache); label(&S0.snapshot); return S0
     }
 
     //=------------------------------------------------------------------------=
@@ -56,8 +56,8 @@ public struct SuffixTextStyle<Base: DiffableTextStyle>: WrapperTextStyle {
         text.append(contentsOf: suffix)
     }
 
-    @inlinable func label(_ commit: inout Commit<Value>) {
-        commit.snapshot.append(contentsOf: suffix, as: .phantom)
+    @inlinable func label(_ snapshot: inout Snapshot) {
+        snapshot.append(contentsOf: suffix, as: .phantom)
     }
 }