Fix protocol inheritance (#1383)

krzysztofzablocki · Nov 21, 2024 · b851897 · b851897
1 parent a6da5b0
commit b851897
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 2 deletions.
diff --git a/SourceryRuntime/Sources/Common/Composer/Composer.swift b/SourceryRuntime/Sources/Common/Composer/Composer.swift
@@ -272,7 +272,7 @@ public enum Composer {
         if baseType is Class {
             type.inherits[baseType.name] = baseType
         } else if let `protocol` = baseType as? SourceryProtocol {
-            type.implements[baseType.name] = baseType
+            type.implements[baseType.globalName] = baseType
             if let extendingProtocol = type as? SourceryProtocol {
                 `protocol`.associatedTypes.forEach {
                     if extendingProtocol.associatedTypes[$0.key] == nil {

diff --git a/SourcerySwift/Sources/SourceryRuntime.content.generated.swift b/SourcerySwift/Sources/SourceryRuntime.content.generated.swift
@@ -1005,7 +1005,7 @@ public enum Composer {
         if baseType is Class {
             type.inherits[baseType.name] = baseType
         } else if let `protocol` = baseType as? SourceryProtocol {
-            type.implements[baseType.name] = baseType
+            type.implements[baseType.globalName] = baseType
             if let extendingProtocol = type as? SourceryProtocol {
                 `protocol`.associatedTypes.forEach {
                     if extendingProtocol.associatedTypes[$0.key] == nil {

diff --git a/SourceryTests/Parsing/ComposerSpec.swift b/SourceryTests/Parsing/ComposerSpec.swift
@@ -2451,6 +2451,15 @@ class ParserComposerSpec: QuickSpec {
                         }
                     }
 
+                    it("resolves inherited properties") {
+                        let types = parseModules(
+                            ("A", "protocol Foo { var a: Int { get } }"),
+                            ("B", "protocol Foo { var b: Int { get } }"),
+                            ("C", "import A; import B; protocol Foo: A.Foo, B.Foo { var c: Int { get } }"))
+
+                        expect(types.last?.allVariables.map(\.name).sorted()).to(equal(["a", "b", "c"]))
+                    }
+
                     it("resolves types properly") {
                         let types = parseModules(
                             ("Mod1", "protocol Foo { func foo1() }"),