Merge pull request #21 from manucodin/develop

Fixes duplicated parameter labels

Author: manucodin

Sources/SwiftMockGenerator/Generators/Implementations/DummyGenerator.swift

@@ -312,12 +312,16 @@ public class DummyGenerator: MockGeneratorProtocol {
 
     private func generateParameterList(_ parameters: [ParameterElement]) -> String {
         return parameters.map { parameter in
-            let externalName = parameter.externalName ?? parameter.internalName
             let inoutKeyword = parameter.isInout ? "inout " : ""
             let variadicMarker = parameter.isVariadic ? "..." : ""
             let defaultValueClause = parameter.defaultValue.map { " = \($0)" } ?? ""
 
-            return "\(externalName) \(parameter.internalName): \(inoutKeyword)\(parameter.type)\(variadicMarker)\(defaultValueClause)"
+            // If externalName exists, use it; otherwise use internal name without duplication
+            if let externalName = parameter.externalName {
+                return "\(externalName) \(parameter.internalName): \(inoutKeyword)\(parameter.type)\(variadicMarker)\(defaultValueClause)"
+            } else {
+                return "\(parameter.internalName): \(inoutKeyword)\(parameter.type)\(variadicMarker)\(defaultValueClause)"
+            }
         }.joined(separator: ", ")
     }
 

Sources/SwiftMockGenerator/Generators/Implementations/SpyGenerator.swift

@@ -412,12 +412,16 @@ public class SpyGenerator: MockGeneratorProtocol {
 
     private func generateParameterList(_ parameters: [ParameterElement]) -> String {
         return parameters.map { parameter in
-            let externalName = parameter.externalName ?? parameter.internalName
             let inoutKeyword = parameter.isInout ? "inout " : ""
             let variadicMarker = parameter.isVariadic ? "..." : ""
             let defaultValueClause = parameter.defaultValue.map { " = \($0)" } ?? ""
 
-            return "\(externalName) \(parameter.internalName): \(inoutKeyword)\(parameter.type)\(variadicMarker)\(defaultValueClause)"
+            // If externalName exists, use it; otherwise use internal name without duplication
+            if let externalName = parameter.externalName {
+                return "\(externalName) \(parameter.internalName): \(inoutKeyword)\(parameter.type)\(variadicMarker)\(defaultValueClause)"
+            } else {
+                return "\(parameter.internalName): \(inoutKeyword)\(parameter.type)\(variadicMarker)\(defaultValueClause)"
+            }
         }.joined(separator: ", ")
     }
 

Sources/SwiftMockGenerator/Generators/Implementations/StubGenerator.swift

@@ -363,12 +363,16 @@ public class StubGenerator: MockGeneratorProtocol {
 
     private func generateParameterList(_ parameters: [ParameterElement]) -> String {
         return parameters.map { parameter in
-            let externalName = parameter.externalName ?? parameter.internalName
             let inoutKeyword = parameter.isInout ? "inout " : ""
             let variadicMarker = parameter.isVariadic ? "..." : ""
             let defaultValueClause = parameter.defaultValue.map { " = \($0)" } ?? ""
 
-            return "\(externalName) \(parameter.internalName): \(inoutKeyword)\(parameter.type)\(variadicMarker)\(defaultValueClause)"
+            // If externalName exists, use it; otherwise use internal name without duplication
+            if let externalName = parameter.externalName {
+                return "\(externalName) \(parameter.internalName): \(inoutKeyword)\(parameter.type)\(variadicMarker)\(defaultValueClause)"
+            } else {
+                return "\(parameter.internalName): \(inoutKeyword)\(parameter.type)\(variadicMarker)\(defaultValueClause)"
+            }
         }.joined(separator: ", ")
     }
 

Sources/SwiftMockGenerator/Parser/SyntaxParser.swift

@@ -294,12 +294,15 @@ public class AnnotationVisitor: SyntaxVisitor {
 
     private func parseParameterClause(_ clause: FunctionParameterClauseSyntax) -> [ParameterElement] {
         return clause.parameters.map { parameter in
-            let externalName = parameter.firstName.text
+            let firstName = parameter.firstName.text
             let internalName = parameter.secondName?.text ?? parameter.firstName.text
             let type = parameter.type.description.trimmingCharacters(in: .whitespaces)
 
+            // External name is only different if there's a second name or the first name is not empty
+            let externalName = parameter.secondName != nil ? firstName : nil
+            
             return ParameterElement(
-                externalName: externalName == internalName ? nil : externalName,
+                externalName: externalName,
                 internalName: internalName,
                 type: type,
                 defaultValue: nil,