src: moved bundling info to NodeType

* also: fixed NodeType for global variables not in NodeTypeSet::all()

src/lib/data/NodeType.cpp

@@ -135,14 +135,57 @@ bool NodeType::isVisibleAsParentInGraph() const
 	return !isPackage();
 }
 
-FilePath NodeType::getIconPath() const
+Tree<NodeType::BundleInfo> NodeType::getOverviewBundleTree() const
 {
 	switch (m_type)
 	{
-	case NodeType::NODE_NAMESPACE:
-	case NodeType::NODE_PACKAGE:
-		// package icon cannot be changed
+	case  NodeType::NODE_FILE:
+		return Tree<BundleInfo>(BundleInfo([](const std::string&) { return true; }, "Files"));
+	case  NodeType::NODE_MACRO:
+		return Tree<BundleInfo>(BundleInfo([](const std::string&) { return true; }, "Macros"));
+	case  NodeType::NODE_NAMESPACE:
+		{
+			Tree<BundleInfo> tree(BundleInfo([](const std::string&) { return true; }, "Namespaces"));
+			tree.children.push_back(Tree<BundleInfo>(BundleInfo([](const std::string& nodeName) { return nodeName.find("anonymous namespace") != std::string::npos; }, "Anonymous Namespaces")));
+			return tree;
+		}
+	case  NodeType::NODE_PACKAGE:
+		return Tree<BundleInfo>(BundleInfo([](const std::string&) { return true; }, "Packages"));
+	case  NodeType::NODE_CLASS:
+		return Tree<BundleInfo>(BundleInfo([](const std::string&) { return true; }, "Classes"));
+	case  NodeType::NODE_INTERFACE:
+		return Tree<BundleInfo>(BundleInfo([](const std::string&) { return true; }, "Interfaces"));
+	case  NodeType::NODE_STRUCT:
+		return Tree<BundleInfo>(BundleInfo([](const std::string&) { return true; }, "Structs"));
+	case  NodeType::NODE_FUNCTION:
+		return Tree<BundleInfo>(BundleInfo([](const std::string&) { return true; }, "Functions"));
+	case  NodeType::NODE_GLOBAL_VARIABLE:
+		return Tree<BundleInfo>(BundleInfo([](const std::string&) { return true; }, "Global Variables"));
+	case  NodeType::NODE_TYPE:
+		return Tree<BundleInfo>(BundleInfo([](const std::string&) { return true; }, "Types"));
+	case  NodeType::NODE_TYPEDEF:
+		return Tree<BundleInfo>(BundleInfo([](const std::string&) { return true; }, "Typedefs"));
+	case  NodeType::NODE_ENUM:
+		return Tree<BundleInfo>(BundleInfo([](const std::string&) { return true; }, "Enums"));
+	case  NodeType::NODE_UNION:
+		return Tree<BundleInfo>(BundleInfo([](const std::string&) { return true; }, "Unions"));
+	default:
+		break;
+	}
+
+	return Tree<BundleInfo>();
+}
+
+FilePath NodeType::getIconPath() const
+{
+	if (isPackage())
+	{
+		// this icon cannot be changed
 		return ResourcePaths::getGuiPath().concat(FilePath("graph_view/images/namespace.png"));
+	}
+
+	switch (m_type)
+	{
 	case NodeType::NODE_ENUM:
 		return ResourcePaths::getGuiPath().concat(FilePath("graph_view/images/enum.png"));
 	case NodeType::NODE_TYPEDEF:
@@ -158,9 +201,12 @@ FilePath NodeType::getIconPath() const
 
 bool NodeType::hasIcon() const
 {
+	if (isPackage())
+	{
+		return true;
+	}
+
 	const NodeType::TypeMask mask =
-		NodeType::NODE_NAMESPACE |
-		NodeType::NODE_PACKAGE |
 		NodeType::NODE_ENUM |
 		NodeType::NODE_TYPEDEF |
 		NodeType::NODE_FILE |
@@ -198,6 +244,11 @@ NodeType::StyleType NodeType::getNodeStyle() const
 	}
 }
 
+bool NodeType::hasOverviewBundle() const
+{
+	return !getOverviewBundleTree().data.bundleName.empty();
+}
+
 std::string NodeType::getUnderscoredTypeString() const
 {
 	return utility::replace(utility::replace(getReadableTypeString(), "-", "_"), " ", "_");

src/lib/data/NodeType.h

@@ -7,6 +7,7 @@
 #include <vector>
 
 #include "utility/file/FilePath.h"
+#include "utility/Tree.h"
 #include "utility/types.h"
 
 class NodeType
@@ -49,6 +50,20 @@ public:
 		STYLE_BIG_NODE = 2
 	};
 
+	struct BundleInfo
+	{
+		BundleInfo()
+			: nameMatcher(nullptr)
+			, bundleName("")
+		{}
+		BundleInfo(std::function<bool(std::string)> nameMatcher, std::string bundleName)
+			: nameMatcher(nameMatcher)
+			, bundleName(bundleName)
+		{}
+		std::function<bool(const std::string&)> nameMatcher;
+		std::string bundleName;
+	};
+
 	NodeType(Type type);
 
 	bool operator==(const NodeType& o) const;
@@ -68,11 +83,14 @@ public:
 	bool isPotentialMember() const;
 	bool isCollapsible() const;
 	bool isVisibleAsParentInGraph() const;
+	Tree<BundleInfo> getOverviewBundleTree() const;
+
 	FilePath getIconPath() const;
 
 	bool hasIcon() const;
 	StyleType getNodeStyle() const;
 
+	bool hasOverviewBundle() const;
 	std::string getUnderscoredTypeString() const;
 	std::string getReadableTypeString() const;
 

src/lib/data/NodeTypeSet.cpp

@@ -142,6 +142,7 @@ const std::vector<NodeType> NodeTypeSet::s_allNodeTypes = {
 	NodeType(NodeType::NODE_STRUCT),
 	NodeType(NodeType::NODE_CLASS),
 	NodeType(NodeType::NODE_INTERFACE),
+	NodeType(NodeType::NODE_GLOBAL_VARIABLE),
 	NodeType(NodeType::NODE_FIELD),
 	NodeType(NodeType::NODE_FUNCTION),
 	NodeType(NodeType::NODE_METHOD),