From 0539fb010146904adfb0ed7f6727ba1037965ba1 Mon Sep 17 00:00:00 2001
From: Bartek Kryza <bkryza@gmail.com>
Date: Sat, 27 Apr 2024 10:43:15 +0200
Subject: [PATCH] Fixed type aliases handling in sequence diagram message names
 (#260)

---
 .../generators/json/sequence_diagram_generator.cc               | 2 ++
 .../generators/mermaid/sequence_diagram_generator.cc            | 2 ++
 .../generators/plantuml/sequence_diagram_generator.cc           | 2 ++
 tests/t20044/.clang-uml                                         | 2 ++
 4 files changed, 8 insertions(+)

diff --git a/src/sequence_diagram/generators/json/sequence_diagram_generator.cc b/src/sequence_diagram/generators/json/sequence_diagram_generator.cc
index b23816f5..1aeef809 100644
--- a/src/sequence_diagram/generators/json/sequence_diagram_generator.cc
+++ b/src/sequence_diagram/generators/json/sequence_diagram_generator.cc
@@ -99,6 +99,8 @@ void generator::generate_call(const message &m, nlohmann::json &parent) const
         }
     }
 
+    message = config().simplify_template_type(message);
+
     nlohmann::json msg;
 
     msg["name"] = message;
diff --git a/src/sequence_diagram/generators/mermaid/sequence_diagram_generator.cc b/src/sequence_diagram/generators/mermaid/sequence_diagram_generator.cc
index 9183c894..ce3d47bf 100644
--- a/src/sequence_diagram/generators/mermaid/sequence_diagram_generator.cc
+++ b/src/sequence_diagram/generators/mermaid/sequence_diagram_generator.cc
@@ -128,6 +128,8 @@ void generator::generate_call(const message &m, std::ostream &ostr) const
         }
     }
 
+    message = config().simplify_template_type(message);
+
     const std::string from_alias = generate_alias(from.value());
     const std::string to_alias = generate_alias(to.value());
 
diff --git a/src/sequence_diagram/generators/plantuml/sequence_diagram_generator.cc b/src/sequence_diagram/generators/plantuml/sequence_diagram_generator.cc
index 64ed970a..520abf9f 100644
--- a/src/sequence_diagram/generators/plantuml/sequence_diagram_generator.cc
+++ b/src/sequence_diagram/generators/plantuml/sequence_diagram_generator.cc
@@ -78,6 +78,8 @@ void generator::generate_call(const message &m, std::ostream &ostr) const
         }
     }
 
+    message = config().simplify_template_type(message);
+
     const std::string from_alias = generate_alias(from.value());
     const std::string to_alias = generate_alias(to.value());
 
diff --git a/tests/t20044/.clang-uml b/tests/t20044/.clang-uml
index 37ea1a93..3526dcf7 100644
--- a/tests/t20044/.clang-uml
+++ b/tests/t20044/.clang-uml
@@ -5,6 +5,8 @@ diagrams:
     type: sequence
     glob:
       - t20044.cc
+    type_aliases:
+      "detail::expected<int,error>": result_t
     generate_message_comments: true
     include:
       namespaces: