Factorize ExpressionVariableParentFinder and ExpressionVariableTypeFi…

…nder.
4ian · May 2, 2024 · 6a61431 · 6a61431
1 parent 02314a2
commit 6a61431
Show file tree

Hide file tree

Showing 13 changed files with 527 additions and 632 deletions.
diff --git a/Core/GDCore/IDE/Events/EventsVariableReplacer.cpp b/Core/GDCore/IDE/Events/EventsVariableReplacer.cpp
@@ -367,6 +367,9 @@ bool EventsVariableReplacer::DoVisitInstruction(gd::Instruction& instruction,
         }
 
         if (gd::ParameterMetadata::IsExpression("variable", type)) {
+          // TODO Find the variable path
+          // If there is an empty element (a bracket) don't change the type.
+          // When there is a bracket the drop down menu is shown.
           const auto& newParameterValue = instruction.GetParameter(parameterIndex);
           const auto &variableName = newParameterValue.GetPlainString();
           auto itr = variableNewTypes.find(variableName);

diff --git a/Core/GDCore/IDE/Events/ExpressionCompletionFinder.h b/Core/GDCore/IDE/Events/ExpressionCompletionFinder.h
@@ -3,8 +3,7 @@
  * Copyright 2008-present Florian Rival (Florian.Rival@gmail.com). All rights
  * reserved. This project is released under the MIT License.
  */
-#ifndef GDCORE_EXPRESSIONAUTOCOMPLETIONPROVIDER_H
-#define GDCORE_EXPRESSIONAUTOCOMPLETIONPROVIDER_H
+#pragma once
 
 #include <memory>
 #include <vector>
@@ -20,7 +19,7 @@
 #include "GDCore/IDE/Events/ExpressionNodeLocationFinder.h"
 #include "GDCore/IDE/Events/ExpressionTypeFinder.h"
 #include "GDCore/IDE/Events/ExpressionVariableOwnerFinder.h"
-#include "GDCore/IDE/Events/ExpressionVariableParentFinder.h"
+#include "GDCore/IDE/Events/ExpressionVariablePathFinder.h"
 #include "GDCore/Project/ProjectScopedContainers.h"
 #include "GDCore/Project/Variable.h"
 
@@ -525,7 +524,7 @@ class GD_CORE_API ExpressionCompletionFinder
   }
   void OnVisitVariableAccessorNode(VariableAccessorNode& node) override {
     VariableAndItsParent variableAndItsParent =
-        gd::ExpressionVariableParentFinder::GetLastParentOfNode(
+        gd::ExpressionVariablePathFinder::GetLastParentOfNode(
             platform, projectScopedContainers, node);
 
     // If no child, we're at the end of a variable (like `GrandChild` in
@@ -666,7 +665,7 @@ class GD_CORE_API ExpressionCompletionFinder
             [&]() {
               // This is a variable.
               VariableAndItsParent variableAndItsParent =
-                  gd::ExpressionVariableParentFinder::GetLastParentOfNode(
+                  gd::ExpressionVariablePathFinder::GetLastParentOfNode(
                       platform, projectScopedContainers, node);
 
               AddCompletionsForChildrenVariablesOf(
@@ -1113,5 +1112,3 @@ class GD_CORE_API ExpressionCompletionFinder
 };
 
 }  // namespace gd
-
-#endif  // GDCORE_EXPRESSIONAUTOCOMPLETIONPROVIDER_H