Merge branch 'master' into electron-32

Author: arthuro555

.circleci/config.yml

@@ -33,3 +33,4 @@
 .Spotlight-V100
 .Trashes
 Thumbs.db
+.claude

.gitignore

@@ -38,8 +38,7 @@
       "presentation": {
         "reveal": "silent"
       },
-      "isBackground": true,
-      "runOptions": { "instanceLimit": 1, "runOn": "folderOpen" }
+      "isBackground": true
     },
     {
       "type": "npm",

.vscode/tasks.json

@@ -61,10 +61,12 @@ void GroupEvent::UnserializeFrom(gd::Project& project,
       project, events, element.GetChild("events"));
 
   parameters.clear();
-  gd::SerializerElement& parametersElement = element.GetChild("parameters");
-  parametersElement.ConsiderAsArrayOf("parameters");
-  for (std::size_t i = 0; i < parametersElement.GetChildrenCount(); ++i)
-    parameters.push_back(parametersElement.GetChild(i).GetValue().GetString());
+  if (element.HasChild("parameters")) {
+    gd::SerializerElement& parametersElement = element.GetChild("parameters");
+    parametersElement.ConsiderAsArrayOf("parameters");
+    for (std::size_t i = 0; i < parametersElement.GetChildrenCount(); ++i)
+      parameters.push_back(parametersElement.GetChild(i).GetValue().GetString());
+  }
 }
 
 void GroupEvent::SetBackgroundColor(unsigned int colorR_,

Core/GDCore/Events/Builtin/GroupEvent.cpp

@@ -163,6 +163,21 @@ void LinkEvent::UnserializeFrom(gd::Project& project,
   // end of compatibility code
 }
 
+vector<gd::String> LinkEvent::GetAllSearchableStrings() const {
+  vector<gd::String> allSearchableStrings;
+
+  allSearchableStrings.push_back(target);
+
+  return allSearchableStrings;
+}
+
+bool LinkEvent::ReplaceAllSearchableStrings(
+    std::vector<gd::String> newSearchableString) {
+  if (newSearchableString[0] == target) return false;
+  SetTarget(newSearchableString[0]);
+  return true;
+}
+
 bool LinkEvent::AcceptVisitor(gd::EventVisitor &eventVisitor) {
   return BaseEvent::AcceptVisitor(eventVisitor) ||
          eventVisitor.VisitLinkEvent(*this);

Core/GDCore/Events/Builtin/LinkEvent.cpp

@@ -109,6 +109,10 @@ class GD_CORE_API LinkEvent : public gd::BaseEvent {
 
   virtual bool IsExecutable() const override { return true; };
 
+  virtual std::vector<gd::String> GetAllSearchableStrings() const override;
+  virtual bool ReplaceAllSearchableStrings(
+      std::vector<gd::String> newSearchableString) override;
+
   virtual void SerializeTo(SerializerElement& element) const override;
   virtual void UnserializeFrom(gd::Project& project,
                                const SerializerElement& element) override;

Core/GDCore/Events/Builtin/LinkEvent.h

@@ -9,9 +9,9 @@
 #include <utility>
 #include <vector>
 
+#include "GDCore/Events/CodeGeneration/DiagnosticReport.h"
 #include "GDCore/Events/Event.h"
 #include "GDCore/Events/Instruction.h"
-#include "GDCore/Events/CodeGeneration/DiagnosticReport.h"
 #include "GDCore/Project/ProjectScopedContainers.h"
 #include "GDCore/String.h"
 
@@ -62,7 +62,7 @@ class GD_CORE_API EventsCodeGenerator {
   EventsCodeGenerator(
       const gd::Platform& platform,
       const gd::ProjectScopedContainers& projectScopedContainers_);
-  virtual ~EventsCodeGenerator(){};
+  virtual ~EventsCodeGenerator() {};
 
   /**
    * \brief Preprocess an events list (replacing for example links with the
@@ -160,15 +160,16 @@ class GD_CORE_API EventsCodeGenerator {
   gd::String GenerateActionCode(
       gd::Instruction& action,
       EventsCodeGenerationContext& context,
-      const gd::String& optionalAsyncCallbackName = "");
+      const gd::String& optionalAsyncCallbackName = "",
+      const gd::String& optionalAsyncCallbackId = "");
 
   struct CallbackDescriptor {
     CallbackDescriptor(const gd::String functionName_,
                        const gd::String argumentsList_,
                        const std::set<gd::String> requiredObjects_)
         : functionName(functionName_),
           argumentsList(argumentsList_),
-          requiredObjects(requiredObjects_){};
+          requiredObjects(requiredObjects_) {};
     /**
      * The name by which the function can be invoked.
      */
@@ -338,9 +339,9 @@ class GD_CORE_API EventsCodeGenerator {
   }
 
   /**
-   * @brief Give access to the project scoped containers as code generation might
-   * push and pop variable containers (for local variables).
-   * This could be passed as a parameter recursively in code generation, but this requires
+   * @brief Give access to the project scoped containers as code generation
+   * might push and pop variable containers (for local variables). This could be
+   * passed as a parameter recursively in code generation, but this requires
    * heavy refactoring. Instead, we use this single instance.
    */
   gd::ProjectScopedContainers& GetProjectScopedContainers() {
@@ -387,9 +388,7 @@ class GD_CORE_API EventsCodeGenerator {
     diagnosticReport = diagnosticReport_;
   }
 
-  gd::DiagnosticReport* GetDiagnosticReport() {
-    return diagnosticReport;
-  }
+  gd::DiagnosticReport* GetDiagnosticReport() { return diagnosticReport; }
 
   /**
    * \brief Generate the full name for accessing to a boolean variable used for
@@ -513,16 +512,16 @@ class GD_CORE_API EventsCodeGenerator {
    * \brief Generate an any variable getter that fallbacks on scene variable for
    * compatibility reason.
    */
-  gd::String
-  GenerateAnyOrSceneVariableGetter(const gd::Expression &variableExpression,
-                                   EventsCodeGenerationContext &context);
+  gd::String GenerateAnyOrSceneVariableGetter(
+      const gd::Expression& variableExpression,
+      EventsCodeGenerationContext& context);
 
   virtual gd::String GeneratePropertySetterWithoutCasting(
-      const gd::PropertiesContainer &propertiesContainer,
-      const gd::NamedPropertyDescriptor &property,
-      const gd::String &operandCode);
+      const gd::PropertiesContainer& propertiesContainer,
+      const gd::NamedPropertyDescriptor& property,
+      const gd::String& operandCode);
 
-protected:
+ protected:
   virtual const gd::String GenerateRelationalOperatorCodes(
       const gd::String& operatorString);
 
@@ -643,16 +642,16 @@ class GD_CORE_API EventsCodeGenerator {
       gd::EventsCodeGenerationContext& context);
 
   virtual gd::String GeneratePropertyGetterWithoutCasting(
-      const gd::PropertiesContainer &propertiesContainer,
-      const gd::NamedPropertyDescriptor &property);
+      const gd::PropertiesContainer& propertiesContainer,
+      const gd::NamedPropertyDescriptor& property);
 
   virtual gd::String GenerateParameterGetter(
       const gd::ParameterMetadata& parameter,
       const gd::String& type,
       gd::EventsCodeGenerationContext& context);
 
-  virtual gd::String
-  GenerateParameterGetterWithoutCasting(const gd::ParameterMetadata &parameter);
+  virtual gd::String GenerateParameterGetterWithoutCasting(
+      const gd::ParameterMetadata& parameter);
 
   /**
    * \brief Generate the code to reference an object which is
@@ -769,7 +768,8 @@ class GD_CORE_API EventsCodeGenerator {
       const std::vector<gd::String>& arguments,
       const gd::InstructionMetadata& instrInfos,
       gd::EventsCodeGenerationContext& context,
-      const gd::String& optionalAsyncCallbackName = "");
+      const gd::String& optionalAsyncCallbackName = "",
+      const gd::String& optionalAsyncCallbackId = "");
 
   virtual gd::String GenerateObjectAction(
       const gd::String& objectName,
@@ -778,7 +778,8 @@ class GD_CORE_API EventsCodeGenerator {
       const std::vector<gd::String>& arguments,
       const gd::InstructionMetadata& instrInfos,
       gd::EventsCodeGenerationContext& context,
-      const gd::String& optionalAsyncCallbackName = "");
+      const gd::String& optionalAsyncCallbackName = "",
+      const gd::String& optionalAsyncCallbackId = "");
 
   virtual gd::String GenerateBehaviorAction(
       const gd::String& objectName,
@@ -788,7 +789,8 @@ class GD_CORE_API EventsCodeGenerator {
       const std::vector<gd::String>& arguments,
       const gd::InstructionMetadata& instrInfos,
       gd::EventsCodeGenerationContext& context,
-      const gd::String& optionalAsyncCallbackName = "");
+      const gd::String& optionalAsyncCallbackName = "",
+      const gd::String& optionalAsyncCallbackId = "");
 
   gd::String GenerateRelationalOperatorCall(
       const gd::InstructionMetadata& instrInfos,
@@ -837,9 +839,8 @@ class GD_CORE_API EventsCodeGenerator {
   virtual gd::String GenerateGetBehaviorNameCode(
       const gd::String& behaviorName);
 
-  void CheckBehaviorParameters(
-      const gd::Instruction &instruction,
-      const gd::InstructionMetadata &instrInfos);
+  bool CheckBehaviorParameters(const gd::Instruction& instruction,
+                               const gd::InstructionMetadata& instrInfos);
 
   const gd::Platform& platform;  ///< The platform being used.
 
@@ -876,4 +877,3 @@ class GD_CORE_API EventsCodeGenerator {
 };
 
 }  // namespace gd
-

Core/GDCore/Events/CodeGeneration/EventsCodeGenerator.cpp

@@ -286,6 +286,20 @@ class GD_CORE_API BaseEvent {
    * \brief True if the event should be folded in the events editor.
    */
   bool IsFolded() const { return folded; }
+
+  /**
+   * \brief Set the AI generated event ID.
+   */
+  void SetAiGeneratedEventId(const gd::String& aiGeneratedEventId_) {
+    aiGeneratedEventId = aiGeneratedEventId_;
+  }
+
+  /**
+   * \brief Get the AI generated event ID.
+   */
+  const gd::String& GetAiGeneratedEventId() const {
+    return aiGeneratedEventId;
+  }
   ///@}
 
   std::weak_ptr<gd::BaseEvent>
@@ -304,6 +318,7 @@ class GD_CORE_API BaseEvent {
   bool disabled;    ///< True if the event is disabled and must not be executed
   gd::String type;  ///< Type of the event. Must be assigned at the creation.
                     ///< Used for saving the event for instance.
+  gd::String aiGeneratedEventId;  ///< When generated by an AI/external tool.
 
   static gd::EventsList badSubEvents;
   static gd::VariablesContainer badLocalVariables;

Core/GDCore/Events/CodeGeneration/EventsCodeGenerator.h

@@ -221,6 +221,8 @@ void EventsListSerialization::UnserializeEventsFrom(
 
     event->SetDisabled(eventElem.GetBoolAttribute("disabled", false));
     event->SetFolded(eventElem.GetBoolAttribute("folded", false));
+    event->SetAiGeneratedEventId(
+        eventElem.GetStringAttribute("aiGeneratedEventId", ""));
 
     list.InsertEvent(event, list.GetEventsCount());
   }
@@ -236,6 +238,8 @@ void EventsListSerialization::SerializeEventsTo(const EventsList& list,
     if (event.IsDisabled())
       eventElem.SetAttribute("disabled", event.IsDisabled());
     if (event.IsFolded()) eventElem.SetAttribute("folded", event.IsFolded());
+    if (!event.GetAiGeneratedEventId().empty())
+      eventElem.SetAttribute("aiGeneratedEventId", event.GetAiGeneratedEventId());
     eventElem.AddChild("type").SetValue(event.GetType());
 
     event.SerializeTo(eventElem);