fix: revert parts of #1113

krzysztofzablocki · Dec 7, 2022 · e1517aa · e1517aa
1 parent 6371770
commit e1517aa
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Sourcery CHANGELOG
 
+## 1.9.2
+## Internal Changes
+- Reverts part of [#1113](https://github.com/krzysztofzablocki/Sourcery/pull/1113) due to incomplete implementation breaking type complex resolution
+
 ## 1.9.1
 ## New Features
 - Adds support for public protocols in AutoMockable template [#1100](https://github.com/krzysztofzablocki/Sourcery/pull/1100)

diff --git a/SourceryRuntime/Sources/Composer/ParserResultsComposed.swift b/SourceryRuntime/Sources/Composer/ParserResultsComposed.swift
@@ -87,7 +87,9 @@ internal struct ParserResultsComposed {
                 }
 
                 if let resolved = resolveGlobalName(for: oldName, containingType: $0.parent, unique: typeMap, modules: modules, typealiases: resolvedTypealiases)?.name {
-                    $0.localName = resolved.components(separatedBy: ".").last!
+                    $0.localName = resolved.replacingOccurrences(of: "\($0.module != nil ? "\($0.module!)." : "")", with: "")
+                } else {
+                    return
                 }
 
                 // nothing left to do

diff --git a/SourceryTests/Parsing/ComposerSpec.swift b/SourceryTests/Parsing/ComposerSpec.swift
@@ -2120,13 +2120,22 @@ class ParserComposerSpec: QuickSpec {
                             struct Item: AutoInitializable {
                             }
                         }
+
+                        extension Root.ViewState.Item {
+                            struct ChildItem {}
+                        }
                         """
 
                         let types = parseModules(
                             ("Mod1", code)
                         ).types
 
-                        expect(types.map { $0.globalName }).to(equal(["Mod1.Root", "Mod1.Root.ViewState", "Mod1.Root.ViewState.Item"]))
+                        expect(types.map { $0.globalName }).to(equal([
+                            "Mod1.Root",
+                            "Mod1.Root.ViewState",
+                            "Mod1.Root.ViewState.Item",
+                            "Mod1.Root.ViewState.Item.ChildItem"
+                        ]))
                     }
                 }