From 563014901639bc5a0152a82d6567fd340dc5f5a5 Mon Sep 17 00:00:00 2001 From: Bartek Kryza Date: Tue, 13 Feb 2024 23:42:27 +0100 Subject: [PATCH] Fixed clang-tidy warnings --- src/common/generators/progress_indicator.cc | 9 ++++++--- src/common/visitor/template_builder.cc | 2 +- src/common/visitor/template_builder.h | 2 +- src/package_diagram/visitor/translation_unit_visitor.cc | 3 ++- src/sequence_diagram/visitor/translation_unit_visitor.cc | 3 ++- 5 files changed, 12 insertions(+), 7 deletions(-) diff --git a/src/common/generators/progress_indicator.cc b/src/common/generators/progress_indicator.cc index 5db13a71..ce019d87 100644 --- a/src/common/generators/progress_indicator.cc +++ b/src/common/generators/progress_indicator.cc @@ -72,12 +72,13 @@ void progress_indicator::increment(const std::string &name) auto &p = progress_bar_index_.at(name); auto &bar = progress_bars_[p.index]; - progress_bars_mutex_.unlock(); p.progress++; + bar.set_progress((p.progress * kASTTraverseProgressPercent) / p.max); bar.set_option(indicators::option::PostfixText{ fmt::format("{}/{}", p.progress, p.max)}); + progress_bars_mutex_.unlock(); } void progress_indicator::stop() @@ -104,7 +105,6 @@ void progress_indicator::complete(const std::string &name) auto &p = progress_bar_index_.at(name); auto &bar = progress_bars_[p.index]; - progress_bars_mutex_.unlock(); bar.set_progress(kCompleteProgressPercent); @@ -117,6 +117,8 @@ void progress_indicator::complete(const std::string &name) bar.set_option( indicators::option::ForegroundColor{indicators::Color::green}); bar.mark_as_completed(); + + progress_bars_mutex_.unlock(); } void progress_indicator::fail(const std::string &name) @@ -124,7 +126,6 @@ void progress_indicator::fail(const std::string &name) progress_bars_mutex_.lock(); auto &p = progress_bar_index_.at(name); auto &bar = progress_bars_[p.index]; - progress_bars_mutex_.unlock(); #if _MSC_VER const auto postfix_text = fmt::format("{}/{} FAILED", p.progress, p.max); @@ -134,6 +135,8 @@ void progress_indicator::fail(const std::string &name) bar.set_option(indicators::option::ForegroundColor{indicators::Color::red}); bar.set_option(indicators::option::PostfixText{postfix_text}); bar.mark_as_completed(); + + progress_bars_mutex_.unlock(); } } // namespace clanguml::common::generators \ No newline at end of file diff --git a/src/common/visitor/template_builder.cc b/src/common/visitor/template_builder.cc index 1b232357..f8aaf021 100644 --- a/src/common/visitor/template_builder.cc +++ b/src/common/visitor/template_builder.cc @@ -83,4 +83,4 @@ std::string map_type_parameter_to_template_parameter_name( return type_parameter; } -} // namespace clanguml::class_diagram::visitor +} // namespace clanguml::common::visitor diff --git a/src/common/visitor/template_builder.h b/src/common/visitor/template_builder.h index a8f0f118..ebae7ecc 100644 --- a/src/common/visitor/template_builder.h +++ b/src/common/visitor/template_builder.h @@ -119,7 +119,7 @@ public: void build( clanguml::common::model::template_element &template_instantiation, const clang::NamedDecl *cls, const clang::TemplateDecl *template_decl, - const clang::ArrayRef template_arguments, + clang::ArrayRef template_arguments, std::string full_template_specialization_name, std::optional parent = {}); diff --git a/src/package_diagram/visitor/translation_unit_visitor.cc b/src/package_diagram/visitor/translation_unit_visitor.cc index 15ea040a..850e1aec 100644 --- a/src/package_diagram/visitor/translation_unit_visitor.cc +++ b/src/package_diagram/visitor/translation_unit_visitor.cc @@ -325,7 +325,8 @@ common::id_t translation_unit_visitor::get_package_id(const clang::Decl *cls) return {}; } - else if (config().package_type() == config::package_type_t::kModule) { + + if (config().package_type() == config::package_type_t::kModule) { const auto *module = cls->getOwningModule(); if (module != nullptr) { std::string module_path = module->Name; diff --git a/src/sequence_diagram/visitor/translation_unit_visitor.cc b/src/sequence_diagram/visitor/translation_unit_visitor.cc index fe8f491b..33b5d558 100644 --- a/src/sequence_diagram/visitor/translation_unit_visitor.cc +++ b/src/sequence_diagram/visitor/translation_unit_visitor.cc @@ -33,7 +33,8 @@ translation_unit_visitor::translation_unit_visitor(clang::SourceManager &sm, } std::unique_ptr -translation_unit_visitor::create_element(const clang::NamedDecl *decl) const +translation_unit_visitor::create_element( + const clang::NamedDecl * /*decl*/) const { return std::make_unique( config().using_namespace());