From 153dd55aaab3b0e968666d71731ef1dce37d593c Mon Sep 17 00:00:00 2001
From: Bartek Kryza <bkryza@gmail.com>
Date: Fri, 15 Apr 2022 18:56:38 +0200
Subject: [PATCH] Fixed include diagram items with hyphen

---
 .../generators/plantuml/include_diagram_generator.cc   |  6 +++---
 tests/test_cases.h                                     | 10 ++++++----
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/src/include_diagram/generators/plantuml/include_diagram_generator.cc b/src/include_diagram/generators/plantuml/include_diagram_generator.cc
index 91e7c3df..4aea084d 100644
--- a/src/include_diagram/generators/plantuml/include_diagram_generator.cc
+++ b/src/include_diagram/generators/plantuml/include_diagram_generator.cc
@@ -56,8 +56,8 @@ void generator::generate(const source_file &f, std::ostream &ostr) const
     LOG_DBG("Generating source_file {}", f.name());
 
     if (f.type() == common::model::source_file_t::kDirectory) {
-        ostr << "folder " << f.name();
-        ostr << " as " << f.alias();
+        ostr << "folder \"" << f.name();
+        ostr << "\" as " << f.alias();
         ostr << " {\n";
         for (const auto &file : f) {
             generate(dynamic_cast<const source_file &>(*file), ostr);
@@ -65,7 +65,7 @@ void generator::generate(const source_file &f, std::ostream &ostr) const
         ostr << "}" << '\n';
     }
     else {
-        ostr << "file " << f.name() << " as " << f.alias();
+        ostr << "file \"" << f.name() << "\" as " << f.alias();
 
         if (m_config.generate_links) {
             generate_link(ostr, f);
diff --git a/tests/test_cases.h b/tests/test_cases.h
index 0593e223..898ac8f9 100644
--- a/tests/test_cases.h
+++ b/tests/test_cases.h
@@ -186,9 +186,9 @@ struct AliasMatcher {
         patterns.push_back(
             std::regex{"package\\s\\[" + name + "\\]\\sas\\s" + alias_regex});
         patterns.push_back(
-            std::regex{"file\\s\"?" + name + "\"?\\sas\\s" + alias_regex});
+            std::regex{"file\\s\"" + name + "\"\\sas\\s" + alias_regex});
         patterns.push_back(
-            std::regex{"folder\\s\"?" + name + "\"?\\sas\\s" + alias_regex});
+            std::regex{"folder\\s\"" + name + "\"\\sas\\s" + alias_regex});
 
         std::smatch base_match;
 
@@ -465,13 +465,15 @@ ContainsMatcher IsPackage(std::string const &str,
 ContainsMatcher IsFolder(std::string const &str,
     CaseSensitive::Choice caseSensitivity = CaseSensitive::Yes)
 {
-    return ContainsMatcher(CasedString("folder " + str, caseSensitivity));
+    return ContainsMatcher(
+        CasedString("folder \"" + str + "\"", caseSensitivity));
 }
 
 ContainsMatcher IsFile(std::string const &str,
     CaseSensitive::Choice caseSensitivity = CaseSensitive::Yes)
 {
-    return ContainsMatcher(CasedString("file " + str, caseSensitivity));
+    return ContainsMatcher(
+        CasedString("file \"" + str + "\"", caseSensitivity));
 }
 
 ContainsMatcher IsDeprecated(std::string const &str,