Improved: Layout with Resolve options.

Author: oscbyspro

Sources/DiffableTextKit/Models/Context.swift

@@ -253,7 +253,7 @@ extension Context {
         self.unique()
         self.storage.layout!.merge(
         selection: selection,
-        momentums: momentums)
+        resolve: [.max, .momentums(momentums)])
 
         update += .selection(layout!.selection != selection)
         //=--------------------------------------=

Sources/DiffableTextKit/Models/Layout.swift

@@ -36,9 +36,9 @@
 
     /// Use this method to defer autocorrection.
     @inlinable init(deferring:(snapshot: Snapshot, preference: Selection<Index>?)) {
-        self.snapshot   = deferring.snapshot
+        self.snapshot = deferring.snapshot
         self.preference = deferring.preference
-        self.selection  = Selection(snapshot.endIndex)
+        self.selection = Selection(snapshot.endIndex)
     }
 
     //=------------------------------------------------------------------------=
@@ -50,7 +50,7 @@
         //=--------------------------------------=
         // Values
         //=--------------------------------------=
-        let selection = selection.map(
+        let selection = preference ?? selection.map(
         lower: { Mismatches .forwards(from: self.snapshot[..<$0], to: snapshot).next },
         upper: { Mismatches.backwards(from: self.snapshot[$0...], to: snapshot).next })
         //=--------------------------------------=
@@ -65,7 +65,7 @@
     // MARK: Transformations
     //=------------------------------------------------------------------------=
 
-    /// Use this method to resolve a custom or deferred selection.
+    /// Use this method to resolve selection.
     @inlinable mutating func autocorrect() {
         self.merge(selection: self.selection)
     }
@@ -75,11 +75,11 @@
     //=------------------------------------------------------------------------=
 
     /// Use this method on changes to selection.
-    @inlinable mutating func merge(selection: Selection<Index>, momentums: Bool = false) {
+    @inlinable mutating func merge(selection: Selection<Index>, resolve: Resolve = []) {
         //=--------------------------------------=
         // Accept Max Selection
         //=--------------------------------------=
-        if  selection == .max(snapshot) {
+        if  resolve.contains(.max), selection == .max(snapshot) {
             self.selection = selection; return
         }
         //=--------------------------------------=
@@ -93,7 +93,7 @@
         //=--------------------------------------=
         var carets = selection.carets().detached()
 
-        if  momentums {
+        if  resolve.contains(.momentums) {
             carets.lower.momentum = Direction(from: self.selection.lower, to: selection.lower)
             carets.upper.momentum = Direction(from: self.selection.upper, to: selection.upper)
         }

Sources/DiffableTextKit/Models/Resolve.swift

@@ -0,0 +1,32 @@
+//=----------------------------------------------------------------------------=
+// This source file is part of the DiffableTextViews open source project.
+//
+// Copyright (c) 2022 Oscar Byström Ericsson
+// Licensed under Apache License, Version 2.0
+//
+// See http://www.apache.org/licenses/LICENSE-2.0 for license information.
+//=----------------------------------------------------------------------------=
+
+//*========================================================================*
+// MARK: * Resolve [...]
+//*========================================================================*
+
+/// A message describing selection behavior.
+@usableFromInline struct Resolve: OptionSet {
+    
+    //=--------------------------------------------------------------------=
+    
+    /// Resolve max selection.
+    public static let max = Self(rawValue: 1 << 0)
+    
+    /// Resolve selection by using caret momentums.
+    public static let momentums = Self(rawValue: 1 << 1)
+    
+    //=--------------------------------------------------------------------=
+    
+    @usableFromInline var rawValue: UInt8
+    
+    //=--------------------------------------------------------------------=
+    
+    @usableFromInline init(rawValue: UInt8) { self.rawValue = rawValue }
+}