Fix handling of static properties in UnreadSimplePropertyReferenceEliminator. (#79)

Author: ileitch

Sources/PeripheryKit/Analyzer/Visitors/UnreadSimplePropertyReferenceEliminator.swift

@@ -18,21 +18,36 @@ final class UnreadSimplePropertyReferenceEliminator: SourceGraphVisitor {
 
     func transformToGetterUsr(fromMangledSetterUsr usr: String) -> String {
         var usr = usr
-        assert(usr.last == "s")
-        usr.removeLast()
-        usr.append("g")
+
+        if usr.hasSuffix("sZ") {
+            usr.removeLast(2)
+            usr.append("gZ")
+        } else if usr.hasSuffix("s") {
+            usr.removeLast()
+            usr.append("g")
+        } else {
+            fatalError("Unexpected setter usr: '\(usr)'")
+        }
+
         return usr
     }
 
     func transformToPropertyUsr(fromMangledSetterUsr usr: String) -> String {
         var usr = usr
-        assert(usr.last == "s")
-        usr.removeLast()
-        usr.append("p")
+
+        if usr.hasSuffix("sZ") {
+            usr.removeLast(2)
+            usr.append("pZ")
+        } else if usr.hasSuffix("s") {
+            usr.removeLast()
+            usr.append("p")
+        } else {
+            fatalError("Unexpected setter usr: '\(usr)'")
+        }
+
         return usr
     }
 
-
     func visit() {
         guard configuration.aggressive else { return }
 

Tests/PeripheryKitTests/RetentionTest.swift

@@ -928,6 +928,13 @@ class RetentionTest: XCTestCase {
         }
     }
 
+    func testIdenticallyNamedVarsInStaticAndInstanceScopes() {
+        analyze(retainPublic: true) {
+            XCTAssertReferenced((.varInstance, "someVar"))
+            XCTAssertReferenced((.varStatic, "someVar"))
+        }
+    }
+
     // MARK: - Known Failures
 
     func testProtocolConformingMembersAreRetained() {
@@ -1155,17 +1162,6 @@ class RetentionTest: XCTestCase {
         }
     }
 
-    func testDuplicateGetterUSRBug() {
-        guard performKnownFailures else { return }
-
-        // Broken as of Xcode 10.
-        // https://bugreport.apple.com/web/?problemID=44531531
-        analyze(retainPublic: true, aggressive: true) {
-            XCTAssertReferenced((.varInstance, "someVar"))
-            XCTAssertReferenced((.varStatic, "someVar"))
-        }
-    }
-
     func testClassRetainedByUnusedInstanceVariable() {
         guard performKnownFailures else { return }