matthias/clang-uml
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed include diagram items with hyphen

Browse Source
This commit is contained in:
Bartek Kryza
2022-04-15 18:56:38 +02:00
parent 01a6cf6fe3
commit 153dd55aaa
2 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/include_diagram/generators/plantuml/include_diagram_generator.cc
View File

@@ -56,8 +56,8 @@ void generator::generate(const source_file &f, std::ostream &ostr) const
LOG_DBG("Generating source_file {}", f.name()); LOG_DBG("Generating source_file {}", f.name());
if (f.type() == common::model::source_file_t::kDirectory) { if (f.type() == common::model::source_file_t::kDirectory) {
ostr << "folder " << f.name(); ostr << "folder \"" << f.name();
ostr << " as " << f.alias(); ostr << "\" as " << f.alias();
ostr << " {\n"; ostr << " {\n";
for (const auto &file : f) { for (const auto &file : f) {
generate(dynamic_cast<const source_file &>(*file), ostr); 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'; ostr << "}" << '\n';
} }
else { else {
ostr << "file " << f.name() << " as " << f.alias(); ostr << "file \"" << f.name() << "\" as " << f.alias();
if (m_config.generate_links) { if (m_config.generate_links) {
generate_link(ostr, f); generate_link(ostr, f);

10
tests/test_cases.h
View File

@@ -186,9 +186,9 @@ struct AliasMatcher {
patterns.push_back( patterns.push_back(
std::regex{"package\\s\\[" + name + "\\]\\sas\\s" + alias_regex}); std::regex{"package\\s\\[" + name + "\\]\\sas\\s" + alias_regex});
patterns.push_back( patterns.push_back(
std::regex{"file\\s\"?" + name + "\"?\\sas\\s" + alias_regex}); std::regex{"file\\s\"" + name + "\"\\sas\\s" + alias_regex});
patterns.push_back( 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; std::smatch base_match;
@@ -465,13 +465,15 @@ ContainsMatcher IsPackage(std::string const &str,
ContainsMatcher IsFolder(std::string const &str, ContainsMatcher IsFolder(std::string const &str,
CaseSensitive::Choice caseSensitivity = CaseSensitive::Yes) CaseSensitive::Choice caseSensitivity = CaseSensitive::Yes)
{ {
return ContainsMatcher(CasedString("folder " + str, caseSensitivity)); return ContainsMatcher(
CasedString("folder \"" + str + "\"", caseSensitivity));
} }
ContainsMatcher IsFile(std::string const &str, ContainsMatcher IsFile(std::string const &str,
CaseSensitive::Choice caseSensitivity = CaseSensitive::Yes) CaseSensitive::Choice caseSensitivity = CaseSensitive::Yes)
{ {
return ContainsMatcher(CasedString("file " + str, caseSensitivity)); return ContainsMatcher(
CasedString("file \"" + str + "\"", caseSensitivity));
} }
ContainsMatcher IsDeprecated(std::string const &str, ContainsMatcher IsDeprecated(std::string const &str,