Improve pragma marks and method ordering (#319)

Author: tinder-cfuller

Sources/Layout/Layout.swift

@@ -750,7 +750,7 @@ public final class Layout { // swiftlint:disable:this type_body_length
         constraints.forEach { $0.prioritize(priority) }
     }
 
-    // MARK: - Update
+    // MARK: - Animation
 
     /// Updates the constraints of the ``view`` of the layout.
     ///

Sources/Layout/LayoutItem.swift

@@ -144,6 +144,8 @@ extension LayoutItem {
         self.size(width: size.width, height: size.height, priority: priority)
     }
 
+    // MARK: - Width
+
     /// Adds a constraint defining the width of the ``layoutItemView``.
     ///
     /// - Parameters:
@@ -178,6 +180,8 @@ extension LayoutItem {
         }
     }
 
+    // MARK: - Height
+
     /// Adds a constraint defining the height of the ``layoutItemView``.
     ///
     /// - Parameters:

Sources/Layout/UIKit/UIView+AutoLayout.swift

@@ -56,6 +56,22 @@ extension UIView {
 
     // MARK: - Size
 
+    /// Creates constraints defining the size of the receiver.
+    ///
+    /// - Parameter size: The constant size value. When `nil`, the size of the receiver is used.
+    ///
+    /// - Returns: The created constraints.
+    public func sizeConstraints(
+        _ size: CGSize? = nil
+    ) -> [NSLayoutConstraint] {
+        [
+            width.constraint(size?.width ?? bounds.width),
+            height.constraint(size?.height ?? bounds.height)
+        ]
+    }
+
+    // MARK: - Width
+
     /// Creates a constraint defining the width of the receiver.
     ///
     /// - Parameters:
@@ -81,6 +97,8 @@ extension UIView {
         width.constraint(constant ?? bounds.width)
     }
 
+    // MARK: - Height
+
     /// Creates a constraint defining the height of the receiver.
     ///
     /// - Parameters:
@@ -106,21 +124,7 @@ extension UIView {
         height.constraint(constant ?? bounds.height)
     }
 
-    /// Creates constraints defining the size of the receiver.
-    ///
-    /// - Parameter size: The constant size value. When `nil`, the size of the receiver is used.
-    ///
-    /// - Returns: The created constraints.
-    public func sizeConstraints(
-        _ size: CGSize? = nil
-    ) -> [NSLayoutConstraint] {
-        [
-            width.constraint(size?.width ?? bounds.width),
-            height.constraint(size?.height ?? bounds.height)
-        ]
-    }
-
-    // MARK: - Aspect Ratio
+    // MARK: - Square
 
     /// Creates a constraint defining the aspect ratio of the receiver to be square.
     ///
@@ -129,6 +133,8 @@ extension UIView {
         constraint(for: .width, to: .height, of: self)
     }
 
+    // MARK: - Aspect Ratio
+
     /// Creates a constraint defining the aspect ratio of the receiver.
     ///
     /// - Parameter ratio: The aspect ratio.

Tests/LayoutTests/LayoutItemTests.swift

@@ -105,6 +105,8 @@ final class LayoutItemTests: XCTestCase {
         }
     }
 
+    // MARK: - Width
+
     func testWidthIsRelationToConstantPriority() {
 
         // swiftlint:disable:next closure_body_length
@@ -193,6 +195,8 @@ final class LayoutItemTests: XCTestCase {
         }
     }
 
+    // MARK: - Height
+
     func testHeightIsRelationToConstantPriority() {
 
         // swiftlint:disable:next closure_body_length
@@ -281,52 +285,54 @@ final class LayoutItemTests: XCTestCase {
         }
     }
 
-    // MARK: - Aspect Ratio
+    // MARK: - Square
 
-    func testSquare() {
+    func testSquareWithLengthPriority() {
         assertLayout { view in
             view.layout {
 
-                // Square with Width
+                // Square Length with Default Priority
 
                 pinkView
                     .to([.top, .leading])
-                    .width(100)
-                    .square()
+                    .square(200, priority: .high)
+                    .square(100)
 
-                // Square with Height
+                // Square Length with Priority
 
                 yellowView
                     .to([.top, .trailing])
-                    .height(100)
-                    .square()
+                    .square(25, priority: .low)
+                    .square(100, priority: .high)
             }
             .activate()
         }
     }
 
-    func testSquareWithLengthPriority() {
+    func testSquare() {
         assertLayout { view in
             view.layout {
 
-                // Square Length with Default Priority
+                // Square with Width
 
                 pinkView
                     .to([.top, .leading])
-                    .square(200, priority: .high)
-                    .square(100)
+                    .width(100)
+                    .square()
 
-                // Square Length with Priority
+                // Square with Height
 
                 yellowView
                     .to([.top, .trailing])
-                    .square(25, priority: .low)
-                    .square(100, priority: .high)
+                    .height(100)
+                    .square()
             }
             .activate()
         }
     }
 
+    // MARK: - Aspect Ratio
+
     func testAspectRatioWithRatioPriority() {
         assertLayout { view in
             view.layout {

Tests/LayoutTests/LayoutTests.swift

@@ -1402,7 +1402,7 @@ final class LayoutTests: XCTestCase {
         expect(layout.constraints[1].priority) == UILayoutPriority.high
     }
 
-    // MARK: - Update
+    // MARK: - Animation
 
     func testUpdate() {