diff --git a/src/common/model/diagram_filter.cc b/src/common/model/diagram_filter.cc index 000a9cbb..a1232308 100644 --- a/src/common/model/diagram_filter.cc +++ b/src/common/model/diagram_filter.cc @@ -347,7 +347,6 @@ void diagram_filter::init_filters(const config::diagram &c) element_filters.emplace_back(std::make_unique( filter_t::kInclusive, c.include().context)); - inclusive_.emplace_back(std::make_unique( filter_t::kInclusive, std::move(element_filters))); } diff --git a/src/common/model/diagram_filter.h b/src/common/model/diagram_filter.h index b3df613e..f1e3ad96 100644 --- a/src/common/model/diagram_filter.h +++ b/src/common/model/diagram_filter.h @@ -135,8 +135,8 @@ struct paths_filter : public filter_visitor { paths_filter(filter_t type, const std::filesystem::path &root, std::vector p); - tvl::value_t match(const diagram &d, - const common::model::source_file &r) const override; + tvl::value_t match( + const diagram &d, const common::model::source_file &r) const override; private: std::vector paths_; @@ -162,9 +162,7 @@ public: return false; auto inc = tvl::all_of(inclusive_.begin(), inclusive_.end(), - [this, &e](const auto &in) { - return in->match(diagram_, e); - }); + [this, &e](const auto &in) { return in->match(diagram_, e); }); if (tvl::is_undefined(inc) || tvl::is_true(inc)) return true; diff --git a/src/common/model/nested_trait.h b/src/common/model/nested_trait.h index 8f083f39..d79d04b3 100644 --- a/src/common/model/nested_trait.h +++ b/src/common/model/nested_trait.h @@ -52,8 +52,7 @@ public: } template - void add_element( - const Path &path, std::unique_ptr p) + void add_element(const Path &path, std::unique_ptr p) { assert(p); diff --git a/src/include_diagram/model/diagram.cc b/src/include_diagram/model/diagram.cc index 58023d60..77513703 100644 --- a/src/include_diagram/model/diagram.cc +++ b/src/include_diagram/model/diagram.cc @@ -45,8 +45,8 @@ void diagram::add_file(std::unique_ptr &&f) add_element(p, std::move(f)); } -type_safe::optional_ref -diagram::get_file(const std::string &name) const +type_safe::optional_ref diagram::get_file( + const std::string &name) const { for (const auto &p : files_) { if (p.get().full_name(false) == name) { diff --git a/src/include_diagram/visitor/translation_unit_visitor.cc b/src/include_diagram/visitor/translation_unit_visitor.cc index c453b309..c0cc675f 100644 --- a/src/include_diagram/visitor/translation_unit_visitor.cc +++ b/src/include_diagram/visitor/translation_unit_visitor.cc @@ -145,6 +145,5 @@ void translation_unit_visitor::process_file(const std::string &file, ctx.diagram().add_file(std::move(f)); } } - } } diff --git a/src/include_diagram/visitor/translation_unit_visitor.h b/src/include_diagram/visitor/translation_unit_visitor.h index b9347a6f..5b034882 100644 --- a/src/include_diagram/visitor/translation_unit_visitor.h +++ b/src/include_diagram/visitor/translation_unit_visitor.h @@ -17,17 +17,17 @@ */ #pragma once +#include "common/model/enums.h" +#include "common/model/package.h" #include "config/config.h" #include "cx/cursor.h" #include "include_diagram/model/diagram.h" #include "include_diagram/visitor/translation_unit_context.h" -#include "common/model/enums.h" -#include "common/model/package.h" #include #include -#include #include +#include #include #include diff --git a/src/util/util.cc b/src/util/util.cc index 08fc0415..88f108c0 100644 --- a/src/util/util.cc +++ b/src/util/util.cc @@ -202,7 +202,7 @@ template <> bool starts_with( const std::filesystem::path &path, const std::filesystem::path &prefix) { - if(path == prefix) + if (path == prefix) return true; const int path_length = std::distance(std::begin(path), std::end(path));