RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-05-31 04:38:11 +00:00
Code Issues Activity Actions

HackStudio: Sort the project tree alphabetically

Browse source 
I had to turn the tree nodes into RefCounted objects since it's not
possible to quick_sort() a Vector<OwnPtr<T>> at the moment.
This commit is contained in:
Andreas Kling 2019-12-23 00:36:57 +01:00
parent d9706ee882
commit 6e27b14a4a
2 changed files with 27 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

36
DevTools/HackStudio/Project.cpp
View file

@ -1,12 +1,13 @@
#include "Project.h" #include "Project.h"
#include <AK/FileSystemPath.h> #include <AK/FileSystemPath.h>
#include <AK/QuickSort.h>
#include <AK/StringBuilder.h> #include <AK/StringBuilder.h>
#include <LibCore/CFile.h> #include <LibCore/CFile.h>
#include <stdio.h> #include <stdio.h>
#include <string.h> #include <string.h>
#include <sys/stat.h> #include <sys/stat.h>
struct Project::ProjectTreeNode { struct Project::ProjectTreeNode : public RefCounted<ProjectTreeNode> {
enum class Type { enum class Type {
Invalid, Invalid,
Project, Project,
@ -20,7 +21,7 @@ struct Project::ProjectTreeNode {
if (child->type == Type::Directory && child->name == name) if (child->type == Type::Directory && child->name == name)
return *child; return *child;
} }
auto new_child = make<ProjectTreeNode>(); auto new_child = adopt(*new ProjectTreeNode);
new_child->type = Type::Directory; new_child->type = Type::Directory;
new_child->name = name; new_child->name = name;
new_child->parent = this; new_child->parent = this;
@ -29,9 +30,21 @@ struct Project::ProjectTreeNode {
return *ptr; return *ptr;
} }
void sort()
{
if (type == Type::File)
return;
quick_sort(children.begin(), children.end(), [](auto& a, auto& b) {
return a->name < b->name;
});
for (auto& child : children)
child->sort();
}
Type type { Type::Invalid }; Type type { Type::Invalid };
String name; String name;
Vector<OwnPtr<ProjectTreeNode>> children; String path;
Vector<NonnullRefPtr<ProjectTreeNode>> children;
ProjectTreeNode* parent { nullptr }; ProjectTreeNode* parent { nullptr };
}; };
@ -59,10 +72,10 @@ public:
{ {
auto* node = static_cast<Project::ProjectTreeNode*>(index.internal_data()); auto* node = static_cast<Project::ProjectTreeNode*>(index.internal_data());
if (role == Role::Display) { if (role == Role::Display) {
return FileSystemPath(node->name).basename(); return node->name;
} }
if (role == Role::Custom) { if (role == Role::Custom) {
return node->name; return node->path;
} }
if (role == Role::Icon) { if (role == Role::Icon) {
if (node->type == Project::ProjectTreeNode::Type::Project) if (node->type == Project::ProjectTreeNode::Type::Project)
@ -196,7 +209,7 @@ ProjectFile* Project::get_file(const String& filename)
void Project::rebuild_tree() void Project::rebuild_tree()
{ {
auto root = make<ProjectTreeNode>(); auto root = adopt(*new ProjectTreeNode);
root->type = ProjectTreeNode::Type::Project; root->type = ProjectTreeNode::Type::Project;
for (auto& file : m_files) { for (auto& file : m_files) {
@ -220,8 +233,9 @@ void Project::rebuild_tree()
current = &current->find_or_create_subdirectory(part); current = &current->find_or_create_subdirectory(part);
continue; continue;
} }
auto file_node = make<ProjectTreeNode>(); auto file_node = adopt(*new ProjectTreeNode);
file_node->name = file.name(); file_node->name = part;
file_node->path = path.string();
file_node->type = Project::ProjectTreeNode::Type::File; file_node->type = Project::ProjectTreeNode::Type::File;
file_node->parent = current; file_node->parent = current;
current->children.append(move(file_node)); current->children.append(move(file_node));
@ -229,6 +243,9 @@ void Project::rebuild_tree()
} }
} }
root->sort();
#if 0
Function<void(ProjectTreeNode&, int indent)> dump_tree = [&](ProjectTreeNode& node, int indent) { Function<void(ProjectTreeNode&, int indent)> dump_tree = [&](ProjectTreeNode& node, int indent) {
for (int i = 0; i < indent; ++i) for (int i = 0; i < indent; ++i)
printf(" "); printf(" ");
@ -241,9 +258,8 @@ void Project::rebuild_tree()
} }
}; };
printf("begin tree dump\n");
dump_tree(*root, 0); dump_tree(*root, 0);
printf("end tree dump\n"); #endif
m_root_node = move(root); m_root_node = move(root);
m_model->update(); m_model->update();

2
DevTools/HackStudio/Project.h
View file

@ -40,7 +40,7 @@ private:
String m_path; String m_path;
RefPtr<GModel> m_model; RefPtr<GModel> m_model;
NonnullRefPtrVector<ProjectFile> m_files; NonnullRefPtrVector<ProjectFile> m_files;
OwnPtr<ProjectTreeNode> m_root_node; RefPtr<ProjectTreeNode> m_root_node;
GIcon m_directory_icon; GIcon m_directory_icon;
GIcon m_file_icon; GIcon m_file_icon;