Cleanup.

Author: oscbyspro

Sources/DiffableTextKit/Models/Attribute.swift

@@ -18,50 +18,22 @@
 /// - Note: The easiest way to unformat text is to exclude symbols marked as virtual.
 ///
 public struct Attribute: OptionSet {
-
-    //=------------------------------------------------------------------------=
-    // MARK: State
-    //=------------------------------------------------------------------------=
-    
-    public let rawValue: UInt8
-    
-    //=------------------------------------------------------------------------=
-    // MARK: Initializers
-    //=------------------------------------------------------------------------=
-    
-    @inlinable public init(rawValue: UInt8) {
-        self.rawValue = rawValue
-    }
-}
-
-//=----------------------------------------------------------------------------=
-// MARK: Singular
-//=----------------------------------------------------------------------------=
-
-public extension Attribute {
 
     //=------------------------------------------------------------------------=
     // MARK: Instances
     //=------------------------------------------------------------------------=
 
     /// Signifies that the symbol is not real and should not be parsed.
-    static let virtual = Self(rawValue: 1 << 0)
+    public static let virtual = Self(rawValue: 1 << 0)
 
     /// Signifies that the symbol should be ignored when it is inserted.
-    static let insertable = Self(rawValue: 1 << 1)
+    public static let insertable = Self(rawValue: 1 << 1)
 
     /// Signifies that the symbol should be ignored when it is removed.
-    static let removable = Self(rawValue: 1 << 2)
+    public static let removable = Self(rawValue: 1 << 2)
 
     /// Signifies that the symbol has no interactive size and should be passed through.
-    static let passthrough = Self(rawValue: 1 << 3)
-}
-
-//=----------------------------------------------------------------------------=
-// MARK: Composites
-//=----------------------------------------------------------------------------=
-
-public extension Attribute {
+    public static let passthrough = Self(rawValue: 1 << 3)
 
     //=------------------------------------------------------------------------=
     // MARK: Instances
@@ -71,13 +43,27 @@ public extension Attribute {
     ///
     /// It contains no attributes.
     ///
-    static let content = Self([])
+    public static let content = Self([])
 
     /// A formatting attribute describing formatting characters.
     ///
     /// It contains: virtual, insertable, removable, passthrough.
     ///
-    static let phantom = Self([.virtual, .insertable, .removable, .passthrough])
+    public static let phantom = Self([.virtual, .insertable, .removable, .passthrough])
+
+    //=------------------------------------------------------------------------=
+    // MARK: State
+    //=------------------------------------------------------------------------=
+    
+    public let rawValue: UInt8
+    
+    //=------------------------------------------------------------------------=
+    // MARK: Initializers
+    //=------------------------------------------------------------------------=
+    
+    @inlinable public init(rawValue: UInt8) {
+        self.rawValue = rawValue
+    }
 }
 
 //=----------------------------------------------------------------------------=

Sources/DiffableTextKit/Models/Changes.swift

@@ -33,7 +33,7 @@ public struct Changes: OptionSet {
     //=------------------------------------------------------------------------=
 
     @inlinable @inline(__always)
-    public init(rawValue: UInt8 = 0) {
+    public init(rawValue: UInt8) {
         self.rawValue = rawValue
     }
 }

Sources/DiffableTextKit/Models/Commit.swift

@@ -26,8 +26,7 @@ public struct Commit<Value> {
     //=------------------------------------------------------------------------=
 
     @inlinable public init(_ value: Value, _ snapshot: Snapshot) {
-        self.value = value
-        self.snapshot = snapshot
+        self.value = value;  self.snapshot = snapshot
     }
 
     //=------------------------------------------------------------------------=

Sources/DiffableTextKit/Models/Position.swift

@@ -27,7 +27,7 @@ public struct Position<Offset: DiffableTextKit.Offset>: Comparable {
     // MARK: Initializers
     //=------------------------------------------------------------------------=
 
-    @inlinable public init(_ offset: Int = 0) {
+    @inlinable public init(_ offset: Int) {
         self.offset = offset
     }
 

Sources/DiffableTextKit/Models/Symbol.swift

@@ -37,31 +37,37 @@ public struct Symbol: Equatable {
     // MARK: Initializers
     //=------------------------------------------------------------------------=
 
-    @inlinable @inline(__always) public static func content(_ character: Character) -> Self {
+    @inlinable @inline(__always)
+    public static func content(_ character: Character) -> Self {
         Self(character, as: .content)
     }
 
-    @inlinable @inline(__always) public static func phantom(_ character: Character) -> Self {
+    @inlinable @inline(__always)
+    public static func phantom(_ character: Character) -> Self {
         Self(character, as: .phantom)
     }
 
     //=------------------------------------------------------------------------=
     // MARK: Accessors
     //=------------------------------------------------------------------------=
 
-    @inlinable @inline(__always) public var virtual: Bool {
+    @inlinable @inline(__always)
+    public var virtual: Bool {
         self.attribute.contains(.virtual)
     }
 
-    @inlinable @inline(__always) public var nonvirtual: Bool {
+    @inlinable @inline(__always)
+    public var nonvirtual: Bool {
         self.attribute.contains(.virtual) == false
     }
 
-    @inlinable @inline(__always) public func contains(_ character: Character) -> Bool {
+    @inlinable @inline(__always)
+    public func contains(_ character: Character) -> Bool {
         self.character == character
     }
 
-    @inlinable @inline(__always) public func contains(_ attribute: Attribute) -> Bool {
+    @inlinable @inline(__always)
+    public func contains(_ attribute: Attribute) -> Bool {
         self.attribute.contains(attribute)
     }
 }