Trim exclamation mark from assign-only property types

peripheryapp · Jan 9, 2024 · 72bfce3 · 72bfce3
1 parent 7ce3f96
commit 72bfce3
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 1 deletion.
diff --git a/Sources/Shared/PropertyTypeSanitizer.swift b/Sources/Shared/PropertyTypeSanitizer.swift
@@ -8,6 +8,6 @@ public struct PropertyTypeSanitizer {
 
     @inlinable
     public static func sanitize(_ type: String) -> String {
-        type.trimmed.trimmingCharacters(in: .init(["?"]))
+        type.trimmed.trimmingCharacters(in: .init(["?", "!"]))
     }
 }
diff --git a/Tests/Fixtures/RetentionFixtures/testRetainsAssignOnlyPropertyTypes.swift b/Tests/Fixtures/RetentionFixtures/testRetainsAssignOnlyPropertyTypes.swift
@@ -6,6 +6,7 @@ public class FixtureClass123 {
     struct CustomType {}
 
     var retainedSimpleProperty: CustomType?
+    var retainedSimplePropertyImplicitUnwrap: CustomType!
     var notRetainedSimpleProperty: String?
     var retainedModulePrefixedProperty: Swift.Double?
     var notRetainedModulePrefixedProperty: Swift.Bool?
@@ -20,6 +21,7 @@ public class FixtureClass123 {
 
     public func someFunc() {
         retainedSimpleProperty = CustomType()
+        retainedSimplePropertyImplicitUnwrap = CustomType()
         notRetainedSimpleProperty = ""
 
         retainedModulePrefixedProperty = 1

diff --git a/Tests/PeripheryTests/RetentionTest.swift b/Tests/PeripheryTests/RetentionTest.swift
@@ -1150,10 +1150,22 @@ final class RetentionTest: FixtureSourceGraphTestCase {
         analyze(retainPublic: true) {
             assertReferenced(.class("FixtureClass123")) {
                 self.assertReferenced(.varInstance("retainedSimpleProperty"))
+                self.assertNotAssignOnlyProperty(.varInstance("retainedSimpleProperty"))
+
+                self.assertReferenced(.varInstance("retainedSimplePropertyImplicitUnwrap"))
+                self.assertNotAssignOnlyProperty(.varInstance("retainedSimplePropertyImplicitUnwrap"))
+
                 self.assertReferenced(.varInstance("retainedModulePrefixedProperty"))
+                self.assertNotAssignOnlyProperty(.varInstance("retainedModulePrefixedProperty"))
+
                 self.assertReferenced(.varInstance("retainedTupleProperty"))
+                self.assertNotAssignOnlyProperty(.varInstance("retainedTupleProperty"))
+
                 self.assertReferenced(.varInstance("retainedDestructuredPropertyA"))
+                self.assertNotAssignOnlyProperty(.varInstance("retainedDestructuredPropertyA"))
+
                 self.assertReferenced(.varInstance("retainedMultipleBindingPropertyA"))
+                self.assertNotAssignOnlyProperty(.varInstance("retainedMultipleBindingPropertyA"))
 
                 #if canImport(Combine)
                 self.assertReferenced(.varInstance("retainedAnyCancellable"))