Do not use NSString's 'trimmingCharacters' API

dfed · Jan 10, 2024 · 9d4225d · 9d4225d
1 parent 6e0e67f
commit 9d4225d
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 10 deletions.
diff --git a/Sources/SafeDICore/Generators/DependencyTreeGenerator.swift b/Sources/SafeDICore/Generators/DependencyTreeGenerator.swift
@@ -54,7 +54,7 @@ public final class DependencyTreeGenerator {
             for try await generatedRoot in taskGroup {
                 generatedRoots.append(generatedRoot)
             }
-            return generatedRoots.sorted().joined(separator: "\n\n").trimmingCharacters(in: .whitespacesAndNewlines)
+            return generatedRoots.sorted().joined(separator: "\n\n")
         }
 
         let importsWhitespace = imports.isEmpty ? "" : "\n"

diff --git a/Sources/SafeDICore/Models/TypeDescription.swift b/Sources/SafeDICore/Models/TypeDescription.swift
@@ -121,7 +121,7 @@ public enum TypeDescription: Codable, Hashable, Comparable, Sendable {
         case let .closure(arguments, isAsync, doesThrow, returnType):
             return "(\(arguments.map { $0.asSource }.joined(separator: ", ")))\([isAsync ? " async" : "", doesThrow ? " throws" : ""].filter { !$0.isEmpty }.joined()) -> \(returnType.asSource)"
         case let .unknown(text):
-            return text.trimmingCharacters(in: .whitespacesAndNewlines)
+            return text
         }
     }
 
@@ -478,7 +478,7 @@ extension TypeSyntax {
         } else {
             assertionFailure("TypeSyntax of unknown type. Defaulting to `description`.")
             // The description is a source-accurate description of this node, so it is a reasonable fallback.
-            return .unknown(text: description)
+            return .unknown(text: trimmedDescription)
         }
     }
 }
@@ -500,7 +500,7 @@ extension ExprSyntax {
                 if let base = memberAccessExpr.base {
                     return base.typeDescription
                 } else {
-                    return .unknown(text: memberAccessExpr.description)
+                    return .unknown(text: memberAccessExpr.trimmedDescription)
                 }
             } else {
                 if let base = memberAccessExpr.base {
@@ -517,7 +517,7 @@ extension ExprSyntax {
                         )
                     }
                 } else {
-                    return .unknown(text: memberAccessExpr.description)
+                    return .unknown(text: memberAccessExpr.trimmedDescription)
                 }
             }
         } else if let genericExpr = GenericSpecializationExprSyntax(self) {
@@ -535,7 +535,7 @@ extension ExprSyntax {
                     parentType: parentType, generics: genericTypeVisitor.genericArguments
                 )
             case .any, .array, .attributed, .closure, .composition, .dictionary, .implicitlyUnwrappedOptional, .metatype, .optional, .some, .tuple, .unknown:
-                return .unknown(text: description)
+                return .unknown(text: trimmedDescription)
             }
         } else if let tupleExpr = TupleExprSyntax(self) {
             let tupleTypes = tupleExpr.elements.map(\.expression.typeDescription)
@@ -573,7 +573,7 @@ extension ExprSyntax {
                     returnType: returnType.typeDescription
                 )
             } else {
-                return .unknown(text: description)
+                return .unknown(text: trimmedDescription)
             }
         } else if let optionalChainingExpr = OptionalChainingExprSyntax(self) {
             return .optional(optionalChainingExpr.expression.typeDescription)
@@ -594,7 +594,7 @@ extension ExprSyntax {
                 value: onlyElement.value.typeDescription
             )
         } else {
-            return .unknown(text: description)
+            return .unknown(text: trimmedDescription)
         }
     }
 }

diff --git a/Tests/SafeDICoreTests/TypeDescriptionTests.swift b/Tests/SafeDICoreTests/TypeDescriptionTests.swift
@@ -882,8 +882,8 @@ final class TypeDescriptionTests: XCTestCase {
     }
 
     func test_asSource_whenDescribingAnUnknownCase_returnsTheProvidedStringWithWhitespaceStripped() {
-        let sut = TypeDescription.unknown(text: " SomeTypeThatIsFormattedOddly    ")
-        XCTAssertEqual(sut.asSource, "SomeTypeThatIsFormattedOddly")
+        let typeDescription = TypeSyntax(stringLiteral: " SomeTypeThatIsFormattedOddly    ").typeDescription
+        XCTAssertEqual(typeDescription.asSource, "SomeTypeThatIsFormattedOddly")
     }
 
     // MARK: - Visitors