Fixed incorrect handling of commas in documentation comments #13

Author: odrobnik

Sources/SwiftMCPMacros/Documentation.swift

@@ -78,7 +78,11 @@ struct Documentation {
 		// Helper to flush the current parameter's accumulated lines into our dictionary.
 		func flushCurrentParameter() {
 			if let paramName = currentParameterName {
-				let fullDescription = currentParameterLines.joined(separator: " ").trimmingCharacters(in: .whitespaces)
+				// Join lines with a single space, but preserve existing spaces
+				let fullDescription = currentParameterLines
+					.map { $0.trimmingCharacters(in: .whitespaces) }
+					.filter { !$0.isEmpty }
+					.joined(separator: " ")
 				// Escape the description when storing it
 				parameters[paramName] = fullDescription.escapedForSwiftString
 			}
@@ -200,7 +204,11 @@ struct Documentation {
 			else {
 				if currentParameterName != nil {
 					// If we are in the middle of a parameter, treat the line as a continuation.
-					currentParameterLines.append(line)
+					// Only add non-empty lines and trim whitespace
+					let trimmedLine = line.trimmingCharacters(in: .whitespaces)
+					if !trimmedLine.isEmpty {
+						currentParameterLines.append(trimmedLine)
+					}
 				} else if inReturnsSection && !inOtherSection {
 					// If we're in the returns section, add to returns lines
 					returnsLines.append(line)

Tests/SwiftMCPTests/MacroDocumentationTests.swift

@@ -240,4 +240,29 @@ func testParagraphBreaksAndQuotes() {
     #expect(doc.description == "A Calculator for simple math doing additionals, subtractions etc.\\n\\nTesting \\\"quoted\\\" stuff. And on multiple lines. \\'single quotes\\'")
 }
 
+@Test("Handles parameter descriptions with commas and newlines")
+func testParameterDescriptionsWithCommasAndNewlines() {
+    let docText = """
+    /**
+     Get reminders from the reminders app with flexible filtering options.
+     
+     - Parameters:
+        - completed: If true, fetch completed reminders. If false, fetch incomplete reminders. If not specified, fetch all reminders.
+        - startDate: ISO date string for the start of the date range to fetch reminders from
+        - endDate: ISO date string for the end of the date range to fetch reminders from
+        - listNames: Names of reminder lists to fetch from. If empty or not specified,
+          fetches from all lists.
+        - searchText: Text to search for in reminder titles
+     */
+    """
+    let doc = Documentation(from: docText)
+    #expect(doc.description == "Get reminders from the reminders app with flexible filtering options.")
+    #expect(doc.parameters["completed"] == "If true, fetch completed reminders. If false, fetch incomplete reminders. If not specified, fetch all reminders.")
+    #expect(doc.parameters["startDate"] == "ISO date string for the start of the date range to fetch reminders from")
+    #expect(doc.parameters["endDate"] == "ISO date string for the end of the date range to fetch reminders from")
+    #expect(doc.parameters["listNames"] == "Names of reminder lists to fetch from. If empty or not specified, fetches from all lists.")
+    #expect(doc.parameters["searchText"] == "Text to search for in reminder titles")
+    #expect(doc.returns == nil)
+}
+
 #endif