Fix consistency when context state is not correct

uber · Nov 6, 2024 · 7676296 · 7676296
1 parent de68c4c
commit 7676296
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 25 deletions.
diff --git a/Sources/MockoloFramework/Models/MethodModel.swift b/Sources/MockoloFramework/Models/MethodModel.swift
@@ -219,18 +219,13 @@ final class MethodModel: Model {
             return nil
         }
 
-        return applyMethodTemplate(name: name,
-                                   kind: kind,
+        guard let overloadingResolvedName = context.overloadingResolvedName else {
+            return nil
+        }
+
+        return applyMethodTemplate(overloadingResolvedName: overloadingResolvedName,
                                    arguments: arguments,
-                                   isStatic: isStatic,
-                                   customModifiers: customModifiers,
                                    isOverride: shouldOverride,
-                                   genericTypeParams: genericTypeParams,
-                                   genericWhereClause: genericWhereClause,
-                                   params: params,
-                                   returnType: returnType,
-                                   accessLevel: accessLevel,
-                                   argsHistory: argsHistory,
                                    handler: handler(),
                                    context: context)
     }

diff --git a/Sources/MockoloFramework/Templates/MethodTemplate.swift b/Sources/MockoloFramework/Templates/MethodTemplate.swift
@@ -17,23 +17,11 @@
 import Foundation
 
 extension MethodModel {
-    func applyMethodTemplate(name: String,
-                             kind: MethodKind,
+    func applyMethodTemplate(overloadingResolvedName: String,
                              arguments: GenerationArguments,
-                             isStatic: Bool,
-                             customModifiers: [String: Modifier]?,
                              isOverride: Bool,
-                             genericTypeParams: [ParamModel],
-                             genericWhereClause: String?,
-                             params: [ParamModel],
-                             returnType: SwiftType,
-                             accessLevel: String,
-                             argsHistory: ArgumentsHistoryModel?,
                              handler: ClosureModel?,
                              context: RenderContext) -> String {
-        guard let overloadingResolvedName = context.overloadingResolvedName else {
-            preconditionFailure("context broken")
-        }
         var template = ""
 
         let returnTypeName = returnType.isUnknown ? "" : returnType.typeName
@@ -122,8 +110,7 @@ extension MethodModel {
 
             let overrideStr = isOverride ? "\(String.override) " : ""
             let modifierTypeStr: String
-            if let customModifiers = customModifiers,
-            let customModifier: Modifier = customModifiers[name] {
+            if let customModifier: Modifier = customModifiers[name] {
                 modifierTypeStr = customModifier.rawValue + " "
             } else {
                 modifierTypeStr = ""