Merge branch 'main' into v5

Author: ptoffy

Sources/LeafKit/LeafCache/DefaultLeafCache.swift

@@ -1,5 +1,4 @@
 import NIOConcurrencyHelpers
-import NIOCore
 
 public actor DefaultLeafCache: LeafCache {
     // MARK: - Public - `LeafCache` Protocol Conformance

Sources/LeafKit/LeafSyntax/LeafSyntax.swift

@@ -27,7 +27,6 @@ public enum ConditionalSyntax: Sendable {
     case `if`([ParameterDeclaration])
     case `elseif`([ParameterDeclaration])
     case `else`
-
     func imports() -> Set<String> {
         switch self {
         case .if(let pDA), .elseif(let pDA):
@@ -715,17 +714,18 @@ extension Syntax: CustomStringConvertible {
         print(depth: 0)
     }
 
+    // swift-format-ignore
     func print(depth: Int) -> String {
         switch self {
         case .expression(let exp): return indent(depth) + "expression\(exp.description)"
-        //           case .variable(let v):     return v.print(depth: depth)
-        case .custom(let custom): return custom.print(depth: depth)
-        case .conditional(let c): return c.print(depth: depth)
-        case .loop(let loop): return loop.print(depth: depth)
-        case .import(let imp): return imp.print(depth: depth)
-        case .extend(let ext): return ext.print(depth: depth)
-        case .export(let export): return export.print(depth: depth)
-        case .with(let with): return with.print(depth: depth)
+//           case .variable(let v):     return v.print(depth: depth)
+        case .custom(let custom):  return custom.print(depth: depth)
+        case .conditional(let c):  return c.print(depth: depth)
+        case .loop(let loop):      return loop.print(depth: depth)
+        case .import(let imp):     return imp.print(depth: depth)
+        case .extend(let ext):     return ext.print(depth: depth)
+        case .export(let export):  return export.print(depth: depth)
+        case .with(let with):      return with.print(depth: depth)
         case .raw(var bB):
             let string = bB.readString(length: bB.readableBytes) ?? ""
             return indent(depth) + "raw(\(string.debugDescription))"

Tests/LeafKitTests/LeafErrorTests.swift

@@ -1,6 +1,7 @@
 /// Place all tests related to verifying that errors ARE thrown here.
 
 import Testing
+import XCTest
 
 @testable import LeafKit
 

Tests/LeafKitTests/LeafSerializerTests.swift

@@ -1,4 +1,5 @@
 import Testing
+import XCTest
 
 @testable import LeafKit
 

Tests/LeafKitTests/TagTests.swift

@@ -1,8 +1,6 @@
 import Foundation
 import Testing
 
-@testable import LeafKit
-
 @Suite
 struct TagTests {
     @Test func testWithHTMLEntities() throws {

Tests/LeafKitTests/TestHelpers.swift

@@ -7,8 +7,6 @@ import XCTest
 
 /// Assorted multi-purpose helper pieces for LeafKit tests
 
-// MARK: - Helper Functions
-
 /// Directly run a String "template" through `LeafLexer`
 /// - Parameter str: Raw String holding Leaf template source data
 /// - Returns: A lexed array of LeafTokens