From 44033415bc82d99577e42010ca015c3636d7ec2e Mon Sep 17 00:00:00 2001
From: Sam Atkins <atkinssj@serenityos.org>
Date: Thu, 25 Jan 2024 12:59:24 +0000
Subject: [PATCH] HackStudio: Rename & move DeclarationsModel::Suggestion ->
 Declaration

---
 .../DevTools/HackStudio/DeclarationsModel.cpp | 10 +++---
 .../DevTools/HackStudio/DeclarationsModel.h   | 32 +++++++++----------
 Userland/DevTools/HackStudio/Locator.cpp      |  8 ++---
 3 files changed, 25 insertions(+), 25 deletions(-)

diff --git a/Userland/DevTools/HackStudio/DeclarationsModel.cpp b/Userland/DevTools/HackStudio/DeclarationsModel.cpp
index 47e5e9286d..de162aa412 100644
--- a/Userland/DevTools/HackStudio/DeclarationsModel.cpp
+++ b/Userland/DevTools/HackStudio/DeclarationsModel.cpp
@@ -11,22 +11,22 @@
 
 namespace HackStudio {
 
-DeclarationsModel::Suggestion DeclarationsModel::Suggestion::create_filename(ByteString const& filename)
+Declaration Declaration::create_filename(ByteString const& filename)
 {
-    DeclarationsModel::Suggestion s;
+    Declaration s;
     s.as_filename = filename;
     return s;
 }
-DeclarationsModel::Suggestion DeclarationsModel::Suggestion::create_symbol_declaration(CodeComprehension::Declaration const& decl)
+Declaration Declaration::create_symbol_declaration(CodeComprehension::Declaration const& decl)
 {
-    DeclarationsModel::Suggestion s;
+    Declaration s;
     s.as_symbol_declaration = decl;
     return s;
 }
 
 GUI::Variant DeclarationsModel::data(GUI::ModelIndex const& index, GUI::ModelRole role) const
 {
-    auto& suggestion = m_suggestions.at(index.row());
+    auto& suggestion = m_declarations.at(index.row());
     if (role != GUI::ModelRole::Display)
         return {};
 
diff --git a/Userland/DevTools/HackStudio/DeclarationsModel.h b/Userland/DevTools/HackStudio/DeclarationsModel.h
index 2063bbdd98..ee75fd8e2e 100644
--- a/Userland/DevTools/HackStudio/DeclarationsModel.h
+++ b/Userland/DevTools/HackStudio/DeclarationsModel.h
@@ -14,21 +14,21 @@
 
 namespace HackStudio {
 
+struct Declaration {
+    static Declaration create_filename(ByteString const& filename);
+    static Declaration create_symbol_declaration(CodeComprehension::Declaration const&);
+
+    bool is_filename() const { return as_filename.has_value(); }
+    bool is_symbol_declaration() const { return as_symbol_declaration.has_value(); }
+
+    Optional<ByteString> as_filename;
+    Optional<CodeComprehension::Declaration> as_symbol_declaration;
+};
+
 class DeclarationsModel final : public GUI::Model {
 public:
-    struct Suggestion {
-        static Suggestion create_filename(ByteString const& filename);
-        static Suggestion create_symbol_declaration(CodeComprehension::Declaration const&);
-
-        bool is_filename() const { return as_filename.has_value(); }
-        bool is_symbol_declaration() const { return as_symbol_declaration.has_value(); }
-
-        Optional<ByteString> as_filename;
-        Optional<CodeComprehension::Declaration> as_symbol_declaration;
-    };
-
-    explicit DeclarationsModel(Vector<Suggestion>&& suggestions)
-        : m_suggestions(move(suggestions))
+    explicit DeclarationsModel(Vector<Declaration>&& declarations)
+        : m_declarations(move(declarations))
     {
     }
 
@@ -38,14 +38,14 @@ public:
         Filename,
         __Column_Count,
     };
-    virtual int row_count(GUI::ModelIndex const& = GUI::ModelIndex()) const override { return m_suggestions.size(); }
+    virtual int row_count(GUI::ModelIndex const& = GUI::ModelIndex()) const override { return m_declarations.size(); }
     virtual int column_count(GUI::ModelIndex const& = GUI::ModelIndex()) const override { return Column::__Column_Count; }
     virtual GUI::Variant data(GUI::ModelIndex const& index, GUI::ModelRole role) const override;
 
-    Vector<Suggestion> const& suggestions() const { return m_suggestions; }
+    Vector<Declaration> const& declarations() const { return m_declarations; }
 
 private:
-    Vector<Suggestion> m_suggestions;
+    Vector<Declaration> m_declarations;
 };
 
 }
diff --git a/Userland/DevTools/HackStudio/Locator.cpp b/Userland/DevTools/HackStudio/Locator.cpp
index 3287693514..594d648346 100644
--- a/Userland/DevTools/HackStudio/Locator.cpp
+++ b/Userland/DevTools/HackStudio/Locator.cpp
@@ -82,7 +82,7 @@ Locator::Locator(Core::EventReceiver* parent)
 void Locator::open_suggestion(const GUI::ModelIndex& index)
 {
     auto& model = reinterpret_cast<DeclarationsModel&>(*m_suggestion_view->model());
-    auto suggestion = model.suggestions()[index.row()];
+    auto suggestion = model.declarations()[index.row()];
     if (suggestion.is_filename()) {
         auto filename = suggestion.as_filename.value();
         open_file(filename);
@@ -112,15 +112,15 @@ void Locator::close()
 void Locator::update_suggestions()
 {
     auto typed_text = m_textbox->text();
-    Vector<DeclarationsModel::Suggestion> suggestions;
+    Vector<Declaration> suggestions;
     project().for_each_text_file([&](auto& file) {
         if (file.name().contains(typed_text, CaseSensitivity::CaseInsensitive))
-            suggestions.append(DeclarationsModel::Suggestion::create_filename(file.name()));
+            suggestions.append(Declaration::create_filename(file.name()));
     });
 
     ProjectDeclarations::the().for_each_declared_symbol([&suggestions, &typed_text](auto& decl) {
         if (decl.name.contains(typed_text, CaseSensitivity::CaseInsensitive) || decl.scope.contains(typed_text, CaseSensitivity::CaseInsensitive))
-            suggestions.append((DeclarationsModel::Suggestion::create_symbol_declaration(decl)));
+            suggestions.append((Declaration::create_symbol_declaration(decl)));
     });
 
     bool has_suggestions = !suggestions.is_empty();