🐛 fix: incorrect PlantUMLScript when @unchecked Sendable present in S…

…wift code resolves #76
MarcoEidinger · Nov 11, 2023 · 3ae71a5 · 3ae71a5
1 parent 8e46455
commit 3ae71a5
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 1 deletion.
diff --git a/Sources/SwiftPlantUMLFramework/Internal/PlantUMLContext.swift b/Sources/SwiftPlantUMLFramework/Internal/PlantUMLContext.swift
@@ -27,7 +27,13 @@ class PlantUMLContext {
     var index = 0
 
     func addLinking(item: SyntaxStructure, parent: SyntaxStructure) {
-        let linkTo = parent.name?.removeAngleBracketsWithContent() ?? "___"
+        var linkTo = parent.name?.removeAngleBracketsWithContent() ?? "___"
+
+        // escape names like "@unchecked Sendable" for PlantUML
+        if linkTo.starts(with: "@") {
+            linkTo = "\"\(linkTo)\""
+        }
+
         guard skipLinking(element: parent, basedOn: configuration.relationships.inheritance?.exclude) == false else { return }
         let namedConnection = (uniqElementAndTypes[linkTo] != nil) ? "\(uniqElementAndTypes[linkTo] ?? "--ERROR--")" : "inherits"
         var linkTypeKey = item.fullName! + "LinkType"

diff --git a/Tests/SwiftPlantUMLFrameworkTests/PlantUMLContextTests.swift b/Tests/SwiftPlantUMLFrameworkTests/PlantUMLContextTests.swift
@@ -59,4 +59,15 @@ final class PlantUMLContextTests: XCTestCase {
 
         XCTAssertEqual(context.connections.count, 0)
     }
+
+    func testAddLinkingEscapeName() {
+        let superclass = SyntaxStructure(kind: .class, name: "@unchecked Sendable")
+        let subclass = SyntaxStructure(kind: .class, name: "Yoo")
+        let context = PlantUMLContext()
+
+        _ = context.uniqName(item: subclass, relationship: "inherits")
+        context.addLinking(item: subclass, parent: superclass)
+
+        XCTAssertEqual(context.connections.first!, #""@unchecked Sendable" <|-- Yoo : inherits"#)
+    }
 }