Upgrade Travis Ubuntu version

.circleci/config.yml

@@ -41,7 +41,7 @@ jobs:
 
       - run:
           name: Install Emscripten (for GDevelop.js)
-          command: git clone https://github.com/juj/emsdk.git && cd emsdk && ./emsdk install 3.1.21 && ./emsdk activate 3.1.21 && cd ..
+          command: git clone https://github.com/juj/emsdk.git && cd emsdk && ./emsdk install 3.1.66 && ./emsdk activate 3.1.66 && cd ..
 
       # GDevelop.js dependencies
       - restore_cache:
@@ -118,7 +118,7 @@ jobs:
 
       - run:
           name: Install Emscripten (for GDevelop.js)
-          command: git clone https://github.com/juj/emsdk.git && cd emsdk && ./emsdk install 3.1.21 && ./emsdk activate 3.1.21 && cd ..
+          command: git clone https://github.com/juj/emsdk.git && cd emsdk && ./emsdk install 3.1.66 && ./emsdk activate 3.1.66 && cd ..
 
       - run:
           name: Install system dependencies for Electron builder
@@ -197,7 +197,7 @@ jobs:
 
       - run:
           name: Install Emscripten (for GDevelop.js)
-          command: git clone https://github.com/juj/emsdk.git && cd emsdk && ./emsdk install 3.1.21 && ./emsdk activate 3.1.21 && cd ..
+          command: git clone https://github.com/juj/emsdk.git && cd emsdk && ./emsdk install 3.1.66 && ./emsdk activate 3.1.66 && cd ..
 
       # GDevelop.js dependencies
       - restore_cache:

.gitattributes

@@ -3,7 +3,6 @@ Extensions/ParticleSystem/SPARK/* linguist-vendored
 Extensions/PhysicsBehavior/Box2D/* linguist-vendored
 Extensions/PhysicsBehavior/box2djs/* linguist-vendored
 Extensions/Physics2Behavior/box2d.js linguist-vendored
-Extensions/Physics3DBehavior/*.wasm-compat.js linguist-vendored
 Extensions/BBText/pixi-multistyle-text/* linguist-vendored
 Extensions/P2P/A_peer.js linguist-vendored
 Extensions/Multiplayer/peer.js linguist-vendored

.github/workflows/update-extension-translations.yml

@@ -1,47 +0,0 @@
-# GitHub Action to update extension translations.
-# It copies the latest messages.js files from the GDevelop-extensions repository
-# and opens a Pull Request with the changes on GDevelop's repository.
-
-name: Update extension translations
-on:
-  push:
-    branches:
-      - master
-    tags-ignore:
-      - "**" # Don't run on new tags
-  workflow_dispatch: # Allows manual triggering from the Actions tab
-
-jobs:
-  update-extension-translations:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout current repository
-        uses: actions/checkout@v3
-
-      - name: Clone GDevelop-extensions repository
-        run: git clone https://github.com/GDevelopApp/GDevelop-extensions.git /tmp/GDevelop-extensions
-
-      - name: Copy and rename translation files
-        run: |
-          mkdir -p newIDE/app/src/locales
-          for folder in /tmp/GDevelop-extensions/.translations/*; do
-            if [ -d "$folder" ]; then
-              lang=$(basename "$folder")
-              mkdir -p "newIDE/app/src/locales/$lang"
-              cp "$folder/messages.js" "newIDE/app/src/locales/$lang/extension-messages.js"
-            fi
-          done
-          cp /tmp/GDevelop-extensions/.translations/LocalesMetadata.js newIDE/app/src/locales/ExtensionLocalesMetadata.js
-
-      - name: Create Pull Request with updated translations
-        uses: peter-evans/create-pull-request@v6
-        with:
-          commit-message: Update extension translations [skip ci]
-          branch: chore/update-extension-translations
-          delete-branch: true
-          title: "[Auto PR] Update extension translations"
-          body: |
-            This updates the extension translations by copying the latest messages.js files from the GDevelop-extensions repository.
-            Each messages.js file is renamed to extension-messages.js and placed in the corresponding language folder under `newIDE/app/src/locales`.
-
-            Please review the changes carefully before merging.

.gitpod.yml

@@ -1,6 +1,6 @@
 # This is a configuration file allowing to quickly set up a development environment
 # on GitPod (https://www.gitpod.io/).
-# Also check GitHub codespaces if you're interested in working 
+# Also check GitHub codespaces if you're interested in working
 # on a remote development server.
 
 # This works well for:
@@ -12,9 +12,9 @@
 tasks:
   - name: Install dependencies for Emscripten and build GDevelop.js
     init: |
-          sudo apt-get update 
+          sudo apt-get update
           sudo apt install cmake python-is-python3 python3-distutils -y
-          git clone https://github.com/juj/emsdk.git && cd emsdk && ./emsdk install 3.1.21 && ./emsdk activate 3.1.21 && cd ..
+          git clone https://github.com/juj/emsdk.git && cd emsdk && ./emsdk install 3.1.66 && ./emsdk activate 3.1.66 && cd ..
           cd GDevelop.js
           npm install
           source ../emsdk/emsdk_env.sh && npm run build -- --dev

.travis.yml

@@ -6,6 +6,7 @@
 
 language: cpp
 sudo: false
+dist: jammy
 compiler:
   - clang
 
@@ -16,21 +17,14 @@ cache:
 
 addons:
   apt:
-    sources:
-      - ubuntu-toolchain-r-test
     packages:
       # Build dependencies:
       - cmake
       - p7zip-full
 
-before_install:
-  # This workaround is required to avoid libstdc++ errors (Emscripten requires a recent version of libstdc++)
-  - wget -q -O libstdc++6 http://security.ubuntu.com/ubuntu/pool/main/g/gcc-5/libstdc++6_5.4.0-6ubuntu1~16.04.12_amd64.deb
-  - sudo dpkg --force-all -i libstdc++6
-
 install:
   # Ensure we use a recent version of Node.js (and npm).
-  - nvm install v16 && nvm use v16
+  - nvm install v18 && nvm use v18
   #Compile the tests only for GDCore
   - mkdir .build-tests
   - cd .build-tests
@@ -39,8 +33,8 @@ install:
   - cd ..
   # Install Emscripten (for GDevelop.js)
   # Specify the tag for the core repository to avois breaking changes.
-  - git clone --depth 1 --branch 3.1.21 https://github.com/juj/emsdk.git
-  - cd emsdk && ./emsdk install 3.1.21 && ./emsdk activate 3.1.21 && cd ..
+  - git clone --depth 1 --branch 3.1.66 https://github.com/juj/emsdk.git
+  - cd emsdk && ./emsdk install 3.1.66 && ./emsdk activate 3.1.66 && cd ..
   # Install GDevelop.js dependencies
   - cd GDevelop.js && npm install && cd ..
   # Build GDevelop.js

Core/CMakeLists.txt

@@ -78,7 +78,7 @@ else()
 	add_library(GDCore SHARED ${source_files})
 endif()
 if(EMSCRIPTEN)
-	set_target_properties(GDCore PROPERTIES SUFFIX ".bc")
+	# set_target_properties(GDCore PROPERTIES SUFFIX ".bc")
 elseif(WIN32)
 	set_target_properties(GDCore PROPERTIES PREFIX "")
 else()

Core/GDCore/Events/CodeGeneration/EventsCodeGenerator.cpp

@@ -1358,30 +1358,12 @@ gd::String EventsCodeGenerator::GeneratePropertyGetter(const gd::PropertiesConta
   return "getProperty" + property.GetName() + "As" + type + "()";
 }
 
-gd::String EventsCodeGenerator::GeneratePropertyGetterWithoutCasting(
-    const gd::PropertiesContainer &propertiesContainer,
-    const gd::NamedPropertyDescriptor &property) {
-  return "getProperty" + property.GetName() + "()";
-}
-
-gd::String EventsCodeGenerator::GeneratePropertySetterWithoutCasting(
-    const gd::PropertiesContainer &propertiesContainer,
-    const gd::NamedPropertyDescriptor &property,
-    const gd::String &operandCode) {
-  return "setProperty" + property.GetName() + "(" + operandCode + ")";
-    }
-
 gd::String EventsCodeGenerator::GenerateParameterGetter(const gd::ParameterMetadata& parameter,
                                                         const gd::String& type,
                                                         gd::EventsCodeGenerationContext& context) {
   return "getParameter" + parameter.GetName() + "As" + type + "()";
 }
 
-gd::String EventsCodeGenerator::GenerateParameterGetterWithoutCasting(
-    const gd::ParameterMetadata &parameter) {
-      return "getParameter" + parameter.GetName() + "()";
-    }
-
 EventsCodeGenerator::EventsCodeGenerator(const gd::Project& project_,
                                          const gd::Layout& layout,
                                          const gd::Platform& platform_)

Core/GDCore/Events/CodeGeneration/EventsCodeGenerator.h

@@ -467,14 +467,7 @@ class GD_CORE_API EventsCodeGenerator {
    */
   virtual gd::String GetCodeNamespace() { return ""; };
 
-  enum VariableScope {
-    LAYOUT_VARIABLE = 0,
-    PROJECT_VARIABLE,
-    OBJECT_VARIABLE,
-    ANY_VARIABLE,
-    VARIABLE_OR_PROPERTY,
-    VARIABLE_OR_PROPERTY_OR_PARAMETER
-  };
+  enum VariableScope { LAYOUT_VARIABLE = 0, PROJECT_VARIABLE, OBJECT_VARIABLE, ANY_VARIABLE };
 
   /**
    * Generate a single unique number for the specified instruction.
@@ -517,11 +510,6 @@ class GD_CORE_API EventsCodeGenerator {
   GenerateAnyOrSceneVariableGetter(const gd::Expression &variableExpression,
                                    EventsCodeGenerationContext &context);
 
-  virtual gd::String GeneratePropertySetterWithoutCasting(
-      const gd::PropertiesContainer &propertiesContainer,
-      const gd::NamedPropertyDescriptor &property,
-      const gd::String &operandCode);
-
 protected:
   virtual const gd::String GenerateRelationalOperatorCodes(
       const gd::String& operatorString);
@@ -577,8 +565,7 @@ protected:
       const gd::String& variableName,
       const VariableScope& scope,
       gd::EventsCodeGenerationContext& context,
-      const gd::String& objectName,
-      bool hasChild) {
+      const gd::String& objectName) {
     // This code is only used as a mock.
     // See the real implementation in GDJS.
     if (scope == LAYOUT_VARIABLE) {
@@ -586,9 +573,7 @@ protected:
 
     } else if (scope == PROJECT_VARIABLE) {
       return "getProjectVariable(" + variableName + ")";
-    } else if (scope == ANY_VARIABLE || scope == VARIABLE_OR_PROPERTY ||
-               scope == VARIABLE_OR_PROPERTY_OR_PARAMETER) {
-      // TODO Split the 3 cases to make tests stronger.
+    } else if (scope == ANY_VARIABLE) {
       return "getAnyVariable(" + variableName + ")";
     }
 
@@ -642,18 +627,11 @@ protected:
       const gd::String& type,
       gd::EventsCodeGenerationContext& context);
 
-  virtual gd::String GeneratePropertyGetterWithoutCasting(
-      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);
-
   /**
    * \brief Generate the code to reference an object which is
    * in an empty/null state.

Core/GDCore/Events/CodeGeneration/ExpressionCodeGenerator.cpp

@@ -135,20 +135,18 @@ void ExpressionCodeGenerator::OnVisitVariableNode(VariableNode& node) {
     EventsCodeGenerator::VariableScope scope =
         type == "variable"
             ? gd::EventsCodeGenerator::ANY_VARIABLE
-        : type == "variableOrProperty"
-            ? gd::EventsCodeGenerator::VARIABLE_OR_PROPERTY
-        : type == "variableOrPropertyOrParameter"
-            ? gd::EventsCodeGenerator::VARIABLE_OR_PROPERTY_OR_PARAMETER
-        : type == "globalvar" ? gd::EventsCodeGenerator::PROJECT_VARIABLE
-        : type == "scenevar"  ? gd::EventsCodeGenerator::LAYOUT_VARIABLE
-                              : gd::EventsCodeGenerator::OBJECT_VARIABLE;
+        : type == "globalvar"
+            ? gd::EventsCodeGenerator::PROJECT_VARIABLE
+            : type == "scenevar"
+                  ? gd::EventsCodeGenerator::LAYOUT_VARIABLE
+                  : gd::EventsCodeGenerator::OBJECT_VARIABLE;
 
     auto objectName = gd::ExpressionVariableOwnerFinder::GetObjectName(codeGenerator.GetPlatform(),
                                           codeGenerator.GetObjectsContainersList(),
                                           rootObjectName,
                                           node);
     output += codeGenerator.GenerateGetVariable(
-        node.name, scope, context, objectName, node.child != nullptr);
+        node.name, scope, context, objectName);
     if (node.child) node.child->Visit(*this);
   } else {
     // The node represents a variable or an object variable in an expression waiting for its *value* to be returned.
@@ -165,7 +163,7 @@ void ExpressionCodeGenerator::OnVisitVariableNode(VariableNode& node) {
       output += codeGenerator.GenerateVariableValueAs(type);
     }, [&]() {
       output += codeGenerator.GenerateGetVariable(
-          node.name, gd::EventsCodeGenerator::ANY_VARIABLE, context, "", node.child != nullptr);
+          node.name, gd::EventsCodeGenerator::ANY_VARIABLE, context, "");
       if (node.child) node.child->Visit(*this);
       output += codeGenerator.GenerateVariableValueAs(type);
     }, [&]() {
@@ -186,9 +184,8 @@ void ExpressionCodeGenerator::OnVisitVariableAccessorNode(
     VariableAccessorNode& node) {
     if (!objectNameToUseForVariableAccessor.empty()) {
       // Use the name of the object passed by the parent, as we need both to access an object variable.
-      output += codeGenerator.GenerateGetVariable(
-          node.name, gd::EventsCodeGenerator::OBJECT_VARIABLE, context,
-          objectNameToUseForVariableAccessor, node.child != nullptr);
+      output += codeGenerator.GenerateGetVariable(node.name,
+          gd::EventsCodeGenerator::OBJECT_VARIABLE, context, objectNameToUseForVariableAccessor);
 
       // We have accessed an object variable, from now we can continue accessing the child variables
       // (including using the bracket notation).
@@ -225,27 +222,24 @@ void ExpressionCodeGenerator::OnVisitIdentifierNode(IdentifierNode& node) {
     output +=
         codeGenerator.GenerateObject(node.identifierName, type, context);
   } else if (gd::ParameterMetadata::IsExpression("variable", type)) {
-    EventsCodeGenerator::VariableScope scope =
+      EventsCodeGenerator::VariableScope scope =
         type == "variable"
             ? gd::EventsCodeGenerator::ANY_VARIABLE
-        : type == "variableOrProperty"
-            ? gd::EventsCodeGenerator::VARIABLE_OR_PROPERTY
-        : type == "variableOrPropertyOrParameter"
-            ? gd::EventsCodeGenerator::VARIABLE_OR_PROPERTY_OR_PARAMETER
-        : type == "globalvar" ? gd::EventsCodeGenerator::PROJECT_VARIABLE
-        : type == "scenevar"  ? gd::EventsCodeGenerator::LAYOUT_VARIABLE
-                              : gd::EventsCodeGenerator::OBJECT_VARIABLE;
+        : type == "globalvar"
+              ? gd::EventsCodeGenerator::PROJECT_VARIABLE
+              : type == "scenevar"
+                    ? gd::EventsCodeGenerator::LAYOUT_VARIABLE
+                    : gd::EventsCodeGenerator::OBJECT_VARIABLE;
 
-    auto objectName = gd::ExpressionVariableOwnerFinder::GetObjectName(
-        codeGenerator.GetPlatform(), codeGenerator.GetObjectsContainersList(),
-        rootObjectName, node);
-    output += codeGenerator.GenerateGetVariable(
-        node.identifierName, scope, context, objectName,
-        !node.childIdentifierName.empty());
-    if (!node.childIdentifierName.empty()) {
-      output +=
-          codeGenerator.GenerateVariableAccessor(node.childIdentifierName);
-    }
+      auto objectName = gd::ExpressionVariableOwnerFinder::GetObjectName(codeGenerator.GetPlatform(),
+                                            codeGenerator.GetObjectsContainersList(),
+                                            rootObjectName,
+                                            node);
+      output += codeGenerator.GenerateGetVariable(
+          node.identifierName, scope, context, objectName);
+      if (!node.childIdentifierName.empty()) {
+        output += codeGenerator.GenerateVariableAccessor(node.childIdentifierName);
+      }
   } else {
     const auto& variablesContainersList = codeGenerator.GetProjectScopedContainers().GetVariablesContainersList();
     const auto& propertiesContainersList = codeGenerator.GetProjectScopedContainers().GetPropertiesContainersList();
@@ -255,13 +249,12 @@ void ExpressionCodeGenerator::OnVisitIdentifierNode(IdentifierNode& node) {
     codeGenerator.GetProjectScopedContainers().MatchIdentifierWithName<void>(node.identifierName, [&]() {
       // Generate the code to access the object variable.
       output += codeGenerator.GenerateGetVariable(
-          node.childIdentifierName, gd::EventsCodeGenerator::OBJECT_VARIABLE,
-          context, node.identifierName, !node.childIdentifierName.empty());
+        node.childIdentifierName, gd::EventsCodeGenerator::OBJECT_VARIABLE, context, node.identifierName);
       output += codeGenerator.GenerateVariableValueAs(type);
     }, [&]() {
       output += codeGenerator.GenerateGetVariable(
-          node.identifierName, gd::EventsCodeGenerator::VARIABLE_OR_PROPERTY_OR_PARAMETER, context,
-          "", !node.childIdentifierName.empty());
+          node.identifierName, gd::EventsCodeGenerator::ANY_VARIABLE, context,
+          "");
       if (!node.childIdentifierName.empty()) {
         output += codeGenerator.GenerateVariableAccessor(node.childIdentifierName);
       }

Core/GDCore/Events/Event.cpp

@@ -18,6 +18,8 @@ namespace gd {
 
 EventsList BaseEvent::badSubEvents;
 VariablesContainer BaseEvent::badLocalVariables;
+std::vector<gd::String> BaseEvent::emptyDependencies;
+gd::String BaseEvent::emptySourceFile;
 
 BaseEvent::BaseEvent()
     : totalTimeDuringLastSession(0),

Core/GDCore/Events/Event.h

@@ -175,6 +175,26 @@ class GD_CORE_API BaseEvent {
         noExpr;
     return noExpr;
   };
+
+  /**
+   * \brief Returns the dependencies on source files of the project.
+   * \note Default implementation returns an empty list of dependencies. This is
+   * fine for most events that are not related to adding custom user source
+   * code.
+   */
+  virtual const std::vector<gd::String>& GetSourceFileDependencies() const {
+    return emptyDependencies;
+  };
+
+  /**
+   * \brief Returns the name of the source file associated with the event
+   * \note Default implementation returns an empty string. This is fine for most
+   * events that are not related to adding custom user source code.
+   */
+  virtual const gd::String& GetAssociatedGDManagedSourceFile(
+      gd::Project& project) const {
+    return emptySourceFile;
+  };
   ///@}
 
   /** \name Code generation
@@ -307,6 +327,8 @@ class GD_CORE_API BaseEvent {
 
   static gd::EventsList badSubEvents;
   static gd::VariablesContainer badLocalVariables;
+  static std::vector<gd::String> emptyDependencies;
+  static gd::String emptySourceFile;
 };
 
 /**

Core/GDCore/Extensions/Builtin/AdvancedExtension.cpp

@@ -141,8 +141,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsAdvancedExtension(
                     "res/function32.png")
       .AddParameter("functionParameterName", _("Parameter name"), "number,string,boolean")
       .SetRelevantForFunctionEventsOnly()
-      .MarkAsAdvanced()
-      .SetHidden();
+      .MarkAsAdvanced();
 
   extension
       .AddExpression(
@@ -178,8 +177,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsAdvancedExtension(
       .AddParameter("functionParameterName", _("Parameter name"), "number,string,boolean")
       .UseStandardRelationalOperatorParameters(
           "number", gd::ParameterOptions::MakeNewOptions())
-      .SetRelevantForFunctionEventsOnly()
-      .SetHidden();
+      .SetRelevantForFunctionEventsOnly();
 
   extension
       .AddCondition(
@@ -193,8 +191,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsAdvancedExtension(
       .AddParameter("functionParameterName", _("Parameter name"), "number,string,boolean")
       .UseStandardRelationalOperatorParameters(
           "string", gd::ParameterOptions::MakeNewOptions())
-      .SetRelevantForFunctionEventsOnly()
-      .SetHidden();
+      .SetRelevantForFunctionEventsOnly();
 }
 
 }  // namespace gd

Core/GDCore/Extensions/Builtin/BaseObjectExtension.cpp

@@ -117,7 +117,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
                 _("Change the position of the center of _PARAM0_: _PARAM1_ "
                   "_PARAM2_ (x "
                   "axis), _PARAM3_ _PARAM4_ (y axis)"),
-                _("Position ❯ Center"),
+                _("Position/Center"),
                 "res/actions/position24_black.png",
                 "res/actions/position_black.png")
       .AddParameter("object", _("Object"))
@@ -133,7 +133,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
          _("Center X position"),
          _("the X position of the center of rotation"),
          _("the X position of the center"),
-         _("Position ❯ Center"),
+         _("Position/Center"),
          "res/actions/position24_black.png")
       .AddParameter("object", _("Object"))
       .UseStandardParameters("number", ParameterOptions::MakeNewOptions());
@@ -144,7 +144,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
          _("Center Y position"),
          _("the Y position of the center of rotation"),
          _("the Y position of the center"),
-         _("Position ❯ Center"),
+         _("Position/Center"),
          "res/actions/position24_black.png")
       .AddParameter("object", _("Object"))
       .UseStandardParameters("number", ParameterOptions::MakeNewOptions());
@@ -155,7 +155,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
                                 _("the bounding box (the area encapsulating "
                                   "the object) left position"),
                                 _("the bounding box left position"),
-                                _("Position ❯ Bounding Box"),
+                                _("Position/Bounding Box"),
                                 "res/conditions/bounding-box-left_black.svg")
       .AddParameter("object", _("Object"))
       .UseStandardParameters("number", ParameterOptions::MakeNewOptions());
@@ -166,7 +166,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
          _("Bounding box top position"),
          _("the bounding box (the area encapsulating the object) top position"),
          _("the bounding box top position"),
-         _("Position ❯ Bounding Box"),
+         _("Position/Bounding Box"),
          "res/conditions/bounding-box-top_black.svg")
       .AddParameter("object", _("Object"))
       .UseStandardParameters("number", ParameterOptions::MakeNewOptions());
@@ -177,7 +177,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
                                 _("the bounding box (the area encapsulating "
                                   "the object) right position"),
                                 _("the bounding box right position"),
-                                _("Position ❯ Bounding Box"),
+                                _("Position/Bounding Box"),
                                 "res/conditions/bounding-box-right_black.svg")
       .AddParameter("object", _("Object"))
       .UseStandardParameters("number", ParameterOptions::MakeNewOptions());
@@ -188,7 +188,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
                                 _("the bounding box (the area encapsulating "
                                   "the object) bottom position"),
                                 _("the bounding box bottom position"),
-                                _("Position ❯ Bounding Box"),
+                                _("Position/Bounding Box"),
                                 "res/conditions/bounding-box-bottom_black.svg")
       .AddParameter("object", _("Object"))
       .UseStandardParameters("number", ParameterOptions::MakeNewOptions());
@@ -199,7 +199,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
                                 _("the bounding box (the area encapsulating "
                                   "the object) center X position"),
                                 _("the bounding box center X position"),
-                                _("Position ❯ Bounding Box"),
+                                _("Position/Bounding Box"),
                                 "res/conditions/bounding-box-center_black.svg")
       .AddParameter("object", _("Object"))
       .UseStandardParameters("number", ParameterOptions::MakeNewOptions());
@@ -210,7 +210,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
                                 _("the bounding box (the area encapsulating "
                                   "the object) center Y position"),
                                 _("the bounding box center Y position"),
-                                _("Position ❯ Bounding Box"),
+                                _("Position/Bounding Box"),
                                 "res/conditions/bounding-box-center_black.svg")
       .AddParameter("object", _("Object"))
       .UseStandardParameters("number", ParameterOptions::MakeNewOptions());
@@ -255,6 +255,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
                 _("Angle"),
                 "res/actions/rotate24_black.png",
                 "res/actions/rotate_black.png")
+
       .AddParameter("object", _("Object"))
       .AddParameter("expression", _("Angular speed (in degrees per second)"))
       .AddCodeOnlyParameter("currentScene", "")
@@ -268,6 +269,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
          _("Angle"),
          "res/actions/rotate24_black.png",
          "res/actions/rotate_black.png")
+
       .AddParameter("object", _("Object"))
       .AddParameter("expression", _("Angle to rotate towards (in degrees)"))
       .AddParameter("expression", _("Angular speed (in degrees per second)"))
@@ -283,6 +285,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
          _("Angle"),
          "res/actions/rotate24_black.png",
          "res/actions/rotate_black.png")
+
       .AddParameter("object", _("Object"))
       .AddParameter("expression", _("X position"))
       .AddParameter("expression", _("Y position"))
@@ -301,12 +304,12 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
          _("Movement using forces"),
          "res/actions/force24.png",
          "res/actions/force.png")
+
       .AddParameter("object", _("Object"))
       .AddParameter("expression", _("Speed on X axis (in pixels per second)"))
       .AddParameter("expression", _("Speed on Y axis (in pixels per second)"))
       .AddParameter("forceMultiplier", _("Force multiplier"), "", true)
-      .SetDefaultValue("0")
-      .SetHelpPath("/tutorials/how-to-move-objects/");
+      .SetDefaultValue("0");
 
   obj.AddAction("AddForceAL",
                 _("Add a force (angle)"),
@@ -318,12 +321,12 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
                 _("Movement using forces"),
                 "res/actions/force24.png",
                 "res/actions/force.png")
+
       .AddParameter("object", _("Object"))
       .AddParameter("expression", _("Angle"))
       .AddParameter("expression", _("Speed (in pixels per second)"))
       .AddParameter("forceMultiplier", _("Force multiplier"), "", true)
       .SetDefaultValue("0")
-      .SetHelpPath("/tutorials/how-to-move-objects/")
       .MarkAsAdvanced();
 
   obj.AddAction(
@@ -336,13 +339,13 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
          _("Movement using forces"),
          "res/actions/force24.png",
          "res/actions/force.png")
+
       .AddParameter("object", _("Object"))
       .AddParameter("expression", _("X position"))
       .AddParameter("expression", _("Y position"))
       .AddParameter("expression", _("Speed (in pixels per second)"))
       .AddParameter("forceMultiplier", _("Force multiplier"), "", true)
       .SetDefaultValue("0")
-      .SetHelpPath("/tutorials/how-to-move-objects/")
       .MarkAsAdvanced();
 
   obj.AddAction(
@@ -357,13 +360,13 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
          _("Movement using forces"),
          "res/actions/forceTourne24.png",
          "res/actions/forceTourne.png")
+
       .AddParameter("object", _("Object"))
       .AddParameter("expression", "X position of the center")
       .AddParameter("expression", "Y position of the center")
       .AddParameter("expression", "Speed (in Degrees per seconds)")
       .AddParameter("expression", "Distance (in pixels)")
       .AddParameter("forceMultiplier", "Force multiplier")
-      .SetHelpPath("/tutorials/how-to-move-objects/")
       .SetHidden();
 
   obj.AddAction("Arreter",
@@ -373,8 +376,8 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
                 _("Movement using forces"),
                 "res/actions/arreter24.png",
                 "res/actions/arreter.png")
+
       .AddParameter("object", _("Object"))
-      .SetHelpPath("/tutorials/how-to-move-objects/")
       .MarkAsAdvanced();
 
   obj.AddAction("Delete",
@@ -415,7 +418,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
       .MarkAsAdvanced();
 
   obj.AddAction("SetNumberObjectVariable",
-                _("Change object variable value"),
+                _("Change variable value"),
                 _("Modify the number value of an object variable."),
                 _("the variable _PARAM1_"),
                 _("Variables"),
@@ -426,11 +429,10 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
       .AddParameter("objectvar", _("Variable"))
       .UseStandardOperatorParameters("number",
                                      ParameterOptions::MakeNewOptions())
-      .SetHelpPath("/all-features/variables/object-variables/")
       .SetRelevantForLayoutEventsOnly();
 
   obj.AddAction("SetStringObjectVariable",
-                _("Change object variable value"),
+                _("Change text variable"),
                 _("Modify the text of an object variable."),
                 _("the variable _PARAM1_"),
                 _("Variables"),
@@ -441,11 +443,10 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
       .AddParameter("objectvar", _("Variable"))
       .UseStandardOperatorParameters("string",
                                      ParameterOptions::MakeNewOptions())
-      .SetHelpPath("/all-features/variables/object-variables/")
       .SetRelevantForLayoutEventsOnly();
 
   obj.AddAction("SetBooleanObjectVariable",
-                _("Change object variable value"),
+                _("Change boolean variable"),
                 _("Modify the boolean value of an object variable."),
                 _("Change the variable _PARAM1_ of _PARAM0_: _PARAM2_"),
                 _("Variables"),
@@ -457,11 +458,10 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
       // This parameter allows to keep the operand expression
       // when the editor switch between variable instructions.
       .AddCodeOnlyParameter("yesorno", _("Value"))
-      .SetHelpPath("/all-features/variables/object-variables/")
       .SetRelevantForLayoutEventsOnly();
 
   obj.AddCondition("NumberObjectVariable",
-                   _("Object variable value"),
+                   _("Variable value"),
                    _("Compare the number value of an object variable."),
                    _("the variable _PARAM1_"),
                    _("Variables"),
@@ -472,11 +472,10 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
       .AddParameter("objectvar", _("Variable"))
       .UseStandardRelationalOperatorParameters(
           "number", ParameterOptions::MakeNewOptions())
-      .SetHelpPath("/all-features/variables/object-variables/")
       .SetRelevantForLayoutEventsOnly();
 
   obj.AddCondition("StringObjectVariable",
-                   _("Object variable value"),
+                   _("Text variable"),
                    _("Compare the text of an object variable."),
                    _("the variable _PARAM1_"),
                    _("Variables"),
@@ -487,11 +486,10 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
       .AddParameter("objectvar", _("Variable"))
       .UseStandardRelationalOperatorParameters(
           "string", ParameterOptions::MakeNewOptions())
-      .SetHelpPath("/all-features/variables/object-variables/")
       .SetRelevantForLayoutEventsOnly();
 
   obj.AddCondition("BooleanObjectVariable",
-                   _("Object variable value"),
+                   _("Boolean variable"),
                    _("Compare the boolean value of an object variable."),
                    _("The variable _PARAM1_ of _PARAM0_ is _PARAM2_"),
                    _("Variables"),
@@ -504,7 +502,6 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
       // This parameter allows to keep the operand expression
       // when the editor switch between variable instructions.
       .AddCodeOnlyParameter("yesorno", _("Value"))
-      .SetHelpPath("/all-features/variables/object-variables/")
       .SetRelevantForLayoutEventsOnly();
 
   obj.AddAction("ModVarObjet",
@@ -517,7 +514,6 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
 
       .AddParameter("object", _("Object"))
       .AddParameter("objectvar", _("Variable"))
-      .SetHelpPath("/all-features/variables/object-variables/")
       .UseStandardOperatorParameters("number",
                                      ParameterOptions::MakeNewOptions())
       .SetRelevantForFunctionEventsOnly();
@@ -532,7 +528,6 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
 
       .AddParameter("object", _("Object"))
       .AddParameter("objectvar", _("Variable"))
-      .SetHelpPath("/all-features/variables/object-variables/")
       .UseStandardOperatorParameters("string",
                                      ParameterOptions::MakeNewOptions())
       .SetRelevantForFunctionEventsOnly();
@@ -549,7 +544,6 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
       .AddParameter("object", _("Object"))
       .AddParameter("objectvar", _("Variable"))
       .AddParameter("trueorfalse", _("New Value:"))
-      .SetHelpPath("/all-features/variables/object-variables/")
       .SetRelevantForFunctionEventsOnly();
 
   obj.AddAction(
@@ -566,7 +560,6 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
 
       .AddParameter("object", _("Object"))
       .AddParameter("objectvar", _("Variable"))
-      .SetHelpPath("/all-features/variables/object-variables/")
       .SetRelevantForFunctionEventsOnly();
 
   obj.AddCondition("ObjectVariableChildExists",
@@ -574,26 +567,24 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
                    _("Check if the specified child of the object "
                      "structure variable exists."),
                    _("Child _PARAM2_ of variable _PARAM1_ of _PARAM0_ exists"),
-                   _("Variables ❯ Arrays and structures"),
+                   _("Variables/Arrays and structures"),
                    "res/conditions/var24.png",
                    "res/conditions/var.png")
       .AddParameter("object", _("Object"))
       .AddParameter("objectvar", _("Structure variable"))
       .AddParameter("string", _("Name of the child"))
-      .SetHelpPath("/all-features/variables/structures-and-arrays/")
       .MarkAsAdvanced();
 
   obj.AddAction("ObjectVariableRemoveChild",
                 _("Remove a child"),
                 _("Remove a child from an object structure variable."),
                 _("Remove child _PARAM2_ from variable _PARAM1_ of _PARAM0_"),
-                _("Variables ❯ Arrays and structures"),
+                _("Variables/Arrays and structures"),
                 "res/actions/var24.png",
                 "res/actions/var.png")
       .AddParameter("object", _("Object"))
       .AddParameter("objectvar", _("Structure variable"))
       .AddParameter("string", _("Child's name"))
-      .SetHelpPath("/all-features/variables/structures-and-arrays/")
       .MarkAsAdvanced();
 
   obj.AddAction("ObjectVariableClearChildren",
@@ -601,12 +592,11 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
                 _("Remove all the children from the object array or structure "
                   "variable."),
                 _("Clear children from variable _PARAM1_ of _PARAM0_"),
-                _("Variables ❯ Arrays and structures"),
+                _("Variables/Arrays and structures"),
                 "res/actions/var24.png",
                 "res/actions/var.png")
       .AddParameter("object", _("Object"))
       .AddParameter("objectvar", _("Array or structure variable"))
-      .SetHelpPath("/all-features/variables/structures-and-arrays/")
       .MarkAsAdvanced();
 
   obj.AddAction("Cache",
@@ -701,8 +691,8 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
                    _("Movement using forces"),
                    "res/conditions/arret24.png",
                    "res/conditions/arret.png")
+
       .AddParameter("object", _("Object"))
-      .SetHelpPath("/tutorials/how-to-move-objects/")
       .MarkAsAdvanced();
 
   obj.AddCondition("Vitesse",
@@ -712,10 +702,10 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
                    _("Movement using forces"),
                    "res/conditions/vitesse24.png",
                    "res/conditions/vitesse.png")
+
       .AddParameter("object", _("Object"))
       .UseStandardRelationalOperatorParameters(
           "number", ParameterOptions::MakeNewOptions())
-      .SetHelpPath("/tutorials/how-to-move-objects/")
       .MarkAsAdvanced();
 
   // Deprecated
@@ -732,7 +722,6 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
       .AddParameter("object", _("Object"))
       .AddParameter("expression", _("Angle, in degrees"))
       .AddParameter("expression", _("Tolerance, in degrees"))
-      .SetHelpPath("/tutorials/how-to-move-objects/")
       .MarkAsAdvanced();
 
   obj.AddCondition("IsTotalForceAngleAround",
@@ -746,7 +735,6 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
       .AddParameter("object", _("Object"))
       .AddParameter("expression", _("Angle, in degrees"))
       .AddParameter("expression", _("Tolerance, in degrees"))
-      .SetHelpPath("/tutorials/how-to-move-objects/")
       .MarkAsAdvanced();
 
   obj.AddCondition("VarObjet",
@@ -761,7 +749,6 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
       .AddParameter("objectvar", _("Variable"))
       .UseStandardRelationalOperatorParameters(
           "number", ParameterOptions::MakeNewOptions())
-      .SetHelpPath("/all-features/variables/object-variables/")
       .SetRelevantForFunctionEventsOnly();
 
   obj.AddCondition("VarObjetTxt",
@@ -776,7 +763,6 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
       .AddParameter("objectvar", _("Variable"))
       .UseStandardRelationalOperatorParameters(
           "string", ParameterOptions::MakeNewOptions())
-      .SetHelpPath("/all-features/variables/object-variables/")
       .SetRelevantForFunctionEventsOnly();
 
   obj.AddCondition("ObjectVariableAsBoolean",
@@ -791,7 +777,6 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
       .AddParameter("objectvar", _("Variable"))
       .AddParameter("trueorfalse", _("Check if the value is"))
       .SetDefaultValue("true")
-      .SetHelpPath("/all-features/variables/object-variables/")
       .SetRelevantForFunctionEventsOnly();
 
   obj.AddCondition("VarObjetDef",
@@ -808,45 +793,42 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
 
   obj.AddAction(
          "PushStringToObjectVariable",
-         _("Add value to object array variable"),
+         _("Add text variable"),
          _("Adds a text (string) to the end of an object array variable."),
          _("Add value _PARAM2_ to array variable _PARAM1_ of _PARAM0_"),
-         _("Variables ❯ Arrays and structures"),
+         _("Variables/Arrays and structures"),
          "res/actions/var24.png",
          "res/actions/var.png")
       .AddParameter("object", _("Object"))
       .AddParameter("objectvar", _("Array variable"))
       .AddParameter("string", _("Text to add"))
-      .SetHelpPath("/all-features/variables/structures-and-arrays/")
       .MarkAsAdvanced()
       .SetRelevantForLayoutEventsOnly();
 
   obj.AddAction("PushNumberToObjectVariable",
-                _("Add value to object array variable"),
+                _("Add variable array value"),
                 _("Adds a number to the end of an object array variable."),
                 _("Add value _PARAM2_ to array variable _PARAM1_ of _PARAM0_"),
-                _("Variables ❯ Arrays and structures"),
+                _("Variables/Arrays and structures"),
                 "res/actions/var24.png",
                 "res/actions/var.png")
       .AddParameter("object", _("Object"))
       .AddParameter("objectvar", _("Array variable"))
       .AddParameter("expression", _("Number to add"))
-      .SetHelpPath("/all-features/variables/structures-and-arrays/")
       .MarkAsAdvanced()
       .SetRelevantForLayoutEventsOnly();
 
   obj.AddAction(
          "PushBooleanToObjectVariable",
-         _("Add value to object array variable"),
+         _("Add boolean variable"),
          _("Adds a boolean to the end of an object array variable."),
          _("Add value _PARAM2_ to array variable _PARAM1_ of _PARAM0_"),
-         _("Variables ❯ Arrays and structures"),
+         _("Variables/Arrays and structures"),
          "res/actions/var24.png",
          "res/actions/var.png")
       .AddParameter("object", _("Object"))
       .AddParameter("objectvar", _("Array variable"))
       .AddParameter("trueorfalse", _("Boolean to add"))
-      .SetHelpPath("/all-features/variables/structures-and-arrays/")
       .MarkAsAdvanced()
       .SetRelevantForLayoutEventsOnly();
 
@@ -856,7 +838,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
          _("Add existing variable"),
          _("Adds an existing variable to the end of an object array variable."),
          _("Add variable _PARAM2_ to array variable _PARAM1_ of _PARAM0_"),
-         _("Variables ❯ Arrays and structures"),
+         _("Variables/Arrays and structures"),
          "res/actions/var24.png",
          "res/actions/var.png")
       .AddParameter("object", _("Object"))
@@ -865,7 +847,6 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
       .SetParameterLongDescription(_("The content of the object variable will "
                                      "*be copied* and added at the "
                                      "end of the array."))
-      .SetHelpPath("/all-features/variables/structures-and-arrays/")
       .MarkAsAdvanced()
       .SetHidden();
 
@@ -874,7 +855,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
          _("Add existing variable"),
          _("Adds an existing variable to the end of an object array variable."),
          _("Add variable _PARAM2_ to array variable _PARAM1_ of _PARAM0_"),
-         _("Variables ❯ Arrays and structures"),
+         _("Variables/Arrays and structures"),
          "res/actions/var24.png",
          "res/actions/var.png")
       .AddParameter("object", _("Object"))
@@ -883,7 +864,6 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
       .SetParameterLongDescription(_("The content of the object variable will "
                                      "*be copied* and added at the "
                                      "end of the array."))
-      .SetHelpPath("/all-features/variables/structures-and-arrays/")
       .MarkAsAdvanced();
 
   obj.AddAction(
@@ -891,13 +871,12 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
          _("Add text variable"),
          _("Adds a text (string) to the end of an object array variable."),
          _("Add text _PARAM2_ to array variable _PARAM1_ of _PARAM0_"),
-         _("Variables ❯ Arrays and structures"),
+         _("Variables/Arrays and structures"),
          "res/actions/var24.png",
          "res/actions/var.png")
       .AddParameter("object", _("Object"))
       .AddParameter("objectvar", _("Array variable"))
       .AddParameter("string", _("Text to add"))
-      .SetHelpPath("/all-features/variables/structures-and-arrays/")
       .MarkAsAdvanced()
       .SetRelevantForFunctionEventsOnly();
 
@@ -905,13 +884,12 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
                 _("Add number variable"),
                 _("Adds a number to the end of an object array variable."),
                 _("Add number _PARAM2_ to array variable _PARAM1_ of _PARAM0_"),
-                _("Variables ❯ Arrays and structures"),
+                _("Variables/Arrays and structures"),
                 "res/actions/var24.png",
                 "res/actions/var.png")
       .AddParameter("object", _("Object"))
       .AddParameter("objectvar", _("Array variable"))
       .AddParameter("expression", _("Number to add"))
-      .SetHelpPath("/all-features/variables/structures-and-arrays/")
       .MarkAsAdvanced()
       .SetRelevantForFunctionEventsOnly();
 
@@ -920,13 +898,12 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
          _("Add boolean variable"),
          _("Adds a boolean to the end of an object array variable."),
          _("Add boolean _PARAM2_ to array variable _PARAM1_ of _PARAM0_"),
-         _("Variables ❯ Arrays and structures"),
+         _("Variables/Arrays and structures"),
          "res/actions/var24.png",
          "res/actions/var.png")
       .AddParameter("object", _("Object"))
       .AddParameter("objectvar", _("Array variable"))
       .AddParameter("trueorfalse", _("Boolean to add"))
-      .SetHelpPath("/all-features/variables/structures-and-arrays/")
       .MarkAsAdvanced()
       .SetRelevantForFunctionEventsOnly();
 
@@ -937,13 +914,12 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
            "variable."),
          _("Remove variable at index _PARAM2_ from array variable _PARAM1_ of "
            "_PARAM0_"),
-         _("Variables ❯ Arrays and structures"),
+         _("Variables/Arrays and structures"),
          "res/actions/var24.png",
          "res/actions/var.png")
       .AddParameter("object", _("Object"))
       .AddParameter("objectvar", _("Array variable"))
       .AddParameter("expression", _("Index to remove"))
-      .SetHelpPath("/all-features/variables/structures-and-arrays/")
       .MarkAsAdvanced();
 
   obj.AddCondition(
@@ -951,14 +927,13 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
          _("Number of children"),
          _("Compare the number of children in an object array variable."),
          _("The number of children in the array variable _PARAM1_"),
-         _("Variables ❯ Arrays and structures"),
+         _("Variables/Arrays and structures"),
          "res/conditions/var24.png",
          "res/conditions/var.png")
       .AddParameter("object", _("Object"))
       .AddParameter("objectvar", _("Variable"))
       .UseStandardRelationalOperatorParameters(
           "number", ParameterOptions::MakeNewOptions())
-      .SetHelpPath("/all-features/variables/structures-and-arrays/")
       .MarkAsAdvanced();
 
   obj.AddStrExpression(
@@ -966,44 +941,40 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
          _("First text child"),
          _("Get the value of the first element of an object array variable, if "
            "it is a text (string) variable."),
-         _("Variables ❯ Arrays and structures"),
+         _("Variables/Arrays and structures"),
          "res/actions/var.png")
       .AddParameter("object", _("Object"))
-      .AddParameter("objectvar", _("Array variable"))
-      .SetHelpPath("/all-features/variables/structures-and-arrays/");
+      .AddParameter("objectvar", _("Array variable"));
 
   obj.AddExpression(
          "ArrayVariableFirstNumber",
          _("First number child"),
          _("Get the value of the first element of an object array variable, if "
            "it is a number variable."),
-         _("Variables ❯ Arrays and structures"),
+         _("Variables/Arrays and structures"),
          "res/actions/var.png")
       .AddParameter("object", _("Object"))
-      .AddParameter("objectvar", _("Array variable"))
-      .SetHelpPath("/all-features/variables/structures-and-arrays/");
+      .AddParameter("objectvar", _("Array variable"));
 
   obj.AddStrExpression(
          "ArrayVariableLastString",
          _("Last text child"),
          _("Get the value of the last element of an object array variable, if "
            "it is a text (string) variable."),
-         _("Variables ❯ Arrays and structures"),
+         _("Variables/Arrays and structures"),
          "res/actions/var.png")
       .AddParameter("object", _("Object"))
-      .AddParameter("objectvar", _("Array variable"))
-      .SetHelpPath("/all-features/variables/structures-and-arrays/");
+      .AddParameter("objectvar", _("Array variable"));
 
   obj.AddExpression(
          "ArrayVariableLastNumber",
          _("Last number child"),
          _("Get the value of the last element of an object array variable, if "
            "it is a number variable."),
-         _("Variables ❯ Arrays and structures"),
+         _("Variables/Arrays and structures"),
          "res/actions/var.png")
       .AddParameter("object", _("Object"))
-      .AddParameter("objectvar", _("Array variable"))
-      .SetHelpPath("/all-features/variables/structures-and-arrays/");
+      .AddParameter("objectvar", _("Array variable"));
 
   obj.AddCondition("BehaviorActivated",
                    _("Behavior activated"),
@@ -1038,12 +1009,12 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
                 _("Movement using forces"),
                 "res/actions/forceVers24.png",
                 "res/actions/forceVers.png")
+
       .AddParameter("object", _("Object"))
       .AddParameter("objectPtr", _("Target Object"))
       .AddParameter("expression", _("Speed (in pixels per second)"))
       .AddParameter("forceMultiplier", _("Force multiplier"), "", true)
       .SetDefaultValue("0")
-      .SetHelpPath("/tutorials/how-to-move-objects/")
       .MarkAsAdvanced();
 
   obj.AddAction(
@@ -1058,13 +1029,13 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
          _("Movement using forces"),
          "res/actions/forceTourne24.png",
          "res/actions/forceTourne.png")
+
       .AddParameter("object", _("Object"))
       .AddParameter("objectPtr", _("Rotate around this object"))
       .AddParameter("expression", _("Speed (in degrees per second)"))
       .AddParameter("expression", _("Distance (in pixels)"))
       .AddParameter("forceMultiplier", _("Force multiplier"), "", true)
       .SetDefaultValue("0")
-      .SetHelpPath("/tutorials/how-to-move-objects/")
       .MarkAsAdvanced();
 
   obj.AddAction("MettreAutour",
@@ -1092,10 +1063,10 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
                 _("Movement using forces"),
                 "res/actions/ecarter24.png",
                 "res/actions/ecarter.png")
+
       .SetHidden()
       .AddParameter("object", _("Object"))
-      .AddParameter("objectList", "Object 2 (won't move)")
-      .SetHelpPath("/tutorials/how-to-move-objects/");
+      .AddParameter("objectList", "Object 2 (won't move)");
 
   // Deprecated action
   obj.AddAction("Ecarter",
@@ -1119,6 +1090,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
                 _("Position"),
                 "res/actions/ecarter24.png",
                 "res/actions/ecarter.png")
+
       .AddParameter("object", _("Object"))
       .AddParameter("objectList", _("Objects (won't move)"))
       .AddParameter("yesorno",
@@ -1127,7 +1099,6 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
                     "",
                     true)
       .SetDefaultValue("no")
-      .SetHelpPath("/all-features/collisions/")
       .MarkAsSimple();
 
   obj.AddCondition("CollisionPoint",
@@ -1140,7 +1111,6 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
       .AddParameter("object", _("Object"))
       .AddParameter("expression", _("X position of the point"))
       .AddParameter("expression", _("Y position of the point"))
-      .SetHelpPath("/all-features/collisions/")
       .MarkAsSimple();
 
   extension
@@ -1172,7 +1142,6 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
       .AddParameter("object", _("Object"))
       .AddParameter("identifier", _("Timer's name"), "objectTimer")
       .AddParameter("expression", _("Time in seconds"))
-      .SetHelpPath("/all-features/timers-and-time/")
       .SetHidden();
 
   obj.AddCondition(
@@ -1188,7 +1157,6 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
       .AddParameter("identifier", _("Timer's name"), "objectTimer")
       .AddParameter("relationalOperator", _("Sign of the test"), "time")
       .AddParameter("expression", _("Time in seconds"))
-      .SetHelpPath("/all-features/timers-and-time/")
       .SetManipulatedType("number");
 
   obj.AddCondition("ObjectTimerPaused",
@@ -1200,7 +1168,6 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
                    "res/conditions/timerPaused.png")
       .AddParameter("object", _("Object"))
       .AddParameter("identifier", _("Timer's name"), "objectTimer")
-      .SetHelpPath("/all-features/timers-and-time/")
       .MarkAsAdvanced();
 
   obj.AddAction(
@@ -1213,8 +1180,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
          "res/actions/timer24.png",
          "res/actions/timer.png")
       .AddParameter("object", _("Object"))
-      .AddParameter("identifier", _("Timer's name"), "objectTimer")
-      .SetHelpPath("/all-features/timers-and-time/");
+      .AddParameter("identifier", _("Timer's name"), "objectTimer");
 
   obj.AddAction("PauseObjectTimer",
                 _("Pause an object timer"),
@@ -1225,7 +1191,6 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
                 "res/actions/pauseTimer.png")
       .AddParameter("object", _("Object"))
       .AddParameter("identifier", _("Timer's name"), "objectTimer")
-      .SetHelpPath("/all-features/timers-and-time/")
       .MarkAsAdvanced();
 
   obj.AddAction("UnPauseObjectTimer",
@@ -1237,7 +1202,6 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
                 "res/actions/unPauseTimer.png")
       .AddParameter("object", _("Object"))
       .AddParameter("identifier", _("Timer's name"), "objectTimer")
-      .SetHelpPath("/all-features/timers-and-time/")
       .MarkAsAdvanced();
 
   obj.AddAction("RemoveObjectTimer",
@@ -1249,7 +1213,6 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
                 "res/actions/timer.png")
       .AddParameter("object", _("Object"))
       .AddParameter("identifier", _("Timer's name"), "objectTimer")
-      .SetHelpPath("/all-features/timers-and-time/")
       .MarkAsAdvanced();
 
   obj.AddExpression("X",
@@ -1278,32 +1241,28 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
                     _("X coordinate of the sum of forces"),
                     _("Movement using forces"),
                     "res/actions/force.png")
-      .AddParameter("object", _("Object"))
-      .SetHelpPath("/tutorials/how-to-move-objects/");
+      .AddParameter("object", _("Object"));
 
   obj.AddExpression("ForceY",
                     _("Y coordinate of the sum of forces"),
                     _("Y coordinate of the sum of forces"),
                     _("Movement using forces"),
                     "res/actions/force.png")
-      .AddParameter("object", _("Object"))
-      .SetHelpPath("/tutorials/how-to-move-objects/");
+      .AddParameter("object", _("Object"));
 
   obj.AddExpression("ForceAngle",
                     _("Angle of the sum of forces"),
                     _("Angle of the sum of forces (in degrees)"),
                     _("Movement using forces"),
                     "res/actions/force.png")
-      .AddParameter("object", _("Object"))
-      .SetHelpPath("/tutorials/how-to-move-objects/");
+      .AddParameter("object", _("Object"));
 
   obj.AddExpression("ForceLength",
                     _("Length of the sum of forces"),
                     _("Length of the sum of forces"),
                     _("Movement using forces"),
                     "res/actions/force.png")
-      .AddParameter("object", _("Object"))
-      .SetHelpPath("/tutorials/how-to-move-objects/");
+      .AddParameter("object", _("Object"));
 
   obj.AddExpression("Longueur",
                     _("Length of the sum of forces"),
@@ -1311,7 +1270,6 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
                     _("Movement using forces"),
                     "res/actions/force.png")
       .AddParameter("object", _("Object"))
-      .SetHelpPath("/tutorials/how-to-move-objects/")
       .SetHidden();
 
   obj.AddExpression("Width",
@@ -1408,11 +1366,10 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
          "VariableChildCount",
          _("Number of children"),
          _("Number of children in an object array or structure variable"),
-         _("Variables ❯ Arrays and structures"),
+         _("Variables/Arrays and structures"),
          "res/actions/var.png")
       .AddParameter("object", _("Object"))
-      .AddParameter("objectvar", _("Array or structure variable"))
-      .SetHelpPath("/all-features/variables/structures-and-arrays/");
+      .AddParameter("objectvar", _("Array or structure variable"));
 
   obj.AddStrExpression("VariableString",
                        _("Text variable"),
@@ -1421,7 +1378,6 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
                        "res/actions/var.png")
       .AddParameter("object", _("Object"))
       .AddParameter("objectvar", _("Variable"))
-      .SetHelpPath("/all-features/variables/object-variables/")
       .SetRelevantForFunctionEventsOnly();
 
   obj.AddExpression("ObjectTimerElapsedTime",
@@ -1430,8 +1386,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
                     _("Timers"),
                     "res/actions/time.png")
       .AddParameter("object", _("Object"))
-      .AddParameter("identifier", _("Timer's name"), "objectTimer")
-      .SetHelpPath("/all-features/timers-and-time/");
+      .AddParameter("identifier", _("Timer's name"), "objectTimer");
 
   obj.AddExpression("AngleToObject",
                     _("Angle between two objects"),
@@ -1651,7 +1606,6 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
           "res/actions/doMove24.png",
           "res/actions/doMove.png")
       .AddCodeOnlyParameter("currentScene", "")
-      .SetHelpPath("/tutorials/how-to-move-objects/")
       .MarkAsAdvanced();
 
   extension
@@ -1667,7 +1621,6 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
       .AddParameter("objectList", _("Object 2"))
       .AddParameter("expression", _("Tolerance, in degrees"))
       .AddCodeOnlyParameter("conditionInverted", "")
-      .SetHelpPath("/tutorials/how-to-move-objects/")
       .MarkAsAdvanced();
 
   extension
@@ -1800,7 +1753,6 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
                     "",
                     true)
       .SetDefaultValue("no")
-      .SetHelpPath("/all-features/collisions/")
       .MarkAsSimple();
 
   extension
@@ -1863,7 +1815,6 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
           _("Scene variable where to store the Y position of the intersection. "
             "If no intersection is found, the variable won't be changed."))
       .AddCodeOnlyParameter("conditionInverted", "")
-      .SetHelpPath("/all-features/collisions/")
       .MarkAsAdvanced();
 
   extension
@@ -1895,7 +1846,6 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
           _("Scene variable where to store the Y position of the intersection. "
             "If no intersection is found, the variable won't be changed."))
       .AddCodeOnlyParameter("conditionInverted", "")
-      .SetHelpPath("/all-features/collisions/")
       .MarkAsAdvanced();
 
   extension

Core/GDCore/Extensions/Builtin/Capabilities/TextContainerExtension.cpp

@@ -19,7 +19,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsTextContainerExtension(
   extension
       .SetExtensionInformation("TextContainerCapability",
                                _("Text capability"),
-                               _("Allows an object to contain a text, usually shown on screen, that can be modified."),
+                               _("Animate objects."),
                                "Florian Rival",
                                "Open source (MIT License)")
       .SetExtensionHelpPath("/objects");
@@ -30,7 +30,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsTextContainerExtension(
       "TextContainerBehavior",
       _("Text capability"),
       "Text",
-      _("Allows an object to contain a text, usually shown on screen, that can be modified."),
+      _("Access objects text."),
       "",
       "res/conditions/text24_black.png",
       "TextContainerBehavior",

Core/GDCore/Extensions/Builtin/CommonInstructionsExtension.cpp

@@ -59,57 +59,47 @@ BuiltinExtensionsImplementer::ImplementsCommonInstructionsExtension(
   // end of compatibility code
 
   extension
-      .AddCondition(
-          "Or",
-          _("Or"),
-          _("Checks if at least one sub-condition is true. If no "
-            "sub-condition is specified, it will always be false. "
-            "This is rarely used — multiple events and sub-events are "
-            "usually a better approach."),
-          _("If one of these conditions is true:"),
-          "",
-          "res/conditions/or24_black.png",
-          "res/conditions/or_black.png")
+      .AddCondition("Or",
+                    _("Or"),
+                    _("Check if one of the sub conditions is true"),
+                    _("If one of these conditions is true:"),
+                    "",
+                    "res/conditions/or24_black.png",
+                    "res/conditions/or_black.png")
+      .SetCanHaveSubInstructions()
+      .MarkAsAdvanced();
+
+  extension
+      .AddCondition("And",
+                    _("And"),
+                    _("Check if all sub conditions are true"),
+                    _("If all of these conditions are true:"),
+                    "",
+                    "res/conditions/and24_black.png",
+                    "res/conditions/and_black.png")
       .SetCanHaveSubInstructions()
       .MarkAsAdvanced();
 
   extension
       .AddCondition(
-          "And",
-          _("And"),
-          _("Checks if all sub-conditions are true. If no sub-condition is "
-            "specified, it will always be false. This is rarely needed, as "
-            "events already check all conditions before running actions."),
-          _("If all of these conditions are true:"),
+          "Not",
+          _("Not"),
+          _("Return the contrary of the result of the sub conditions"),
+          _("Invert the logical result of these conditions:"),
           "",
-          "res/conditions/and24_black.png",
-          "res/conditions/and_black.png")
+          "res/conditions/not24_black.png",
+          "res/conditions/not_black.png")
       .SetCanHaveSubInstructions()
       .MarkAsAdvanced();
 
-  extension
-      .AddCondition("Not",
-                    _("Not"),
-                    _("Returns the opposite of the sub-condition(s) result. "
-                      "This is rarely needed, as most conditions can be "
-                      "inverted or expressed more simply."),
-                    _("Invert the logical result of these conditions:"),
-                    "",
-                    "res/conditions/not24_black.png",
-                    "res/conditions/not_black.png")
-      .SetCanHaveSubInstructions()
-      .MarkAsAdvanced();
-
-  extension
-      .AddCondition("Once",
-                    _("Trigger once while true"),
-                    _("Run actions only once, for each time the conditions "
-                      "have been met."),
-                    _("Trigger once"),
-                    "",
-                    "res/conditions/once24.png",
-                    "res/conditions/once.png")
-      .SetHelpPath("/all-features/advanced-conditions/trigger-once");
+  extension.AddCondition(
+      "Once",
+      _("Trigger once while true"),
+      _("Run actions only once, for each time the conditions have been met."),
+      _("Trigger once"),
+      "",
+      "res/conditions/once24.png",
+      "res/conditions/once.png");
 
   extension
       .AddCondition("CompareNumbers",

Core/GDCore/Extensions/Builtin/ExternalLayoutsExtension.cpp

@@ -28,7 +28,7 @@ BuiltinExtensionsImplementer::ImplementsExternalLayoutsExtension(
       .AddAction("CreateObjectsFromExternalLayout",
                  _("Create objects from an external layout"),
                  _("Create objects from an external layout."),
-                 _("Create objects from the external layout named _PARAM1_ at position _PARAM2_;_PARAM3_;_PARAM4_"),
+                 _("Create objects from the external layout named _PARAM1_"),
                  "",
                  "res/ribbon_default/externallayout32.png",
                  "res/ribbon_default/externallayout32.png")

Core/GDCore/Extensions/Builtin/KeyboardExtension.cpp

@@ -35,8 +35,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsKeyboardExtension(
                     "res/conditions/keyboard24.png",
                     "res/conditions/keyboard.png")
       .AddCodeOnlyParameter("currentScene", "")
-      .AddParameter("key", _("Key to check"))
-      .SetHidden();
+      .AddParameter("key", _("Key"));
 
   extension
       .AddCondition("KeyReleased",
@@ -47,32 +46,33 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsKeyboardExtension(
                     "res/conditions/keyboard24.png",
                     "res/conditions/keyboard.png")
       .AddCodeOnlyParameter("currentScene", "")
-      .AddParameter("key", _("Key to check"))
-      .SetHidden();
+      .AddParameter("key", _("Key"));
 
   extension
       .AddCondition("KeyFromTextPressed",
-                    _("Key pressed"),
-                    _("Check if a key is pressed"),
+                    _("Key pressed (text expression)"),
+                    _("Check if a key, retrieved from the result of the "
+                      "expression, is pressed"),
                     _("_PARAM1_ key is pressed"),
                     "",
                     "res/conditions/keyboard24.png",
                     "res/conditions/keyboard.png")
       .AddCodeOnlyParameter("currentScene", "")
-      .AddParameter("keyboardKey", _("Key to check"))
-      .MarkAsSimple();
+      .AddParameter("string", _("Expression generating the key to check"))
+      .MarkAsAdvanced();
 
   extension
       .AddCondition("KeyFromTextReleased",
-                    _("Key released"),
-                    _("Check if a key was just released"),
+                    _("Key released (text expression)"),
+                    _("Check if a key, retrieved from the result of the "
+                      "expression, was just released"),
                     _("_PARAM1_ key is released"),
                     "",
                     "res/conditions/keyboard24.png",
                     "res/conditions/keyboard.png")
       .AddCodeOnlyParameter("currentScene", "")
-      .AddParameter("keyboardKey", _("Key to check"))
-      .MarkAsSimple();
+      .AddParameter("string", _("Expression generating the key to check"))
+      .MarkAsAdvanced();
 
   extension
       .AddCondition("AnyKeyPressed",

Core/GDCore/Extensions/Builtin/MathematicalToolsExtension.cpp

@@ -151,8 +151,7 @@ BuiltinExtensionsImplementer::ImplementsMathematicalToolsExtension(
   extension
       .AddExpression("abs",
                      _("Absolute value"),
-                     _("Return the non-negative value by removing the sign. "
-                       "The absolute value of -8 is 8."),
+                     _("Absolute value"),
                      "",
                      "res/mathfunction.png")
       .AddParameter("expression", _("Expression"));

Core/GDCore/Extensions/Builtin/MouseExtension.cpp

@@ -252,8 +252,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsMouseExtension(
                     "res/conditions/mouse.png")
       .AddCodeOnlyParameter("currentScene", "")
       .AddParameter("mouse", _("Button to check"))
-      .MarkAsSimple()
-      .SetHidden();
+      .MarkAsSimple();
 
   // Support for deprecated names:
   extension.AddDuplicatedCondition("SourisBouton", "MouseButtonPressed")
@@ -263,41 +262,49 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsMouseExtension(
       .AddCondition("MouseButtonReleased",
                     _("Mouse button released"),
                     _("Check if the specified mouse button was released."),
-                    _("Touch or _PARAM1_ mouse button is released"),
+                    _("_PARAM1_ mouse button was released"),
                     "",
                     "res/conditions/mouse24.png",
                     "res/conditions/mouse.png")
       .AddCodeOnlyParameter("currentScene", "")
       .AddParameter("mouse", _("Button to check"))
-      .MarkAsSimple()
-      .SetHidden();
+      .MarkAsSimple();
 
   extension
       .AddCondition(
           "MouseButtonFromTextPressed",
-          _("Mouse button pressed or touch held"),
-          _("Check if the specified mouse button is pressed or "
-              "if a touch is in contact with the screen."),
-          _("Touch or _PARAM1_ mouse button is down"),
+          _("Mouse button pressed or touch held (text expression)"),
+          _("Check if a mouse button, retrieved from the result of the "
+            "expression, is pressed."),
+          _("_PARAM1_ mouse button is pressed"),
           "",
           "res/conditions/mouse24.png",
           "res/conditions/mouse.png")
       .AddCodeOnlyParameter("currentScene", "")
-      .AddParameter("mouseButton", _("Button to check"))
-      .MarkAsSimple();
+      .AddParameter("stringWithSelector",
+                    _("Expression generating the mouse button to check"),
+                    "[\"Left\", \"Right\", \"Middle\"]")
+      .SetParameterLongDescription(
+          _("Possible values are Left, Right and Middle."))
+      .MarkAsAdvanced();
 
   extension
       .AddCondition(
           "MouseButtonFromTextReleased",
-          _("Mouse button released"),
-          _("Check if the specified mouse button was released."),
-          _("Touch or _PARAM1_ mouse button is released"),
+          _("Mouse button released (text expression)"),
+          _("Check if a mouse button, retrieved from the result of the "
+            "expression, was just released."),
+          _("_PARAM1_ mouse button is released"),
           "",
           "res/conditions/mouse24.png",
           "res/conditions/mouse.png")
       .AddCodeOnlyParameter("currentScene", "")
-      .AddParameter("mouseButton", _("Button to check"))
-      .MarkAsSimple();
+      .AddParameter("stringWithSelector",
+                    _("Expression generating the mouse button to check"),
+                    "[\"Left\", \"Right\", \"Middle\"]")
+      .SetParameterLongDescription(
+          _("Possible values are Left, Right and Middle."))
+      .MarkAsAdvanced();
 
   extension
       .AddExpressionAndCondition("number",

Core/GDCore/Extensions/Builtin/SceneExtension.cpp

@@ -182,7 +182,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsSceneExtension(
                                 "SceneLoadingProgress",
                                 _("Scene loading progress"),
                                 _("The progress of resources loading in background for a scene (between 0 and 1)."),
-                                _("_PARAM1_ loading progress"),
+                                _("_PARAM0_ loading progress"),
                                 _(""),
                                 "res/actions/hourglass_black.svg")
       .SetHelpPath("/all-features/resources-loading")

Core/GDCore/Extensions/Builtin/TimeExtension.cpp

@@ -43,9 +43,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsTimeExtension(
       .AddCondition("CompareTimer",
                     _("Value of a scene timer"),
                     _("Compare the elapsed time of a scene timer. This "
-                      "condition doesn't start the timer and will always be "
-                      "false if the timer was not started previously (whatever "
-                      "the comparison being made)."),
+                      "condition doesn't start the timer."),
                     _("The timer _PARAM1_ _PARAM2_ _PARAM3_ seconds"),
 
                     "",

Core/GDCore/Extensions/Builtin/VariablesExtension.cpp

@@ -33,7 +33,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsVariablesExtension(
                     "",
                     "res/conditions/var24.png",
                     "res/conditions/var.png")
-      .AddParameter("variableOrPropertyOrParameter", _("Variable"))
+      .AddParameter("variable", _("Variable"))
       .UseStandardRelationalOperatorParameters(
           "number", ParameterOptions::MakeNewOptions());
 
@@ -45,7 +45,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsVariablesExtension(
                     "",
                     "res/conditions/var24.png",
                     "res/conditions/var.png")
-      .AddParameter("variableOrPropertyOrParameter", _("Variable"))
+      .AddParameter("variable", _("Variable"))
       .UseStandardRelationalOperatorParameters(
           "string", ParameterOptions::MakeNewOptions());
 
@@ -58,7 +58,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsVariablesExtension(
           "",
           "res/conditions/var24.png",
           "res/conditions/var.png")
-      .AddParameter("variableOrPropertyOrParameter", _("Variable"))
+      .AddParameter("variable", _("Variable"))
       .AddParameter("trueorfalse", _("Check if the value is"))
       .SetDefaultValue("true")
       // This parameter allows to keep the operand expression
@@ -73,32 +73,32 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsVariablesExtension(
                  "",
                  "res/actions/var24.png",
                  "res/actions/var.png")
-      .AddParameter("variableOrProperty", _("Variable"))
+      .AddParameter("variable", _("Variable"))
       .UseStandardOperatorParameters("number",
                                      ParameterOptions::MakeNewOptions());
 
   extension
       .AddAction("SetStringVariable",
-                 _("Change variable value"),
+                 _("Change text variable"),
                  _("Modify the text (string) of a variable."),
                  _("the variable _PARAM0_"),
                  "",
                  "res/actions/var24.png",
                  "res/actions/var.png")
-      .AddParameter("variableOrProperty", _("Variable"))
+      .AddParameter("variable", _("Variable"))
       .UseStandardOperatorParameters("string",
                                      ParameterOptions::MakeNewOptions());
 
   extension
       .AddAction(
           "SetBooleanVariable",
-          _("Change variable value"),
+          _("Change boolean variable"),
           _("Modify the boolean value of a variable."),
           _("Change the variable _PARAM0_: _PARAM1_"),
           "",
           "res/conditions/var24.png",
           "res/conditions/var.png")
-      .AddParameter("variableOrProperty", _("Variable"))
+      .AddParameter("variable", _("Variable"))
       .AddParameter("operator", _("Value"), "boolean")
       // This parameter allows to keep the operand expression
       // when the editor switch between variable instructions.
@@ -116,7 +116,6 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsVariablesExtension(
       .AddParameter("variable", _("Array variable"))
       .UseStandardRelationalOperatorParameters(
           "number", ParameterOptions::MakeNewOptions())
-      .SetHelpPath("/all-features/variables/structures-and-arrays/")
       .MarkAsAdvanced();
 
   extension
@@ -130,7 +129,6 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsVariablesExtension(
                     "res/conditions/var.png")
       .AddParameter("variable", _("Variable"))
       .AddParameter("string", _("Name of the child"))
-      .SetHelpPath("/all-features/variables/structures-and-arrays/")
       .MarkAsAdvanced();
 
   extension
@@ -144,7 +142,6 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsVariablesExtension(
           "res/actions/var.png")
       .AddParameter("variable", _("Structure variable"))
       .AddParameter("string", _("Child's name"))
-      .SetHelpPath("/all-features/variables/structures-and-arrays/")
       .MarkAsAdvanced();
 
   extension
@@ -157,7 +154,6 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsVariablesExtension(
                  "res/actions/var24.png",
                  "res/actions/var.png")
       .AddParameter("variable", _("Structure or array variable"))
-      .SetHelpPath("/all-features/variables/structures-and-arrays/")
       .MarkAsAdvanced();
 
   extension
@@ -174,13 +170,12 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsVariablesExtension(
       .SetParameterLongDescription(
           _("The content of the variable will *be copied* and added at the "
             "end of the array."))
-      .SetHelpPath("/all-features/variables/structures-and-arrays/")
       .MarkAsAdvanced();
 
   extension
       .AddAction(
           "PushString",
-          _("Add value to array variable"),
+          _("Add text variable"),
           _("Adds a text (string) at the end of a array variable."),
           _("Add the value _PARAM1_ to array variable _PARAM0_"),
           _("Arrays and structures"),
@@ -188,12 +183,11 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsVariablesExtension(
           "res/actions/var.png")
       .AddParameter("variable", _("Array variable"))
       .AddParameter("string", _("Text to add"))
-      .SetHelpPath("/all-features/variables/structures-and-arrays/")
       .MarkAsAdvanced();
 
   extension
       .AddAction("PushNumber",
-                 _("Add value to array variable"),
+                 _("Add variable array value"),
                  _("Adds a number at the end of an array variable."),
                  _("Add the value _PARAM1_ to array variable _PARAM0_"),
                  _("Arrays and structures"),
@@ -201,12 +195,11 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsVariablesExtension(
                  "res/actions/var.png")
       .AddParameter("variable", _("Array variable"))
       .AddParameter("expression", _("Number to add"))
-      .SetHelpPath("/all-features/variables/structures-and-arrays/")
       .MarkAsAdvanced();
 
   extension
       .AddAction("PushBoolean",
-                 _("Add value to array variable"),
+                 _("Add boolean variable"),
                  _("Adds a boolean at the end of an array variable."),
                  _("Add the value _PARAM1_ to array variable _PARAM0_"),
                  _("Arrays and structures"),
@@ -214,7 +207,6 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsVariablesExtension(
                  "res/actions/var.png")
       .AddParameter("variable", _("Array variable"))
       .AddParameter("trueorfalse", _("Boolean to add"))
-      .SetHelpPath("/all-features/variables/structures-and-arrays/")
       .MarkAsAdvanced();
 
   extension
@@ -229,7 +221,6 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsVariablesExtension(
                  "res/actions/var.png")
       .AddParameter("variable", _("Array variable"))
       .AddParameter("expression", _("Index to remove"))
-      .SetHelpPath("/all-features/variables/structures-and-arrays/")
       .MarkAsAdvanced();
 
   extension
@@ -240,8 +231,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsVariablesExtension(
             "it is a text (string)."),
           _("Arrays and structures"),
           "res/actions/var.png")
-      .AddParameter("variable", _("Array variable"))
-      .SetHelpPath("/all-features/variables/structures-and-arrays/");
+      .AddParameter("variable", _("Array variable"));
 
   extension
       .AddExpression(
@@ -251,8 +241,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsVariablesExtension(
             "it is a number."),
           _("Arrays and structures"),
           "res/actions/var.png")
-      .AddParameter("variable", _("Array variable"))
-      .SetHelpPath("/all-features/variables/structures-and-arrays/");
+      .AddParameter("variable", _("Array variable"));
 
   extension
       .AddStrExpression(
@@ -262,8 +251,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsVariablesExtension(
             "it is a text (string)."),
           _("Arrays and structures"),
           "res/actions/var.png")
-      .AddParameter("variable", _("Array variable"))
-      .SetHelpPath("/all-features/variables/structures-and-arrays/");
+      .AddParameter("variable", _("Array variable"));
 
   extension
       .AddExpression(
@@ -273,8 +261,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsVariablesExtension(
             "it is a number."),
           _("Arrays and structures"),
           "res/actions/var.png")
-      .AddParameter("variable", _("Array variable"))
-      .SetHelpPath("/all-features/variables/structures-and-arrays/");
+      .AddParameter("variable", _("Array variable"));
 
   // Legacy instructions
 
@@ -283,28 +270,26 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsVariablesExtension(
                     _("Number variable"),
                     _("Compare the number value of a scene variable."),
                     _("The number of scene variable _PARAM0_"),
-                    _("External variables ❯ Scene variables"),
+                    _("External variables/Scene variables"),
                     "res/conditions/var24.png",
                     "res/conditions/var.png")
       .AddParameter("scenevar", _("Variable"))
       .UseStandardRelationalOperatorParameters(
           "number", ParameterOptions::MakeNewOptions())
-      .SetRelevantForFunctionEventsOnly()
-      .SetHidden();
+      .SetRelevantForFunctionEventsOnly();
 
   extension
       .AddCondition("VarSceneTxt",
                     _("Text variable"),
                     _("Compare the text (string) of a scene variable."),
                     _("The text of scene variable _PARAM0_"),
-                    _("External variables ❯ Scene variables"),
+                    _("External variables/Scene variables"),
                     "res/conditions/var24.png",
                     "res/conditions/var.png")
       .AddParameter("scenevar", _("Variable"))
       .UseStandardRelationalOperatorParameters(
           "string", ParameterOptions::MakeNewOptions())
-      .SetRelevantForFunctionEventsOnly()
-      .SetHidden();
+      .SetRelevantForFunctionEventsOnly();
 
   extension
       .AddCondition(
@@ -312,14 +297,13 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsVariablesExtension(
           _("Boolean variable"),
           _("Compare the boolean value of a scene variable."),
           _("The boolean value of scene variable _PARAM0_ is _PARAM1_"),
-          _("External variables ❯ Scene variables"),
+          _("External variables/Scene variables"),
           "res/conditions/var24.png",
           "res/conditions/var.png")
       .AddParameter("scenevar", _("Variable"))
       .AddParameter("trueorfalse", _("Check if the value is"))
       .SetDefaultValue("true")
-      .SetRelevantForFunctionEventsOnly()
-      .SetHidden();
+      .SetRelevantForFunctionEventsOnly();
 
   extension
       .AddCondition("VariableChildExists",
@@ -327,14 +311,12 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsVariablesExtension(
                     _("Check if the specified child of the scene structure "
                       "variable exists."),
                     _("Child _PARAM1_ of scene variable _PARAM0_ exists"),
-                    _("External variables ❯ Scene variables ❯ Arrays and structures"),
+                    _("External variables/Scene variables/Arrays and structures"),
                     "res/conditions/var24.png",
                     "res/conditions/var.png")
       .AddParameter("scenevar", _("Variable"))
       .AddParameter("string", _("Name of the child"))
-      .SetHelpPath("/all-features/variables/structures-and-arrays/")
       .SetRelevantForFunctionEventsOnly()
-      .SetHidden()
       .MarkAsAdvanced();
 
   extension
@@ -343,14 +325,12 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsVariablesExtension(
                     _("Check if the specified child of the global structure "
                       "variable exists."),
                     _("Child _PARAM1_ of global variable _PARAM0_ exists"),
-                    _("External variables ❯ Global variables ❯ Arrays and structures"),
+                    _("External variables/Global variables/Arrays and structures"),
                     "res/conditions/var24.png",
                     "res/conditions/var.png")
       .AddParameter("globalvar", _("Variable"))
       .AddParameter("string", _("Name of the child"))
-      .SetHelpPath("/all-features/variables/structures-and-arrays/")
       .SetRelevantForFunctionEventsOnly()
-      .SetHidden()
       .MarkAsAdvanced();
 
   extension
@@ -358,7 +338,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsVariablesExtension(
                     "Variable defined",
                     "Test if the scene variable exists.",
                     "Scene variable _PARAM0_ is defined",
-                    _("External variables ❯ Scene variables"),
+                    _("External variables/Scene variables"),
                     "res/conditions/var24.png",
                     "res/conditions/var.png")
       .AddCodeOnlyParameter("currentScene", "")
@@ -370,14 +350,13 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsVariablesExtension(
                     _("Number variable"),
                     _("Compare the number value of a global variable."),
                     _("the global variable _PARAM0_"),
-                    _("External variables ❯ Global variables"),
+                    _("External variables/Global variables"),
                     "res/conditions/var24.png",
                     "res/conditions/var.png")
       .AddParameter("globalvar", _("Variable"))
       .UseStandardRelationalOperatorParameters(
           "number", ParameterOptions::MakeNewOptions())
       .SetRelevantForFunctionEventsOnly()
-      .SetHidden()
       .MarkAsAdvanced();
 
   extension
@@ -385,14 +364,13 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsVariablesExtension(
                     _("Text variable"),
                     _("Compare the text (string) of a global variable."),
                     _("the text of the global variable _PARAM0_"),
-                    _("External variables ❯ Global variables"),
+                    _("External variables/Global variables"),
                     "res/conditions/var24.png",
                     "res/conditions/var.png")
       .AddParameter("globalvar", _("Variable"))
       .UseStandardRelationalOperatorParameters(
           "string", ParameterOptions::MakeNewOptions())
       .SetRelevantForFunctionEventsOnly()
-      .SetHidden()
       .MarkAsAdvanced();
 
   extension
@@ -401,21 +379,20 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsVariablesExtension(
           _("Boolean variable"),
           _("Compare the boolean value of a global variable."),
           _("The boolean value of global variable _PARAM0_ is _PARAM1_"),
-          _("External variables ❯ Global variables"),
+          _("External variables/Global variables"),
           "res/conditions/var24.png",
           "res/conditions/var.png")
       .AddParameter("globalvar", _("Variable"))
       .AddParameter("trueorfalse", _("Check if the value is"))
       .SetDefaultValue("true")
-      .SetRelevantForFunctionEventsOnly()
-      .SetHidden();
+      .SetRelevantForFunctionEventsOnly();
 
   extension
       .AddCondition("VarGlobalDef",
                     "Variable defined",
                     "Test if a global variable exists.",
                     "Global variable _PARAM0_ is defined",
-                    _("External variables ❯ Global variables"),
+                    _("External variables/Global variables"),
                     "res/conditions/var24.png",
                     "res/conditions/var.png")
       .AddCodeOnlyParameter("currentScene", "")
@@ -428,28 +405,26 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsVariablesExtension(
                  _("Change number variable"),
                  _("Modify the number value of a scene variable."),
                  _("the scene variable _PARAM0_"),
-                 _("External variables ❯ Scene variables"),
+                 _("External variables/Scene variables"),
                  "res/actions/var24.png",
                  "res/actions/var.png")
       .AddParameter("scenevar", _("Variable"))
       .UseStandardOperatorParameters("number",
                                      ParameterOptions::MakeNewOptions())
-      .SetRelevantForFunctionEventsOnly()
-      .SetHidden();
+      .SetRelevantForFunctionEventsOnly();
 
   extension
       .AddAction("ModVarSceneTxt",
                  _("Change text variable"),
                  _("Modify the text (string) of a scene variable."),
                  _("the text of scene variable _PARAM0_"),
-                 _("External variables ❯ Scene variables"),
+                 _("External variables/Scene variables"),
                  "res/actions/var24.png",
                  "res/actions/var.png")
       .AddParameter("scenevar", _("Variable"))
       .UseStandardOperatorParameters("string",
                                      ParameterOptions::MakeNewOptions())
-      .SetRelevantForFunctionEventsOnly()
-      .SetHidden();
+      .SetRelevantForFunctionEventsOnly();
 
   extension
       .AddAction(
@@ -457,13 +432,12 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsVariablesExtension(
           _("Change boolean variable"),
           _("Modify the boolean value of a scene variable."),
           _("Set the boolean value of scene variable _PARAM0_ to _PARAM1_"),
-          _("External variables ❯ Scene variables"),
+          _("External variables/Scene variables"),
           "res/conditions/var24.png",
           "res/conditions/var.png")
       .AddParameter("scenevar", _("Variable"))
       .AddParameter("trueorfalse", _("New Value:"))
-      .SetRelevantForFunctionEventsOnly()
-      .SetHidden();
+      .SetRelevantForFunctionEventsOnly();
 
   extension
       .AddAction("ToggleSceneVariableAsBoolean",
@@ -472,26 +446,24 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsVariablesExtension(
                      _("If it was true, it will become false, and if it was "
                        "false it will become true."),
                  _("Toggle the boolean value of scene variable _PARAM0_"),
-                 _("External variables ❯ Scene variables"),
+                 _("External variables/Scene variables"),
                  "res/conditions/var24.png",
                  "res/conditions/var.png")
       .AddParameter("scenevar", _("Variable"))
-      .SetRelevantForFunctionEventsOnly()
-      .SetHidden();
+      .SetRelevantForFunctionEventsOnly();
 
   extension
       .AddAction("ModVarGlobal",
                  _("Change number variable"),
                  _("Modify the number value of a global variable."),
                  _("the global variable _PARAM0_"),
-                 _("External variables ❯ Global variables"),
+                 _("External variables/Global variables"),
                  "res/actions/var24.png",
                  "res/actions/var.png")
       .AddParameter("globalvar", _("Variable"))
       .UseStandardOperatorParameters("number",
                                      ParameterOptions::MakeNewOptions())
       .SetRelevantForFunctionEventsOnly()
-      .SetHidden()
       .MarkAsAdvanced();
 
   extension
@@ -499,14 +471,13 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsVariablesExtension(
                  _("Change text variable"),
                  _("Modify the text (string) of a global variable."),
                  _("the text of global variable _PARAM0_"),
-                 _("External variables ❯ Global variables"),
+                 _("External variables/Global variables"),
                  "res/actions/var24.png",
                  "res/actions/var.png")
       .AddParameter("globalvar", _("Variable"))
       .UseStandardOperatorParameters("string",
                                      ParameterOptions::MakeNewOptions())
       .SetRelevantForFunctionEventsOnly()
-      .SetHidden()
       .MarkAsAdvanced();
 
   extension
@@ -515,13 +486,12 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsVariablesExtension(
           _("Change boolean variable"),
           _("Modify the boolean value of a global variable."),
           _("Set the boolean value of global variable _PARAM0_ to _PARAM1_"),
-          _("External variables ❯ Global variables"),
+          _("External variables/Global variables"),
           "res/conditions/var24.png",
           "res/conditions/var.png")
       .AddParameter("globalvar", _("Variable"))
       .AddParameter("trueorfalse", _("New Value:"))
-      .SetRelevantForFunctionEventsOnly()
-      .SetHidden();
+      .SetRelevantForFunctionEventsOnly();
 
   extension
       .AddAction("ToggleGlobalVariableAsBoolean",
@@ -530,12 +500,11 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsVariablesExtension(
                      _("If it was true, it will become false, and if it was "
                        "false it will become true."),
                  _("Toggle the boolean value of global variable _PARAM0_"),
-                 _("External variables ❯ Global variables"),
+                 _("External variables/Global variables"),
                  "res/conditions/var24.png",
                  "res/conditions/var.png")
       .AddParameter("globalvar", _("Variable"))
-      .SetRelevantForFunctionEventsOnly()
-      .SetHidden();
+      .SetRelevantForFunctionEventsOnly();
 
   extension
       .AddAction(
@@ -543,15 +512,13 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsVariablesExtension(
           _("Remove a child"),
           _("Remove a child from a scene structure variable."),
           _("Remove child _PARAM1_ from scene structure variable _PARAM0_"),
-          _("External variables ❯ Scene variables ❯ Arrays and structures"),
+          _("External variables/Scene variables/Arrays and structures"),
           "res/actions/var24.png",
           "res/actions/var.png")
       .AddParameter("scenevar", _("Structure variable"))
       .AddParameter("string", _("Child's name"))
-      .SetHelpPath("/all-features/variables/structures-and-arrays/")
       .MarkAsAdvanced()
-      .SetRelevantForFunctionEventsOnly()
-      .SetHidden();
+      .SetRelevantForFunctionEventsOnly();
 
   extension
       .AddAction(
@@ -559,15 +526,13 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsVariablesExtension(
           _("Remove a child"),
           _("Remove a child from a global structure variable."),
           _("Remove child _PARAM1_ from global structure variable _PARAM0_"),
-          _("External variables ❯ Global variables ❯ Arrays and structures"),
+          _("External variables/Global variables/Arrays and structures"),
           "res/actions/var24.png",
           "res/actions/var.png")
       .AddParameter("globalvar", _("Structure variable"))
       .AddParameter("string", _("Child's name"))
-      .SetHelpPath("/all-features/variables/structures-and-arrays/")
       .MarkAsAdvanced()
-      .SetRelevantForFunctionEventsOnly()
-      .SetHidden();
+      .SetRelevantForFunctionEventsOnly();
 
   extension
       .AddAction("VariableClearChildren",
@@ -575,13 +540,11 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsVariablesExtension(
                  _("Remove all the children from the scene structure or array "
                    "variable."),
                  _("Clear children from scene variable _PARAM0_"),
-                 _("External variables ❯ Scene variables ❯ Arrays and structures"),
+                 _("External variables/Scene variables/Arrays and structures"),
                  "res/actions/var24.png",
                  "res/actions/var.png")
       .AddParameter("scenevar", _("Structure or array variable"))
-      .SetHelpPath("/all-features/variables/structures-and-arrays/")
       .SetRelevantForFunctionEventsOnly()
-      .SetHidden()
       .MarkAsAdvanced();
 
   extension
@@ -590,13 +553,11 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsVariablesExtension(
                  _("Remove all the children from the global structure or array "
                    "variable."),
                  _("Clear children from global variable _PARAM0_"),
-                 _("External variables ❯ Global variables ❯ Arrays and structures"),
+                 _("External variables/Global variables/Arrays and structures"),
                  "res/actions/var24.png",
                  "res/actions/var.png")
       .AddParameter("globalvar", _("Structure or array variable"))
-      .SetHelpPath("/all-features/variables/structures-and-arrays/")
       .SetRelevantForFunctionEventsOnly()
-      .SetHidden()
       .MarkAsAdvanced();
 
   extension
@@ -605,7 +566,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsVariablesExtension(
                  _("Adds an existing variable at the end of a scene array "
                    "variable."),
                  _("Add variable _PARAM1_ to array variable _PARAM0_"),
-                 _("External variables ❯ Scene variables ❯ Arrays and structures"),
+                 _("External variables/Scene variables/Arrays and structures"),
                  "res/actions/var24.png",
                  "res/actions/var.png")
       .AddParameter("scenevar", _("Array variable"))
@@ -613,9 +574,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsVariablesExtension(
       .SetParameterLongDescription(
           _("The content of the variable will *be copied* and added at the "
             "end of the array."))
-      .SetHelpPath("/all-features/variables/structures-and-arrays/")
       .SetRelevantForFunctionEventsOnly()
-      .SetHidden()
       .MarkAsAdvanced();
 
   extension
@@ -624,14 +583,12 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsVariablesExtension(
           _("Add text variable"),
           _("Adds a text (string) at the end of a scene array variable."),
           _("Add text _PARAM1_ to array variable _PARAM0_"),
-          _("External variables ❯ Scene variables ❯ Arrays and structures"),
+          _("External variables/Scene variables/Arrays and structures"),
           "res/actions/var24.png",
           "res/actions/var.png")
       .AddParameter("scenevar", _("Array variable"))
       .AddParameter("string", _("Text to add"))
-      .SetHelpPath("/all-features/variables/structures-and-arrays/")
       .SetRelevantForFunctionEventsOnly()
-      .SetHidden()
       .MarkAsAdvanced();
 
   extension
@@ -639,14 +596,12 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsVariablesExtension(
                  _("Add number variable"),
                  _("Adds a number at the end of a scene array variable."),
                  _("Add number _PARAM1_ to array variable _PARAM0_"),
-                 _("External variables ❯ Scene variables ❯ Arrays and structures"),
+                 _("External variables/Scene variables/Arrays and structures"),
                  "res/actions/var24.png",
                  "res/actions/var.png")
       .AddParameter("scenevar", _("Array variable"))
       .AddParameter("expression", _("Number to add"))
-      .SetHelpPath("/all-features/variables/structures-and-arrays/")
       .SetRelevantForFunctionEventsOnly()
-      .SetHidden()
       .MarkAsAdvanced();
 
   extension
@@ -654,14 +609,12 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsVariablesExtension(
                  _("Add boolean variable"),
                  _("Adds a boolean at the end of a scene array variable."),
                  _("Add boolean _PARAM1_ to array variable _PARAM0_"),
-                 _("External variables ❯ Scene variables ❯ Arrays and structures"),
+                 _("External variables/Scene variables/Arrays and structures"),
                  "res/actions/var24.png",
                  "res/actions/var.png")
       .AddParameter("scenevar", _("Array variable"))
       .AddParameter("trueorfalse", _("Boolean to add"))
-      .SetHelpPath("/all-features/variables/structures-and-arrays/")
       .SetRelevantForFunctionEventsOnly()
-      .SetHidden()
       .MarkAsAdvanced();
 
   extension
@@ -671,14 +624,12 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsVariablesExtension(
                    "variable."),
                  _("Remove variable at index _PARAM1_ from scene array "
                    "variable _PARAM0_"),
-                 _("External variables ❯ Scene variables ❯ Arrays and structures"),
+                 _("External variables/Scene variables/Arrays and structures"),
                  "res/actions/var24.png",
                  "res/actions/var.png")
       .AddParameter("scenevar", _("Array variable"))
       .AddParameter("expression", _("Index to remove"))
-      .SetHelpPath("/all-features/variables/structures-and-arrays/")
       .SetRelevantForFunctionEventsOnly()
-      .SetHidden()
       .MarkAsAdvanced();
 
   extension
@@ -687,15 +638,13 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsVariablesExtension(
           _("Number of children"),
           _("Compare the number of children in a scene array variable."),
           _("The number of children in the array variable _PARAM0_"),
-          _("External variables ❯ Scene variables ❯ Arrays and structures"),
+          _("External variables/Scene variables/Arrays and structures"),
           "res/conditions/var24.png",
           "res/conditions/var.png")
       .AddParameter("scenevar", _("Array variable"))
       .UseStandardRelationalOperatorParameters(
           "number", ParameterOptions::MakeNewOptions())
-      .SetHelpPath("/all-features/variables/structures-and-arrays/")
       .SetRelevantForFunctionEventsOnly()
-      .SetHidden()
       .MarkAsAdvanced();
 
   extension
@@ -704,12 +653,10 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsVariablesExtension(
           _("First text child"),
           _("Get the value of the first element of a scene array variable, if "
             "it is a text (string)."),
-          _("External variables ❯ Scene variables ❯ Arrays and structures"),
+          _("External variables/Scene variables/Arrays and structures"),
           "res/actions/var.png")
       .AddParameter("scenevar", _("Array variable"))
-      .SetHelpPath("/all-features/variables/structures-and-arrays/")
-      .SetRelevantForFunctionEventsOnly()
-      .SetHidden();
+      .SetRelevantForFunctionEventsOnly();
 
   extension
       .AddExpression(
@@ -717,12 +664,10 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsVariablesExtension(
           _("First number child"),
           _("Get the value of the first element of a scene array variable, if "
             "it is a number."),
-          _("External variables ❯ Scene variables ❯ Arrays and structures"),
+          _("External variables/Scene variables/Arrays and structures"),
           "res/actions/var.png")
       .AddParameter("scenevar", _("Array variable"))
-      .SetHelpPath("/all-features/variables/structures-and-arrays/")
-      .SetRelevantForFunctionEventsOnly()
-      .SetHidden();
+      .SetRelevantForFunctionEventsOnly();
 
   extension
       .AddStrExpression(
@@ -730,12 +675,10 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsVariablesExtension(
           _("Last text child"),
           _("Get the value of the last element of a scene array variable, if "
             "it is a text (string)."),
-          _("External variables ❯ Scene variables ❯ Arrays and structures"),
+          _("External variables/Scene variables/Arrays and structures"),
           "res/actions/var.png")
       .AddParameter("scenevar", _("Array variable"))
-      .SetHelpPath("/all-features/variables/structures-and-arrays/")
-      .SetRelevantForFunctionEventsOnly()
-      .SetHidden();
+      .SetRelevantForFunctionEventsOnly();
 
   extension
       .AddExpression(
@@ -743,12 +686,10 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsVariablesExtension(
           _("Last number child"),
           _("Get the value of the last element of a scene array variable, if "
             "it is a number."),
-          _("External variables ❯ Scene variables ❯ Arrays and structures"),
+          _("External variables/Scene variables/Arrays and structures"),
           "res/actions/var.png")
       .AddParameter("scenevar", _("Array variable"))
-      .SetHelpPath("/all-features/variables/structures-and-arrays/")
-      .SetRelevantForFunctionEventsOnly()
-      .SetHidden();
+      .SetRelevantForFunctionEventsOnly();
 
   extension
       .AddAction(
@@ -756,7 +697,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsVariablesExtension(
           _("Add existing variable"),
           _("Adds an existing variable at the end of a global array variable."),
           _("Add variable _PARAM1_ to array variable _PARAM0_"),
-          _("External variables ❯ Global variables ❯ Arrays and structures"),
+          _("External variables/Global variables/Arrays and structures"),
           "res/actions/var24.png",
           "res/actions/var.png")
       .AddParameter("globalvar", _("Array variable"))
@@ -764,9 +705,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsVariablesExtension(
       .SetParameterLongDescription(
           _("The content of the variable will *be copied* and added at the "
             "end of the array."))
-      .SetHelpPath("/all-features/variables/structures-and-arrays/")
       .SetRelevantForFunctionEventsOnly()
-      .SetHidden()
       .MarkAsAdvanced();
 
   extension
@@ -776,14 +715,12 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsVariablesExtension(
                    "array variable."),
                  _("Remove variable at index _PARAM1_ from global array "
                    "variable _PARAM0_"),
-                 _("External variables ❯ Global variables ❯ Arrays and structures"),
+                 _("External variables/Global variables/Arrays and structures"),
                  "res/actions/var24.png",
                  "res/actions/var.png")
       .AddParameter("globalvar", _("Array variable"))
       .AddParameter("expression", _("Index to remove"))
-      .SetHelpPath("/all-features/variables/structures-and-arrays/")
       .SetRelevantForFunctionEventsOnly()
-      .SetHidden()
       .MarkAsAdvanced();
 
   extension
@@ -792,14 +729,12 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsVariablesExtension(
           _("Add text variable"),
           _("Adds a text (string) at the end of a global array variable."),
           _("Add text _PARAM1_ to array variable _PARAM0_"),
-          _("External variables ❯ Global variables ❯ Arrays and structures"),
+          _("External variables/Global variables/Arrays and structures"),
           "res/actions/var24.png",
           "res/actions/var.png")
       .AddParameter("globalvar", _("Array variable"))
       .AddParameter("string", _("Text to add"))
-      .SetHelpPath("/all-features/variables/structures-and-arrays/")
       .SetRelevantForFunctionEventsOnly()
-      .SetHidden()
       .MarkAsAdvanced();
 
   extension
@@ -807,14 +742,12 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsVariablesExtension(
                  _("Add number variable"),
                  _("Adds a number at the end of a global array variable."),
                  _("Add number _PARAM1_ to array variable _PARAM0_"),
-                 _("External variables ❯ Global variables ❯ Arrays and structures"),
+                 _("External variables/Global variables/Arrays and structures"),
                  "res/actions/var24.png",
                  "res/actions/var.png")
       .AddParameter("globalvar", _("Array variable"))
       .AddParameter("expression", _("Number to add"))
-      .SetHelpPath("/all-features/variables/structures-and-arrays/")
       .SetRelevantForFunctionEventsOnly()
-      .SetHidden()
       .MarkAsAdvanced();
 
   extension
@@ -822,14 +755,12 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsVariablesExtension(
                  _("Add boolean variable"),
                  _("Adds a boolean at the end of a global array variable."),
                  _("Add boolean _PARAM1_ to array variable _PARAM0_"),
-                 _("External variables ❯ Global variables ❯ Arrays and structures"),
+                 _("External variables/Global variables/Arrays and structures"),
                  "res/actions/var24.png",
                  "res/actions/var.png")
       .AddParameter("globalvar", _("Array variable"))
       .AddParameter("trueorfalse", _("Boolean to add"))
-      .SetHelpPath("/all-features/variables/structures-and-arrays/")
       .SetRelevantForFunctionEventsOnly()
-      .SetHidden()
       .MarkAsAdvanced();
 
   extension
@@ -838,15 +769,13 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsVariablesExtension(
           _("Number of children"),
           _("Compare the number of children in a global array variable."),
           _("The number of children of the array variable _PARAM0_"),
-          _("External variables ❯ Global variables ❯ Arrays and structures"),
+          _("External variables/Global variables/Arrays and structures"),
           "res/conditions/var24.png",
           "res/conditions/var.png")
       .AddParameter("globalvar", _("Array variable"))
       .UseStandardRelationalOperatorParameters(
           "number", ParameterOptions::MakeNewOptions())
-      .SetHelpPath("/all-features/variables/structures-and-arrays/")
       .SetRelevantForFunctionEventsOnly()
-      .SetHidden()
       .MarkAsAdvanced();
 
   extension
@@ -854,24 +783,20 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsVariablesExtension(
                         _("First text child"),
                         _("Value of the first element of a global array "
                           "variable, if it is a text (string) variable."),
-                        _("External variables ❯ Global variables ❯ Arrays and structures"),
+                        _("External variables/Global variables/Arrays and structures"),
                         "res/actions/var.png")
       .AddParameter("globalvar", _("Array variable"))
-      .SetHelpPath("/all-features/variables/structures-and-arrays/")
-      .SetRelevantForFunctionEventsOnly()
-      .SetHidden();
+      .SetRelevantForFunctionEventsOnly();
 
   extension
       .AddExpression("GlobalVariableFirstNumber",
                      _("First number child"),
                      _("Value of the first element of a global array "
                        "variable, if it is a number variable"),
-                     _("External variables ❯ Global variables ❯ Arrays and structures"),
+                     _("External variables/Global variables/Arrays and structures"),
                      "res/actions/var.png")
       .AddParameter("globalvar", _("Array variable"))
-      .SetHelpPath("/all-features/variables/structures-and-arrays/")
-      .SetRelevantForFunctionEventsOnly()
-      .SetHidden();
+      .SetRelevantForFunctionEventsOnly();
 
   extension
       .AddStrExpression(
@@ -879,12 +804,10 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsVariablesExtension(
           _("Last text child"),
           _("Value of the last element of a global array variable, if "
             "it is a text (string) variable."),
-          _("External variables ❯ Global variables ❯ Arrays and structures"),
+          _("External variables/Global variables/Arrays and structures"),
           "res/actions/var.png")
       .AddParameter("globalvar", _("Array variable"))
-      .SetHelpPath("/all-features/variables/structures-and-arrays/")
-      .SetRelevantForFunctionEventsOnly()
-      .SetHidden();
+      .SetRelevantForFunctionEventsOnly();
 
   extension
       .AddExpression(
@@ -892,23 +815,20 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsVariablesExtension(
           _("Last number child"),
           _("Value of the last element of a global array variable, if "
             "it is a number variable"),
-          _("External variables ❯ Global variables ❯ Arrays and structures"),
+          _("External variables/Global variables/Arrays and structures"),
           "res/actions/var.png")
       .AddParameter("globalvar", _("Array variable"))
-      .SetRelevantForFunctionEventsOnly()
-      .SetHidden();
+      .SetRelevantForFunctionEventsOnly();
 
   extension
       .AddExpression("GlobalVariableChildCount",
                      _("Number of children"),
                      _("Number of children in a global array or "
                        "structure variable"),
-                     _("External variables ❯ Global variables ❯ Arrays and structures"),
+                     _("External variables/Global variables/Arrays and structures"),
                      "res/actions/var.png")
       .AddParameter("globalvar", _("Array or structure variable"))
-      .SetHelpPath("/all-features/variables/structures-and-arrays/")
-      .SetRelevantForFunctionEventsOnly()
-      .SetHidden();
+      .SetRelevantForFunctionEventsOnly();
 
   extension
       .AddExpression("VariableChildCount",
@@ -917,48 +837,43 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsVariablesExtension(
                        "structure variable"),
                      _("Arrays and structures"),
                      "res/actions/var.png")
-      .AddParameter("variable", _("Array or structure variable"), "AllowUndeclaredVariable")
-      .SetHelpPath("/all-features/variables/structures-and-arrays/");
+      .AddParameter("variable", _("Array or structure variable"), "AllowUndeclaredVariable");
 
   extension
       .AddExpression("Variable",
                      _("Number variable"),
                      _("Number value of a scene variable"),
-                     _("External variables ❯ Scene variables"),
+                     _("External variables/Scene variables"),
                      "res/actions/var.png")
       .AddParameter("scenevar", _("Variable"))
-      .SetRelevantForFunctionEventsOnly()
-      .SetHidden();
+      .SetRelevantForFunctionEventsOnly();
 
   extension
       .AddStrExpression("VariableString",
                         _("Text variable"),
                         _("Text of a scene variable"),
-                        _("External variables ❯ Scene variables"),
+                        _("External variables/Scene variables"),
                         "res/actions/var.png")
       .AddParameter("scenevar", _("Variable"))
-      .SetRelevantForFunctionEventsOnly()
-      .SetHidden();
+      .SetRelevantForFunctionEventsOnly();
 
   extension
       .AddExpression("GlobalVariable",
                      _("Number variable"),
                      _("Number value of a global variable"),
-                     _("External variables ❯ Global variables"),
+                     _("External variables/Global variables"),
                      "res/actions/var.png")
       .AddParameter("globalvar", _("Name of the global variable"))
-      .SetRelevantForFunctionEventsOnly()
-      .SetHidden();
+      .SetRelevantForFunctionEventsOnly();
 
   extension
       .AddStrExpression("GlobalVariableString",
                         _("Text variable"),
                         _("Text of a global variable"),
-                        _("External variables ❯ Global variables"),
+                        _("External variables/Global variables"),
                         "res/actions/var.png")
       .AddParameter("globalvar", _("Variable"))
-      .SetRelevantForFunctionEventsOnly()
-      .SetHidden();
+      .SetRelevantForFunctionEventsOnly();
 }
 
 }  // namespace gd

Core/GDCore/Extensions/Metadata/BehaviorMetadata.h

@@ -272,7 +272,7 @@ class GD_CORE_API BehaviorMetadata : public InstructionOrExpressionContainerMeta
    * Check if the behavior is private - it can't be used outside of its
    * extension.
    */
-  bool IsPrivate() const override { return isPrivate; }
+  bool IsPrivate() const { return isPrivate; }
 
   /**
    * Set that the behavior is private - it can't be used outside of its

Core/GDCore/Extensions/Metadata/InstructionOrExpressionContainerMetadata.h

@@ -174,7 +174,6 @@ public:
   virtual const gd::String &GetFullName() const = 0;
   virtual const gd::String &GetDescription() const = 0;
   virtual const gd::String &GetIconFilename() const = 0;
-  virtual bool IsPrivate() const = 0;
 
   /**
    * \brief Return a reference to a map containing the names of the actions

Core/GDCore/Extensions/Metadata/ObjectMetadata.cpp

@@ -46,25 +46,30 @@ ObjectMetadata::ObjectMetadata(const gd::String& extensionNamespace_,
                                const gd::String& fullname_,
                                const gd::String& description_,
                                const gd::String& icon24x24)
-    : name(name_),
-      iconFilename(icon24x24),
-      extensionNamespace(extensionNamespace_) {
-  SetFullName(gd::String(fullname_));
-  SetDescription(gd::String(description_));
-}
+    : ObjectMetadata(extensionNamespace_,
+                     name_,
+                     fullname_,
+                     description_,
+                     icon24x24,
+                     []() -> std::unique_ptr<gd::ObjectConfiguration> {
+      gd::LogFatalError(
+          "Error: Event-based objects don't have blueprint. "
+          "This method should not never be called.");
+      return nullptr;
+    }) {}
 
 ObjectMetadata::ObjectMetadata(const gd::String& extensionNamespace_,
                                const gd::String& name_,
                                const gd::String& fullname_,
                                const gd::String& description_,
                                const gd::String& icon24x24,
-                               CreateFunPtr createFunPtr_)
-    : ObjectMetadata(extensionNamespace_,
-                     name_,
-                     fullname_,
-                     description_,
-                     icon24x24) {
-  createFunPtr = createFunPtr_;
+                               CreateFunPtr createFunPtrP)
+    : name(name_),
+      iconFilename(icon24x24),
+      createFunPtr(createFunPtrP),
+      extensionNamespace(extensionNamespace_) {
+  SetFullName(gd::String(fullname_));
+  SetDescription(gd::String(description_));
 }
 
 gd::InstructionMetadata& ObjectMetadata::AddCondition(

Core/GDCore/Extensions/Metadata/ObjectMetadata.h

@@ -39,8 +39,6 @@ class GD_CORE_API ObjectMetadata : public InstructionOrExpressionContainerMetada
   /**
    * \brief Construct an object metadata, using a "blueprint" object that will
    * be copied when a new object is requested.
-   *
-   * \note This is used for objects declared in JavaScript extensions.
    */
   ObjectMetadata(const gd::String& extensionNamespace_,
                  const gd::String& name_,
@@ -49,9 +47,9 @@ class GD_CORE_API ObjectMetadata : public InstructionOrExpressionContainerMetada
                  const gd::String& icon24x24_,
                  std::shared_ptr<gd::ObjectConfiguration> blueprintObject_);
   /**
-   * \brief Construct an object metadata.
+   * \brief Construct an object metadata, without "blueprint" object
    *
-   * \note This is used by events based objects ("custom objects").
+   * \note This is used by events based objects.
    */
   ObjectMetadata(const gd::String& extensionNamespace_,
                  const gd::String& name_,
@@ -62,17 +60,14 @@ class GD_CORE_API ObjectMetadata : public InstructionOrExpressionContainerMetada
   /**
    * \brief Construct an object metadata, with a function that will be called
    * to instantiate a new object.
-   *
-   * \note This is used for objects declared in C++ extensions.
    */
   ObjectMetadata(const gd::String& extensionNamespace_,
                  const gd::String& name_,
                  const gd::String& fullname_,
                  const gd::String& description_,
                  const gd::String& icon24x24_,
-                 CreateFunPtr createFunPtr_);
-
-  ObjectMetadata() {}
+                 CreateFunPtr createFunPtrP);
+  ObjectMetadata() : createFunPtr(NULL) {}
   virtual ~ObjectMetadata(){};
 
   /**
@@ -251,11 +246,6 @@ class GD_CORE_API ObjectMetadata : public InstructionOrExpressionContainerMetada
     return *this;
   }
 
-  ObjectMetadata& ResetDefaultBehaviorsJustForTesting() {
-    defaultBehaviorTypes.clear();
-    return *this;
-  }
-
   const gd::String& GetName() const override { return name; }
   const gd::String& GetFullName() const override { return fullname; }
   const gd::String& GetCategoryFullName() const { return categoryFullName; }
@@ -305,22 +295,6 @@ class GD_CORE_API ObjectMetadata : public InstructionOrExpressionContainerMetada
    */
   std::map<gd::String, gd::ExpressionMetadata>& GetAllStrExpressions() override { return strExpressionsInfos; };
 
-
-  /**
-   * Check if the behavior is private - it can't be used outside of its
-   * extension.
-   */
-  bool IsPrivate() const override { return isPrivate; }
-
-  /**
-   * Set that the behavior is private - it can't be used outside of its
-   * extension.
-   */
-  ObjectMetadata &SetPrivate() {
-    isPrivate = true;
-    return *this;
-  }
-
   /**
    * \brief Set the object to be hidden in the IDE.
    *
@@ -365,7 +339,7 @@ class GD_CORE_API ObjectMetadata : public InstructionOrExpressionContainerMetada
 
   std::vector<gd::String> includeFiles;
   gd::String className;
-  CreateFunPtr createFunPtr = nullptr;
+  CreateFunPtr createFunPtr;
 
  private:
   gd::String extensionNamespace;
@@ -377,7 +351,6 @@ class GD_CORE_API ObjectMetadata : public InstructionOrExpressionContainerMetada
   gd::String iconFilename;
   gd::String categoryFullName;
   std::set<gd::String> defaultBehaviorTypes;
-  bool isPrivate = false;
   bool hidden = false;
   bool isRenderedIn3D = false;
   gd::String openFullEditorLabel;

Core/GDCore/Extensions/Metadata/ParameterMetadataTools.cpp

@@ -6,8 +6,6 @@
 #include "ParameterMetadataTools.h"
 
 #include "GDCore/Events/Expression.h"
-#include "GDCore/Events/Parsers/ExpressionParser2.h"
-#include "GDCore/Events/Parsers/ExpressionParser2NodePrinter.h"
 #include "GDCore/Project/Object.h"
 #include "GDCore/Project/ObjectsContainer.h"
 #include "GDCore/Project/ObjectsContainersList.h"
@@ -15,6 +13,8 @@
 #include "GDCore/Project/Project.h"
 #include "GDCore/String.h"
 #include "InstructionMetadata.h"
+#include "GDCore/Events/Parsers/ExpressionParser2.h"
+#include "GDCore/Events/Parsers/ExpressionParser2NodePrinter.h"
 
 namespace gd {
 const ParameterMetadata ParameterMetadataTools::badParameterMetadata;
@@ -23,109 +23,42 @@ void ParameterMetadataTools::ParametersToObjectsContainer(
     const gd::Project& project,
     const ParameterMetadataContainer& parameters,
     gd::ObjectsContainer& outputObjectsContainer) {
-  // Keep track of all objects and their behaviors names, so we can remove
-  // those who are in the container but not in the parameters anymore.
-  std::set<gd::String> allObjectNames;
-  std::map<gd::String, std::set<gd::String>> allObjectNonDefaultBehaviorNames;
+  outputObjectsContainer.GetObjects().clear();
 
   gd::String lastObjectName;
   for (std::size_t i = 0; i < parameters.GetParametersCount(); ++i) {
     const auto& parameter = parameters.GetParameter(i);
     if (parameter.GetName().empty()) continue;
 
-    auto &valueTypeMetadata = parameter.GetValueTypeMetadata();
-    if (valueTypeMetadata.IsObject()) {
-      const gd::String& objectName = parameter.GetName();
-      const gd::String& objectType = parameter.GetExtraInfo();
-      allObjectNames.insert(objectName);
-
-      // Check if we can keep the existing object.
-      if (outputObjectsContainer.HasObjectNamed(objectName)) {
-        const gd::Object& object = outputObjectsContainer.GetObject(objectName);
-
-        if (object.GetType() != objectType) {
-          // Object type has changed, remove it so it is re-created.
-          outputObjectsContainer.RemoveObject(objectName);
-        }
-      }
-
-      if (outputObjectsContainer.HasObjectNamed(objectName)) {
-        // Keep the existing object, ensure the default behaviors
-        // are all present (and no more than required by the object type).
-        // Non default behaviors coming from parameters will be added or removed later.
-        project.EnsureObjectDefaultBehaviors(outputObjectsContainer.GetObject(objectName));
-      } else {
-        // Create a new object (and its default behaviors) if needed.
-        outputObjectsContainer.InsertNewObject(
-            project,
-            objectType,
-            objectName,
-            outputObjectsContainer.GetObjectsCount());
-      }
+    if (gd::ParameterMetadata::IsObject(parameter.GetType())) {
+      outputObjectsContainer.InsertNewObject(
+          project,
+          parameter.GetExtraInfo(),
+          parameter.GetName(),
+          outputObjectsContainer.GetObjectsCount());
 
       // Memorize the last object name. By convention, parameters that require
       // an object (mainly, "objectvar" and "behavior") should be placed after
       // the object in the list of parameters (if possible, just after).
       // Search "lastObjectName" in the codebase for other place where this
       // convention is enforced.
-      lastObjectName = objectName;
-    } else if (valueTypeMetadata.IsBehavior()) {
+      lastObjectName = parameter.GetName();
+    } else if (gd::ParameterMetadata::IsBehavior(parameter.GetType())) {
       if (!lastObjectName.empty()) {
         if (outputObjectsContainer.HasObjectNamed(lastObjectName)) {
-          const gd::String& behaviorName = parameter.GetName();
-          const gd::String& behaviorType = parameter.GetExtraInfo();
-
-          gd::Object& object = outputObjectsContainer.GetObject(lastObjectName);
-          allObjectNonDefaultBehaviorNames[lastObjectName].insert(behaviorName);
-
-          // Check if we can keep the existing behavior.
-          if (object.HasBehaviorNamed(behaviorName)) {
-            if (object.GetBehavior(behaviorName).GetTypeName() !=
-                behaviorType) {
-              // Behavior type has changed, remove it so it is re-created.
-              object.RemoveBehavior(behaviorName);
-            }
-          }
+          const gd::Object& object =
+              outputObjectsContainer.GetObject(lastObjectName);
+          gd::String behaviorName = parameter.GetName();
 
           if (!object.HasBehaviorNamed(behaviorName)) {
-            object.AddNewBehavior(
-                project, parameter.GetExtraInfo(), behaviorName);
+            outputObjectsContainer.GetObject(lastObjectName)
+                .AddNewBehavior(
+                    project, parameter.GetExtraInfo(), behaviorName);
           }
         }
       }
     }
   }
-
-  // Remove objects that are not in the parameters anymore.
-  std::set<gd::String> objectNamesInContainer =
-      outputObjectsContainer.GetAllObjectNames();
-  for (const auto& objectName : objectNamesInContainer) {
-    if (allObjectNames.find(objectName) == allObjectNames.end()) {
-      outputObjectsContainer.RemoveObject(objectName);
-    }
-  }
-
-  // Remove behaviors of objects that are not in the parameters anymore.
-  for (const auto& objectName : allObjectNames) {
-    if (!outputObjectsContainer.HasObjectNamed(objectName)) {
-      // Should not happen.
-      continue;
-    }
-
-    auto& object = outputObjectsContainer.GetObject(objectName);
-    const auto& allBehaviorNames = allObjectNonDefaultBehaviorNames[objectName];
-    for (const auto& behaviorName : object.GetAllBehaviorNames()) {
-      if (object.GetBehavior(behaviorName).IsDefaultBehavior()) {
-        // Default behaviors are already ensured to be all present
-        // (and no more than required by the object type).
-        continue;
-      }
-
-      if (allBehaviorNames.find(behaviorName) == allBehaviorNames.end()) {
-        object.RemoveBehavior(behaviorName);
-      }
-    }
-  }
 }
 
 void ParameterMetadataTools::ForEachParameterMatchingSearch(

Core/GDCore/Extensions/Metadata/SourceFileMetadata.h

@@ -1,56 +0,0 @@
-/*
- * GDevelop Core
- * Copyright 2008-2016 Florian Rival (Florian.Rival@gmail.com). All rights
- * reserved. This project is released under the MIT License.
- */
-#pragma once
-#include "GDCore/String.h"
-#include "GDCore/Serialization/SerializerElement.h"
-
-namespace gd {
-/**
- * \brief Contains information about a source file that must be included
- * when an extension is used.
- */
-class GD_CORE_API SourceFileMetadata {
- public:
-  /**
-   * Construct a new dependency metadata, though you probably want to call
-   * `AddSourceFile` on gd::PlatformExtension.
-   *
-   * \see gd::PlatformExtension
-   */
-  SourceFileMetadata() {};
-
-  SourceFileMetadata& SetResourceName(const gd::String& resourceName_) {
-    resourceName = resourceName_;
-    return *this;
-  };
-
-  SourceFileMetadata& SetIncludePosition(const gd::String& includePosition_) {
-    includePosition = includePosition_;
-    return *this;
-  };
-
-  const gd::String& GetResourceName() const { return resourceName; };
-
-  gd::String& GetResourceName() { return resourceName; };
-
-  const gd::String& GetIncludePosition() const { return includePosition; };
-
-  void SerializeTo(SerializerElement& element) const {
-    element.AddChild("resourceName").SetStringValue(resourceName);
-    element.AddChild("includePosition").SetStringValue(includePosition);
-  }
-
-  void UnserializeFrom(const SerializerElement& element) {
-    resourceName = element.GetStringAttribute("resourceName");
-    includePosition = element.GetStringAttribute("includePosition", "last");
-  }
-
- private:
-  gd::String resourceName;  ///< The name of the resource in the project.
-  gd::String includePosition = "last";  ///< "first" or "last".
-};
-
-}  // namespace gd

Core/GDCore/Extensions/Metadata/ValueTypeMetadata.cpp

@@ -79,8 +79,6 @@ const gd::String ValueTypeMetadata::colorValueType = "color";
 const gd::String ValueTypeMetadata::choiceValueType = "stringWithSelector";
 const gd::String ValueTypeMetadata::behaviorValueType = "behavior";
 const gd::String ValueTypeMetadata::leaderboardIdValueType = "leaderboardId";
-const gd::String ValueTypeMetadata::objectAnimationNameValueType = "objectAnimationName";
-const gd::String ValueTypeMetadata::keyboardKeyValueType = "keyboardKey";
 
 const gd::String &ValueTypeMetadata::ConvertPropertyTypeToValueType(
     const gd::String &propertyType) {
@@ -96,12 +94,8 @@ const gd::String &ValueTypeMetadata::ConvertPropertyTypeToValueType(
     return behaviorValueType;
   } else if (propertyType == "LeaderboardId") {
     return leaderboardIdValueType;
-  } else if (propertyType == "ObjectAnimationName") {
-    return objectAnimationNameValueType;
-  } else if (propertyType == "KeyboardKey") {
-    return keyboardKeyValueType;
   }
-  // For "String", "Resource", "MultilineString" or default
+  // For "String" or default
   return stringValueType;
 };
 

Core/GDCore/Extensions/Metadata/ValueTypeMetadata.h

@@ -129,36 +129,13 @@ class GD_CORE_API ValueTypeMetadata {
   }
 
   /**
-   * \brief Return true if the type of the parameter is a variable.
+   * \brief Return true if the type of the parameter is a number.
    * \note If you had a new type of parameter, also add it in the IDE (
    * see EventsFunctionParametersEditor, ParameterRenderingService
    * and ExpressionAutocompletion) and in the EventsCodeGenerator.
    */
   bool IsVariable() const {
-    return gd::ValueTypeMetadata::IsVariable(name);
-  }
-
-  /**
-   * \brief Return true if the type of the parameter is a variable.
-   * \note If you had a new type of parameter, also add it in the IDE (
-   * see EventsFunctionParametersEditor, ParameterRenderingService
-   * and ExpressionAutocompletion) and in the EventsCodeGenerator.
-   */
-  static bool IsVariable(const gd::String &type) {
-    return gd::ValueTypeMetadata::GetPrimitiveValueType(type) == "variable";
-  }
-
-  /**
-   * \brief Return true if the type of the parameter is a variable and not a
-   * property or a parameter.
-   */
-  bool IsVariableOnly() const {
-      return
-          // Any variable.
-          name == "variable" ||
-          // Old, "pre-scoped" variables:
-          name == "objectvar" || name == "globalvar" ||
-          name == "scenevar";
+    return gd::ValueTypeMetadata::GetPrimitiveValueType(name) == "variable";
   }
 
   /**
@@ -225,20 +202,15 @@ class GD_CORE_API ValueTypeMetadata {
              parameterType == "functionParameterName" ||
              parameterType == "externalLayoutName" ||
              parameterType == "leaderboardId" ||
-             parameterType == "keyboardKey" ||
-             parameterType == "mouseButton" ||
              parameterType == "identifier";
     } else if (type == "boolean") {
       return parameterType == "yesorno" || parameterType == "trueorfalse";
     } else if (type == "variable") {
       return
-          // Any variable.
-          parameterType == "variable" ||
-          parameterType == "variableOrProperty" ||
-          parameterType == "variableOrPropertyOrParameter" ||
-          // Old, "pre-scoped" variables:
-          parameterType == "objectvar" || parameterType == "globalvar" ||
-          parameterType == "scenevar";
+             parameterType == "variable" || // Any variable.
+             // Old, "pre-scoped" variables:
+             parameterType == "objectvar" || parameterType == "globalvar" ||
+             parameterType == "scenevar";
     } else if (type == "resource") {
       return parameterType == "fontResource" ||
              parameterType == "audioResource" ||
@@ -334,8 +306,6 @@ class GD_CORE_API ValueTypeMetadata {
   static const gd::String choiceValueType;
   static const gd::String behaviorValueType;
   static const gd::String leaderboardIdValueType;
-  static const gd::String objectAnimationNameValueType;
-  static const gd::String keyboardKeyValueType;
 };
 
 }  // namespace gd

Core/GDCore/Extensions/Platform.cpp

@@ -38,14 +38,12 @@ bool Platform::AddExtension(std::shared_ptr<gd::PlatformExtension> extension) {
 
   extensionsLoaded.push_back(extension);
 
-  // Load all creation functions for objects provided by the
-  // extension.
+  // Load all creation/destruction functions for objects provided by the
+  // extension
   vector<gd::String> objectsTypes = extension->GetExtensionObjectsTypes();
   for (std::size_t i = 0; i < objectsTypes.size(); ++i) {
-    CreateFunPtr createFunPtr = extension->GetObjectCreationFunctionPtr(objectsTypes[i]);
-    if (createFunPtr != nullptr) {
-      creationFunctionTable[objectsTypes[i]] = createFunPtr;
-    }
+    creationFunctionTable[objectsTypes[i]] =
+        extension->GetObjectCreationFunctionPtr(objectsTypes[i]);
   }
 
   for (const auto& it :
@@ -64,9 +62,7 @@ void Platform::RemoveExtension(const gd::String& name) {
     if (extension->GetName() == name) {
       vector<gd::String> objectsTypes = extension->GetExtensionObjectsTypes();
       for (std::size_t i = 0; i < objectsTypes.size(); ++i) {
-        if (creationFunctionTable.find(objectsTypes[i]) != creationFunctionTable.end()) {
-          creationFunctionTable.erase(objectsTypes[i]);
-        }
+        creationFunctionTable.erase(objectsTypes[i]);
       }
     }
   }

Core/GDCore/Extensions/PlatformExtension.cpp

@@ -18,8 +18,8 @@
 #include "GDCore/Extensions/Platform.h"
 #include "GDCore/IDE/PlatformManager.h"
 #include "GDCore/Project/Behavior.h"
-#include "GDCore/Project/BehaviorsSharedData.h"
 #include "GDCore/Project/ObjectConfiguration.h"
+#include "GDCore/Project/BehaviorsSharedData.h"
 #include "GDCore/Tools/Localization.h"
 
 namespace gd {
@@ -200,11 +200,11 @@ PlatformExtension::AddExpressionAndConditionAndAction(
                           group,
                           icon)
           : AddStrExpression(name,
-                             fullname,
-                             expressionDescriptionTemplate.FindAndReplace(
-                                 "<subject>", descriptionSubject),
-                             group,
-                             icon);
+                              fullname,
+                              expressionDescriptionTemplate.FindAndReplace(
+                                  "<subject>", descriptionSubject),
+                              group,
+                              icon);
 
   return MultipleInstructionMetadata::WithExpressionAndConditionAndAction(
       expression, condition, action);
@@ -215,11 +215,6 @@ gd::DependencyMetadata& PlatformExtension::AddDependency() {
   return extensionDependenciesMetadata.back();
 }
 
-gd::SourceFileMetadata& PlatformExtension::AddSourceFile() {
-  extensionSourceFilesMetadata.push_back(SourceFileMetadata());
-  return extensionSourceFilesMetadata.back();
-}
-
 gd::ObjectMetadata& PlatformExtension::AddObject(
     const gd::String& name,
     const gd::String& fullname,
@@ -244,10 +239,12 @@ gd::ObjectMetadata& PlatformExtension::AddEventsBasedObject(
     const gd::String& description,
     const gd::String& icon24x24) {
   gd::String nameWithNamespace = GetNameSpace() + name;
-  objectsInfos[nameWithNamespace] =
-      ObjectMetadata(
-          GetNameSpace(), nameWithNamespace, fullname, description, icon24x24)
-          .SetHelpPath(GetHelpPath());
+  objectsInfos[nameWithNamespace] = ObjectMetadata(GetNameSpace(),
+                                                   nameWithNamespace,
+                                                   fullname,
+                                                   description,
+                                                   icon24x24)
+                                        .SetHelpPath(GetHelpPath());
   return objectsInfos[nameWithNamespace];
 }
 
@@ -351,7 +348,8 @@ gd::BehaviorMetadata& PlatformExtension::GetBehaviorMetadata(
   return badBehaviorMetadata;
 }
 
-bool PlatformExtension::HasBehavior(const gd::String& behaviorType) const {
+bool PlatformExtension::HasBehavior(
+    const gd::String& behaviorType) const {
   return behaviorsInfo.find(behaviorType) != behaviorsInfo.end();
 }
 
@@ -383,7 +381,7 @@ gd::InstructionMetadata& PlatformExtension::AddDuplicatedAction(
   auto copiedAction = actionsInfos.find(copiedNameWithNamespace);
   if (copiedAction == actionsInfos.end()) {
     gd::LogError("Could not find an action with name " +
-                 copiedNameWithNamespace + " to copy.");
+                   copiedNameWithNamespace + " to copy.");
   } else {
     actionsInfos[newNameWithNamespace] = copiedAction->second;
   }
@@ -403,7 +401,7 @@ gd::InstructionMetadata& PlatformExtension::AddDuplicatedCondition(
   auto copiedCondition = conditionsInfos.find(copiedNameWithNamespace);
   if (copiedCondition == conditionsInfos.end()) {
     gd::LogError("Could not find a condition with name " +
-                 copiedNameWithNamespace + " to copy.");
+                   copiedNameWithNamespace + " to copy.");
   } else {
     conditionsInfos[newNameWithNamespace] = copiedCondition->second;
   }
@@ -420,7 +418,7 @@ gd::ExpressionMetadata& PlatformExtension::AddDuplicatedExpression(
   auto copiedExpression = expressionsInfos.find(copiedNameWithNamespace);
   if (copiedExpression == expressionsInfos.end()) {
     gd::LogError("Could not find an expression with name " +
-                 copiedNameWithNamespace + " to copy.");
+                   copiedNameWithNamespace + " to copy.");
   } else {
     expressionsInfos[newNameWithNamespace] = copiedExpression->second;
   }
@@ -437,7 +435,7 @@ gd::ExpressionMetadata& PlatformExtension::AddDuplicatedStrExpression(
   auto copiedExpression = strExpressionsInfos.find(copiedNameWithNamespace);
   if (copiedExpression == strExpressionsInfos.end()) {
     gd::LogError("Could not find a string expression with name " +
-                 copiedNameWithNamespace + " to copy.");
+                   copiedNameWithNamespace + " to copy.");
   } else {
     strExpressionsInfos[newNameWithNamespace] = copiedExpression->second;
   }
@@ -465,24 +463,10 @@ PlatformExtension::GetAllStrExpressions() {
   return strExpressionsInfos;
 }
 
-const std::vector<gd::DependencyMetadata>&
-PlatformExtension::GetAllDependencies() const {
-  return extensionDependenciesMetadata;
-}
-
 std::vector<gd::DependencyMetadata>& PlatformExtension::GetAllDependencies() {
   return extensionDependenciesMetadata;
 }
 
-const std::vector<gd::SourceFileMetadata>&
-PlatformExtension::GetAllSourceFiles() const {
-  return extensionSourceFilesMetadata;
-}
-
-std::vector<gd::SourceFileMetadata>& PlatformExtension::GetAllSourceFiles() {
-  return extensionSourceFilesMetadata;
-}
-
 std::map<gd::String, gd::EventMetadata>& PlatformExtension::GetAllEvents() {
   return eventsInfos;
 }
@@ -614,6 +598,37 @@ void PlatformExtension::SetNameSpace(gd::String nameSpace_) {
   nameSpace = nameSpace_ + GetNamespaceSeparator();
 }
 
+std::vector<gd::String> PlatformExtension::GetBuiltinExtensionsNames() {
+  std::vector<gd::String> builtinExtensions;
+  builtinExtensions.push_back("Sprite");
+  builtinExtensions.push_back("BuiltinObject");
+  builtinExtensions.push_back("BuiltinAudio");
+  builtinExtensions.push_back("BuiltinMouse");
+  builtinExtensions.push_back("BuiltinKeyboard");
+  builtinExtensions.push_back("BuiltinJoystick");
+  builtinExtensions.push_back("BuiltinTime");
+  builtinExtensions.push_back("BuiltinFile");
+  builtinExtensions.push_back("BuiltinVariables");
+  builtinExtensions.push_back("BuiltinCamera");
+  builtinExtensions.push_back("BuiltinWindow");
+  builtinExtensions.push_back("BuiltinNetwork");
+  builtinExtensions.push_back("BuiltinScene");
+  builtinExtensions.push_back("BuiltinAdvanced");
+  builtinExtensions.push_back("BuiltinCommonConversions");
+  builtinExtensions.push_back("BuiltinStringInstructions");
+  builtinExtensions.push_back("BuiltinMathematicalTools");
+  builtinExtensions.push_back("BuiltinExternalLayouts");
+  builtinExtensions.push_back("BuiltinCommonInstructions");
+
+  return builtinExtensions;
+}
+
+bool PlatformExtension::IsBuiltin() const {
+  std::vector<gd::String> builtinExtensions = GetBuiltinExtensionsNames();
+  return std::find(builtinExtensions.begin(), builtinExtensions.end(), name) !=
+         builtinExtensions.end();
+}
+
 void PlatformExtension::StripUnimplementedInstructionsAndExpressions() {
   for (std::map<gd::String, gd::InstructionMetadata>::iterator it =
            GetAllActions().begin();
@@ -759,42 +774,41 @@ void PlatformExtension::StripUnimplementedInstructionsAndExpressions() {
   }
 }
 
-gd::String PlatformExtension::GetEventsFunctionFullType(
-    const gd::String& extensionName, const gd::String& functionName) {
-  const auto& separator = GetNamespaceSeparator();
+gd::String
+PlatformExtension::GetEventsFunctionFullType(const gd::String &extensionName,
+                                             const gd::String &functionName) {
+  const auto &separator = GetNamespaceSeparator();
   return extensionName + separator + functionName;
 }
 
 gd::String PlatformExtension::GetBehaviorEventsFunctionFullType(
-    const gd::String& extensionName,
-    const gd::String& behaviorName,
-    const gd::String& functionName) {
-  const auto& separator = GetNamespaceSeparator();
+    const gd::String &extensionName, const gd::String &behaviorName,
+    const gd::String &functionName) {
+  const auto &separator = GetNamespaceSeparator();
   return extensionName + separator + behaviorName + separator + functionName;
 }
 
-gd::String PlatformExtension::GetBehaviorFullType(
-    const gd::String& extensionName, const gd::String& behaviorName) {
-  const auto& separator = GetNamespaceSeparator();
+gd::String
+PlatformExtension::GetBehaviorFullType(const gd::String &extensionName,
+                                       const gd::String &behaviorName) {
+  const auto &separator = GetNamespaceSeparator();
   return extensionName + separator + behaviorName;
 }
 
 gd::String PlatformExtension::GetObjectEventsFunctionFullType(
-    const gd::String& extensionName,
-    const gd::String& objectName,
-    const gd::String& functionName) {
-  const auto& separator = GetNamespaceSeparator();
+    const gd::String &extensionName, const gd::String &objectName,
+    const gd::String &functionName) {
+  const auto &separator = GetNamespaceSeparator();
   return extensionName + separator + objectName + separator + functionName;
 }
 
-gd::String PlatformExtension::GetObjectFullType(const gd::String& extensionName,
-                                                const gd::String& objectName) {
-  const auto& separator = GetNamespaceSeparator();
+gd::String PlatformExtension::GetObjectFullType(const gd::String &extensionName,
+                                                const gd::String &objectName) {
+  const auto &separator = GetNamespaceSeparator();
   return extensionName + separator + objectName;
 }
 
-gd::String PlatformExtension::GetExtensionFromFullObjectType(
-    const gd::String& type) {
+gd::String PlatformExtension::GetExtensionFromFullObjectType(const gd::String& type) {
   const auto separatorIndex =
       type.find(PlatformExtension::GetNamespaceSeparator());
   if (separatorIndex == std::string::npos) {
@@ -803,8 +817,7 @@ gd::String PlatformExtension::GetExtensionFromFullObjectType(
   return type.substr(0, separatorIndex);
 }
 
-gd::String PlatformExtension::GetObjectNameFromFullObjectType(
-    const gd::String& type) {
+gd::String PlatformExtension::GetObjectNameFromFullObjectType(const gd::String& type) {
   const auto separatorIndex =
       type.find(PlatformExtension::GetNamespaceSeparator());
   if (separatorIndex == std::string::npos) {

Core/GDCore/Extensions/PlatformExtension.h

@@ -17,7 +17,6 @@
 #include "GDCore/Extensions/Metadata/EventMetadata.h"
 #include "GDCore/Extensions/Metadata/InstructionOrExpressionGroupMetadata.h"
 #include "GDCore/Extensions/Metadata/ObjectMetadata.h"
-#include "GDCore/Extensions/Metadata/SourceFileMetadata.h"
 #include "GDCore/Project/PropertyDescriptor.h"
 #include "GDCore/String.h"
 #include "GDCore/Tools/VersionPriv.h"
@@ -215,7 +214,6 @@ class GD_CORE_API PlatformExtension {
       const gd::String& icon);
 
   gd::DependencyMetadata& AddDependency();
-  gd::SourceFileMetadata& AddSourceFile();
 
   /**
    * \brief Declare a new object as being part of the extension.
@@ -440,6 +438,12 @@ class GD_CORE_API PlatformExtension {
    */
   bool IsDeprecated() const { return deprecated; }
 
+  /**
+   * \brief Return true if the extension is a standard extension that cannot be
+   * deactivated
+   */
+  bool IsBuiltin() const;
+
   /**
    * \brief Get the namespace of the extension.
    * \note The namespace is simply the name of the extension concatenated with
@@ -548,24 +552,6 @@ class GD_CORE_API PlatformExtension {
    */
   std::vector<gd::DependencyMetadata>& GetAllDependencies();
 
-  /**
-   * \brief Return a reference to a vector containing the metadata of all the
-   * dependencies of the extension.
-   */
-  const std::vector<gd::DependencyMetadata>& GetAllDependencies() const;
-
-  /**
-   * \brief Return a reference to a vector containing the metadata of all the
-   * dependencies of the extension.
-   */
-  std::vector<gd::SourceFileMetadata>& GetAllSourceFiles();
-
-  /**
-   * \brief Return a reference to a vector containing the metadata of all the
-   * dependencies of the extension.
-   */
-  const std::vector<gd::SourceFileMetadata>& GetAllSourceFiles() const;
-
   /**
    * \brief Return a reference to a map containing the names of the actions,
    * related to the object type, and the metadata associated with.
@@ -634,6 +620,12 @@ class GD_CORE_API PlatformExtension {
   }
   ///@}
 
+  /**
+   * \brief Return the name of all the extensions which are considered provided
+   * by platforms.
+   */
+  static std::vector<gd::String> GetBuiltinExtensionsNames();
+
   /**
    * \brief Get the string used to separate the name of the
    * instruction/expression and the extension.
@@ -695,7 +687,6 @@ class GD_CORE_API PlatformExtension {
   std::map<gd::String, gd::ExpressionMetadata> expressionsInfos;
   std::map<gd::String, gd::ExpressionMetadata> strExpressionsInfos;
   std::vector<gd::DependencyMetadata> extensionDependenciesMetadata;
-  std::vector<gd::SourceFileMetadata> extensionSourceFilesMetadata;
   std::map<gd::String, gd::EventMetadata> eventsInfos;
   std::map<gd::String, gd::PropertyDescriptor> extensionPropertiesMetadata;
   std::map<gd::String, InstructionOrExpressionGroupMetadata>

Core/GDCore/IDE/DependenciesAnalyzer.cpp

@@ -12,6 +12,7 @@
 #include "GDCore/Project/ExternalEvents.h"
 #include "GDCore/Project/Layout.h"
 #include "GDCore/Project/Project.h"
+#include "GDCore/Project/SourceFile.h"
 
 DependenciesAnalyzer::DependenciesAnalyzer(const gd::Project& project_,
                                            const gd::Layout& layout_)
@@ -73,6 +74,16 @@ bool DependenciesAnalyzer::Analyze(const gd::EventsList& events) {
       }
     }
 
+    // Search for source files dependencies
+    std::vector<gd::String> dependencies =
+        events[i].GetSourceFileDependencies();
+    sourceFilesDependencies.insert(dependencies.begin(), dependencies.end());
+
+    const gd::String& associatedSourceFile =
+        events[i].GetAssociatedGDManagedSourceFile(const_cast<gd::Project&>(project));
+    if (!associatedSourceFile.empty())
+      sourceFilesDependencies.insert(associatedSourceFile);
+
     // Analyze sub events dependencies
     if (events[i].CanHaveSubEvents()) {
       if (!Analyze(events[i].GetSubEvents())) return false;

Core/GDCore/IDE/DependenciesAnalyzer.h

@@ -71,6 +71,14 @@ class GD_CORE_API DependenciesAnalyzer {
     return externalEventsDependencies;
   };
 
+  /**
+   * \brief Return the source files being dependencies of the scene or external
+   * events passed in the constructor.
+   */
+  const std::set<gd::String>& GetSourceFilesDependencies() const {
+    return sourceFilesDependencies;
+  };
+
  private:
   /**
    * \brief Analyze the dependencies of the events.
@@ -84,6 +92,7 @@ class GD_CORE_API DependenciesAnalyzer {
 
   std::set<gd::String> scenesDependencies;
   std::set<gd::String> externalEventsDependencies;
+  std::set<gd::String> sourceFilesDependencies;
   std::vector<gd::String>
       parentScenes;  ///< Used to check for circular dependencies.
   std::vector<gd::String>

Core/GDCore/IDE/Events/EventsParameterReplacer.cpp

@@ -1,243 +0,0 @@
-/*
- * GDevelop Core
- * Copyright 2008-2016 Florian Rival (Florian.Rival@gmail.com). All rights
- * reserved. This project is released under the MIT License.
- */
-#include "GDCore/IDE/Events/EventsParameterReplacer.h"
-
-#include <map>
-#include <memory>
-#include <unordered_map>
-#include <unordered_set>
-#include <vector>
-
-#include "GDCore/Events/Event.h"
-#include "GDCore/Events/EventsList.h"
-#include "GDCore/Events/Parsers/ExpressionParser2NodePrinter.h"
-#include "GDCore/Events/Parsers/ExpressionParser2NodeWorker.h"
-#include "GDCore/Extensions/Metadata/MetadataProvider.h"
-#include "GDCore/Extensions/Metadata/ParameterMetadata.h"
-#include "GDCore/Extensions/Metadata/ParameterMetadataTools.h"
-#include "GDCore/IDE/Events/ExpressionValidator.h"
-#include "GDCore/Project/Layout.h"
-#include "GDCore/Project/Project.h"
-#include "GDCore/Project/ProjectScopedContainers.h"
-#include "GDCore/Project/PropertiesContainer.h"
-#include "GDCore/String.h"
-#include "GDCore/Tools/Log.h"
-
-namespace gd {
-
-/**
- * \brief Go through the nodes and rename parameters.
- *
- * \see gd::ExpressionParser2
- */
-class GD_CORE_API ExpressionParameterReplacer
-    : public ExpressionParser2NodeWorker {
- public:
-  ExpressionParameterReplacer(
-      const gd::Platform& platform_,
-      const gd::ProjectScopedContainers& projectScopedContainers_,
-      bool isParentTypeAVariable_,
-      const std::unordered_map<gd::String, gd::String>& oldToNewPropertyNames_)
-      : hasDoneRenaming(false),
-        platform(platform_),
-        projectScopedContainers(projectScopedContainers_),
-        isParentTypeAVariable(isParentTypeAVariable_),
-        oldToNewPropertyNames(oldToNewPropertyNames_){};
-  virtual ~ExpressionParameterReplacer(){};
-
-  bool HasDoneRenaming() const { return hasDoneRenaming; }
-
- protected:
-  void OnVisitSubExpressionNode(SubExpressionNode& node) override {
-    node.expression->Visit(*this);
-  }
-  void OnVisitOperatorNode(OperatorNode& node) override {
-    node.leftHandSide->Visit(*this);
-    node.rightHandSide->Visit(*this);
-  }
-  void OnVisitUnaryOperatorNode(UnaryOperatorNode& node) override {
-    node.factor->Visit(*this);
-  }
-  void OnVisitNumberNode(NumberNode& node) override {}
-  void OnVisitTextNode(TextNode& node) override {}
-  void OnVisitVariableNode(VariableNode& node) override {
-    if (isParentTypeAVariable) {
-        // Do nothing, it's a variable.
-        if (node.child) node.child->Visit(*this);
-        return;
-    }
-
-    // The node represents a variable or an object name on which a variable
-    // will be accessed, or a property with a child.
-
-    projectScopedContainers.MatchIdentifierWithName<void>(
-      // The property name is changed after the refactor operation.
-      node.name,
-      [&]() {
-        // Do nothing, it's an object variable.
-        if (node.child) node.child->Visit(*this);
-      }, [&]() {
-        // Do nothing, it's a variable.
-        if (node.child) node.child->Visit(*this);
-      }, [&]() {
-        // Do nothing, it's a property.
-        if (node.child) node.child->Visit(*this);
-      }, [&]() {
-        // This is a parameter
-        RenameParameter(node.name);
-        if (node.child) node.child->Visit(*this);
-      }, [&]() {
-        // Do nothing, it's something else.
-        if (node.child) node.child->Visit(*this);
-      });
-  }
-  void OnVisitVariableAccessorNode(VariableAccessorNode& node) override {
-    if (node.child) node.child->Visit(*this);
-  }
-  void OnVisitVariableBracketAccessorNode(
-      VariableBracketAccessorNode& node) override {
-    bool isGrandParentTypeAVariable = isParentTypeAVariable;
-    isParentTypeAVariable = false;
-    node.expression->Visit(*this);
-    isParentTypeAVariable = isGrandParentTypeAVariable;
-    if (node.child) node.child->Visit(*this);
-  }
-  void OnVisitIdentifierNode(IdentifierNode& node) override {
-    if (isParentTypeAVariable) {
-        // Do nothing, it's a variable.
-        return;
-    }
-    projectScopedContainers.MatchIdentifierWithName<void>(
-      // The property name is changed after the refactor operation
-      node.identifierName,
-      [&]() {
-        // Do nothing, it's an object variable.
-      }, [&]() {
-        // Do nothing, it's a variable.
-      }, [&]() {
-        // Do nothing, it's a property.
-      }, [&]() {
-        // This is a parameter.
-        RenameParameter(node.identifierName);
-      }, [&]() {
-        // Do nothing, it's something else.
-      });
-  }
-  void OnVisitObjectFunctionNameNode(ObjectFunctionNameNode& node) override {}
-  void OnVisitFunctionCallNode(FunctionCallNode &node) override {
-    bool isGrandParentTypeAVariable = isParentTypeAVariable;
-    for (auto &parameter : node.parameters) {
-      const auto &parameterMetadata =
-          gd::MetadataProvider::GetFunctionCallParameterMetadata(
-              platform, projectScopedContainers.GetObjectsContainersList(),
-              node, *parameter);
-      if (!parameterMetadata) {
-        continue;
-      }
-      const auto &parameterTypeMetadata =
-          parameterMetadata->GetValueTypeMetadata();
-      if (gd::EventsParameterReplacer::CanContainParameter(
-              parameterTypeMetadata)) {
-        isParentTypeAVariable = parameterTypeMetadata.IsVariableOnly();
-        parameter->Visit(*this);
-      }
-    }
-    isParentTypeAVariable = isGrandParentTypeAVariable;
-  }
-  void OnVisitEmptyNode(EmptyNode& node) override {}
-
- private:
-  bool hasDoneRenaming;
-
-  bool RenameParameter(
-      gd::String& name) {
-    if (oldToNewPropertyNames.count(name) >= 1) {
-      name = oldToNewPropertyNames.find(name)->second;
-      hasDoneRenaming = true;
-      return true;
-    }
-
-    return false;  // Nothing was changed or done.
-  }
-
-  // Scope:
-  const gd::Platform& platform;
-  const gd::ProjectScopedContainers& projectScopedContainers;
-
-  // Renaming to do
-  const std::unordered_map<gd::String, gd::String>& oldToNewPropertyNames;
-
-  gd::String objectNameToUseForVariableAccessor;
-  bool isParentTypeAVariable;
-};
-
-bool EventsParameterReplacer::DoVisitInstruction(gd::Instruction& instruction,
-                                                bool isCondition) {
-  const auto& metadata = isCondition
-                             ? gd::MetadataProvider::GetConditionMetadata(
-                                   platform, instruction.GetType())
-                             : gd::MetadataProvider::GetActionMetadata(
-                                   platform, instruction.GetType());
-
-  gd::ParameterMetadataTools::IterateOverParametersWithIndex(
-      instruction.GetParameters(),
-      metadata.GetParameters(),
-      [&](const gd::ParameterMetadata& parameterMetadata,
-          const gd::Expression& parameterValue,
-          size_t parameterIndex,
-          const gd::String& lastObjectName) {
-        if (!gd::EventsParameterReplacer::CanContainParameter(
-          parameterMetadata.GetValueTypeMetadata())) {
-          return;
-        }
-        auto node = parameterValue.GetRootNode();
-        if (node) {
-          ExpressionParameterReplacer renamer(
-              platform, GetProjectScopedContainers(),
-              parameterMetadata.GetValueTypeMetadata().IsVariableOnly(),
-              oldToNewPropertyNames);
-          node->Visit(renamer);
-
-          if (renamer.HasDoneRenaming()) {
-            instruction.SetParameter(
-                parameterIndex, ExpressionParser2NodePrinter::PrintNode(*node));
-          }
-        }
-      });
-
-  return false;
-}
-
-bool EventsParameterReplacer::DoVisitEventExpression(
-    gd::Expression& expression, const gd::ParameterMetadata& metadata) {
-  if (!gd::EventsParameterReplacer::CanContainParameter(
-          metadata.GetValueTypeMetadata())) {
-    return false;
-  }
-  auto node = expression.GetRootNode();
-  if (node) {
-    ExpressionParameterReplacer renamer(
-        platform, GetProjectScopedContainers(),
-        metadata.GetValueTypeMetadata().IsVariableOnly(), oldToNewPropertyNames);
-    node->Visit(renamer);
-
-    if (renamer.HasDoneRenaming()) {
-      expression = ExpressionParser2NodePrinter::PrintNode(*node);
-    }
-  }
-
-  return false;
-}
-
-bool EventsParameterReplacer::CanContainParameter(
-    const gd::ValueTypeMetadata &valueTypeMetadata) {
-  return valueTypeMetadata.IsVariable() || valueTypeMetadata.IsNumber() ||
-         valueTypeMetadata.IsString();
-}
-
-EventsParameterReplacer::~EventsParameterReplacer() {}
-
-}  // namespace gd

Core/GDCore/IDE/Events/EventsParameterReplacer.h

@@ -1,52 +0,0 @@
-/*
- * GDevelop Core
- * Copyright 2008-2016 Florian Rival (Florian.Rival@gmail.com). All rights
- * reserved. This project is released under the MIT License.
- */
-#pragma once
-
-#include <map>
-#include <memory>
-#include <unordered_map>
-#include <unordered_set>
-#include <vector>
-
-#include "GDCore/IDE/Events/ArbitraryEventsWorker.h"
-#include "GDCore/String.h"
-namespace gd {
-class BaseEvent;
-class PropertiesContainer;
-class EventsList;
-class Platform;
-}  // namespace gd
-
-namespace gd {
-/**
- * \brief Replace in expressions and in parameters of actions or conditions,
- * references to the name of a parameter by another.
- *
- * \ingroup IDE
- */
-class GD_CORE_API EventsParameterReplacer
-    : public ArbitraryEventsWorkerWithContext {
- public:
-  EventsParameterReplacer(
-      const gd::Platform &platform_,
-      const std::unordered_map<gd::String, gd::String> &oldToNewPropertyNames_)
-      : platform(platform_),
-        oldToNewPropertyNames(oldToNewPropertyNames_){};
-  virtual ~EventsParameterReplacer();
-
-  static bool CanContainParameter(const gd::ValueTypeMetadata &valueTypeMetadata);
-
- private:
-  bool DoVisitInstruction(gd::Instruction &instruction,
-                          bool isCondition) override;
-  bool DoVisitEventExpression(gd::Expression &expression,
-                              const gd::ParameterMetadata &metadata) override;
-
-  const gd::Platform &platform;
-  const std::unordered_map<gd::String, gd::String> &oldToNewPropertyNames;
-};
-
-}  // namespace gd

Core/GDCore/IDE/Events/EventsPropertyReplacer.cpp

@@ -41,7 +41,6 @@ class GD_CORE_API ExpressionPropertyReplacer
       const gd::Platform& platform_,
       const gd::ProjectScopedContainers& projectScopedContainers_,
       const gd::PropertiesContainer& targetPropertiesContainer_,
-      bool isParentTypeAVariable_,
       const std::unordered_map<gd::String, gd::String>& oldToNewPropertyNames_,
       const std::unordered_set<gd::String>& removedPropertyNames_)
       : hasDoneRenaming(false),
@@ -49,7 +48,6 @@ class GD_CORE_API ExpressionPropertyReplacer
         platform(platform_),
         projectScopedContainers(projectScopedContainers_),
         targetPropertiesContainer(targetPropertiesContainer_),
-        isParentTypeAVariable(isParentTypeAVariable_),
         oldToNewPropertyNames(oldToNewPropertyNames_),
         removedPropertyNames(removedPropertyNames_){};
   virtual ~ExpressionPropertyReplacer(){};
@@ -71,21 +69,16 @@ class GD_CORE_API ExpressionPropertyReplacer
   void OnVisitNumberNode(NumberNode& node) override {}
   void OnVisitTextNode(TextNode& node) override {}
   void OnVisitVariableNode(VariableNode& node) override {
-    if (isParentTypeAVariable) {
-        // Do nothing, it's a variable.
-        if (node.child) node.child->Visit(*this);
-        return;
-    }
-
     auto& propertiesContainersList =
         projectScopedContainers.GetPropertiesContainersList();
 
     // The node represents a variable or an object name on which a variable
     // will be accessed, or a property with a child.
 
+    // Match the potential *new* name of the property, because refactorings are
+    // done after changes in the variables container.
     projectScopedContainers.MatchIdentifierWithName<void>(
-      // The property name is changed after the refactor operation.
-      node.name,
+      GetPotentialNewName(node.name),
       [&]() {
         // Do nothing, it's an object variable.
         if (node.child) node.child->Visit(*this);
@@ -107,7 +100,16 @@ class GD_CORE_API ExpressionPropertyReplacer
         // Do nothing, it's a parameter.
         if (node.child) node.child->Visit(*this);
       }, [&]() {
-        // Do nothing, it's something else.
+        // This is something else - potentially a deleted property.
+        // Check if it's coming from the target container with
+        // properties to replace.
+        if (propertiesContainersList.HasPropertiesContainer(
+                targetPropertiesContainer)) {
+          // The node represents a property, that can come from the target
+          // (because the target is in the scope), replace or remove it:
+          RenameOrRemovePropertyOfTargetPropertyContainer(node.name);
+        }
+
         if (node.child) node.child->Visit(*this);
       });
   }
@@ -116,24 +118,17 @@ class GD_CORE_API ExpressionPropertyReplacer
   }
   void OnVisitVariableBracketAccessorNode(
       VariableBracketAccessorNode& node) override {
-    bool isGrandParentTypeAVariable = isParentTypeAVariable;
-    isParentTypeAVariable = false;
     node.expression->Visit(*this);
-    isParentTypeAVariable = isGrandParentTypeAVariable;
     if (node.child) node.child->Visit(*this);
   }
   void OnVisitIdentifierNode(IdentifierNode& node) override {
-    if (isParentTypeAVariable) {
-        // Do nothing, it's a variable.
-        return;
-    }
-
     auto& propertiesContainersList =
         projectScopedContainers.GetPropertiesContainersList();
 
+    // Match the potential *new* name of the property, because refactorings are
+    // done after changes in the variables container.
     projectScopedContainers.MatchIdentifierWithName<void>(
-      // The property name is changed after the refactor operation
-      node.identifierName,
+      GetPotentialNewName(node.identifierName),
       [&]() {
         // Do nothing, it's an object variable.
       }, [&]() {
@@ -150,29 +145,22 @@ class GD_CORE_API ExpressionPropertyReplacer
       }, [&]() {
         // Do nothing, it's a parameter.
       }, [&]() {
-        // Do nothing, it's something else.
+        // This is something else - potentially a deleted property.
+        // Check if it's coming from the target container with
+        // properties to replace.
+        if (propertiesContainersList.HasPropertiesContainer(
+                targetPropertiesContainer)) {
+          // The node represents a property, that can come from the target
+          // (because the target is in the scope), replace or remove it:
+          RenameOrRemovePropertyOfTargetPropertyContainer(node.identifierName);
+        }
       });
   }
   void OnVisitObjectFunctionNameNode(ObjectFunctionNameNode& node) override {}
-  void OnVisitFunctionCallNode(FunctionCallNode &node) override {
-    bool isGrandParentTypeAVariable = isParentTypeAVariable;
-    for (auto &parameter : node.parameters) {
-      const auto &parameterMetadata =
-          gd::MetadataProvider::GetFunctionCallParameterMetadata(
-              platform, projectScopedContainers.GetObjectsContainersList(),
-              node, *parameter);
-      if (!parameterMetadata) {
-        continue;
-      }
-      const auto &parameterTypeMetadata =
-          parameterMetadata->GetValueTypeMetadata();
-      if (gd::EventsPropertyReplacer::CanContainProperty(
-              parameterTypeMetadata)) {
-        isParentTypeAVariable = parameterTypeMetadata.IsVariableOnly();
-        parameter->Visit(*this);
-      }
+  void OnVisitFunctionCallNode(FunctionCallNode& node) override {
+    for (auto& parameter : node.parameters) {
+      parameter->Visit(*this);
     }
-    isParentTypeAVariable = isGrandParentTypeAVariable;
   }
   void OnVisitEmptyNode(EmptyNode& node) override {}
 
@@ -180,6 +168,12 @@ class GD_CORE_API ExpressionPropertyReplacer
   bool hasDoneRenaming;
   bool removedPropertyUsed;
 
+  const gd::String& GetPotentialNewName(const gd::String& oldName) {
+    return oldToNewPropertyNames.count(oldName) >= 1
+            ? oldToNewPropertyNames.find(oldName)->second
+            : oldName;
+  }
+
   bool RenameOrRemovePropertyOfTargetPropertyContainer(
       gd::String& propertyName) {
     if (oldToNewPropertyNames.count(propertyName) >= 1) {
@@ -204,7 +198,6 @@ class GD_CORE_API ExpressionPropertyReplacer
   const std::unordered_set<gd::String>& removedPropertyNames;
 
   gd::String objectNameToUseForVariableAccessor;
-  bool isParentTypeAVariable;
 };
 
 bool EventsPropertyReplacer::DoVisitInstruction(gd::Instruction& instruction,
@@ -223,16 +216,20 @@ bool EventsPropertyReplacer::DoVisitInstruction(gd::Instruction& instruction,
           const gd::Expression& parameterValue,
           size_t parameterIndex,
           const gd::String& lastObjectName) {
-        if (!gd::EventsPropertyReplacer::CanContainProperty(
-          parameterMetadata.GetValueTypeMetadata())) {
-          return;
-        }
+        const gd::String& type = parameterMetadata.GetType();
+
+        if (!gd::ParameterMetadata::IsExpression("variable", type) &&
+            !gd::ParameterMetadata::IsExpression("number", type) &&
+            !gd::ParameterMetadata::IsExpression("string", type))
+          return;  // Not an expression that can contain properties.
+
         auto node = parameterValue.GetRootNode();
         if (node) {
-          ExpressionPropertyReplacer renamer(
-              platform, GetProjectScopedContainers(), targetPropertiesContainer,
-              parameterMetadata.GetValueTypeMetadata().IsVariableOnly(),
-              oldToNewPropertyNames, removedPropertyNames);
+          ExpressionPropertyReplacer renamer(platform,
+                                             GetProjectScopedContainers(),
+                                             targetPropertiesContainer,
+                                             oldToNewPropertyNames,
+                                             removedPropertyNames);
           node->Visit(renamer);
 
           if (renamer.IsRemovedPropertyUsed()) {
@@ -249,16 +246,20 @@ bool EventsPropertyReplacer::DoVisitInstruction(gd::Instruction& instruction,
 
 bool EventsPropertyReplacer::DoVisitEventExpression(
     gd::Expression& expression, const gd::ParameterMetadata& metadata) {
-  if (!gd::EventsPropertyReplacer::CanContainProperty(
-          metadata.GetValueTypeMetadata())) {
-    return false;
-  }
+  const gd::String& type = metadata.GetType();
+
+  if (!gd::ParameterMetadata::IsExpression("variable", type) &&
+      !gd::ParameterMetadata::IsExpression("number", type) &&
+      !gd::ParameterMetadata::IsExpression("string", type))
+    return false;  // Not an expression that can contain properties.
+
   auto node = expression.GetRootNode();
   if (node) {
-    ExpressionPropertyReplacer renamer(
-        platform, GetProjectScopedContainers(), targetPropertiesContainer,
-        metadata.GetValueTypeMetadata().IsVariableOnly(), oldToNewPropertyNames,
-        removedPropertyNames);
+    ExpressionPropertyReplacer renamer(platform,
+                                       GetProjectScopedContainers(),
+                                       targetPropertiesContainer,
+                                       oldToNewPropertyNames,
+                                       removedPropertyNames);
     node->Visit(renamer);
 
     if (renamer.IsRemovedPropertyUsed()) {
@@ -271,12 +272,6 @@ bool EventsPropertyReplacer::DoVisitEventExpression(
   return false;
 }
 
-bool EventsPropertyReplacer::CanContainProperty(
-    const gd::ValueTypeMetadata &valueTypeMetadata) {
-  return valueTypeMetadata.IsVariable() || valueTypeMetadata.IsNumber() ||
-         valueTypeMetadata.IsString();
-}
-
 EventsPropertyReplacer::~EventsPropertyReplacer() {}
 
 }  // namespace gd

Core/GDCore/IDE/Events/EventsPropertyReplacer.h

@@ -4,7 +4,6 @@
  * reserved. This project is released under the MIT License.
  */
 #pragma once
-
 #include <map>
 #include <memory>
 #include <unordered_map>
@@ -42,8 +41,6 @@ class GD_CORE_API EventsPropertyReplacer
         removedPropertyNames(removedPropertyNames_){};
   virtual ~EventsPropertyReplacer();
 
-  static bool CanContainProperty(const gd::ValueTypeMetadata &valueTypeMetadata);
-
  private:
   bool DoVisitInstruction(gd::Instruction &instruction,
                           bool isCondition) override;

Core/GDCore/IDE/Events/EventsRefactorer.cpp

@@ -22,7 +22,6 @@
 #include "GDCore/Project/EventsBasedObject.h"
 #include "GDCore/Project/ProjectScopedContainers.h"
 #include "GDCore/IDE/Events/ExpressionTypeFinder.h"
-#include "GDCore/IDE/Events/ArbitraryEventsWorker.h"
 
 using namespace std;
 
@@ -52,17 +51,17 @@ class GD_CORE_API ExpressionObjectRenamer : public ExpressionParser2NodeWorker {
 
   static bool Rename(const gd::Platform &platform,
                      const gd::ProjectScopedContainers &projectScopedContainers,
-                     const gd::String &rootType, gd::ExpressionNode &node,
-                     const gd::String &objectName,
-                     const gd::String &objectNewName) {
-    if (gd::ExpressionValidator::HasNoErrors(platform, projectScopedContainers,
-                                             rootType, node)) {
-      ExpressionObjectRenamer renamer(platform, projectScopedContainers,
-                                      rootType, objectName, objectNewName);
+                     const gd::String &rootType,
+                     gd::ExpressionNode& node,
+                     const gd::String& objectName,
+                     const gd::String& objectNewName) {
+    if (gd::ExpressionValidator::HasNoErrors(platform, projectScopedContainers, rootType, node)) {
+      ExpressionObjectRenamer renamer(platform, projectScopedContainers, rootType, objectName, objectNewName);
       node.Visit(renamer);
 
       return renamer.HasDoneRenaming();
     }
+
     return false;
   }
 
@@ -84,7 +83,7 @@ class GD_CORE_API ExpressionObjectRenamer : public ExpressionParser2NodeWorker {
   void OnVisitVariableNode(VariableNode& node) override {
     auto type = gd::ExpressionTypeFinder::GetType(platform, projectScopedContainers, rootType, node);
 
-    if (gd::ValueTypeMetadata::IsVariable(type)) {
+    if (gd::ValueTypeMetadata::IsTypeLegacyPreScopedVariable(type)) {
       // Nothing to do (this can't reference an object)
     } else {
       if (node.name == objectName) {
@@ -120,7 +119,7 @@ class GD_CORE_API ExpressionObjectRenamer : public ExpressionParser2NodeWorker {
         node.identifierName == objectName) {
       hasDoneRenaming = true;
       node.identifierName = objectNewName;
-    } else if (gd::ValueTypeMetadata::IsVariable(type)) {
+    } else if (gd::ValueTypeMetadata::IsTypeLegacyPreScopedVariable(type)) {
       // Nothing to do (this can't reference an object)
     } else {
       if (node.identifierName == objectName) {
@@ -296,114 +295,183 @@ class GD_CORE_API ExpressionObjectFinder : public ExpressionParser2NodeWorker {
   const gd::String rootType;
 };
 
-/**
- * \brief Replace in expressions and in parameters of actions or conditions,
- * references to the name of an object by another.
- *
- * \ingroup IDE
- */
-class GD_CORE_API EventsObjectReplacer
-    : public ArbitraryEventsWorkerWithContext {
-public:
-  EventsObjectReplacer(const gd::Platform &platform_,
-                       const gd::ObjectsContainer &targetedObjectsContainer_,
-                       const gd::String &oldObjectName_,
-                       const gd::String &newObjectName_)
-      : platform(platform_),
-        targetedObjectsContainer(targetedObjectsContainer_),
-        oldObjectName(oldObjectName_), newObjectName(newObjectName_){};
+bool EventsRefactorer::RenameObjectInActions(const gd::Platform& platform,
+                                             const gd::ProjectScopedContainers& projectScopedContainers,
+                                             gd::InstructionsList& actions,
+                                             gd::String oldName,
+                                             gd::String newName) {
+  bool somethingModified = false;
 
-  virtual ~EventsObjectReplacer() {}
+  for (std::size_t aId = 0; aId < actions.size(); ++aId) {
+    const gd::InstructionMetadata& instrInfos =
+        MetadataProvider::GetActionMetadata(platform, actions[aId].GetType());
+    for (std::size_t pNb = 0; pNb < instrInfos.parameters.GetParametersCount(); ++pNb) {
+      // Replace object's name in parameters
+      if (gd::ParameterMetadata::IsObject(instrInfos.parameters.GetParameter(pNb).GetType()) &&
+          actions[aId].GetParameter(pNb).GetPlainString() == oldName)
+        actions[aId].SetParameter(pNb, gd::Expression(newName));
+      // Replace object's name in expressions
+      else if (ParameterMetadata::IsExpression(
+                   "number", instrInfos.parameters.GetParameter(pNb).GetType())) {
+        auto node = actions[aId].GetParameter(pNb).GetRootNode();
 
-private:
-  bool DoVisitInstruction(gd::Instruction &instruction,
-                          bool isCondition) override {
-    if (&targetedObjectsContainer !=
-        GetProjectScopedContainers()
-            .GetObjectsContainersList()
-            .GetObjectsContainerFromObjectName(oldObjectName)) {
-      return false;
-    }
-    const auto &metadata = isCondition
-                               ? gd::MetadataProvider::GetConditionMetadata(
-                                     platform, instruction.GetType())
-                               : gd::MetadataProvider::GetActionMetadata(
-                                     platform, instruction.GetType());
+        if (ExpressionObjectRenamer::Rename(platform, projectScopedContainers, "number", *node, oldName, newName)) {
+          actions[aId].SetParameter(
+              pNb, ExpressionParser2NodePrinter::PrintNode(*node));
+        }
+      }
+      // Replace object's name in text expressions
+      else if (ParameterMetadata::IsExpression(
+                   "string", instrInfos.parameters.GetParameter(pNb).GetType())) {
+        auto node = actions[aId].GetParameter(pNb).GetRootNode();
 
-    gd::ParameterMetadataTools::IterateOverParametersWithIndex(
-        instruction.GetParameters(), metadata.GetParameters(),
-        [&](const gd::ParameterMetadata &parameterMetadata,
-            const gd::Expression &parameterValue, size_t parameterIndex,
-            const gd::String &lastObjectName) {
-          if (!gd::EventsObjectReplacer::CanContainObject(
-                  parameterMetadata.GetValueTypeMetadata())) {
-            return;
-          }
-          auto node = parameterValue.GetRootNode();
-          if (node) {
-            ExpressionObjectRenamer renamer(
-                platform, GetProjectScopedContainers(),
-                parameterMetadata.GetValueTypeMetadata().GetName(),
-                oldObjectName, newObjectName);
-            node->Visit(renamer);
-
-            if (renamer.HasDoneRenaming()) {
-              instruction.SetParameter(
-                  parameterIndex,
-                  ExpressionParser2NodePrinter::PrintNode(*node));
-            }
-          }
-        });
-
-    return false;
-  }
-
-  bool DoVisitEventExpression(gd::Expression &expression,
-                              const gd::ParameterMetadata &metadata) override {
-    if (&targetedObjectsContainer !=
-        GetProjectScopedContainers()
-            .GetObjectsContainersList()
-            .GetObjectsContainerFromObjectName(oldObjectName)) {
-      return false;
-    }
-    if (!gd::EventsObjectReplacer::CanContainObject(
-            metadata.GetValueTypeMetadata())) {
-      return false;
-    }
-    auto node = expression.GetRootNode();
-    if (node) {
-      ExpressionObjectRenamer renamer(platform, GetProjectScopedContainers(),
-                                      metadata.GetValueTypeMetadata().GetName(),
-                                      oldObjectName, newObjectName);
-      node->Visit(renamer);
-
-      if (renamer.HasDoneRenaming()) {
-        expression = ExpressionParser2NodePrinter::PrintNode(*node);
+        if (ExpressionObjectRenamer::Rename(platform, projectScopedContainers, "string", *node, oldName, newName)) {
+          actions[aId].SetParameter(
+              pNb, ExpressionParser2NodePrinter::PrintNode(*node));
+        }
       }
     }
 
-    return false;
+    if (!actions[aId].GetSubInstructions().empty())
+      somethingModified =
+          RenameObjectInActions(platform,
+                                projectScopedContainers,
+                                actions[aId].GetSubInstructions(),
+                                oldName,
+                                newName) ||
+          somethingModified;
   }
 
-  bool CanContainObject(const gd::ValueTypeMetadata &valueTypeMetadata) {
-    return valueTypeMetadata.IsObject() || valueTypeMetadata.IsVariable() ||
-           valueTypeMetadata.IsNumber() || valueTypeMetadata.IsString();
+  return somethingModified;
+}
+
+bool EventsRefactorer::RenameObjectInConditions(
+    const gd::Platform& platform,
+    const gd::ProjectScopedContainers& projectScopedContainers,
+    gd::InstructionsList& conditions,
+    gd::String oldName,
+    gd::String newName) {
+  bool somethingModified = false;
+
+  for (std::size_t cId = 0; cId < conditions.size(); ++cId) {
+    const gd::InstructionMetadata& instrInfos =
+        MetadataProvider::GetConditionMetadata(platform,
+                                               conditions[cId].GetType());
+    for (std::size_t pNb = 0; pNb < instrInfos.parameters.GetParametersCount(); ++pNb) {
+      // Replace object's name in parameters
+      if (gd::ParameterMetadata::IsObject(instrInfos.parameters.GetParameter(pNb).GetType()) &&
+          conditions[cId].GetParameter(pNb).GetPlainString() == oldName)
+        conditions[cId].SetParameter(pNb, gd::Expression(newName));
+      // Replace object's name in expressions
+      else if (ParameterMetadata::IsExpression(
+                   "number", instrInfos.parameters.GetParameter(pNb).GetType())) {
+        auto node = conditions[cId].GetParameter(pNb).GetRootNode();
+
+        if (ExpressionObjectRenamer::Rename(platform, projectScopedContainers, "number", *node, oldName, newName)) {
+          conditions[cId].SetParameter(
+              pNb, ExpressionParser2NodePrinter::PrintNode(*node));
+        }
+      }
+      // Replace object's name in text expressions
+      else if (ParameterMetadata::IsExpression(
+                   "string", instrInfos.parameters.GetParameter(pNb).GetType())) {
+        auto node = conditions[cId].GetParameter(pNb).GetRootNode();
+
+        if (ExpressionObjectRenamer::Rename(platform, projectScopedContainers, "string", *node, oldName, newName)) {
+          conditions[cId].SetParameter(
+              pNb, ExpressionParser2NodePrinter::PrintNode(*node));
+        }
+      }
+    }
+
+    if (!conditions[cId].GetSubInstructions().empty())
+      somethingModified =
+          RenameObjectInConditions(platform,
+                                   projectScopedContainers,
+                                   conditions[cId].GetSubInstructions(),
+                                   oldName,
+                                   newName) ||
+          somethingModified;
   }
 
-  const gd::Platform &platform;
-  const gd::ObjectsContainer &targetedObjectsContainer;
-  const gd::String &oldObjectName;
-  const gd::String &newObjectName;
-};
+  return somethingModified;
+}
+
+bool EventsRefactorer::RenameObjectInEventParameters(
+    const gd::Platform& platform,
+    const gd::ProjectScopedContainers& projectScopedContainers,
+    gd::Expression& expression,
+    gd::ParameterMetadata parameterMetadata,
+    gd::String oldName,
+    gd::String newName) {
+  bool somethingModified = false;
+
+  if (gd::ParameterMetadata::IsObject(parameterMetadata.GetType()) &&
+      expression.GetPlainString() == oldName)
+    expression = gd::Expression(newName);
+  // Replace object's name in expressions
+  else if (ParameterMetadata::IsExpression("number",
+                                           parameterMetadata.GetType())) {
+    auto node = expression.GetRootNode();
+
+    if (ExpressionObjectRenamer::Rename(platform, projectScopedContainers, "number", *node, oldName, newName)) {
+      expression = ExpressionParser2NodePrinter::PrintNode(*node);
+    }
+  }
+  // Replace object's name in text expressions
+  else if (ParameterMetadata::IsExpression("string",
+                                           parameterMetadata.GetType())) {
+    auto node = expression.GetRootNode();
+
+    if (ExpressionObjectRenamer::Rename(platform, projectScopedContainers, "string", *node, oldName, newName)) {
+      expression = ExpressionParser2NodePrinter::PrintNode(*node);
+    }
+  }
+
+  return somethingModified;
+}
 
 void EventsRefactorer::RenameObjectInEvents(const gd::Platform& platform,
                                             const gd::ProjectScopedContainers& projectScopedContainers,
                                             gd::EventsList& events,
-                                            const gd::ObjectsContainer &targetedObjectsContainer,
                                             gd::String oldName,
                                             gd::String newName) {
-  gd::EventsObjectReplacer eventsParameterReplacer(platform, targetedObjectsContainer, oldName, newName);
-  eventsParameterReplacer.Launch(events, projectScopedContainers);
+  for (std::size_t i = 0; i < events.size(); ++i) {
+    vector<gd::InstructionsList*> conditionsVectors =
+        events[i].GetAllConditionsVectors();
+    for (std::size_t j = 0; j < conditionsVectors.size(); ++j) {
+      bool somethingModified = RenameObjectInConditions(
+          platform, projectScopedContainers, *conditionsVectors[j], oldName, newName);
+    }
+
+    vector<gd::InstructionsList*> actionsVectors =
+        events[i].GetAllActionsVectors();
+    for (std::size_t j = 0; j < actionsVectors.size(); ++j) {
+      bool somethingModified = RenameObjectInActions(
+          platform, projectScopedContainers, *actionsVectors[j], oldName, newName);
+    }
+
+    vector<pair<gd::Expression*, gd::ParameterMetadata>>
+        expressionsWithMetadata = events[i].GetAllExpressionsWithMetadata();
+    for (std::size_t j = 0; j < expressionsWithMetadata.size(); ++j) {
+      gd::Expression* expression = expressionsWithMetadata[j].first;
+      gd::ParameterMetadata parameterMetadata =
+          expressionsWithMetadata[j].second;
+      bool somethingModified = RenameObjectInEventParameters(platform,
+                                                             projectScopedContainers,
+                                                             *expression,
+                                                             parameterMetadata,
+                                                             oldName,
+                                                             newName);
+    }
+
+    if (events[i].CanHaveSubEvents())
+      RenameObjectInEvents(platform,
+                           projectScopedContainers,
+                           events[i].GetSubEvents(),
+                           oldName,
+                           newName);
+  }
 }
 
 bool EventsRefactorer::RemoveObjectInActions(const gd::Platform& platform,

Core/GDCore/IDE/Events/EventsRefactorer.h

@@ -83,7 +83,6 @@ class GD_CORE_API EventsRefactorer {
   static void RenameObjectInEvents(const gd::Platform& platform,
                                    const gd::ProjectScopedContainers& projectScopedContainers,
                                    gd::EventsList& events,
-                                   const gd::ObjectsContainer &targetedObjectsContainer,
                                    gd::String oldName,
                                    gd::String newName);
 
@@ -122,6 +121,44 @@ class GD_CORE_API EventsRefactorer {
   virtual ~EventsRefactorer(){};
 
  private:
+  /**
+   * Replace all occurrences of an object name by another name in an action
+   * ( include : objects in parameters and in math/text expressions ).
+   *
+   * \return true if something was modified.
+   */
+  static bool RenameObjectInActions(const gd::Platform& platform,
+                                    const gd::ProjectScopedContainers& projectScopedContainers,
+                                    gd::InstructionsList& instructions,
+                                    gd::String oldName,
+                                    gd::String newName);
+
+  /**
+   * Replace all occurrences of an object name by another name in a condition
+   * ( include : objects in parameters and in math/text expressions ).
+   *
+   * \return true if something was modified.
+   */
+  static bool RenameObjectInConditions(const gd::Platform& platform,
+                                       const gd::ProjectScopedContainers& projectScopedContainers,
+                                       gd::InstructionsList& instructions,
+                                       gd::String oldName,
+                                       gd::String newName);
+  /**
+   * Replace all occurrences of an object name by another name in an expression
+   * with the specified metadata
+   * ( include : objects or objects in math/text expressions ).
+   *
+   * \return true if something was modified.
+   */
+  static bool RenameObjectInEventParameters(
+      const gd::Platform& platform,
+      const gd::ProjectScopedContainers& projectScopedContainers,
+      gd::Expression& expression,
+      gd::ParameterMetadata parameterMetadata,
+      gd::String oldName,
+      gd::String newName);
+
   /**
    * Remove all conditions of the list using an object
    *

Core/GDCore/IDE/Events/EventsVariableInstructionTypeSwitcher.cpp

@@ -71,18 +71,13 @@ bool EventsVariableInstructionTypeSwitcher::DoVisitInstruction(gd::Instruction&
                     .GetObjectsContainersList()
                     .GetObjectOrGroupVariablesContainer(lastObjectName);
           }
-        } else if (type == "variableOrProperty") {
-            variablesContainer =
-                &GetProjectScopedContainers()
-                      .GetVariablesContainersList()
-                      .GetVariablesContainerFromVariableOrPropertyName(variableName);
         } else {
           if (GetProjectScopedContainers().GetVariablesContainersList().Has(
                   variableName)) {
             variablesContainer =
                 &GetProjectScopedContainers()
                       .GetVariablesContainersList()
-                      .GetVariablesContainerFromVariableOrPropertyOrParameterName(variableName);
+                      .GetVariablesContainerFromVariableName(variableName);
           }
         }
 

Core/GDCore/IDE/Events/EventsVariableReplacer.cpp

@@ -122,7 +122,7 @@ class GD_CORE_API ExpressionVariableReplacer
         [&]() {
           // This is a variable.
           if (&projectScopedContainers.GetVariablesContainersList()
-                   .GetVariablesContainerFromVariableOrPropertyOrParameterName(node.name) ==
+                   .GetVariablesContainerFromVariableName(node.name) ==
               &targetVariablesContainer) {
             // The node represents a variable, that can come from the target
             // (because the target is in the scope), replace or remove it:
@@ -235,7 +235,7 @@ class GD_CORE_API ExpressionVariableReplacer
         [&]() {
           // This is a variable.
           if (&projectScopedContainers.GetVariablesContainersList()
-                   .GetVariablesContainerFromVariableOrPropertyOrParameterName(
+                   .GetVariablesContainerFromVariableName(
                        node.identifierName) == &targetVariablesContainer) {
             // The node represents a variable, that can come from the target
             // (because the target is in the scope), replace or remove it:

Core/GDCore/IDE/Events/EventsVariableReplacer.h

@@ -73,7 +73,6 @@ class GD_CORE_API EventsVariableReplacer
    */
   const gd::String targetGroupName;
   const VariablesRenamingChangesetNode &variablesRenamingChangesetRoot;
-  // TODO There is no reason de delete events. This dead code should be removed.
   const std::unordered_set<gd::String> &removedVariableNames;
 
   static VariablesContainer nullVariablesContainer;

Core/GDCore/IDE/Events/ExampleExtensionUsagesFinder.cpp

@@ -1,235 +0,0 @@
-#include "ExampleExtensionUsagesFinder.h"
-
-#include "GDCore/Events/Instruction.h"
-#include "GDCore/Extensions/Metadata/MetadataProvider.h"
-#include "GDCore/Extensions/Metadata/ParameterMetadataTools.h"
-#include "GDCore/Extensions/PlatformExtension.h"
-#include "GDCore/IDE/Events/ExpressionTypeFinder.h"
-#include "GDCore/IDE/ProjectBrowserHelper.h"
-#include "GDCore/IDE/WholeProjectRefactorer.h"
-#include "GDCore/Project/Behavior.h"
-#include "GDCore/Project/EventsFunctionsExtension.h"
-#include "GDCore/Project/Object.h"
-#include "GDCore/Project/Project.h"
-
-namespace gd {
-
-std::set<gd::String>
-ExampleExtensionUsagesFinder::GetUsedExtensions(gd::Project &project) {
-  ExampleExtensionUsagesFinder worker(project);
-  gd::ProjectBrowserHelper::ExposeProjectObjects(project, worker);
-  gd::ProjectBrowserHelper::ExposeProjectEventsWithoutExtensions(project,
-                                                                 worker);
-
-  for (std::size_t e = 0; e < project.GetEventsFunctionsExtensionsCount();
-       e++) {
-    auto &eventsFunctionsExtension = project.GetEventsFunctionsExtension(e);
-    worker.isStoreExtension =
-        eventsFunctionsExtension.GetOriginName() == "gdevelop-extension-store";
-    ProjectBrowserHelper::ExposeEventsFunctionsExtensionEvents(
-        project, eventsFunctionsExtension, worker);
-  }
-  if (!worker.has3DObjects) {
-    worker.usedExtensions.erase("Scene3D");
-  }
-  return worker.usedExtensions;
-};
-
-void ExampleExtensionUsagesFinder::AddUsedExtension(
-    const gd::PlatformExtension &extension) {
-  usedExtensions.insert(extension.GetName());
-}
-
-void ExampleExtensionUsagesFinder::AddUsedBuiltinExtension(
-    const gd::String &extensionName) {
-  usedExtensions.insert(extensionName);
-}
-
-// Objects scanner
-
-void ExampleExtensionUsagesFinder::DoVisitObject(gd::Object &object) {
-  auto metadata = gd::MetadataProvider::GetExtensionAndObjectMetadata(
-      project.GetCurrentPlatform(), object.GetType());
-  if (metadata.GetMetadata().IsRenderedIn3D()) {
-    has3DObjects = true;
-  }
-  AddUsedExtension(metadata.GetExtension());
-};
-
-// Behaviors scanner
-
-void ExampleExtensionUsagesFinder::DoVisitBehavior(gd::Behavior &behavior) {
-  auto metadata = gd::MetadataProvider::GetExtensionAndBehaviorMetadata(
-      project.GetCurrentPlatform(), behavior.GetTypeName());
-  AddUsedExtension(metadata.GetExtension());
-};
-
-// Instructions scanner
-
-bool ExampleExtensionUsagesFinder::DoVisitInstruction(
-    gd::Instruction &instruction, bool isCondition) {
-  auto metadata =
-      isCondition ? gd::MetadataProvider::GetExtensionAndConditionMetadata(
-                        project.GetCurrentPlatform(), instruction.GetType())
-                  : gd::MetadataProvider::GetExtensionAndActionMetadata(
-                        project.GetCurrentPlatform(), instruction.GetType());
-  // Unused event-based objects or events-based behaviors may use object and
-  // behavior instructions that should not be detected as extension usage.
-  // The extension of actually used objects and behaviors will be detected on
-  // scene objects. This is why object or behavior instructions usually don't
-  // have any import.
-  // Built-in extensions that are included by default don't declare any include
-  // files on their instructions either. To still detect their usage, we
-  // consider that main events and dedicated extensions can't have dead code.
-  if (!isStoreExtension || !metadata.GetMetadata().GetIncludeFiles().empty()) {
-    AddUsedExtension(metadata.GetExtension());
-  }
-
-  gd::ParameterMetadataTools::IterateOverParameters(
-      instruction.GetParameters(), metadata.GetMetadata().GetParameters(),
-      [this](const gd::ParameterMetadata &parameterMetadata,
-             const gd::Expression &parameterValue,
-             const gd::String &lastObjectName) {
-        const gd::String &parameterType = parameterMetadata.GetType();
-
-        if (gd::ParameterMetadata::IsExpression("string", parameterType)) {
-          rootType = "string";
-          parameterValue.GetRootNode()->Visit(*this);
-        } else if (gd::ParameterMetadata::IsExpression("number",
-                                                       parameterType)) {
-          rootType = "number";
-          parameterValue.GetRootNode()->Visit(*this);
-        } else if (gd::ParameterMetadata::IsExpression("variable",
-                                                       parameterType))
-          AddUsedBuiltinExtension("BuiltinVariables");
-      });
-
-  return false;
-}
-
-// Expressions scanner
-
-// Ignore literals nodes
-void ExampleExtensionUsagesFinder::OnVisitNumberNode(NumberNode &node){};
-void ExampleExtensionUsagesFinder::OnVisitTextNode(TextNode &node){};
-
-// Ignore nodes without valid extensions
-void ExampleExtensionUsagesFinder::OnVisitEmptyNode(EmptyNode &node){};
-void ExampleExtensionUsagesFinder::OnVisitObjectFunctionNameNode(
-    ObjectFunctionNameNode &node){};
-
-// Visit sub-expressions
-void ExampleExtensionUsagesFinder::OnVisitSubExpressionNode(
-    SubExpressionNode &node) {
-  node.expression->Visit(*this);
-};
-
-void ExampleExtensionUsagesFinder::OnVisitOperatorNode(OperatorNode &node) {
-  node.leftHandSide->Visit(*this);
-  node.rightHandSide->Visit(*this);
-};
-
-void ExampleExtensionUsagesFinder::OnVisitUnaryOperatorNode(
-    UnaryOperatorNode &node) {
-  node.factor->Visit(*this);
-};
-
-// Add variable extension and visit sub-expressions on variable nodes
-void ExampleExtensionUsagesFinder::OnVisitVariableNode(VariableNode &node) {
-  AddUsedBuiltinExtension("BuiltinVariables");
-
-  auto type = gd::ExpressionTypeFinder::GetType(project.GetCurrentPlatform(),
-                                                GetProjectScopedContainers(),
-                                                rootType, node);
-
-  if (gd::ParameterMetadata::IsExpression("variable", type)) {
-    // Nothing to do (this can't reference an object)
-  } else {
-    GetProjectScopedContainers().MatchIdentifierWithName<void>(
-        node.name,
-        [&]() {
-          // This represents an object.
-          auto metadata = gd::MetadataProvider::GetExtensionAndObjectMetadata(
-              project.GetCurrentPlatform(), node.name);
-          AddUsedExtension(metadata.GetExtension());
-        },
-        [&]() {
-          // This is a variable.
-        },
-        [&]() {
-          // This is a property.
-        },
-        [&]() {
-          // This is a parameter.
-        },
-        [&]() {
-          // This is something else.
-        });
-  }
-
-  if (node.child)
-    node.child->Visit(*this);
-};
-
-void ExampleExtensionUsagesFinder::OnVisitVariableAccessorNode(
-    VariableAccessorNode &node) {
-  AddUsedBuiltinExtension("BuiltinVariables");
-  if (node.child)
-    node.child->Visit(*this);
-};
-
-void ExampleExtensionUsagesFinder::OnVisitVariableBracketAccessorNode(
-    VariableBracketAccessorNode &node) {
-  AddUsedBuiltinExtension("BuiltinVariables");
-  node.expression->Visit(*this);
-  if (node.child)
-    node.child->Visit(*this);
-};
-
-// Add extensions bound to Objects/Behaviors/Functions
-void ExampleExtensionUsagesFinder::OnVisitIdentifierNode(IdentifierNode &node) {
-  auto type = gd::ExpressionTypeFinder::GetType(project.GetCurrentPlatform(),
-                                                GetProjectScopedContainers(),
-                                                rootType, node);
-  if (gd::ParameterMetadata::IsObject(type) ||
-      GetObjectsContainersList().HasObjectOrGroupNamed(node.identifierName)) {
-    // An object or object variable is used.
-    auto metadata = gd::MetadataProvider::GetExtensionAndObjectMetadata(
-        project.GetCurrentPlatform(), node.identifierName);
-    AddUsedExtension(metadata.GetExtension());
-  }
-};
-
-void ExampleExtensionUsagesFinder::OnVisitFunctionCallNode(
-    FunctionCallNode &node) {
-  // Extensions of non-free functions are already found when scanning objects.
-  if (!(node.objectName.empty() && node.behaviorName.empty()))
-    return;
-  gd::ExtensionAndMetadata<gd::ExpressionMetadata> metadata;
-
-  // Try to find a free number expression
-  metadata = gd::MetadataProvider::GetExtensionAndExpressionMetadata(
-      project.GetCurrentPlatform(), node.functionName);
-  if (gd::MetadataProvider::IsBadExpressionMetadata(metadata.GetMetadata())) {
-    // Try to find a free str expression
-    metadata = gd::MetadataProvider::GetExtensionAndStrExpressionMetadata(
-        project.GetCurrentPlatform(), node.functionName);
-    // No valid expression found, return.
-    if (gd::MetadataProvider::IsBadExpressionMetadata(metadata.GetMetadata()))
-      return;
-  }
-
-  // Unused event-based objects or events-based behaviors may use object and
-  // behavior expressions that should not be detected as extension usage.
-  // The extension of actually used objects and behaviors will be detected on
-  // scene objects. This is why object or behavior expressions usually don't
-  // have any import.
-  // Built-in extensions that are included by default don't declare any include
-  // files on their instructions either. To still detect their usage, we
-  // consider that main events and dedicated extensions can't have dead code.
-  if (!isStoreExtension || !metadata.GetMetadata().GetIncludeFiles().empty()) {
-    AddUsedExtension(metadata.GetExtension());
-  }
-};
-
-} // namespace gd

Core/GDCore/IDE/Events/ExampleExtensionUsagesFinder.h

@@ -1,77 +0,0 @@
-/*
- * GDevelop Core
- * Copyright 2008-2016 Florian Rival (Florian.Rival@gmail.com). All rights
- * reserved. This project is released under the MIT License.
- */
-
-#pragma once
-
-#include <set>
-
-#include "GDCore/Events/Parsers/ExpressionParser2NodeWorker.h"
-#include "GDCore/Extensions/Metadata/SourceFileMetadata.h"
-#include "GDCore/Extensions/PlatformExtension.h"
-#include "GDCore/IDE/Events/ArbitraryEventsWorker.h"
-#include "GDCore/IDE/Project/ArbitraryObjectsWorker.h"
-#include "GDCore/String.h"
-
-namespace gd {
-class Project;
-class Object;
-class Behavior;
-} // namespace gd
-
-namespace gd {
-
-/**
- * @brief List extension usages for generated example web-pages.
- * 
- * Dependency transitivity is not ensured (see UsedExtensionsFinder).
- */
-class GD_CORE_API ExampleExtensionUsagesFinder
-    : public ArbitraryObjectsWorker,
-      public ArbitraryEventsWorkerWithContext,
-      public ExpressionParser2NodeWorker {
-public:
-  static std::set<gd::String> GetUsedExtensions(gd::Project &project);
-
-private:
-  ExampleExtensionUsagesFinder(gd::Project &project_) : project(project_){};
-  gd::Project &project;
-  gd::String rootType;
-  bool isStoreExtension = false;
-
-  // Result
-  std::set<gd::String> usedExtensions;
-  bool has3DObjects = false;
-
-  void AddUsedExtension(const gd::PlatformExtension &extension);
-  void AddUsedBuiltinExtension(const gd::String &extensionName);
-
-  // Object Visitor
-  void DoVisitObject(gd::Object &object) override;
-
-  // Behavior Visitor
-  void DoVisitBehavior(gd::Behavior &behavior) override;
-
-  // Instructions Visitor
-  bool DoVisitInstruction(gd::Instruction &instruction,
-                          bool isCondition) override;
-
-  // Expression Visitor
-  void OnVisitSubExpressionNode(SubExpressionNode &node) override;
-  void OnVisitOperatorNode(OperatorNode &node) override;
-  void OnVisitUnaryOperatorNode(UnaryOperatorNode &node) override;
-  void OnVisitNumberNode(NumberNode &node) override;
-  void OnVisitTextNode(TextNode &node) override;
-  void OnVisitVariableNode(VariableNode &node) override;
-  void OnVisitVariableAccessorNode(VariableAccessorNode &node) override;
-  void OnVisitVariableBracketAccessorNode(
-      VariableBracketAccessorNode &node) override;
-  void OnVisitIdentifierNode(IdentifierNode &node) override;
-  void OnVisitObjectFunctionNameNode(ObjectFunctionNameNode &node) override;
-  void OnVisitFunctionCallNode(FunctionCallNode &node) override;
-  void OnVisitEmptyNode(EmptyNode &node) override;
-};
-
-}; // namespace gd

Core/GDCore/IDE/Events/ExpressionCompletionFinder.h

@@ -1034,7 +1034,7 @@ class GD_CORE_API ExpressionCompletionFinder
           description.SetVariableType(variable.GetType());
           description.SetVariableScope(
               projectScopedContainers.GetVariablesContainersList()
-                  .GetVariablesContainerFromVariableOrPropertyOrParameterName(variableName)
+                  .GetVariablesContainerFromVariableName(variableName)
                   .GetSourceType());
           completions.push_back(description);
 
@@ -1086,7 +1086,7 @@ class GD_CORE_API ExpressionCompletionFinder
           description.SetVariableType(variable.GetType());
           description.SetVariableScope(
               projectScopedContainers.GetVariablesContainersList()
-                  .GetVariablesContainerFromVariableOrPropertyOrParameterName(variableName)
+                  .GetVariablesContainerFromVariableName(variableName)
                   .GetSourceType());
           completions.push_back(description);
 

Core/GDCore/IDE/Events/ExpressionValidator.cpp

@@ -68,26 +68,19 @@ size_t GetMaximumParametersNumber(
 
 bool ExpressionValidator::ValidateObjectVariableOrVariableOrProperty(
     const gd::IdentifierNode& identifier) {
-  return ValidateObjectVariableOrVariableOrProperty(identifier.identifierName, identifier.identifierNameLocation, identifier.childIdentifierName, identifier.childIdentifierNameLocation);
-}
-
-bool ExpressionValidator::ValidateObjectVariableOrVariableOrProperty(
-    const gd::String &identifierName,
-    const gd::ExpressionParserLocation identifierNameLocation,
-    const gd::String &childIdentifierName,
-    const gd::ExpressionParserLocation childIdentifierNameLocation) {
   auto validateVariableTypeForExpression =
-      [this, &identifierNameLocation](gd::Variable::Type type) {
+      [this, &identifier](gd::Variable::Type type) {
         // Collections type can't be used directly in expressions, a child
         // must be accessed.
         if (type == Variable::Structure) {
           RaiseTypeError(_("You need to specify the name of the child variable "
                            "to access. For example: `MyVariable.child`."),
-                         identifierNameLocation);
+                         identifier.identifierNameLocation);
         } else if (type == Variable::Array) {
           RaiseTypeError(_("You need to specify the name of the child variable "
                            "to access. For example: `MyVariable[0]`."),
-                         identifierNameLocation);
+                         identifier.identifierNameLocation);
+
         } else {
           // Number, string or boolean variables can be used in expressions.
           return;
@@ -103,41 +96,38 @@ bool ExpressionValidator::ValidateObjectVariableOrVariableOrProperty(
   // we consider this node will be of the type required by the parent.
   childType = parentType;
 
-  return projectScopedContainers.MatchIdentifierWithName<bool>(identifierName,
+  return projectScopedContainers.MatchIdentifierWithName<bool>(identifier.identifierName,
     [&]() {
       // This represents an object.
-      if (childIdentifierName.empty()) {
+      if (identifier.childIdentifierName.empty()) {
         RaiseTypeError(_("An object variable or expression should be entered."),
-                        identifierNameLocation);
+                        identifier.identifierNameLocation);
 
         return true; // We should have found a variable.
       }
 
-      auto variableExistence =
-          objectsContainersList.HasObjectOrGroupWithVariableNamed(
-              identifierName, childIdentifierName);
+      auto variableExistence = objectsContainersList.HasObjectOrGroupWithVariableNamed(identifier.identifierName, identifier.childIdentifierName);
 
       if (variableExistence == gd::ObjectsContainersList::DoesNotExist) {
         RaiseUndeclaredVariableError(_("This variable does not exist on this object or group."),
-                        childIdentifierNameLocation, childIdentifierName, identifierName);
+                        identifier.childIdentifierNameLocation, identifier.childIdentifierName, identifier.identifierName);
 
         return true; // We should have found a variable.
       }
       else if (variableExistence == gd::ObjectsContainersList::ExistsOnlyOnSomeObjectsOfTheGroup) {
         RaiseUndeclaredVariableError(_("This variable only exists on some objects of the group. It must be declared for all objects."),
-                        childIdentifierNameLocation, childIdentifierName, identifierName);
+                        identifier.childIdentifierNameLocation, identifier.childIdentifierName, identifier.identifierName);
 
         return true; // We should have found a variable.
       }
       else if (variableExistence == gd::ObjectsContainersList::GroupIsEmpty) {
         RaiseUndeclaredVariableError(_("This group is empty. Add an object to this group first."),
-                        identifierNameLocation, childIdentifierName, identifierName);
+                        identifier.identifierNameLocation, identifier.childIdentifierName, identifier.identifierName);
 
         return true; // We should have found a variable.
       }
 
-      auto variableType = objectsContainersList.GetTypeOfObjectOrGroupVariable(
-          identifierName, childIdentifierName);
+      auto variableType = objectsContainersList.GetTypeOfObjectOrGroupVariable(identifier.identifierName, identifier.childIdentifierName);
       ReadChildTypeFromVariable(variableType);
 
       return true; // We found a variable.
@@ -147,9 +137,9 @@ bool ExpressionValidator::ValidateObjectVariableOrVariableOrProperty(
       // Try to identify a declared variable with the name (and maybe the child
       // variable).
       const gd::Variable& variable =
-          variablesContainersList.Get(identifierName);
+          variablesContainersList.Get(identifier.identifierName);
 
-      if (childIdentifierName.empty()) {
+      if (identifier.childIdentifierName.empty()) {
         // Just the root variable is accessed, check it can be used in an
         // expression.
         validateVariableTypeForExpression(variable.GetType());
@@ -158,29 +148,29 @@ bool ExpressionValidator::ValidateObjectVariableOrVariableOrProperty(
         return true; // We found a variable.
       } else {
         // A child variable is accessed, check it can be used in an expression.
-        if (!variable.HasChild(childIdentifierName)) {
+        if (!variable.HasChild(identifier.childIdentifierName)) {
           RaiseTypeError(_("No child variable with this name found."),
-                        childIdentifierNameLocation);
+                        identifier.childIdentifierNameLocation);
 
           return true; // We should have found a variable.
         }
 
         const gd::Variable& childVariable =
-            variable.GetChild(childIdentifierName);
+            variable.GetChild(identifier.childIdentifierName);
         ReadChildTypeFromVariable(childVariable.GetType());
         return true; // We found a variable.
       }
     }, [&]() {
       // This is a property.
-      if (!childIdentifierName.empty()) {
+      if (!identifier.childIdentifierName.empty()) {
         RaiseTypeError(_("Accessing a child variable of a property is not possible - just write the property name."),
-            childIdentifierNameLocation);
+            identifier.childIdentifierNameLocation);
 
         return true; // We found a property, even if the child is not allowed.
       }
 
       const gd::NamedPropertyDescriptor &property =
-          propertiesContainersList.Get(identifierName).second;
+          propertiesContainersList.Get(identifier.identifierName).second;
 
       if (property.GetType() == "Number") {
         childType = Type::Number;
@@ -189,7 +179,7 @@ bool ExpressionValidator::ValidateObjectVariableOrVariableOrProperty(
         // or as a number)
       } else if (property.GetType() == "Behavior") {
         RaiseTypeError(_("Behaviors can't be used as a value in expressions."),
-                       identifierNameLocation);
+                       identifier.identifierNameLocation);
       } else {
         // Assume type is String or equivalent.
         childType = Type::String;
@@ -198,14 +188,14 @@ bool ExpressionValidator::ValidateObjectVariableOrVariableOrProperty(
       return true; // We found a property.
     }, [&]() {
       // This is a parameter.
-      if (!childIdentifierName.empty()) {
+      if (!identifier.childIdentifierName.empty()) {
         RaiseTypeError(_("Accessing a child variable of a parameter is not possible - just write the parameter name."),
-            childIdentifierNameLocation);
+            identifier.childIdentifierNameLocation);
 
         return true; // We found a parameter, even if the child is not allowed.
       }
 
-      const auto& parameter = gd::ParameterMetadataTools::Get(parametersVectorsList, identifierName);
+      const auto& parameter = gd::ParameterMetadataTools::Get(parametersVectorsList, identifier.identifierName);
       const auto& valueTypeMetadata = parameter.GetValueTypeMetadata();
       if (valueTypeMetadata.IsNumber()) {
         childType = Type::Number;
@@ -215,7 +205,7 @@ bool ExpressionValidator::ValidateObjectVariableOrVariableOrProperty(
         // Nothing - we don't know the precise type (this could be used as a string or as a number).
       } else {
         RaiseTypeError(_("This parameter is not a string, number or boolean - it can't be used in an expression."),
-            identifierNameLocation);
+            identifier.identifierNameLocation);
 
         return true; // We found a parameter, even though the type is incompatible.
       }
@@ -460,12 +450,10 @@ const gd::String& ExpressionValidator::TypeToString(Type type) {
     case Type::NumberOrString:
       return numberOrStringTypeString;
     case Type::Variable:
-      // This function is only used to display errors.
-      // Users don't care if it's legacy or not or
-      // if it allows properties and parameters.
-    case Type::VariableOrProperty:
-    case Type::VariableOrPropertyOrParameter:
+      return variableTypeString;
     case Type::LegacyVariable:
+      // This function is only used to display error.
+      // Users don't care if it's legacy or not.
       return variableTypeString;
     case Type::Object:
       return objectTypeString;
@@ -495,11 +483,8 @@ ExpressionValidator::Type ExpressionValidator::StringToType(
           ExpressionValidator::variableTypeString, type)) {
     if (gd::ValueTypeMetadata::IsTypeLegacyPreScopedVariable(type)) {
       return Type::LegacyVariable;
-    } else if (type == "variableOrProperty") {
-      return Type::VariableOrProperty;
-    } else if (type == "variableOrPropertyOrParameter") {
-      return Type::VariableOrPropertyOrParameter;
-    } else {
+    }
+    else {
       return Type::Variable;
     }
   }

Core/GDCore/IDE/Events/ExpressionValidator.h

@@ -14,7 +14,6 @@
 #include "GDCore/Extensions/Metadata/ExpressionMetadata.h"
 #include "GDCore/Project/ProjectScopedContainers.h"
 #include "GDCore/Project/VariablesContainersList.h"
-#include "GDCore/Project/VariablesContainer.h"
 
 namespace gd {
 class Expression;
@@ -46,9 +45,7 @@ class GD_CORE_API ExpressionValidator : public ExpressionParser2NodeWorker {
         parentType(StringToType(gd::ValueTypeMetadata::GetExpressionPrimitiveValueType(rootType_))),
         childType(Type::Unknown),
         forbidsUsageOfBracketsBecauseParentIsObject(false),
-        currentParameterExtraInfo(&extraInfo_),
-        variableObjectName(),
-        variableObjectNameLocation() {};
+        currentParameterExtraInfo(&extraInfo_) {};
   virtual ~ExpressionValidator(){};
 
   /**
@@ -203,12 +200,10 @@ class GD_CORE_API ExpressionValidator : public ExpressionParser2NodeWorker {
   void OnVisitVariableNode(VariableNode& node) override {
     ReportAnyError(node);
 
-    if (parentType == Type::Variable ||
-        parentType == Type::VariableOrProperty ||
-        parentType == Type::VariableOrPropertyOrParameter) {
+    if (parentType == Type::Variable) {
       childType = parentType;
 
-      CheckVariableExistence(node.location, node.name, node.child != nullptr);
+      CheckVariableExistence(node.location, node.name);
       if (node.child) {
         node.child->Visit(*this);
       }
@@ -218,8 +213,7 @@ class GD_CORE_API ExpressionValidator : public ExpressionParser2NodeWorker {
       if (node.child) {
         node.child->Visit(*this);
       }
-    } else if (parentType == Type::String || parentType == Type::Number ||
-               parentType == Type::NumberOrString) {
+    } else if (parentType == Type::String || parentType == Type::Number || parentType == Type::NumberOrString) {
       // The node represents a variable or an object variable in an expression waiting for its *value* to be returned.
       childType = parentType;
 
@@ -231,8 +225,7 @@ class GD_CORE_API ExpressionValidator : public ExpressionParser2NodeWorker {
       projectScopedContainers.MatchIdentifierWithName<void>(node.name,
         [&]() {
           // This represents an object.
-          variableObjectName = node.name;
-          variableObjectNameLocation = node.nameLocation;
+
           // While understood by the parser, it's forbidden to use the bracket notation just after
           // an object name (`MyObject["MyVariable"]`).
           forbidsUsageOfBracketsBecauseParentIsObject = true;
@@ -271,13 +264,7 @@ class GD_CORE_API ExpressionValidator : public ExpressionParser2NodeWorker {
   }
   void OnVisitVariableAccessorNode(VariableAccessorNode& node) override {
     ReportAnyError(node);
-    // TODO Also check child-variables existence on a path with only VariableAccessor to raise non-fatal errors.
-    if (!variableObjectName.empty()) {
-      ValidateObjectVariableOrVariableOrProperty(variableObjectName,
-                                                 variableObjectNameLocation,
-                                                 node.name, node.nameLocation);
-      variableObjectName = "";
-    }
+
     // In the case we accessed an object variable (`MyObject.MyVariable`),
     // brackets can now be used (`MyObject.MyVariable["MyChildVariable"]` is now valid).
     forbidsUsageOfBracketsBecauseParentIsObject = false;
@@ -290,7 +277,6 @@ class GD_CORE_API ExpressionValidator : public ExpressionParser2NodeWorker {
       VariableBracketAccessorNode& node) override {
     ReportAnyError(node);
 
-    variableObjectName = "";
     if (forbidsUsageOfBracketsBecauseParentIsObject) {
       RaiseError(gd::ExpressionParserError::ErrorType::BracketsNotAllowedForObjects,
                  _("You can't use the brackets to access an object variable. "
@@ -339,12 +325,11 @@ class GD_CORE_API ExpressionValidator : public ExpressionParser2NodeWorker {
             _("You must enter a number or a text, wrapped inside double quotes (example: \"Hello world\"), or a variable name."),
             node.location);
       }
-    } else if (parentType == Type::Variable ||
-               parentType == Type::VariableOrProperty ||
-               parentType == Type::VariableOrPropertyOrParameter) {
-      CheckVariableExistence(node.location, node.identifierName, !node.childIdentifierName.empty());
-    } else if (parentType != Type::Object &&
-               parentType != Type::LegacyVariable) {
+    }
+    else if (parentType == Type::Variable) {
+      CheckVariableExistence(node.location, node.identifierName);
+    }
+    else if (parentType != Type::Object && parentType != Type::LegacyVariable) {
       // It can't happen.
       RaiseTypeError(
           _("You've entered a name, but this type was expected:") + " " + TypeToString(parentType),
@@ -380,31 +365,13 @@ class GD_CORE_API ExpressionValidator : public ExpressionParser2NodeWorker {
     childType = Type::Empty;
   }
 
-private:
-  enum Type {
-    Unknown = 0,
-    Number,
-    String,
-    NumberOrString,
-    Variable,
-    LegacyVariable,
-    Object,
-    Empty,
-    VariableOrProperty,
-    VariableOrPropertyOrParameter
-  };
+ private:
+  enum Type {Unknown = 0, Number, String, NumberOrString, Variable, LegacyVariable, Object, Empty};
   Type ValidateFunction(const gd::FunctionCallNode& function);
   bool ValidateObjectVariableOrVariableOrProperty(const gd::IdentifierNode& identifier);
-  bool ValidateObjectVariableOrVariableOrProperty(
-      const gd::String &identifierName,
-      const gd::ExpressionParserLocation identifierNameLocation,
-      const gd::String &childIdentifierName,
-      const gd::ExpressionParserLocation childIdentifierNameLocation);
 
-  void CheckVariableExistence(const ExpressionParserLocation &location,
-                              const gd::String &name, bool hasChild) {
-    if (!currentParameterExtraInfo ||
-        *currentParameterExtraInfo != "AllowUndeclaredVariable") {
+  void CheckVariableExistence(const ExpressionParserLocation &location, const gd::String& name) {
+    if (!currentParameterExtraInfo || *currentParameterExtraInfo != "AllowUndeclaredVariable") {
       projectScopedContainers.MatchIdentifierWithName<void>(
           name,
           [&]() {
@@ -419,28 +386,19 @@ private:
           },
           [&]() {
             // This is a property.
-            if (parentType != Type::VariableOrProperty &&
-                parentType != Type::VariableOrPropertyOrParameter) {
-              RaiseVariableNameCollisionError(
-                  _("This variable has the same name as a property. Consider "
-                    "renaming one or the other."),
-                  location, name);
-            } else if (hasChild) {
-              RaiseMalformedVariableParameter(
-                  _("Properties can't have children."), location, name);
-            }
+            // This error won't happen unless the priority is changed.
+            RaiseVariableNameCollisionError(
+                _("This variable has the same name as a property. Consider "
+                  "renaming one or the other."),
+                location, name);
           },
           [&]() {
             // This is a parameter.
-            if (parentType != Type::VariableOrPropertyOrParameter) {
-              RaiseVariableNameCollisionError(
-                  _("This variable has the same name as a parameter. Consider "
-                    "renaming one or the other."),
-                  location, name);
-            } else if (hasChild) {
-              RaiseMalformedVariableParameter(
-                  _("Properties can't have children."), location, name);
-            }
+            // This error won't happen unless the priority is changed.
+            RaiseVariableNameCollisionError(
+                _("This variable has the same name as a parameter. Consider "
+                  "renaming one or the other."),
+                location, name);
           },
           [&]() {
             // This is something else.
@@ -502,13 +460,6 @@ private:
                message, location, false, variableName, objectName);
   }
 
-  void RaiseMalformedVariableParameter(const gd::String &message,
-                                   const ExpressionParserLocation &location,
-                                   const gd::String &variableName) {
-    RaiseError(gd::ExpressionParserError::ErrorType::MalformedVariableParameter,
-               message, location, true, variableName, "");
-  }
-
   void RaiseTypeError(const gd::String &message,
                       const ExpressionParserLocation &location,
                       bool isFatal = true) {
@@ -554,8 +505,6 @@ private:
   Type childType; ///< The type "discovered" down the tree and passed up.
   Type parentType; ///< The type "required" by the top of the tree.
   bool forbidsUsageOfBracketsBecauseParentIsObject;
-  gd::String variableObjectName;
-  gd::ExpressionParserLocation variableObjectNameLocation;
   const gd::String *currentParameterExtraInfo;
   const gd::Platform &platform;
   const gd::ProjectScopedContainers &projectScopedContainers;

Core/GDCore/IDE/Events/ExpressionVariablePathFinder.h

@@ -215,7 +215,7 @@ class GD_CORE_API ExpressionVariablePathFinder
             if (projectScopedContainers.GetVariablesContainersList().Has(identifier)) {
               variablesContainer =
                   &(projectScopedContainers.GetVariablesContainersList()
-                        .GetVariablesContainerFromVariableOrPropertyOrParameterName(identifier));
+                        .GetVariablesContainerFromVariableName(identifier));
               variableName = identifier;
               if (childIdentifier) {
                 childVariableNames.push_back(*childIdentifier);
@@ -223,28 +223,12 @@ class GD_CORE_API ExpressionVariablePathFinder
             }
           },
           [&]() {
-            // This is a property.
-            if (parameterType != "objectvar" &&
-                    projectScopedContainers.GetVariablesContainersList().Has(
-                        identifier)) {
-              variablesContainer =
-                  &(projectScopedContainers.GetVariablesContainersList()
-                        .GetVariablesContainerFromVariableOrPropertyOrParameterName(identifier));
-              variableName = identifier;
-              // There is no support for "children" of properties.
-            }
+            // Ignore properties here.
+            // There is no support for "children" of properties.
           },
           [&]() {
-            // This is a parameter.
-            if (parameterType != "objectvar" &&
-                projectScopedContainers.GetVariablesContainersList().Has(
-                    identifier)) {
-              variablesContainer =
-                  &(projectScopedContainers.GetVariablesContainersList()
-                        .GetVariablesContainerFromVariableOrPropertyOrParameterName(identifier));
-              variableName = identifier;
-              // There is no support for "children" of parameters.
-            }
+            // Ignore parameters here.
+            // There is no support for "children" of parameters.
           },
           [&]() {
             // Ignore unrecognised identifiers here.

Core/GDCore/IDE/Events/UsedExtensionsFinder.cpp

@@ -13,18 +13,6 @@
 
 namespace gd {
 
-void UsedExtensionsResult::AddUsedExtension(const gd::PlatformExtension& extension) {
-  usedExtensions.insert(extension.GetName());
-
-  usedSourceFiles.insert(usedSourceFiles.end(),
-                         extension.GetAllSourceFiles().begin(),
-                         extension.GetAllSourceFiles().end());
-}
-
-void UsedExtensionsResult::AddUsedBuiltinExtension(const gd::String& extensionName) {
-  usedExtensions.insert(extensionName);
-}
-
 const UsedExtensionsResult UsedExtensionsFinder::ScanProject(gd::Project& project) {
   UsedExtensionsFinder worker(project);
   gd::ProjectBrowserHelper::ExposeProjectObjects(project, worker);
@@ -40,9 +28,9 @@ void UsedExtensionsFinder::DoVisitObject(gd::Object &object) {
   if (metadata.GetMetadata().IsRenderedIn3D()) {
     result.MarkAsHaving3DObjects();
   }
-  result.AddUsedExtension(metadata.GetExtension());
+  result.GetUsedExtensions().insert(metadata.GetExtension().GetName());
   for (auto &&includeFile : metadata.GetMetadata().includeFiles) {
-    result.AddUsedIncludeFiles(includeFile);
+    result.GetUsedIncludeFiles().insert(includeFile);
   }
 };
 
@@ -51,12 +39,12 @@ void UsedExtensionsFinder::DoVisitObject(gd::Object &object) {
 void UsedExtensionsFinder::DoVisitBehavior(gd::Behavior &behavior) {
   auto metadata = gd::MetadataProvider::GetExtensionAndBehaviorMetadata(
       project.GetCurrentPlatform(), behavior.GetTypeName());
-  result.AddUsedExtension(metadata.GetExtension());
+  result.GetUsedExtensions().insert(metadata.GetExtension().GetName());
   for (auto &&includeFile : metadata.GetMetadata().includeFiles) {
-    result.AddUsedIncludeFiles(includeFile);
+    result.GetUsedIncludeFiles().insert(includeFile);
   }
   for (auto &&includeFile : metadata.GetMetadata().requiredFiles) {
-    result.AddUsedRequiredFiles(includeFile);
+    result.GetUsedRequiredFiles().insert(includeFile);
   }
 };
 
@@ -69,9 +57,9 @@ bool UsedExtensionsFinder::DoVisitInstruction(gd::Instruction& instruction,
                         project.GetCurrentPlatform(), instruction.GetType())
                   : gd::MetadataProvider::GetExtensionAndActionMetadata(
                         project.GetCurrentPlatform(), instruction.GetType());
-  result.AddUsedExtension(metadata.GetExtension());
+  result.GetUsedExtensions().insert(metadata.GetExtension().GetName());
   for (auto&& includeFile : metadata.GetMetadata().GetIncludeFiles()) {
-    result.AddUsedIncludeFiles(includeFile);
+    result.GetUsedIncludeFiles().insert(includeFile);
   }
 
   gd::ParameterMetadataTools::IterateOverParameters(
@@ -89,7 +77,7 @@ bool UsedExtensionsFinder::DoVisitInstruction(gd::Instruction& instruction,
       rootType = "number";
       parameterValue.GetRootNode()->Visit(*this);
     } else if (gd::ParameterMetadata::IsExpression("variable", parameterType))
-      result.AddUsedBuiltinExtension("BuiltinVariables");
+      result.GetUsedExtensions().insert("BuiltinVariables");
   });
 
   return false;
@@ -122,7 +110,7 @@ void UsedExtensionsFinder::OnVisitUnaryOperatorNode(UnaryOperatorNode& node) {
 
 // Add variable extension and visit sub-expressions on variable nodes
 void UsedExtensionsFinder::OnVisitVariableNode(VariableNode& node) {
-  result.AddUsedBuiltinExtension("BuiltinVariables");
+  result.GetUsedExtensions().insert("BuiltinVariables");
 
   auto type = gd::ExpressionTypeFinder::GetType(
       project.GetCurrentPlatform(), GetProjectScopedContainers(), rootType, node);
@@ -135,9 +123,9 @@ void UsedExtensionsFinder::OnVisitVariableNode(VariableNode& node) {
         // This represents an object.
         auto metadata = gd::MetadataProvider::GetExtensionAndObjectMetadata(
           project.GetCurrentPlatform(), node.name);
-        result.AddUsedExtension(metadata.GetExtension());
+        result.GetUsedExtensions().insert(metadata.GetExtension().GetName());
         for (auto &&includeFile : metadata.GetMetadata().includeFiles) {
-          result.AddUsedIncludeFiles(includeFile);
+          result.GetUsedIncludeFiles().insert(includeFile);
         }
       }, [&]() {
         // This is a variable.
@@ -155,13 +143,13 @@ void UsedExtensionsFinder::OnVisitVariableNode(VariableNode& node) {
 
 void UsedExtensionsFinder::OnVisitVariableAccessorNode(
     VariableAccessorNode& node) {
-  result.AddUsedBuiltinExtension("BuiltinVariables");
+  result.GetUsedExtensions().insert("BuiltinVariables");
   if (node.child) node.child->Visit(*this);
 };
 
 void UsedExtensionsFinder::OnVisitVariableBracketAccessorNode(
     VariableBracketAccessorNode& node) {
-  result.AddUsedBuiltinExtension("BuiltinVariables");
+  result.GetUsedExtensions().insert("BuiltinVariables");
   node.expression->Visit(*this);
   if (node.child) node.child->Visit(*this);
 };
@@ -175,9 +163,9 @@ void UsedExtensionsFinder::OnVisitIdentifierNode(IdentifierNode &node) {
     // An object or object variable is used.
     auto metadata = gd::MetadataProvider::GetExtensionAndObjectMetadata(
         project.GetCurrentPlatform(), node.identifierName);
-    result.AddUsedExtension(metadata.GetExtension());
+    result.GetUsedExtensions().insert(metadata.GetExtension().GetName());
     for (auto &&includeFile : metadata.GetMetadata().includeFiles) {
-      result.AddUsedIncludeFiles(includeFile);
+      result.GetUsedIncludeFiles().insert(includeFile);
     }
   }
 };
@@ -199,9 +187,9 @@ void UsedExtensionsFinder::OnVisitFunctionCallNode(FunctionCallNode& node) {
       return;
   }
 
-  result.AddUsedExtension(metadata.GetExtension());
+  result.GetUsedExtensions().insert(metadata.GetExtension().GetName());
   for (auto&& includeFile : metadata.GetMetadata().GetIncludeFiles()) {
-    result.AddUsedIncludeFiles(includeFile);
+    result.GetUsedIncludeFiles().insert(includeFile);
   }
 };
 

Core/GDCore/IDE/Events/UsedExtensionsFinder.h

@@ -9,8 +9,6 @@
 #include <set>
 
 #include "GDCore/Events/Parsers/ExpressionParser2NodeWorker.h"
-#include "GDCore/Extensions/Metadata/SourceFileMetadata.h"
-#include "GDCore/Extensions/PlatformExtension.h"
 #include "GDCore/IDE/Events/ArbitraryEventsWorker.h"
 #include "GDCore/IDE/Project/ArbitraryObjectsWorker.h"
 #include "GDCore/String.h"
@@ -46,10 +44,6 @@ public:
     return usedRequiredFiles;
   }
 
-  const std::vector<gd::SourceFileMetadata>& GetUsedSourceFiles() const {
-    return usedSourceFiles;
-  }
-
   /**
    * \brief Return true when at least 1 object uses the 3D renderer.
    */
@@ -57,10 +51,20 @@ public:
     return has3DObjects;
   }
 
-  void AddUsedExtension(const gd::PlatformExtension& extension);
-  void AddUsedBuiltinExtension(const gd::String& extensionName);
-  void AddUsedIncludeFiles(const gd::String& includeFile) { usedIncludeFiles.insert(includeFile); }
-  void AddUsedRequiredFiles(const gd::String& requiredFile) { usedRequiredFiles.insert(requiredFile); }
+  /**
+   * The extensions used by the project (or part of it).
+   */
+  std::set<gd::String> &GetUsedExtensions() { return usedExtensions; }
+
+  /**
+   * The include files used at runtime by the project (or part of it).
+   */
+  std::set<gd::String> &GetUsedIncludeFiles() { return usedIncludeFiles; }
+
+  /**
+   * The additional files required at runtime by the project (or part of it).
+   */
+  std::set<gd::String> &GetUsedRequiredFiles() { return usedRequiredFiles; }
 
   void MarkAsHaving3DObjects() {
     has3DObjects = true;
@@ -70,7 +74,6 @@ private:
   std::set<gd::String> usedExtensions;
   std::set<gd::String> usedIncludeFiles;
   std::set<gd::String> usedRequiredFiles;
-  std::vector<gd::SourceFileMetadata> usedSourceFiles;
   bool has3DObjects = false;
 };
 

Core/GDCore/IDE/EventsBasedObjectVariantHelper.cpp

@@ -1,157 +0,0 @@
-/*
- * GDevelop Core
- * Copyright 2008-2016 Florian Rival (Florian.Rival@gmail.com). All rights
- * reserved. This project is released under the MIT License.
- */
-#include "EventsBasedObjectVariantHelper.h"
-
-#include "GDCore/Project/EventsBasedObject.h"
-#include "GDCore/Project/InitialInstancesContainer.h"
-#include "GDCore/Project/Object.h"
-#include "GDCore/Project/ObjectGroup.h"
-#include "GDCore/Project/ObjectsContainer.h"
-#include "GDCore/Project/ObjectsContainersList.h"
-#include "GDCore/Project/Project.h"
-#include "GDCore/Project/Variable.h"
-#include "GDCore/Project/VariablesContainer.h"
-#include "GDCore/String.h"
-
-namespace gd {
-
-void EventsBasedObjectVariantHelper::ComplyVariantsToEventsBasedObject(
-    const gd::Project &project, gd::EventsBasedObject &eventsBasedObject) {
-  auto &defaultObjects = eventsBasedObject.GetDefaultVariant().GetObjects();
-
-  for (const auto &variant :
-       eventsBasedObject.GetVariants().GetInternalVector()) {
-    auto &objects = variant->GetObjects();
-
-    // Delete extra objects
-    for (auto it = objects.GetObjects().begin();
-         it != objects.GetObjects().end(); ++it) {
-      const auto &objectName = it->get()->GetName();
-      if (!defaultObjects.HasObjectNamed(objectName)) {
-        variant->GetInitialInstances().RemoveInitialInstancesOfObject(
-            objectName);
-        // Do it in last because it unalloc objectName.
-        objects.RemoveObject(objectName);
-        --it;
-      }
-    }
-    for (const auto &defaultObject : defaultObjects.GetObjects()) {
-      const auto &objectName = defaultObject->GetName();
-      const auto &defaultVariables = defaultObject->GetVariables();
-      const auto &defaultBehaviors = defaultObject->GetAllBehaviorContents();
-
-      // Copy missing objects
-      if (!objects.HasObjectNamed(objectName)) {
-        objects.InsertObject(*defaultObject,
-                             defaultObjects.GetObjectPosition(objectName));
-        objects.AddMissingObjectsInRootFolder();
-        continue;
-      }
-      // Change object types
-      auto &object = objects.GetObject(objectName);
-      if (object.GetType() != defaultObject->GetType()) {
-        // Keep a copy of the old object.
-        auto oldObject = objects.GetObject(objectName);
-        objects.RemoveObject(objectName);
-        objects.InsertObject(*defaultObject,
-                             defaultObjects.GetObjectPosition(objectName));
-        object.CopyWithoutConfiguration(oldObject);
-        objects.AddMissingObjectsInRootFolder();
-      }
-
-      // Copy missing behaviors
-      auto &behaviors = object.GetAllBehaviorContents();
-      for (const auto &pair : defaultBehaviors) {
-        const auto &behaviorName = pair.first;
-        const auto &defaultBehavior = pair.second;
-
-        if (object.HasBehaviorNamed(behaviorName) &&
-            object.GetBehavior(behaviorName).GetTypeName() !=
-                defaultBehavior->GetTypeName()) {
-          object.RemoveBehavior(behaviorName);
-        }
-        if (!object.HasBehaviorNamed(behaviorName)) {
-          auto *behavior = object.AddNewBehavior(
-              project, defaultBehavior->GetTypeName(), behaviorName);
-          gd::SerializerElement element;
-          defaultBehavior->SerializeTo(element);
-          behavior->UnserializeFrom(element);
-        }
-      }
-      // Delete extra behaviors
-      for (auto it = behaviors.begin(); it != behaviors.end(); ++it) {
-        const auto &behaviorName = it->first;
-        if (!defaultObject->HasBehaviorNamed(behaviorName)) {
-          object.RemoveBehavior(behaviorName);
-          --it;
-        }
-      }
-
-      // Sort and copy missing variables
-      auto &variables = object.GetVariables();
-      for (size_t defaultVariableIndex = 0;
-           defaultVariableIndex < defaultVariables.Count();
-           defaultVariableIndex++) {
-        const auto &variableName =
-            defaultVariables.GetNameAt(defaultVariableIndex);
-        const auto &defaultVariable =
-            defaultVariables.Get(defaultVariableIndex);
-
-        auto variableIndex = variables.GetPosition(variableName);
-        if (variableIndex == gd::String::npos) {
-          variables.Insert(variableName, defaultVariable, defaultVariableIndex);
-        } else {
-          variables.Move(variableIndex, defaultVariableIndex);
-        }
-        if (variables.Get(variableName).GetType() != defaultVariable.GetType()) {
-          variables.Remove(variableName);
-          variables.Insert(variableName, defaultVariable, defaultVariableIndex);
-        }
-      }
-      // Remove extra variables
-      auto variableToRemoveCount = variables.Count() - defaultVariables.Count();
-      for (size_t iteration = 0; iteration < variableToRemoveCount;
-           iteration++) {
-        variables.Remove(variables.GetNameAt(variables.Count() - 1));
-      }
-
-      // Remove extra instance variables
-      variant->GetInitialInstances().IterateOverInstances(
-          [&objectName,
-           &defaultVariables](gd::InitialInstance &initialInstance) {
-            if (initialInstance.GetObjectName() != objectName) {
-              return false;
-            }
-            auto &instanceVariables = initialInstance.GetVariables();
-            for (size_t instanceVariableIndex = 0;
-                 instanceVariableIndex < instanceVariables.Count();
-                 instanceVariableIndex++) {
-              const auto &variableName =
-                  defaultVariables.GetNameAt(instanceVariableIndex);
-
-              if (!defaultVariables.Has(variableName)) {
-                instanceVariables.Remove(variableName);
-              }
-            }
-            return false;
-          });
-    }
-    auto &defaultObjectGroups =
-        eventsBasedObject.GetDefaultVariant().GetObjects().GetObjectGroups();
-    auto &objectGroups = variant->GetObjects().GetObjectGroups();
-    auto objectGroupsCount = objectGroups.Count();
-    // Clear groups
-    for (size_t index = 0; index < objectGroupsCount; index++) {
-      objectGroups.Remove(objectGroups.Get(0).GetName());
-    }
-    // Copy groups
-    for (size_t index = 0; index < defaultObjectGroups.Count(); index++) {
-      objectGroups.Insert(defaultObjectGroups.Get(index), index);
-    }
-  }
-}
-
-} // namespace gd

Core/GDCore/IDE/EventsBasedObjectVariantHelper.h

@@ -1,26 +0,0 @@
-/*
- * GDevelop Core
- * Copyright 2008-2016 Florian Rival (Florian.Rival@gmail.com). All rights
- * reserved. This project is released under the MIT License.
- */
-#pragma once
-
-namespace gd {
-class EventsBasedObject;
-class Project;
-} // namespace gd
-
-namespace gd {
-
-class GD_CORE_API EventsBasedObjectVariantHelper {
-public:
-  /**
-   * @brief Apply the changes done on events-based object children to all its
-   * variants.
-   */
-  static void
-  ComplyVariantsToEventsBasedObject(const gd::Project &project,
-                                    gd::EventsBasedObject &eventsBasedObject);
-};
-
-} // namespace gd

Core/GDCore/IDE/EventsFunctionTools.cpp

@@ -9,10 +9,7 @@
 #include "GDCore/Extensions/Metadata/ParameterMetadataTools.h"
 #include "GDCore/Project/EventsBasedBehavior.h"
 #include "GDCore/Project/EventsBasedObject.h"
-#include "GDCore/Project/ObjectsContainer.h"
-#include "GDCore/Project/ParameterMetadataContainer.h"
-#include "GDCore/Project/PropertiesContainer.h"
-#include "GDCore/Project/VariablesContainer.h"
+//#include "GDCore/Project/ObjectsContainer.h"
 #include "GDCore/Project/EventsFunction.h"
 #include "GDCore/Project/Object.h"
 #include "GDCore/Project/Project.h"
@@ -27,16 +24,15 @@ void EventsFunctionTools::FreeEventsFunctionToObjectsContainer(
     const gd::EventsFunction& eventsFunction,
     gd::ObjectsContainer& outputObjectsContainer) {
   // Functions scope for objects is defined according
-  // to parameters.
+  // to parameters
+  outputObjectsContainer.GetObjects().clear();
+  outputObjectsContainer.GetObjectGroups().Clear();
+
   auto &parameters = eventsFunction.GetParametersForEvents(functionContainer);
   gd::ParameterMetadataTools::ParametersToObjectsContainer(
       project,
       parameters,
       outputObjectsContainer);
-
-  // TODO: in theory we should ensure stability of the groups across calls
-  // to this function. BUT groups in functions should probably have never been
-  // supported, so we're phasing this out in the UI.
   outputObjectsContainer.GetObjectGroups() = eventsFunction.GetObjectGroups();
 }
 
@@ -101,73 +97,25 @@ void EventsFunctionTools::ObjectEventsFunctionToObjectsContainer(
                   "for the parent. ");
     return;
   }
+
+  gd::EventsFunctionTools::CopyEventsBasedObjectChildrenToObjectsContainer(
+      eventsBasedObject, outputObjectsContainer);
 }
 
-void EventsFunctionTools::ParametersToVariablesContainer(
-    const ParameterMetadataContainer &parameters,
-    gd::VariablesContainer &outputVariablesContainer) {
-  if (outputVariablesContainer.GetSourceType() !=
-      gd::VariablesContainer::SourceType::Parameters) {
-    throw std::logic_error("Tried to generate a variables container from "
-                           "parameters with the wrong source type.");
+void EventsFunctionTools::CopyEventsBasedObjectChildrenToObjectsContainer(
+    const gd::EventsBasedObject& eventsBasedObject,
+    gd::ObjectsContainer& outputObjectsContainer) {
+  auto &children = eventsBasedObject.GetObjects().GetObjects();
+  for (auto &childObject : children) {
+    auto child = childObject.get();
+    outputObjectsContainer.InsertObject(
+        *child, outputObjectsContainer.GetObjectsCount());
   }
-  outputVariablesContainer.Clear();
-
-  gd::String lastObjectName;
-  for (std::size_t i = 0; i < parameters.GetParametersCount(); ++i) {
-    const auto &parameter = parameters.GetParameter(i);
-    if (parameter.GetName().empty())
-      continue;
-
-    auto &valueTypeMetadata = parameter.GetValueTypeMetadata();
-    if (valueTypeMetadata.IsNumber()) {
-      auto &variable = outputVariablesContainer.InsertNew(
-          parameter.GetName(), outputVariablesContainer.Count());
-      variable.SetValue(0);
-    } else if (valueTypeMetadata.IsString()) {
-      auto &variable = outputVariablesContainer.InsertNew(
-          parameter.GetName(), outputVariablesContainer.Count());
-      variable.SetString("");
-    } else if (valueTypeMetadata.IsBoolean()) {
-      auto &variable = outputVariablesContainer.InsertNew(
-          parameter.GetName(), outputVariablesContainer.Count());
-      variable.SetBool(false);
-    }
-  }
-}
-
-void EventsFunctionTools::PropertiesToVariablesContainer(
-    const PropertiesContainer &properties,
-    gd::VariablesContainer &outputVariablesContainer) {
-  if (outputVariablesContainer.GetSourceType() !=
-      gd::VariablesContainer::SourceType::Properties) {
-    throw std::logic_error("Tried to generate a variables container from "
-                           "properties with the wrong source type.");
-  }
-  outputVariablesContainer.Clear();
-
-  gd::String lastObjectName;
-  for (std::size_t i = 0; i < properties.GetCount(); ++i) {
-    const auto &property = properties.Get(i);
-    if (property.GetName().empty())
-      continue;
-
-    auto &propertyType = gd::ValueTypeMetadata::GetPrimitiveValueType(
-        gd::ValueTypeMetadata::ConvertPropertyTypeToValueType(
-            property.GetType()));
-    if (propertyType == "number") {
-      auto &variable = outputVariablesContainer.InsertNew(
-          property.GetName(), outputVariablesContainer.Count());
-      variable.SetValue(0);
-    } else if (propertyType == "string") {
-      auto &variable = outputVariablesContainer.InsertNew(
-          property.GetName(), outputVariablesContainer.Count());
-      variable.SetString("");
-    } else if (propertyType == "boolean") {
-      auto &variable = outputVariablesContainer.InsertNew(
-          property.GetName(), outputVariablesContainer.Count());
-      variable.SetBool(false);
-    }
+  auto &childrenGroups = eventsBasedObject.GetObjects().GetObjectGroups();
+  for (size_t index = 0; index < childrenGroups.Count(); ++index) {
+    auto &childGroup = childrenGroups.Get(index);
+    outputObjectsContainer.GetObjectGroups().Insert(
+        childGroup, outputObjectsContainer.GetObjectGroups().Count());
   }
 }
 

Core/GDCore/IDE/EventsFunctionTools.h

@@ -12,9 +12,6 @@ namespace gd {
 class Project;
 class EventsFunctionsContainer;
 class ObjectsContainer;
-class ParameterMetadataContainer;
-class PropertiesContainer;
-class VariablesContainer;
 class ParameterMetadata;
 class EventsFunction;
 class EventsBasedBehavior;
@@ -72,12 +69,8 @@ class GD_CORE_API EventsFunctionTools {
       const gd::EventsFunction& eventsFunction,
       gd::ObjectsContainer& outputObjectsContainer);
 
-  static void ParametersToVariablesContainer(
-      const ParameterMetadataContainer &parameters,
-      gd::VariablesContainer &outputVariablesContainer);
-
-  static void PropertiesToVariablesContainer(
-      const PropertiesContainer &properties,
-      gd::VariablesContainer &outputVariablesContainer);
+  static void CopyEventsBasedObjectChildrenToObjectsContainer(
+      const gd::EventsBasedObject &eventsBasedObject,
+      gd::ObjectsContainer &outputObjectsContainer);
 };
 }  // namespace gd

Core/GDCore/IDE/GroupVariableHelper.cpp

@@ -3,11 +3,9 @@
  * Copyright 2008-2016 Florian Rival (Florian.Rival@gmail.com). All rights
  * reserved. This project is released under the MIT License.
  */
-#include "ObjectVariableHelper.h"
+#include "GroupVariableHelper.h"
 
 #include "GDCore/IDE/WholeProjectRefactorer.h"
-#include "GDCore/Project/EventsBasedObject.h"
-#include "GDCore/Project/InitialInstancesContainer.h"
 #include "GDCore/Project/Object.h"
 #include "GDCore/Project/ObjectGroup.h"
 #include "GDCore/Project/ObjectsContainer.h"
@@ -18,7 +16,7 @@
 
 namespace gd {
 
-void ObjectVariableHelper::FillAnyVariableBetweenObjects(
+void GroupVariableHelper::FillAnyVariableBetweenObjects(
     gd::ObjectsContainer &globalObjectsContainer,
     gd::ObjectsContainer &objectsContainer,
     const gd::ObjectGroup &objectGroup) {
@@ -67,7 +65,7 @@ void ObjectVariableHelper::FillAnyVariableBetweenObjects(
   }
 }
 
-gd::VariablesContainer ObjectVariableHelper::MergeVariableContainers(
+gd::VariablesContainer GroupVariableHelper::MergeVariableContainers(
     const gd::ObjectsContainersList &objectsContainersList,
     const gd::ObjectGroup &objectGroup) {
   gd::VariablesContainer mergedVariablesContainer;
@@ -115,7 +113,7 @@ gd::VariablesContainer ObjectVariableHelper::MergeVariableContainers(
   return mergedVariablesContainer;
 }
 
-void ObjectVariableHelper::FillMissingGroupVariablesToObjects(
+void GroupVariableHelper::FillMissingGroupVariablesToObjects(
     gd::ObjectsContainer &globalObjectsContainer,
     gd::ObjectsContainer &objectsContainer, const gd::ObjectGroup &objectGroup,
     const gd::SerializerElement &originalSerializedVariables) {
@@ -147,7 +145,7 @@ void ObjectVariableHelper::FillMissingGroupVariablesToObjects(
 // TODO Handle position changes for group variables.
 // We could try to change the order of object variables in a way that the next
 // call to MergeVariableContainers rebuild them in the same order.
-void ObjectVariableHelper::ApplyChangesToObjects(
+void GroupVariableHelper::ApplyChangesToObjects(
     gd::ObjectsContainer &globalObjectsContainer,
     gd::ObjectsContainer &objectsContainer,
     const gd::VariablesContainer &groupVariablesContainer,
@@ -174,7 +172,6 @@ void ObjectVariableHelper::ApplyChangesToObjects(
                                 groupVariablesContainer.Get(variableName),
                                 variablesContainer.Count());
     }
-    // TODO Check what happens if 2 variables exchange their names.
     for (const auto &pair : changeset.oldToNewVariableNames) {
       const gd::String &oldVariableName = pair.first;
       const gd::String &newVariableName = pair.second;
@@ -196,109 +193,4 @@ void ObjectVariableHelper::ApplyChangesToObjects(
   }
 }
 
-void ObjectVariableHelper::ApplyChangesToObjectInstances(
-    gd::VariablesContainer &objectVariablesContainer,
-    gd::InitialInstancesContainer &initialInstancesContainer,
-    const gd::String &objectName, const gd::VariablesChangeset &changeset) {
-  initialInstancesContainer.IterateOverInstances(
-      [&objectVariablesContainer, &objectName,
-       &changeset](gd::InitialInstance &instance) {
-        if (instance.GetObjectName() == objectName) {
-          auto &destinationVariablesContainer = instance.GetVariables();
-          for (const gd::String &variableName :
-               changeset.removedVariableNames) {
-            destinationVariablesContainer.Remove(variableName);
-          }
-          for (const gd::String &variableName : changeset.addedVariableNames) {
-            // Instance variables may already exist with another type.
-            if (destinationVariablesContainer.Has(variableName) &&
-                destinationVariablesContainer.Get(variableName).GetType() !=
-                    objectVariablesContainer.Get(variableName).GetType()) {
-              destinationVariablesContainer.Remove(variableName);
-            }
-          }
-          // TODO Check what happens if 2 variables exchange their names.
-          for (const auto &pair : changeset.oldToNewVariableNames) {
-            const gd::String &oldVariableName = pair.first;
-            const gd::String &newVariableName = pair.second;
-            if (destinationVariablesContainer.Has(newVariableName)) {
-              // It can happens if an instance already had the variable.
-              destinationVariablesContainer.Remove(oldVariableName);
-            } else {
-              destinationVariablesContainer.Rename(oldVariableName,
-                                                   newVariableName);
-            }
-          }
-          // Apply type changes
-          for (const gd::String &variableName :
-               changeset.valueChangedVariableNames) {
-            if (destinationVariablesContainer.Has(variableName) &&
-                destinationVariablesContainer.Get(variableName).GetType() !=
-                    objectVariablesContainer.Get(variableName).GetType()) {
-              destinationVariablesContainer.Remove(variableName);
-            }
-          }
-        }
-        return false;
-      });
-}
-
-void ObjectVariableHelper::ApplyChangesToVariants(
-    gd::EventsBasedObject &eventsBasedObject, const gd::String &objectName,
-    const gd::VariablesChangeset &changeset) {
-  auto &defaultVariablesContainer = eventsBasedObject.GetDefaultVariant()
-                                        .GetObjects()
-                                        .GetObject(objectName)
-                                        .GetVariables();
-  for (auto &variant : eventsBasedObject.GetVariants().GetInternalVector()) {
-    if (!variant->GetObjects().HasObjectNamed(objectName)) {
-      continue;
-    }
-    auto &object = variant->GetObjects().GetObject(objectName);
-    auto &variablesContainer = object.GetVariables();
-
-    for (const gd::String &variableName : changeset.removedVariableNames) {
-      variablesContainer.Remove(variableName);
-    }
-    for (const gd::String &variableName : changeset.addedVariableNames) {
-      if (variablesContainer.Has(variableName)) {
-        // It can happens if a child-object already had the variable but it was
-        // missing in other variant child-object.
-        continue;
-      }
-      variablesContainer.Insert(variableName,
-                                defaultVariablesContainer.Get(variableName),
-                                variablesContainer.Count());
-    }
-    // TODO Check what happens if 2 variables exchange their names.
-    for (const auto &pair : changeset.oldToNewVariableNames) {
-      const gd::String &oldVariableName = pair.first;
-      const gd::String &newVariableName = pair.second;
-      if (variablesContainer.Has(newVariableName)) {
-        // It can happens if a child-object already had the variable but it was
-        // missing in other variant child-object.
-        variablesContainer.Remove(oldVariableName);
-      } else {
-        variablesContainer.Rename(oldVariableName, newVariableName);
-      }
-    }
-    // Apply type changes
-    for (const gd::String &variableName : changeset.valueChangedVariableNames) {
-      size_t index = variablesContainer.GetPosition(variableName);
-
-      if (variablesContainer.Has(variableName) &&
-          variablesContainer.Get(variableName).GetType() !=
-              defaultVariablesContainer.Get(variableName).GetType()) {
-        variablesContainer.Remove(variableName);
-        variablesContainer.Insert(
-            variableName, defaultVariablesContainer.Get(variableName), index);
-      }
-    }
-
-    gd::ObjectVariableHelper::ApplyChangesToObjectInstances(
-        variablesContainer, variant->GetInitialInstances(), objectName,
-        changeset);
-  }
-}
-
 } // namespace gd

Core/GDCore/IDE/GroupVariableHelper.h

@@ -8,8 +8,6 @@
 #include "GDCore/Project/VariablesContainer.h"
 
 namespace gd {
-class EventsBasedObject;
-class InitialInstancesContainer;
 class ObjectsContainersList;
 class ObjectsContainer;
 class ObjectGroup;
@@ -24,7 +22,7 @@ namespace gd {
  *
  * This is used by the object group variable editor.
  */
-class GD_CORE_API ObjectVariableHelper {
+class GD_CORE_API GroupVariableHelper {
 public:
   /**
    * Copy every variable from every object of the group to the other objects
@@ -54,7 +52,7 @@ public:
    * Objects can be added during the group edition and may not necessarily have
    * all the variables initially shared by the group.
    *
-   * \see gd::ObjectVariableHelper::MergeVariableContainers
+   * \see gd::GroupVariableHelper::MergeVariableContainers
    */
   static void FillMissingGroupVariablesToObjects(
       gd::ObjectsContainer &globalObjectsContainer,
@@ -72,22 +70,6 @@ public:
                         const gd::VariablesContainer &groupVariablesContainer,
                         const gd::ObjectGroup &objectGroup,
                         const gd::VariablesChangeset &changeset);
-
-  /**
-   * @brief Apply the changes done on an object to all its instances.
-   */
-  static void ApplyChangesToObjectInstances(
-      gd::VariablesContainer &objectVariablesContainer,
-      gd::InitialInstancesContainer &initialInstancesContainer,
-      const gd::String &objectName, const gd::VariablesChangeset &changeset);
-
-  /**
-   * @brief Apply the changes done on events-based object child to all its
-   * variants.
-   */
-  static void ApplyChangesToVariants(gd::EventsBasedObject &eventsBasedObject,
-                                     const gd::String &objectName,
-                                     const gd::VariablesChangeset &changeset);
 };
 
-} // namespace gd
+} // namespace gd

Core/GDCore/IDE/ObjectAssetSerializer.cpp

@@ -17,8 +17,6 @@
 #include "GDCore/IDE/Project/ResourcesRenamer.h"
 #include "GDCore/Project/Behavior.h"
 #include "GDCore/Project/CustomBehavior.h"
-#include "GDCore/Project/CustomObjectConfiguration.h"
-#include "GDCore/Project/EventsBasedObjectVariant.h"
 #include "GDCore/Project/EventsFunctionsExtension.h"
 #include "GDCore/Project/Layout.h"
 #include "GDCore/Project/Object.h"
@@ -62,6 +60,9 @@ void ObjectAssetSerializer::SerializeTo(
   element.SetAttribute("version", "");
   element.SetIntAttribute("animationsCount", 1);
   element.SetIntAttribute("maxFramesCount", 1);
+  // TODO Find the right object dimensions.
+  element.SetIntAttribute("width", 0);
+  element.SetIntAttribute("height", 0);
   SerializerElement &authorsElement = element.AddChild("authors");
   authorsElement.ConsiderAsArrayOf("author");
   SerializerElement &tagsElement = element.AddChild("tags");
@@ -74,28 +75,6 @@ void ObjectAssetSerializer::SerializeTo(
 
   cleanObject->SerializeTo(objectAssetElement.AddChild("object"));
 
-  double width = 0;
-  double height = 0;
-  if (project.HasEventsBasedObject(object.GetType())) {
-    SerializerElement &variantsElement =
-        objectAssetElement.AddChild("variants");
-    variantsElement.ConsiderAsArrayOf("variant");
-
-    const auto *variant = ObjectAssetSerializer::GetVariant(project, object);
-    if (variant) {
-      width = variant->GetAreaMaxX() - variant->GetAreaMinX();
-      height = variant->GetAreaMaxY() - variant->GetAreaMinY();
-    }
-
-    std::unordered_set<gd::String> alreadyUsedVariantIdentifiers;
-    gd::ObjectAssetSerializer::SerializeUsedVariantsTo(
-        project, object, variantsElement, alreadyUsedVariantIdentifiers);
-  }
-
-  // TODO Find the right object dimensions when their is no variant.
-  element.SetIntAttribute("width", width);
-  element.SetIntAttribute("height", height);
-
   SerializerElement &resourcesElement =
       objectAssetElement.AddChild("resources");
   resourcesElement.ConsiderAsArrayOf("resource");
@@ -129,59 +108,4 @@ void ObjectAssetSerializer::SerializeTo(
       objectAssetElement.AddChild("customization");
   customizationElement.ConsiderAsArrayOf("empty");
 }
-
-void ObjectAssetSerializer::SerializeUsedVariantsTo(
-    gd::Project &project, const gd::Object &object,
-    SerializerElement &variantsElement,
-    std::unordered_set<gd::String> &alreadyUsedVariantIdentifiers) {
-  const auto *variant = ObjectAssetSerializer::GetVariant(project, object);
-  if (!variant) {
-    return;
-  }
-  const auto &variantIdentifier =
-      object.GetType() + gd::PlatformExtension::GetNamespaceSeparator() +
-      variant->GetName();
-  auto insertResult = alreadyUsedVariantIdentifiers.insert(variantIdentifier);
-  if (!insertResult.second) {
-    return;
-  }
-  SerializerElement &pairElement = variantsElement.AddChild("variant");
-  pairElement.SetAttribute("objectType", object.GetType());
-  SerializerElement &variantElement = pairElement.AddChild("variant");
-  variant->SerializeTo(variantElement);
-
-  for (auto &object : variant->GetObjects().GetObjects()) {
-    gd::ObjectAssetSerializer::SerializeUsedVariantsTo(
-        project, *object, variantsElement, alreadyUsedVariantIdentifiers);
-  }
-}
-
-const gd::EventsBasedObjectVariant *
-ObjectAssetSerializer::GetVariant(gd::Project &project,
-                                  const gd::Object &object) {
-  if (!project.HasEventsBasedObject(object.GetType())) {
-    return nullptr;
-  }
-  const auto &eventsBasedObject =
-      project.GetEventsBasedObject(object.GetType());
-  const auto &variants = eventsBasedObject.GetVariants();
-  const auto *customObjectConfiguration =
-      dynamic_cast<const gd::CustomObjectConfiguration *>(
-          &object.GetConfiguration());
-  const auto &variantName = customObjectConfiguration->GetVariantName();
-  if (!variants.HasVariantNamed(variantName) &&
-      (customObjectConfiguration
-           ->IsMarkedAsOverridingEventsBasedObjectChildrenConfiguration() ||
-       customObjectConfiguration
-           ->IsForcedToOverrideEventsBasedObjectChildrenConfiguration())) {
-    return nullptr;
-  }
-  const auto &variantIdentifier =
-      object.GetType() + gd::PlatformExtension::GetNamespaceSeparator() +
-      variantName;
-  const auto &variant = variants.HasVariantNamed(variantName)
-                            ? variants.GetVariant(variantName)
-                            : eventsBasedObject.GetDefaultVariant();
-  return &variant;
-}
 } // namespace gd

Core/GDCore/IDE/ObjectAssetSerializer.h

@@ -6,7 +6,6 @@
 #pragma once
 #include <map>
 #include <vector>
-#include <unordered_set>
 
 #include "GDCore/String.h"
 
@@ -21,7 +20,6 @@ class InitialInstance;
 class SerializerElement;
 class EffectsContainer;
 class AbstractFileSystem;
-class EventsBasedObjectVariant;
 } // namespace gd
 
 namespace gd {
@@ -54,13 +52,6 @@ private:
   ObjectAssetSerializer(){};
 
   static gd::String GetObjectExtensionName(const gd::Object &object);
-
-  static void SerializeUsedVariantsTo(
-      gd::Project &project, const gd::Object &object,
-      SerializerElement &variantsElement,
-      std::unordered_set<gd::String> &alreadyUsedVariantIdentifiers);
-
-  static const gd::EventsBasedObjectVariant* GetVariant(gd::Project &project, const gd::Object &object);
 };
 
 } // namespace gd

Core/GDCore/IDE/Project/ArbitraryResourceWorker.cpp

@@ -62,11 +62,6 @@ void ArbitraryResourceWorker::ExposeSpine(gd::String& resourceName){
     // do.
 };
 
-void ArbitraryResourceWorker::ExposeJavaScript(gd::String& resourceName){
-    // Nothing to do by default - each child class can define here the action to
-    // do.
-};
-
 void ArbitraryResourceWorker::ExposeVideo(gd::String& videoName){
     // Nothing to do by default - each child class can define here the action to
     // do.
@@ -200,10 +195,6 @@ void ArbitraryResourceWorker::ExposeResourceWithType(
     ExposeSpine(resourceName);
     return;
   }
-  if (resourceType == "javascript") {
-    ExposeJavaScript(resourceName);
-    return;
-  }
   gd::LogError("Unexpected resource type: " + resourceType + " for: " + resourceName);
   return;
 }

Core/GDCore/IDE/Project/ArbitraryResourceWorker.h

@@ -96,7 +96,7 @@ public:
    * \brief Expose a 3D model, which is always a reference to a "model3D" resource.
    */
   virtual void ExposeModel3D(gd::String &resourceName);
-
+  
   /**
    * \brief Expose an atlas, which is always a reference to a "atlas" resource.
    */
@@ -112,11 +112,6 @@ public:
    */
   virtual void ExposeVideo(gd::String &videoName);
 
-  /**
-   * \brief Expose a JavaScript file, which is always a reference to a "javascript" resource.
-   */
-  virtual void ExposeJavaScript(gd::String &javaScriptName);
-
   /**
    * \brief Expose a bitmap font, which is always a reference to a "bitmapFont" resource.
    */

Core/GDCore/IDE/Project/AssetResourcePathCleaner.cpp

@@ -38,10 +38,6 @@ void AssetResourcePathCleaner::ExposeVideo(gd::String &videoName) {
   ExposeResourceAsFile(videoName);
 }
 
-void AssetResourcePathCleaner::ExposeJavaScript(gd::String &javaScriptResourceName) {
-  ExposeResourceAsFile(javaScriptResourceName);
-}
-
 void AssetResourcePathCleaner::ExposeBitmapFont(gd::String &bitmapFontName) {
   ExposeResourceAsFile(bitmapFontName);
 }

Core/GDCore/IDE/Project/AssetResourcePathCleaner.h

@@ -46,7 +46,6 @@ public:
   void ExposeTileset(gd::String &tilesetName) override;
   void ExposeVideo(gd::String &videoName) override;
   void ExposeBitmapFont(gd::String &bitmapFontName) override;
-  void ExposeJavaScript(gd::String &javaScriptResourceName) override;
   void ExposeFile(gd::String &resource) override;
 
 protected:

Core/GDCore/IDE/Project/ObjectsUsingResourceCollector.h

@@ -73,9 +73,6 @@ public:
   virtual void ExposeVideo(gd::String& otherResourceName) override {
     MatchResourceName(otherResourceName);
   };
-  virtual void ExposeJavaScript(gd::String& otherResourceName) override {
-    MatchResourceName(otherResourceName);
-  };
   virtual void ExposeBitmapFont(gd::String& otherResourceName) override {
     MatchResourceName(otherResourceName);
   };

Core/GDCore/IDE/Project/ResourcesInUseHelper.h

@@ -60,7 +60,6 @@ public:
     if (resourceType == "model3D") return allModel3Ds;
     if (resourceType == "atlas") return allAtlases;
     if (resourceType == "spine") return allSpines;
-    if (resourceType == "javascript") return allJavaScripts;
 
     return emptyResources;
   };
@@ -89,9 +88,6 @@ public:
   virtual void ExposeVideo(gd::String& resourceName) override {
     allVideos.insert(resourceName);
   };
-  virtual void ExposeJavaScript(gd::String& resourceName) override {
-    allJavaScripts.insert(resourceName);
-  };
   virtual void ExposeBitmapFont(gd::String& resourceName) override {
     allBitmapFonts.insert(resourceName);
   };
@@ -118,7 +114,6 @@ public:
   std::set<gd::String> allModel3Ds;
   std::set<gd::String> allAtlases;
   std::set<gd::String> allSpines;
-  std::set<gd::String> allJavaScripts;
   std::set<gd::String> emptyResources;
 
   static const std::vector<gd::String> resourceTypes;

Core/GDCore/IDE/Project/ResourcesRenamer.h

@@ -59,9 +59,6 @@ class ResourcesRenamer : public gd::ArbitraryResourceWorker {
   virtual void ExposeVideo(gd::String& videoResourceName) override {
     RenameIfNeeded(videoResourceName);
   };
-  virtual void ExposeJavaScript(gd::String& javaScriptResourceName) override {
-    RenameIfNeeded(javaScriptResourceName);
-  };
   virtual void ExposeBitmapFont(gd::String& bitmapFontName) override {
     RenameIfNeeded(bitmapFontName);
   };

Core/GDCore/IDE/Project/SceneResourcesFinder.h

@@ -74,9 +74,6 @@ private:
   void ExposeVideo(gd::String &videoResourceName) override {
     AddUsedResource(videoResourceName);
   };
-  void ExposeJavaScript(gd::String &javaScriptResourceName) override {
-    AddUsedResource(javaScriptResourceName);
-  };
   void ExposeBitmapFont(gd::String &bitmapFontName) override {
     AddUsedResource(bitmapFontName);
   };

Core/GDCore/IDE/ProjectBrowserHelper.cpp

@@ -26,24 +26,8 @@ namespace gd {
 
 void ProjectBrowserHelper::ExposeProjectEvents(
     gd::Project &project, gd::ArbitraryEventsWorker &worker) {
-  // See also gd::ResourceExposer::ExposeWholeProjectResources
-  // for a method that traverses the whole project (this time for resources).
-
-  ExposeProjectEventsWithoutExtensions(project, worker);
-
-  // Add events based extensions
-  for (std::size_t e = 0; e < project.GetEventsFunctionsExtensionsCount();
-       e++) {
-    auto &eventsFunctionsExtension = project.GetEventsFunctionsExtension(e);
-    ProjectBrowserHelper::ExposeEventsFunctionsExtensionEvents(project, eventsFunctionsExtension, worker);
-  }
-}
-
-void ProjectBrowserHelper::ExposeProjectEvents(
-    gd::Project &project, gd::ArbitraryEventsWorkerWithContext &worker) {
-  // See also gd::ResourceExposer::ExposeWholeProjectResources
-  // for a method that traverses the whole project (this time for resources)
-  // and ExposeProjectEffects (this time for effects).
+  // See also gd::Project::ExposeResources for a method that traverses the whole
+  // project (this time for resources).
 
   ExposeProjectEventsWithoutExtensions(project, worker);
 
@@ -67,28 +51,6 @@ void ProjectBrowserHelper::ExposeProjectEventsWithoutExtensions(
   }
 }
 
-void ProjectBrowserHelper::ExposeProjectEventsWithoutExtensions(
-    gd::Project& project, gd::ArbitraryEventsWorkerWithContext& worker) {
-  // Add layouts events
-  for (std::size_t s = 0; s < project.GetLayoutsCount(); s++) {
-    auto &layout = project.GetLayout(s);
-    auto projectScopedContainers =
-      gd::ProjectScopedContainers::MakeNewProjectScopedContainersForProjectAndLayout(project, layout);
-    worker.Launch(layout.GetEvents(), projectScopedContainers);
-  }
-  // Add external events events
-  for (std::size_t s = 0; s < project.GetExternalEventsCount(); s++) {
-    const auto &externalEvents = project.GetExternalEvents(s);
-    const gd::String &associatedLayout = externalEvents.GetAssociatedLayout();
-    if (project.HasLayoutNamed(associatedLayout)) {
-      auto &layout = project.GetLayout(associatedLayout);
-      auto projectScopedContainers =
-        gd::ProjectScopedContainers::MakeNewProjectScopedContainersForProjectAndLayout(project, layout);
-      worker.Launch(project.GetExternalEvents(s).GetEvents(), projectScopedContainers);
-    }
-  }
-}
-
 void ProjectBrowserHelper::ExposeLayoutEventsAndExternalEvents(
     gd::Project &project, gd::Layout &layout,
     gd::ArbitraryEventsWorker &worker) {
@@ -144,17 +106,48 @@ void ProjectBrowserHelper::ExposeLayoutEventsAndDependencies(
   }
   for (const gd::String& sceneName : dependenciesAnalyzer.GetScenesDependencies()) {
     gd::Layout& dependencyLayout = project.GetLayout(sceneName);
-
+    
     worker.Launch(dependencyLayout.GetEvents());
   }
 }
 
+void ProjectBrowserHelper::ExposeProjectEvents(
+    gd::Project &project, gd::ArbitraryEventsWorkerWithContext &worker) {
+  // See also gd::Project::ExposeResources for a method that traverse the whole
+  // project (this time for resources) and ExposeProjectEffects (this time for
+  // effects).
+
+  // Add layouts events
+  for (std::size_t s = 0; s < project.GetLayoutsCount(); s++) {
+    auto &layout = project.GetLayout(s);
+    auto projectScopedContainers =
+      gd::ProjectScopedContainers::MakeNewProjectScopedContainersForProjectAndLayout(project, layout);
+    worker.Launch(layout.GetEvents(), projectScopedContainers);
+  }
+  // Add external events events
+  for (std::size_t s = 0; s < project.GetExternalEventsCount(); s++) {
+    const auto &externalEvents = project.GetExternalEvents(s);
+    const gd::String &associatedLayout = externalEvents.GetAssociatedLayout();
+    if (project.HasLayoutNamed(associatedLayout)) {
+      auto &layout = project.GetLayout(associatedLayout);
+      auto projectScopedContainers =
+        gd::ProjectScopedContainers::MakeNewProjectScopedContainersForProjectAndLayout(project, layout);
+      worker.Launch(project.GetExternalEvents(s).GetEvents(), projectScopedContainers);
+    }
+  }
+  // Add events based extensions
+  for (std::size_t e = 0; e < project.GetEventsFunctionsExtensionsCount();
+       e++) {
+    auto &eventsFunctionsExtension = project.GetEventsFunctionsExtension(e);
+    ProjectBrowserHelper::ExposeEventsFunctionsExtensionEvents(project, eventsFunctionsExtension, worker);
+  }
+}
+
 void ProjectBrowserHelper::ExposeEventsFunctionsExtensionEvents(
     gd::Project &project, const gd::EventsFunctionsExtension &eventsFunctionsExtension,
     gd::ArbitraryEventsWorker &worker) {
     // Add (free) events functions
-    for (auto &&eventsFunction :
-         eventsFunctionsExtension.GetEventsFunctions().GetInternalVector()) {
+    for (auto &&eventsFunction : eventsFunctionsExtension.GetInternalVector()) {
       worker.Launch(eventsFunction->GetEvents());
     }
 
@@ -176,18 +169,12 @@ void ProjectBrowserHelper::ExposeEventsFunctionsExtensionEvents(
     gd::Project &project, const gd::EventsFunctionsExtension &eventsFunctionsExtension,
     gd::ArbitraryEventsWorkerWithContext &worker) {
     // Add (free) events functions
-    for (auto &&eventsFunction :
-         eventsFunctionsExtension.GetEventsFunctions().GetInternalVector()) {
-      gd::ObjectsContainer parameterObjectsContainer(
-          gd::ObjectsContainer::SourceType::Function);
-    gd::VariablesContainer parameterVariablesContainer(
-        gd::VariablesContainer::SourceType::Parameters);
-    gd::VariablesContainer propertyVariablesContainer(
-        gd::VariablesContainer::SourceType::Properties);
+    for (auto &&eventsFunction : eventsFunctionsExtension.GetInternalVector()) {
+      gd::ObjectsContainer parameterObjectsContainer;
       auto projectScopedContainers = gd::ProjectScopedContainers::
           MakeNewProjectScopedContainersForFreeEventsFunction(
               project, eventsFunctionsExtension, *eventsFunction,
-              parameterObjectsContainer, parameterVariablesContainer);
+              parameterObjectsContainer);
 
       worker.Launch(eventsFunction->GetEvents(), projectScopedContainers);
     }
@@ -219,32 +206,14 @@ void ProjectBrowserHelper::ExposeEventsBasedBehaviorEvents(
     gd::Project &project, const gd::EventsFunctionsExtension &eventsFunctionsExtension,
     const gd::EventsBasedBehavior &eventsBasedBehavior,
     gd::ArbitraryEventsWorkerWithContext &worker) {
-  gd::VariablesContainer propertyVariablesContainer(
-      gd::VariablesContainer::SourceType::Properties);
-  gd::ProjectBrowserHelper::ExposeEventsBasedBehaviorEvents(
-    project, eventsFunctionsExtension,
-    eventsBasedBehavior,
-    propertyVariablesContainer,
-    worker);
-}
-
-void ProjectBrowserHelper::ExposeEventsBasedBehaviorEvents(
-    gd::Project &project, const gd::EventsFunctionsExtension &eventsFunctionsExtension,
-    const gd::EventsBasedBehavior &eventsBasedBehavior,
-    gd::VariablesContainer &propertyVariablesContainer,
-    gd::ArbitraryEventsWorkerWithContext &worker) {
   auto &behaviorEventsFunctions = eventsBasedBehavior.GetEventsFunctions();
   for (auto &&eventsFunction : behaviorEventsFunctions.GetInternalVector()) {
 
-    gd::ObjectsContainer parameterObjectsContainers(
-        gd::ObjectsContainer::SourceType::Function);
-    gd::VariablesContainer parameterVariablesContainer(
-        gd::VariablesContainer::SourceType::Parameters);
+    gd::ObjectsContainer parameterObjectsContainers;
     auto projectScopedContainers = gd::ProjectScopedContainers::
         MakeNewProjectScopedContainersForBehaviorEventsFunction(
             project, eventsFunctionsExtension, eventsBasedBehavior,
-            *eventsFunction, parameterObjectsContainers,
-            parameterVariablesContainer, propertyVariablesContainer);
+            *eventsFunction, parameterObjectsContainers);
 
     worker.Launch(eventsFunction->GetEvents(), projectScopedContainers);
   }
@@ -264,31 +233,14 @@ void ProjectBrowserHelper::ExposeEventsBasedObjectEvents(
     const gd::EventsFunctionsExtension &eventsFunctionsExtension,
     const gd::EventsBasedObject &eventsBasedObject,
     gd::ArbitraryEventsWorkerWithContext &worker) {
-  gd::VariablesContainer propertyVariablesContainer(
-      gd::VariablesContainer::SourceType::Properties);
-  gd::ProjectBrowserHelper::ExposeEventsBasedObjectEvents(
-      project, eventsFunctionsExtension, eventsBasedObject,
-      propertyVariablesContainer, worker);
-}
-
-void ProjectBrowserHelper::ExposeEventsBasedObjectEvents(
-    gd::Project &project,
-    const gd::EventsFunctionsExtension &eventsFunctionsExtension,
-    const gd::EventsBasedObject &eventsBasedObject,
-    gd::VariablesContainer &propertyVariablesContainer,
-    gd::ArbitraryEventsWorkerWithContext &worker) {
   auto &objectEventsFunctions = eventsBasedObject.GetEventsFunctions();
   for (auto &&eventsFunction : objectEventsFunctions.GetInternalVector()) {
 
-    gd::ObjectsContainer parameterObjectsContainers(
-        gd::ObjectsContainer::SourceType::Function);
-    gd::VariablesContainer parameterVariablesContainer(
-        gd::VariablesContainer::SourceType::Parameters);
+    gd::ObjectsContainer parameterObjectsContainers;
     auto projectScopedContainers = gd::ProjectScopedContainers::
         MakeNewProjectScopedContainersForObjectEventsFunction(
             project, eventsFunctionsExtension, eventsBasedObject,
-            *eventsFunction, parameterObjectsContainers,
-            parameterVariablesContainer, propertyVariablesContainer);
+            *eventsFunction, parameterObjectsContainers);
 
     worker.Launch(eventsFunction->GetEvents(), projectScopedContainers);
   }
@@ -314,12 +266,6 @@ void ProjectBrowserHelper::ExposeProjectObjects(
          eventsFunctionsExtension.GetEventsBasedObjects().GetInternalVector()) {
       auto eventsBasedObject = eventsBasedObjectUniquePtr.get();
       worker.Launch(eventsBasedObject->GetObjects());
-
-      for (auto &&variantUniquePtr :
-           eventsBasedObject->GetVariants().GetInternalVector()) {
-        auto variant = variantUniquePtr.get();
-        worker.Launch(variant->GetObjects());
-      }
     }
   }
 };
@@ -338,7 +284,7 @@ void ProjectBrowserHelper::ExposeProjectFunctions(
   for (std::size_t e = 0; e < project.GetEventsFunctionsExtensionsCount();
        e++) {
     auto &eventsFunctionsExtension = project.GetEventsFunctionsExtension(e);
-    worker.Launch(eventsFunctionsExtension.GetEventsFunctions());
+    worker.Launch(eventsFunctionsExtension);
 
     for (auto &&eventsBasedBehavior :
          eventsFunctionsExtension.GetEventsBasedBehaviors()

Core/GDCore/IDE/ProjectBrowserHelper.h

@@ -19,7 +19,6 @@ class ArbitraryEventsFunctionsWorker;
 class ArbitraryObjectsWorker;
 class ArbitraryEventBasedBehaviorsWorker;
 class ArbitraryBehaviorSharedDataWorker;
-class VariablesContainer;
 } // namespace gd
 
 namespace gd {
@@ -57,15 +56,6 @@ public:
   ExposeProjectEventsWithoutExtensions(gd::Project &project,
                                        gd::ArbitraryEventsWorker &worker);
 
-  /**
-   * \brief Call the specified worker on all events of the project (layout and
-   * external events) but not events from extensions.
-   *
-   * Only use this for stats.
-   */
-  static void ExposeProjectEventsWithoutExtensions(
-      gd::Project &project, gd::ArbitraryEventsWorkerWithContext &worker);
-
   /**
    * \brief Call the specified worker on all events of a layout and
    * its external events.
@@ -137,20 +127,6 @@ public:
       const gd::EventsBasedBehavior &eventsBasedBehavior,
       gd::ArbitraryEventsWorkerWithContext &worker);
 
-  /**
-   * \brief Call the specified worker on all events of the event-based
-   * behavior.
-   *
-   * This should be the preferred way to traverse all the events of an
-   * event-based behavior.
-   */
-  static void ExposeEventsBasedBehaviorEvents(
-      gd::Project &project,
-      const gd::EventsFunctionsExtension &eventsFunctionsExtension,
-      const gd::EventsBasedBehavior &eventsBasedBehavior,
-      gd::VariablesContainer &propertyVariablesContainer,
-      gd::ArbitraryEventsWorkerWithContext &worker);
-
   /**
    * \brief Call the specified worker on all events of the event-based
    * object.
@@ -176,20 +152,6 @@ public:
       const gd::EventsBasedObject &eventsBasedObject,
       gd::ArbitraryEventsWorkerWithContext &worker);
 
-  /**
-   * \brief Call the specified worker on all events of the event-based
-   * object.
-   *
-   * This should be the preferred way to traverse all the events of an
-   * event-based object.
-   */
-  static void ExposeEventsBasedObjectEvents(
-      gd::Project &project,
-      const gd::EventsFunctionsExtension &eventsFunctionsExtension,
-      const gd::EventsBasedObject &eventsBasedObject,
-      gd::VariablesContainer &propertyVariablesContainer,
-      gd::ArbitraryEventsWorkerWithContext &worker);
-
   /**
    * \brief Call the specified worker on all ObjectContainers of the project
    * (global, layouts...)

Core/GDCore/IDE/ProjectStripper.cpp

@@ -63,7 +63,7 @@ void GD_CORE_API ProjectStripper::StripProjectForExport(gd::Project &project) {
       eventsBasedObject.GetPropertyDescriptors().GetInternalVector().clear();
     }
     extension.GetEventsBasedBehaviors().Clear();
-    extension.GetEventsFunctions().ClearEventsFunctions();
+    extension.ClearEventsFunctions();
   }
 }
 

Core/GDCore/IDE/PropertyFunctionGenerator.cpp

@@ -42,9 +42,6 @@ void PropertyFunctionGenerator::GenerateGetterAndSetter(
     const gd::NamedPropertyDescriptor &property, const gd::String &objectType,
     bool isBehavior, bool isSharedProperties) {
   auto &propertyName = property.GetName();
-  const auto &primitiveType = gd::ValueTypeMetadata::GetPrimitiveValueType(
-      gd::ValueTypeMetadata::ConvertPropertyTypeToValueType(
-          property.GetType()));
   auto &functionsContainer = eventsBasedEntity.GetEventsFunctions();
   gd::String capitalizedName = CapitalizeFirstLetter(property.GetName());
   gd::String setterName = "Set" + capitalizedName;
@@ -62,9 +59,9 @@ void PropertyFunctionGenerator::GenerateGetterAndSetter(
       property.GetLabel().empty() ? property.GetName() : property.GetLabel();
 
   gd::String descriptionSubject =
-      (primitiveType == "boolean" ? "if " : "the ") +
+      (property.GetType() == "Boolean" ? "if " : "the ") +
       UnCapitalizeFirstLetter(propertyLabel) +
-      (isSharedProperties || primitiveType == "boolean"
+      (isSharedProperties || property.GetType() == "Boolean"
            ? "."
            : " of the object.") +
       (property.GetDescription().empty() ? ""
@@ -74,7 +71,19 @@ void PropertyFunctionGenerator::GenerateGetterAndSetter(
              "objects using the behavior."
            : "");
 
+  gd::String propertyGetterName =
+      (isSharedProperties ? "SharedProperty" : "Property") + property.GetName();
+  gd::String getterType =
+      gd::PlatformExtension::GetBehaviorEventsFunctionFullType(
+          extension.GetName(), eventsBasedEntity.GetName(), propertyGetterName);
+  gd::String setterType =
+      gd::PlatformExtension::GetBehaviorEventsFunctionFullType(
+          extension.GetName(), eventsBasedEntity.GetName(),
+          "Set" + propertyGetterName);
+
   gd::String getterName = capitalizedName;
+  gd::String numberOrString =
+      property.GetType() == "Number" ? "Number" : "String";
 
   if (!functionsContainer.HasEventsFunctionNamed(getterName)) {
     auto &getter = functionsContainer.InsertNewEventsFunction(
@@ -90,7 +99,7 @@ void PropertyFunctionGenerator::GenerateGetterAndSetter(
         .SetName(legacyExpressionType)
         .SetExtraInfo(GetStringifiedExtraInfo(property));
     getter.SetFullName(propertyLabel).SetGroup(functionGroupName);
-    if (primitiveType == "boolean") {
+    if (property.GetType() == "Boolean") {
       getter.SetFunctionType(gd::EventsFunction::Condition)
           .SetDescription("Check " + descriptionSubject)
           .SetSentence("_PARAM0_ " + UnCapitalizeFirstLetter(propertyLabel));
@@ -103,12 +112,13 @@ void PropertyFunctionGenerator::GenerateGetterAndSetter(
     auto &event =
         dynamic_cast<gd::StandardEvent &>(getter.GetEvents().InsertNewEvent(
             project, "BuiltinCommonInstructions::Standard", 0));
-    if (primitiveType == "boolean") {
+    if (property.GetType() == "Boolean") {
       gd::Instruction condition;
-      condition.SetType("BooleanVariable");
-      condition.AddParameter(propertyName);
-      condition.AddParameter("True");
-      condition.AddParameter("");
+      condition.SetType(getterType);
+      condition.AddParameter("Object");
+      if (isBehavior) {
+        condition.AddParameter("Behavior");
+      }
       event.GetConditions().Insert(condition, 0);
 
       gd::Instruction action;
@@ -117,8 +127,6 @@ void PropertyFunctionGenerator::GenerateGetterAndSetter(
       event.GetActions().Insert(action, 0);
     } else {
       gd::Instruction action;
-      gd::String numberOrString =
-          primitiveType == "number" ? "Number" : "String";
       action.SetType("SetReturn" + numberOrString);
       action.AddParameter(property.GetName());
       event.GetActions().Insert(action, 0);
@@ -128,7 +136,7 @@ void PropertyFunctionGenerator::GenerateGetterAndSetter(
   if (!functionsContainer.HasEventsFunctionNamed(setterName)) {
     auto &setter = functionsContainer.InsertNewEventsFunction(
         setterName, functionsContainer.GetEventsFunctionsCount());
-    if (primitiveType == "boolean") {
+    if (property.GetType() == "Boolean") {
       setter.SetFunctionType(gd::EventsFunction::Action)
           .SetFullName(propertyLabel)
           .SetGroup(functionGroupName)
@@ -169,24 +177,26 @@ void PropertyFunctionGenerator::GenerateGetterAndSetter(
       setter.SetGetterName(getterName);
     }
 
-    if (primitiveType == "boolean") {
+    if (property.GetType() == "Boolean") {
       {
         auto &event =
             dynamic_cast<gd::StandardEvent &>(setter.GetEvents().InsertNewEvent(
                 project, "BuiltinCommonInstructions::Standard", 0));
 
         gd::Instruction condition;
-        condition.SetType("BooleanVariable");
-        condition.AddParameter("Value");
-        condition.AddParameter("True");
-        condition.AddParameter("");
+        condition.SetType("GetArgumentAsBoolean");
+        condition.AddParameter("\"Value\"");
         event.GetConditions().Insert(condition, 0);
 
         gd::Instruction action;
-        action.SetType("SetBooleanVariable");
-        action.AddParameter(propertyName);
-        action.AddParameter("True");
-        action.AddParameter("");
+        action.SetType(setterType);
+        action.AddParameter("Object");
+        if (isBehavior) {
+          action.AddParameter("Behavior");
+          action.AddParameter("yes");
+        } else {
+          action.AddParameter("yes");
+        }
         event.GetActions().Insert(action, 0);
       }
       {
@@ -195,17 +205,20 @@ void PropertyFunctionGenerator::GenerateGetterAndSetter(
                 project, "BuiltinCommonInstructions::Standard", 0));
 
         gd::Instruction condition;
-        condition.SetType("BooleanVariable");
-        condition.AddParameter("Value");
-        condition.AddParameter("False");
-        condition.AddParameter("");
+        condition.SetType("GetArgumentAsBoolean");
+        condition.AddParameter("\"Value\"");
+        condition.SetInverted(true);
         event.GetConditions().Insert(condition, 0);
 
         gd::Instruction action;
-        action.SetType("SetBooleanVariable");
-        action.AddParameter(propertyName);
-        action.AddParameter("False");
-        action.AddParameter("");
+        action.SetType(setterType);
+        action.AddParameter("Object");
+        if (isBehavior) {
+          action.AddParameter("Behavior");
+          action.AddParameter("no");
+        } else {
+          action.AddParameter("no");
+        }
         event.GetActions().Insert(action, 0);
       }
     } else {
@@ -214,11 +227,16 @@ void PropertyFunctionGenerator::GenerateGetterAndSetter(
               project, "BuiltinCommonInstructions::Standard", 0));
 
       gd::Instruction action;
-      action.SetType(primitiveType == "number" ? "SetNumberVariable"
-                                               : "SetStringVariable");
-      action.AddParameter(propertyName);
-      action.AddParameter("=");
-      action.AddParameter("Value");
+      action.SetType(setterType);
+      action.AddParameter("Object");
+      if (isBehavior) {
+        action.AddParameter("Behavior");
+        action.AddParameter("=");
+        action.AddParameter("Value");
+      } else {
+        action.AddParameter("=");
+        action.AddParameter("Value");
+      }
       event.GetActions().Insert(action, 0);
     }
   }
@@ -227,11 +245,9 @@ void PropertyFunctionGenerator::GenerateGetterAndSetter(
 bool PropertyFunctionGenerator::CanGenerateGetterAndSetter(
     const gd::AbstractEventsBasedEntity &eventsBasedEntity,
     const gd::NamedPropertyDescriptor &property) {
-  const auto &primitiveType = gd::ValueTypeMetadata::GetPrimitiveValueType(
-      gd::ValueTypeMetadata::ConvertPropertyTypeToValueType(
-          property.GetType()));
-  if (primitiveType != "boolean" && primitiveType != "number" &&
-      primitiveType != "string") {
+  auto &type = property.GetType();
+  if (type != "Boolean" && type != "Number" && type != "String" &&
+      type != "Choice" && type != "Color" && type != "LeaderboardId") {
     return false;
   }
 

Core/GDCore/IDE/PropertyFunctionGenerator.h

@@ -3,7 +3,8 @@
  * Copyright 2008-2022 Florian Rival (Florian.Rival@gmail.com). All rights
  * reserved. This project is released under the MIT License.
  */
-#pragma once
+#ifndef GDCORE_PROPERTYFUNCTIONGENERATOR_H
+#define GDCORE_PROPERTYFUNCTIONGENERATOR_H
 
 namespace gd {
 class String;
@@ -72,3 +73,5 @@ class GD_CORE_API PropertyFunctionGenerator {
 };
 
 }  // namespace gd
+
+#endif  // GDCORE_PROPERTYFUNCTIONGENERATOR_H

Core/GDCore/IDE/ResourceExposer.cpp

@@ -5,22 +5,21 @@
  */
 #include "ResourceExposer.h"
 
-#include "GDCore/Extensions/Metadata/EffectMetadata.h"
-#include "GDCore/Extensions/Metadata/MetadataProvider.h"
-#include "GDCore/Extensions/Platform.h"
 #include "GDCore/IDE/Events/ArbitraryEventsWorker.h"
 #include "GDCore/IDE/Project/ArbitraryResourceWorker.h"
 #include "GDCore/IDE/ProjectBrowserHelper.h"
-#include "GDCore/Project/Effect.h"
 #include "GDCore/Project/EventsFunctionsExtension.h"
 #include "GDCore/Project/Layout.h"
 #include "GDCore/Project/Project.h"
+#include "GDCore/Project/Effect.h"
 #include "GDCore/String.h"
+#include "GDCore/Extensions/Platform.h"
+#include "GDCore/Extensions/Metadata/MetadataProvider.h"
+#include "GDCore/Extensions/Metadata/EffectMetadata.h"
 
 namespace gd {
 
-void ResourceExposer::ExposeWholeProjectResources(
-    gd::Project &project, gd::ArbitraryResourceWorker &worker) {
+void ResourceExposer::ExposeWholeProjectResources(gd::Project& project, gd::ArbitraryResourceWorker& worker) {
   // See also gd::ProjectBrowserHelper::ExposeProjectEvents for a method that
   // traverse the whole project (this time for events) and ExposeProjectEffects
   // (this time for effects).
@@ -32,11 +31,13 @@ void ResourceExposer::ExposeWholeProjectResources(
 
   // Expose event resources
   auto eventWorker = gd::GetResourceWorkerOnEvents(project, worker);
-  gd::ProjectBrowserHelper::ExposeProjectEvents(project, eventWorker);
+  gd::ProjectBrowserHelper::ExposeProjectEvents(
+    project, eventWorker);
 
   // Expose object configuration resources
   auto objectWorker = gd::GetResourceWorkerOnObjects(project, worker);
-  gd::ProjectBrowserHelper::ExposeProjectObjects(project, objectWorker);
+  gd::ProjectBrowserHelper::ExposeProjectObjects(
+    project, objectWorker);
 
   // Expose layer effect resources
   for (std::size_t layoutIndex = 0; layoutIndex < project.GetLayoutsCount();
@@ -51,36 +52,28 @@ void ResourceExposer::ExposeWholeProjectResources(
       for (size_t effectIndex = 0; effectIndex < effects.GetEffectsCount();
            effectIndex++) {
         auto &effect = effects.GetEffect(effectIndex);
-        gd::ResourceExposer::ExposeEffectResources(
-            project.GetCurrentPlatform(), effect, worker);
+        gd::ResourceExposer::ExposeEffectResources(project.GetCurrentPlatform(),
+                                                   effect, worker);
       }
     }
   }
 
   // Expose loading screen background image if present
-  auto &loadingScreen = project.GetLoadingScreen();
+  auto& loadingScreen = project.GetLoadingScreen();
   if (loadingScreen.GetBackgroundImageResourceName() != "")
     worker.ExposeImage(loadingScreen.GetBackgroundImageResourceName());
-
-  // Expose extension source files
-  for (std::size_t e = 0; e < project.GetEventsFunctionsExtensionsCount();
-       e++) {
-    auto &eventsFunctionsExtension = project.GetEventsFunctionsExtension(e);
-    ExposeExtensionResources(eventsFunctionsExtension, worker);
-  }
 }
 
-void ResourceExposer::ExposeProjectResources(
-    gd::Project &project, gd::ArbitraryResourceWorker &worker) {
+void ResourceExposer::ExposeProjectResources(gd::Project& project, gd::ArbitraryResourceWorker& worker) {
   // Expose global objects configuration resources
   auto objectWorker = gd::GetResourceWorkerOnObjects(project, worker);
   objectWorker.Launch(project.GetObjects());
 }
 
 void ResourceExposer::ExposeLayoutResources(
-    gd::Project &project,
-    gd::Layout &layout,
+    gd::Project &project, gd::Layout &layout,
     gd::ArbitraryResourceWorker &worker) {
+
   // Expose object configuration resources
   auto objectWorker = gd::GetResourceWorkerOnObjects(project, worker);
   gd::ProjectBrowserHelper::ExposeLayoutObjects(layout, objectWorker);
@@ -94,15 +87,15 @@ void ResourceExposer::ExposeLayoutResources(
     for (size_t effectIndex = 0; effectIndex < effects.GetEffectsCount();
          effectIndex++) {
       auto &effect = effects.GetEffect(effectIndex);
-      gd::ResourceExposer::ExposeEffectResources(
-          project.GetCurrentPlatform(), effect, worker);
+      gd::ResourceExposer::ExposeEffectResources(project.GetCurrentPlatform(),
+                                                 effect, worker);
     }
   }
 
   // Expose event resources
   auto eventWorker = gd::GetResourceWorkerOnEvents(project, worker);
-  gd::ProjectBrowserHelper::ExposeLayoutEventsAndDependencies(
-      project, layout, eventWorker);
+  gd::ProjectBrowserHelper::ExposeLayoutEventsAndDependencies(project, layout,
+                                                              eventWorker);
 
   // Exposed extension event resources
   // Note that using resources in extensions is very unlikely and probably not
@@ -110,14 +103,12 @@ void ResourceExposer::ExposeLayoutResources(
   for (std::size_t e = 0; e < project.GetEventsFunctionsExtensionsCount();
        e++) {
     auto &eventsFunctionsExtension = project.GetEventsFunctionsExtension(e);
-    gd::ProjectBrowserHelper::ExposeEventsFunctionsExtensionEvents(
-        project, eventsFunctionsExtension, eventWorker);
+    gd::ProjectBrowserHelper::ExposeEventsFunctionsExtensionEvents(project, eventsFunctionsExtension, eventWorker);
   }
 }
 
 void ResourceExposer::ExposeEffectResources(
-    gd::Platform &platform,
-    gd::Effect &effect,
+    gd::Platform &platform, gd::Effect &effect,
     gd::ArbitraryResourceWorker &worker) {
   auto &effectMetadata =
       MetadataProvider::GetEffectMetadata(platform, effect.GetEffectType());
@@ -136,20 +127,11 @@ void ResourceExposer::ExposeEffectResources(
         worker.ExposeResourceWithType(resourceType,
                                       potentiallyUpdatedResourceName);
         if (potentiallyUpdatedResourceName != resourceName) {
-          effect.SetStringParameter(propertyName,
-                                    potentiallyUpdatedResourceName);
+          effect.SetStringParameter(propertyName, potentiallyUpdatedResourceName);
         }
       }
     }
   }
 }
 
-void ResourceExposer::ExposeExtensionResources(
-    gd::EventsFunctionsExtension &extension,
-    gd::ArbitraryResourceWorker &worker) {
-  for (auto &sourceFile : extension.GetAllSourceFiles()) {
-    worker.ExposeJavaScript(sourceFile.GetResourceName());
-  }
-}
-
-}  // namespace gd
+} // namespace gd

Core/GDCore/IDE/ResourceExposer.h

@@ -9,10 +9,9 @@ namespace gd {
 class Platform;
 class Project;
 class ArbitraryResourceWorker;
-class EventsFunctionsExtension;
 class Effect;
 class Layout;
-}  // namespace gd
+} // namespace gd
 
 namespace gd {
 
@@ -20,7 +19,7 @@ namespace gd {
  * \brief
  */
 class GD_CORE_API ResourceExposer {
- public:
+public:
   /**
    * \brief Called ( e.g. during compilation ) so as to inventory internal
    * resources, sometimes update their filename or any other work or resources.
@@ -35,7 +34,7 @@ class GD_CORE_API ResourceExposer {
 
   /**
    * @brief Expose only the resources used globally on a project.
-   *
+   * 
    * It doesn't include resources used in layouts.
    */
   static void ExposeProjectResources(gd::Project &project,
@@ -43,25 +42,17 @@ class GD_CORE_API ResourceExposer {
 
   /**
    * @brief Expose the resources used in a given layout.
-   *
+   * 
    * It doesn't include resources used globally.
    */
-  static void ExposeLayoutResources(gd::Project &project,
-                                    gd::Layout &layout,
-                                    gd::ArbitraryResourceWorker &worker);
+  static void ExposeLayoutResources(gd::Project &project, gd::Layout &layout,
+                                          gd::ArbitraryResourceWorker &worker);
 
   /**
    * @brief Expose the resources used in a given effect.
    */
-  static void ExposeEffectResources(gd::Platform &platform,
-                                    gd::Effect &effect,
+  static void ExposeEffectResources(gd::Platform &platform, gd::Effect &effect,
                                     gd::ArbitraryResourceWorker &worker);
-
-  /**
-   * @brief Expose the resources used in an extension.
-   */
-  static void ExposeExtensionResources(gd::EventsFunctionsExtension &extension,
-                                       gd::ArbitraryResourceWorker &worker);
 };
 
-}  // namespace gd
+} // namespace gd

Core/GDCore/IDE/WholeProjectRefactorer.cpp

@@ -11,7 +11,7 @@
 #include "GDCore/Extensions/Metadata/MetadataProvider.h"
 #include "GDCore/Extensions/PlatformExtension.h"
 #include "GDCore/IDE/DependenciesAnalyzer.h"
-#include "GDCore/IDE/ObjectVariableHelper.h"
+#include "GDCore/IDE/GroupVariableHelper.h"
 #include "GDCore/IDE/EventBasedBehaviorBrowser.h"
 #include "GDCore/IDE/EventBasedObjectBrowser.h"
 #include "GDCore/IDE/Events/ArbitraryEventsWorker.h"
@@ -19,7 +19,6 @@
 #include "GDCore/IDE/Events/BehaviorTypeRenamer.h"
 #include "GDCore/IDE/Events/CustomObjectTypeRenamer.h"
 #include "GDCore/IDE/Events/EventsBehaviorRenamer.h"
-#include "GDCore/IDE/Events/EventsParameterReplacer.h"
 #include "GDCore/IDE/Events/EventsPropertyReplacer.h"
 #include "GDCore/IDE/Events/EventsRefactorer.h"
 #include "GDCore/IDE/Events/EventsVariableInstructionTypeSwitcher.h"
@@ -314,16 +313,9 @@ void WholeProjectRefactorer::ApplyRefactoringForVariablesContainer(
   variablesContainer.SerializeTo(editedSerializedVariables);
   variablesContainer.UnserializeFrom(originalSerializedVariables);
 
-  // Rename variables
-  // Pass an empty set to avoid deletion of actions/conditions or events using
-  // them.
-  // While we support refactoring that would remove all references (actions,
-  // conditions...) it's both a bit dangerous for the user and we would need to
-  // show the user what will be removed before doing so. For now, just clear the
-  // removed variables so they don't trigger any refactoring.
-  std::unordered_set<gd::String> removedVariableNames;
+  // Rename and remove variables
   gd::EventsVariableReplacer eventsVariableReplacer(
-      project.GetCurrentPlatform(), changeset, removedVariableNames,
+      project.GetCurrentPlatform(), changeset, changeset.removedVariableNames,
       variablesContainer);
   gd::ProjectBrowserHelper::ExposeProjectEvents(project,
                                                 eventsVariableReplacer);
@@ -340,25 +332,9 @@ void WholeProjectRefactorer::ApplyRefactoringForVariablesContainer(
       project, eventsVariableInstructionTypeSwitcher);
 }
 
-// TODO Apply the refactor to external layouts.
-void WholeProjectRefactorer::ApplyRefactoringForObjectVariablesContainer(
-    gd::Project &project, gd::VariablesContainer &objectVariablesContainer,
-    gd::InitialInstancesContainer &initialInstancesContainer,
-    const gd::String &objectName, const gd::VariablesChangeset &changeset,
-    const gd::SerializerElement &originalSerializedVariables) {
-  gd::WholeProjectRefactorer::ApplyRefactoringForVariablesContainer(
-      project, objectVariablesContainer, changeset,
-      originalSerializedVariables);
-
-  gd::ObjectVariableHelper::ApplyChangesToObjectInstances(
-      objectVariablesContainer, initialInstancesContainer, objectName,
-      changeset);
-}
-
 void WholeProjectRefactorer::ApplyRefactoringForGroupVariablesContainer(
     gd::Project &project, gd::ObjectsContainer &globalObjectsContainer,
     gd::ObjectsContainer &objectsContainer,
-    gd::InitialInstancesContainer &initialInstancesContainer,
     const gd::VariablesContainer &groupVariablesContainer,
     const gd::ObjectGroup &objectGroup,
     const gd::VariablesChangeset &changeset,
@@ -378,15 +354,11 @@ void WholeProjectRefactorer::ApplyRefactoringForGroupVariablesContainer(
     }
     auto &object = hasObject ? objectsContainer.GetObject(objectName)
                              : globalObjectsContainer.GetObject(objectName);
-    auto &objectVariablesContainer = object.GetVariables();
-
-    gd::ObjectVariableHelper::ApplyChangesToObjectInstances(
-      objectVariablesContainer, initialInstancesContainer, objectName,
-      changeset);
+    auto &variablesContainer = object.GetVariables();
 
     gd::EventsVariableReplacer eventsVariableReplacer(
         project.GetCurrentPlatform(), changeset,
-        removedVariableNames, objectVariablesContainer);
+        removedVariableNames, variablesContainer);
     gd::ProjectBrowserHelper::ExposeProjectEvents(project,
                                                   eventsVariableReplacer);
   }
@@ -399,12 +371,12 @@ void WholeProjectRefactorer::ApplyRefactoringForGroupVariablesContainer(
                                                 eventsVariableReplacer);
 
   // Apply changes to objects.
-  gd::ObjectVariableHelper::FillMissingGroupVariablesToObjects(
+  gd::GroupVariableHelper::FillMissingGroupVariablesToObjects(
       globalObjectsContainer,
       objectsContainer,
       objectGroup,
       originalSerializedVariables);
-  gd::ObjectVariableHelper::ApplyChangesToObjects(
+  gd::GroupVariableHelper::ApplyChangesToObjects(
       globalObjectsContainer, objectsContainer, groupVariablesContainer,
       objectGroup, changeset);
 
@@ -627,8 +599,7 @@ void WholeProjectRefactorer::RenameEventsFunctionsExtension(
   // instructions after they are renamed.
 
   // Free expressions
-  for (auto &&eventsFunction :
-       eventsFunctionsExtension.GetEventsFunctions().GetInternalVector()) {
+  for (auto &&eventsFunction : eventsFunctionsExtension.GetInternalVector()) {
     if (eventsFunction->IsExpression()) {
       renameEventsFunction(*eventsFunction);
     }
@@ -645,8 +616,7 @@ void WholeProjectRefactorer::RenameEventsFunctionsExtension(
   }
 
   // Free instructions
-  for (auto &&eventsFunction :
-       eventsFunctionsExtension.GetEventsFunctions().GetInternalVector()) {
+  for (auto &&eventsFunction : eventsFunctionsExtension.GetInternalVector()) {
     if (eventsFunction->IsAction() || eventsFunction->IsCondition()) {
       renameEventsFunction(*eventsFunction);
     }
@@ -726,12 +696,11 @@ void WholeProjectRefactorer::RenameEventsFunction(
     gd::Project &project,
     const gd::EventsFunctionsExtension &eventsFunctionsExtension,
     const gd::String &oldFunctionName, const gd::String &newFunctionName) {
-  const auto &eventsFunctions = eventsFunctionsExtension.GetEventsFunctions();
-  if (!eventsFunctions.HasEventsFunctionNamed(oldFunctionName))
+  if (!eventsFunctionsExtension.HasEventsFunctionNamed(oldFunctionName))
     return;
 
   const gd::EventsFunction &eventsFunction =
-      eventsFunctions.GetEventsFunction(oldFunctionName);
+      eventsFunctionsExtension.GetEventsFunction(oldFunctionName);
 
   const WholeProjectBrowser wholeProjectExposer;
   DoRenameEventsFunction(
@@ -744,7 +713,7 @@ void WholeProjectRefactorer::RenameEventsFunction(
 
   if (eventsFunction.GetFunctionType() ==
       gd::EventsFunction::ExpressionAndCondition) {
-    for (auto &&otherFunction : eventsFunctions.GetInternalVector()) {
+    for (auto &&otherFunction : eventsFunctionsExtension.GetInternalVector()) {
       if (otherFunction->GetFunctionType() ==
               gd::EventsFunction::ActionWithOperator &&
           otherFunction->GetGetterName() == oldFunctionName) {
@@ -847,79 +816,16 @@ void WholeProjectRefactorer::RenameObjectEventsFunction(
   }
 }
 
-void WholeProjectRefactorer::RenameParameter(
-    gd::Project &project, gd::ProjectScopedContainers &projectScopedContainers,
-    gd::EventsFunction &eventsFunction,
-    const gd::ObjectsContainer &parameterObjectsContainer,
-    const gd::String &oldParameterName, const gd::String &newParameterName) {
-  auto &parameters = eventsFunction.GetParameters();
-  if (!parameters.HasParameterNamed(oldParameterName))
-    return;
-  auto &parameter = parameters.GetParameter(oldParameterName);
-  if (parameter.GetValueTypeMetadata().IsObject()) {
-    gd::WholeProjectRefactorer::ObjectOrGroupRenamedInEventsFunction(
-        project, projectScopedContainers, eventsFunction,
-        parameterObjectsContainer, oldParameterName, newParameterName, false);
-  } else if (parameter.GetValueTypeMetadata().IsBehavior()) {
-    size_t behaviorParameterIndex = parameters.GetParameterPosition(parameter);
-    size_t objectParameterIndex =
-        gd::ParameterMetadataTools::GetObjectParameterIndexFor(
-            parameters, behaviorParameterIndex);
-    if (objectParameterIndex == gd::String::npos) {
-      return;
-    }
-    const gd::String &objectName =
-        parameters.GetParameter(objectParameterIndex).GetName();
-    gd::EventsBehaviorRenamer behaviorRenamer(project.GetCurrentPlatform(),
-                                              objectName, oldParameterName,
-                                              newParameterName);
-    behaviorRenamer.Launch(eventsFunction.GetEvents(), projectScopedContainers);
-  } else {
-    // Rename parameter names directly used as an identifier.
-    std::unordered_map<gd::String, gd::String> oldToNewParameterNames = {
-        {oldParameterName, newParameterName}};
-    gd::EventsParameterReplacer eventsParameterReplacer(
-        project.GetCurrentPlatform(), oldToNewParameterNames);
-    eventsParameterReplacer.Launch(eventsFunction.GetEvents(),
-                                   projectScopedContainers);
-
-    // Rename parameter names in legacy expressions and instructions
-    gd::ProjectElementRenamer projectElementRenamer(
-        project.GetCurrentPlatform(), "functionParameterName", oldParameterName,
-        newParameterName);
-    projectElementRenamer.Launch(eventsFunction.GetEvents(),
-                                 projectScopedContainers);
-  }
-}
-
-void WholeProjectRefactorer::ChangeParameterType(
-    gd::Project &project, gd::ProjectScopedContainers &projectScopedContainers,
-    gd::EventsFunction &eventsFunction,
-    const gd::ObjectsContainer &parameterObjectsContainer,
-    const gd::String &parameterName) {
-  std::unordered_set<gd::String> typeChangedPropertyNames;
-  typeChangedPropertyNames.insert(parameterName);
-  gd::VariablesContainer propertyVariablesContainer(
-      gd::VariablesContainer::SourceType::Properties);
-  gd::EventsVariableInstructionTypeSwitcher
-      eventsVariableInstructionTypeSwitcher(project.GetCurrentPlatform(),
-                                            typeChangedPropertyNames,
-                                            propertyVariablesContainer);
-  eventsVariableInstructionTypeSwitcher.Launch(eventsFunction.GetEvents(),
-                                               projectScopedContainers);
-}
-
 void WholeProjectRefactorer::MoveEventsFunctionParameter(
     gd::Project &project,
     const gd::EventsFunctionsExtension &eventsFunctionsExtension,
     const gd::String &functionName, std::size_t oldIndex,
     std::size_t newIndex) {
-  const auto &eventsFunctions = eventsFunctionsExtension.GetEventsFunctions();
-  if (!eventsFunctions.HasEventsFunctionNamed(functionName))
+  if (!eventsFunctionsExtension.HasEventsFunctionNamed(functionName))
     return;
 
   const gd::EventsFunction &eventsFunction =
-      eventsFunctions.GetEventsFunction(functionName);
+      eventsFunctionsExtension.GetEventsFunction(functionName);
 
   const gd::String &eventsFunctionType =
       gd::PlatformExtension::GetEventsFunctionFullType(
@@ -1223,42 +1129,6 @@ void WholeProjectRefactorer::RenameEventsBasedObjectProperty(
   gd::ProjectBrowserHelper::ExposeProjectEvents(project, conditionRenamer);
 }
 
-void WholeProjectRefactorer::ChangeEventsBasedBehaviorPropertyType(
-    gd::Project &project,
-    const gd::EventsFunctionsExtension &eventsFunctionsExtension,
-    const gd::EventsBasedBehavior &eventsBasedBehavior,
-    const gd::String &propertyName) {
-  std::unordered_set<gd::String> typeChangedPropertyNames;
-  typeChangedPropertyNames.insert(propertyName);
-  gd::VariablesContainer propertyVariablesContainer(
-      gd::VariablesContainer::SourceType::Properties);
-  gd::EventsVariableInstructionTypeSwitcher
-      eventsVariableInstructionTypeSwitcher(project.GetCurrentPlatform(),
-                                            typeChangedPropertyNames,
-                                            propertyVariablesContainer);
-  gd::ProjectBrowserHelper::ExposeEventsBasedBehaviorEvents(
-      project, eventsFunctionsExtension, eventsBasedBehavior,
-      propertyVariablesContainer, eventsVariableInstructionTypeSwitcher);
-}
-
-void WholeProjectRefactorer::ChangeEventsBasedObjectPropertyType(
-    gd::Project &project,
-    const gd::EventsFunctionsExtension &eventsFunctionsExtension,
-    const gd::EventsBasedObject &eventsBasedObject,
-    const gd::String &propertyName) {
-  std::unordered_set<gd::String> typeChangedPropertyNames;
-  typeChangedPropertyNames.insert(propertyName);
-  gd::VariablesContainer propertyVariablesContainer(
-      gd::VariablesContainer::SourceType::Properties);
-  gd::EventsVariableInstructionTypeSwitcher
-      eventsVariableInstructionTypeSwitcher(project.GetCurrentPlatform(),
-                                            typeChangedPropertyNames,
-                                            propertyVariablesContainer);
-  gd::ProjectBrowserHelper::ExposeEventsBasedObjectEvents(
-      project, eventsFunctionsExtension, eventsBasedObject,
-      propertyVariablesContainer, eventsVariableInstructionTypeSwitcher);
-}
-
 void WholeProjectRefactorer::AddBehaviorAndRequiredBehaviors(
     gd::Project &project, gd::Object &object, const gd::String &behaviorType,
     const gd::String &behaviorName) {
@@ -1835,15 +1705,6 @@ void WholeProjectRefactorer::BehaviorsAddedToObjectInScene(
 void WholeProjectRefactorer::ObjectOrGroupRenamedInScene(
     gd::Project &project, gd::Layout &layout, const gd::String &oldName,
     const gd::String &newName, bool isObjectGroup) {
-  gd::WholeProjectRefactorer::ObjectOrGroupRenamedInScene(
-      project, layout, layout.GetObjects(), oldName, newName, isObjectGroup);
-}
-
-void WholeProjectRefactorer::ObjectOrGroupRenamedInScene(
-    gd::Project &project, gd::Layout &layout,
-    const gd::ObjectsContainer &targetedObjectsContainer,
-    const gd::String &oldName, const gd::String &newName, bool isObjectGroup) {
-
   if (oldName == newName || newName.empty() || oldName.empty())
     return;
 
@@ -1853,7 +1714,7 @@ void WholeProjectRefactorer::ObjectOrGroupRenamedInScene(
   // Rename object in the current layout
   gd::EventsRefactorer::RenameObjectInEvents(
       project.GetCurrentPlatform(), projectScopedContainers, layout.GetEvents(),
-      layout.GetObjects(), oldName, newName);
+      oldName, newName);
 
   // Object groups can't have instances or be in other groups
   if (!isObjectGroup) {
@@ -1870,7 +1731,7 @@ void WholeProjectRefactorer::ObjectOrGroupRenamedInScene(
     auto &externalEvents = project.GetExternalEvents(externalEventsName);
     gd::EventsRefactorer::RenameObjectInEvents(
         project.GetCurrentPlatform(), projectScopedContainers,
-        externalEvents.GetEvents(), layout.GetObjects(), oldName, newName);
+        externalEvents.GetEvents(), oldName, newName);
   }
 
   // Rename object in external layouts
@@ -2116,8 +1977,8 @@ void WholeProjectRefactorer::ObjectOrGroupRenamedInEventsBasedObject(
        eventsBasedObject.GetEventsFunctions().GetInternalVector()) {
     auto *function = functionUniquePtr.get();
     WholeProjectRefactorer::ObjectOrGroupRenamedInEventsFunction(
-        project, projectScopedContainers, *function,
-        eventsBasedObject.GetObjects(), oldName, newName, isObjectGroup);
+        project, projectScopedContainers, *function, oldName, newName,
+        isObjectGroup);
   }
 
   // Object groups can't have instances or be in other groups
@@ -2129,37 +1990,16 @@ void WholeProjectRefactorer::ObjectOrGroupRenamedInEventsBasedObject(
       groups[g].RenameObject(oldName, newName);
     }
   }
-
-  for (auto &variant : eventsBasedObject.GetVariants().GetInternalVector()) {
-    auto &variantObjects = variant->GetObjects();
-    auto &variantObjectGroups = variantObjects.GetObjectGroups();
-    if (isObjectGroup) {
-      if (variantObjectGroups.Has(oldName)) {
-        variantObjectGroups.Get(oldName).SetName(newName);
-      }
-      // Object groups can't have instances or be in other groups
-    }
-    else {
-      if (variantObjects.HasObjectNamed(oldName)) {
-        variantObjects.GetObject(oldName).SetName(newName);
-      }
-      variant->GetInitialInstances().RenameInstancesOfObject(oldName, newName);
-      for (std::size_t g = 0; g < variantObjectGroups.size(); ++g) {
-        variantObjectGroups[g].RenameObject(oldName, newName);
-      }
-    }
-  }
 }
 
 void WholeProjectRefactorer::ObjectOrGroupRenamedInEventsFunction(
     gd::Project &project,
     const gd::ProjectScopedContainers &projectScopedContainers,
-    gd::EventsFunction &eventsFunction,
-    const gd::ObjectsContainer &targetedObjectsContainer,
-    const gd::String &oldName, const gd::String &newName, bool isObjectGroup) {
+    gd::EventsFunction &eventsFunction, const gd::String &oldName,
+    const gd::String &newName, bool isObjectGroup) {
   gd::EventsRefactorer::RenameObjectInEvents(
       project.GetCurrentPlatform(), projectScopedContainers,
-      eventsFunction.GetEvents(), targetedObjectsContainer, oldName, newName);
+      eventsFunction.GetEvents(), oldName, newName);
 
   // Object groups can't be in other groups
   if (!isObjectGroup) {
@@ -2185,7 +2025,7 @@ void WholeProjectRefactorer::GlobalObjectOrGroupRenamed(
     if (layout.GetObjects().HasObjectNamed(oldName))
       continue;
 
-    ObjectOrGroupRenamedInScene(project, layout, project.GetObjects(), oldName, newName,
+    ObjectOrGroupRenamedInScene(project, layout, oldName, newName,
                                  isObjectGroup);
   }
 }

Core/GDCore/IDE/WholeProjectRefactorer.h

@@ -32,7 +32,6 @@ class UnfilledRequiredBehaviorPropertyProblem;
 class ProjectBrowser;
 class SerializerElement;
 class ProjectScopedContainers;
-class InitialInstancesContainer;
 struct VariablesRenamingChangesetNode;
 }  // namespace gd
 
@@ -81,23 +80,13 @@ class GD_CORE_API WholeProjectRefactorer {
 
   /**
    * \brief Refactor the project according to the changes (renaming or deletion)
-   * made to global or scene variables.
+   * made to variables.
    */
   static void ApplyRefactoringForVariablesContainer(
       gd::Project &project, gd::VariablesContainer &variablesContainer,
       const gd::VariablesChangeset &changeset,
       const gd::SerializerElement &originalSerializedVariables);
 
-  /**
-   * \brief Refactor the project according to the changes (renaming or deletion)
-   * made to object variables.
-   */
-  static void ApplyRefactoringForObjectVariablesContainer(
-      gd::Project &project, gd::VariablesContainer &objectVariablesContainer,
-      gd::InitialInstancesContainer &initialInstancesContainer,
-      const gd::String &objectName, const gd::VariablesChangeset &changeset,
-      const gd::SerializerElement &originalSerializedVariables);
-
   /**
    * \brief Refactor the project according to the changes (renaming or deletion)
    * made to variables of a group.
@@ -105,7 +94,6 @@ class GD_CORE_API WholeProjectRefactorer {
   static void ApplyRefactoringForGroupVariablesContainer(
       gd::Project &project, gd::ObjectsContainer &globalObjectsContainer,
       gd::ObjectsContainer &objectsContainer,
-      gd::InitialInstancesContainer &initialInstancesContainer,
       const gd::VariablesContainer &groupVariablesContainer,
       const gd::ObjectGroup &objectGroup,
       const gd::VariablesChangeset &changeset,
@@ -188,31 +176,6 @@ class GD_CORE_API WholeProjectRefactorer {
       const gd::String& oldFunctionName,
       const gd::String& newFunctionName);
 
-  /**
-   * \brief Refactor the function **before** a parameter is renamed.
-   *
-   * \warning Do the renaming of the specified parameter after calling this.
-   * This is because the function is expected to have its old name for the
-   * refactoring.
-   */
-  static void
-  RenameParameter(gd::Project &project,
-                  gd::ProjectScopedContainers &projectScopedContainers,
-                  gd::EventsFunction &eventsFunction,
-                  const gd::ObjectsContainer &parameterObjectsContainer,
-                  const gd::String &oldParameterName,
-                  const gd::String &newParameterName);
-
-  /**
-   * \brief Refactor the function **after** a parameter has changed of type.
-   */
-  static void
-  ChangeParameterType(gd::Project &project,
-                      gd::ProjectScopedContainers &projectScopedContainers,
-                      gd::EventsFunction &eventsFunction,
-                      const gd::ObjectsContainer &parameterObjectsContainer,
-                      const gd::String &parameterName);
-
   /**
    * \brief Refactor the project **before** an events function parameter
    * is moved.
@@ -305,26 +268,6 @@ class GD_CORE_API WholeProjectRefactorer {
       const gd::String& oldPropertyName,
       const gd::String& newPropertyName);
 
-  /**
-   * \brief Refactor the project **after** a property of a behavior has
-   * changed of type.
-   */
-  static void ChangeEventsBasedBehaviorPropertyType(
-      gd::Project &project,
-      const gd::EventsFunctionsExtension &eventsFunctionsExtension,
-      const gd::EventsBasedBehavior &eventsBasedBehavior,
-      const gd::String &propertyName);
-
-  /**
-   * \brief Refactor the project **after** a property of an object has
-   * changed of type.
-   */
-  static void ChangeEventsBasedObjectPropertyType(
-      gd::Project &project,
-      const gd::EventsFunctionsExtension &eventsFunctionsExtension,
-      const gd::EventsBasedObject &eventsBasedObject,
-      const gd::String &propertyName);
-
   /**
    * \brief Add a behavior to an object and add required behaviors if necessary
    * to fill every behavior properties of the added behaviors.
@@ -586,7 +529,6 @@ class GD_CORE_API WholeProjectRefactorer {
       gd::Project& project,
       const gd::ProjectScopedContainers &projectScopedContainers,
       gd::EventsFunction& eventsFunction,
-      const gd::ObjectsContainer &targetedObjectsContainer,
       const gd::String& oldName,
       const gd::String& newName,
       bool isObjectGroup);
@@ -707,12 +649,6 @@ class GD_CORE_API WholeProjectRefactorer {
   virtual ~WholeProjectRefactorer(){};
 
  private:
-  static void ObjectOrGroupRenamedInScene(gd::Project &project,
-                                          gd::Layout &scene,
-                                          const gd::ObjectsContainer &targetedObjectsContainer,
-                                          const gd::String &oldName,
-                                          const gd::String &newName,
-                                          bool isObjectGroup);
   static std::vector<gd::String> GetAssociatedExternalLayouts(
       gd::Project& project, gd::Layout& layout);
   static std::vector<gd::String>

Core/GDCore/Project/AbstractEventsBasedEntity.cpp

@@ -23,9 +23,6 @@ void AbstractEventsBasedEntity::SerializeTo(SerializerElement& element) const {
   element.SetAttribute("description", description);
   element.SetAttribute("name", name);
   element.SetAttribute("fullName", fullName);
-  if (isPrivate) {
-    element.SetBoolAttribute("private", isPrivate);
-  }
 
   gd::SerializerElement& eventsFunctionsElement =
       element.AddChild("eventsFunctions");
@@ -39,7 +36,6 @@ void AbstractEventsBasedEntity::UnserializeFrom(
   description = element.GetStringAttribute("description");
   name = element.GetStringAttribute("name");
   fullName = element.GetStringAttribute("fullName");
-  isPrivate = element.GetBoolAttribute("private");
 
   const gd::SerializerElement& eventsFunctionsElement =
       element.GetChild("eventsFunctions");

Core/GDCore/Project/AbstractEventsBasedEntity.h

@@ -3,7 +3,8 @@
  * Copyright 2008-2016 Florian Rival (Florian.Rival@gmail.com). All rights
  * reserved. This project is released under the MIT License.
  */
-#pragma once
+#ifndef GDCORE_ABSTRACTEVENTSBASEDENTITY_H
+#define GDCORE_ABSTRACTEVENTSBASEDENTITY_H
 
 #include <vector>
 #include "GDCore/Project/NamedPropertyDescriptor.h"
@@ -39,21 +40,6 @@ class GD_CORE_API AbstractEventsBasedEntity {
    */
   AbstractEventsBasedEntity* Clone() const { return new AbstractEventsBasedEntity(*this); };
 
-  /**
-   * \brief Check if the behavior or object is private - it can't be used outside of its
-   * extension.
-   */
-  bool IsPrivate() const { return isPrivate; }
-
-  /**
-   * \brief Set that the behavior or object is private - it can't be used outside of its
-   * extension.
-   */
-  AbstractEventsBasedEntity& SetPrivate(bool isPrivate_) {
-    isPrivate = isPrivate_;
-    return *this;
-  }
-
   /**
    * \brief Get the description of the behavior or object, that is displayed in the
    * editor.
@@ -165,7 +151,8 @@ class GD_CORE_API AbstractEventsBasedEntity {
   gd::EventsFunctionsContainer eventsFunctionsContainer;
   gd::PropertiesContainer propertyDescriptors;
   gd::String extensionName;
-  bool isPrivate = false;
 };
 
 }  // namespace gd
+
+#endif  // GDCORE_ABSTRACTEVENTSBASEDENTITY_H

Core/GDCore/Project/CustomConfigurationHelper.cpp

@@ -22,17 +22,15 @@ void CustomConfigurationHelper::InitializeContent(
     gd::SerializerElement &configurationContent) {
   for (auto &&property : properties.GetInternalVector()) {
     auto &element = configurationContent.AddChild(property->GetName());
+    auto propertyType = property->GetType();
 
-    const auto &valueType =
-        gd::ValueTypeMetadata::ConvertPropertyTypeToValueType(
-            property->GetType());
-    const auto &primitiveType =
-        gd::ValueTypeMetadata::GetPrimitiveValueType(valueType);
-    if (primitiveType == "string" || valueType == "behavior") {
+    if (propertyType == "String" || propertyType == "Choice" ||
+        propertyType == "Color" || propertyType == "Behavior" ||
+        propertyType == "Resource" || propertyType == "LeaderboardId") {
       element.SetStringValue(property->GetValue());
-    } else if (primitiveType == "number") {
+    } else if (propertyType == "Number") {
       element.SetDoubleValue(property->GetValue().To<double>());
-    } else if (primitiveType == "boolean") {
+    } else if (propertyType == "Boolean") {
       element.SetBoolValue(property->GetValue() == "true");
     }
   }
@@ -45,25 +43,23 @@ std::map<gd::String, gd::PropertyDescriptor> CustomConfigurationHelper::GetPrope
 
   for (auto &property : properties.GetInternalVector()) {
     const auto &propertyName = property->GetName();
+    const auto &propertyType = property->GetType();
 
     // Copy the property
     objectProperties[propertyName] = *property;
 
     auto &newProperty = objectProperties[propertyName];
 
-    const auto &valueType =
-        gd::ValueTypeMetadata::ConvertPropertyTypeToValueType(
-            property->GetType());
-    const auto &primitiveType =
-        gd::ValueTypeMetadata::GetPrimitiveValueType(valueType);
     if (configurationContent.HasChild(propertyName)) {
-      if (primitiveType == "string" || valueType == "behavior") {
+      if (propertyType == "String" || propertyType == "Choice" ||
+          propertyType == "Color" || propertyType == "Behavior" ||
+          propertyType == "Resource" || propertyType == "LeaderboardId") {
         newProperty.SetValue(
             configurationContent.GetChild(propertyName).GetStringValue());
-      } else if (primitiveType == "number") {
+      } else if (propertyType == "Number") {
         newProperty.SetValue(gd::String::From(
             configurationContent.GetChild(propertyName).GetDoubleValue()));
-      } else if (primitiveType == "boolean") {
+      } else if (propertyType == "Boolean") {
         newProperty.SetValue(
             configurationContent.GetChild(propertyName).GetBoolValue()
                 ? "true"
@@ -89,16 +85,15 @@ bool CustomConfigurationHelper::UpdateProperty(
   const auto &property = properties.Get(propertyName);
 
   auto &element = configurationContent.AddChild(propertyName);
+  const gd::String &propertyType = property.GetType();
 
-  const auto &valueType =
-      gd::ValueTypeMetadata::ConvertPropertyTypeToValueType(property.GetType());
-  const auto &primitiveType =
-      gd::ValueTypeMetadata::GetPrimitiveValueType(valueType);
-  if (primitiveType == "string" || valueType == "behavior") {
+  if (propertyType == "String" || propertyType == "Choice" ||
+      propertyType == "Color" || propertyType == "Behavior" ||
+      propertyType == "Resource" || propertyType == "LeaderboardId") {
     element.SetStringValue(newValue);
-  } else if (primitiveType == "number") {
+  } else if (propertyType == "Number") {
     element.SetDoubleValue(newValue.To<double>());
-  } else if (primitiveType == "boolean") {
+  } else if (propertyType == "Boolean") {
     element.SetBoolValue(newValue == "1");
   }
 

Core/GDCore/Project/CustomObjectConfiguration.cpp

@@ -19,7 +19,6 @@ using namespace gd;
 
 void CustomObjectConfiguration::Init(const gd::CustomObjectConfiguration& objectConfiguration) {
   project = objectConfiguration.project;
-  variantName = objectConfiguration.variantName;
   objectContent = objectConfiguration.objectContent;
   animations = objectConfiguration.animations;
   isMarkedAsOverridingEventsBasedObjectChildrenConfiguration =
@@ -166,7 +165,6 @@ void CustomObjectConfiguration::DoSerializeTo(SerializerElement& element) const
     animations.SerializeTo(animatableElement);
   }
 
-  element.SetAttribute("variant", variantName);
   if (IsOverridingEventsBasedObjectChildrenConfiguration()) {
     auto &childrenContentElement = element.AddChild("childrenContent");
     for (auto &pair : childObjectConfigurations) {
@@ -186,7 +184,6 @@ void CustomObjectConfiguration::DoUnserializeFrom(Project& project,
     animations.UnserializeFrom(animatableElement);
   }
 
-  variantName = element.GetStringAttribute("variant");
   isMarkedAsOverridingEventsBasedObjectChildrenConfiguration =
       element.HasChild("childrenContent");
   if (isMarkedAsOverridingEventsBasedObjectChildrenConfiguration) {
@@ -250,26 +247,9 @@ void CustomObjectConfiguration::ExposeResources(gd::ArbitraryResourceWorker& wor
   }
   const auto &eventsBasedObject = project->GetEventsBasedObject(GetType());
 
-  if (isMarkedAsOverridingEventsBasedObjectChildrenConfiguration) {
-    for (auto &childObject : eventsBasedObject.GetObjects().GetObjects()) {
-      auto &configuration = GetChildObjectConfiguration(childObject->GetName());
-      configuration.ExposeResources(worker);
-    }
-  } else {
-    if (variantName.empty() ||
-        !eventsBasedObject.GetVariants().HasVariantNamed(variantName)) {
-      for (auto &childObject :
-           eventsBasedObject.GetDefaultVariant().GetObjects().GetObjects()) {
-        childObject->GetConfiguration().ExposeResources(worker);
-      }
-    } else {
-      for (auto &childObject : eventsBasedObject.GetVariants()
-                                   .GetVariant(variantName)
-                                   .GetObjects()
-                                   .GetObjects()) {
-        childObject->GetConfiguration().ExposeResources(worker);
-      }
-    }
+  for (auto& childObject : eventsBasedObject.GetObjects().GetObjects()) {
+    auto &configuration = GetChildObjectConfiguration(childObject->GetName());
+    configuration.ExposeResources(worker);
   }
 }
 

Core/GDCore/Project/CustomObjectConfiguration.h

@@ -29,9 +29,9 @@ namespace gd {
  * "resource".
  */
 class CustomObjectConfiguration : public gd::ObjectConfiguration {
-public:
-  CustomObjectConfiguration(const Project &project_, const String &type_)
-      : project(&project_) {
+ public:
+  CustomObjectConfiguration(const Project& project_, const String& type_)
+      : project(&project_), isMarkedAsOverridingEventsBasedObjectChildrenConfiguration(false) {
     SetType(type_);
   }
   std::unique_ptr<gd::ObjectConfiguration> Clone() const override;
@@ -66,18 +66,6 @@ public:
 
   void ExposeResources(gd::ArbitraryResourceWorker& worker) override;
 
-  /**
-   * \brief Get the name of the events-based object variant used by this custom object.
-   */
-  const gd::String &GetVariantName() const { return variantName; };
-
-  /**
-   * \brief Set the name of the events-based object variant used by this custom object.
-   */
-  void SetVariantName(const gd::String &variantName_) {
-    variantName = variantName_;
-  }
-
   bool IsForcedToOverrideEventsBasedObjectChildrenConfiguration() const;
 
   bool IsMarkedAsOverridingEventsBasedObjectChildrenConfiguration() const {
@@ -157,7 +145,6 @@ protected:
   gd::SerializerElement objectContent;
   std::unordered_set<gd::String> unfoldedChildren;
 
-  gd::String variantName = "";
   bool isMarkedAsOverridingEventsBasedObjectChildrenConfiguration = false;
   mutable std::map<gd::String, std::unique_ptr<gd::ObjectConfiguration>> childObjectConfigurations;
 

Core/GDCore/Project/EventsBasedBehavior.cpp

@@ -21,6 +21,9 @@ EventsBasedBehavior::EventsBasedBehavior()
 void EventsBasedBehavior::SerializeTo(SerializerElement& element) const {
   AbstractEventsBasedEntity::SerializeTo(element);
   element.SetAttribute("objectType", objectType);
+  if (isPrivate) {
+    element.SetBoolAttribute("private", isPrivate);
+  }
   sharedPropertyDescriptors.SerializeElementsTo(
       "propertyDescriptor", element.AddChild("sharedPropertyDescriptors"));
   if (quickCustomizationVisibility != QuickCustomization::Visibility::Default) {
@@ -36,6 +39,7 @@ void EventsBasedBehavior::UnserializeFrom(gd::Project& project,
                                           const SerializerElement& element) {
   AbstractEventsBasedEntity::UnserializeFrom(project, element);
   objectType = element.GetStringAttribute("objectType");
+  isPrivate = element.GetBoolAttribute("private");
   sharedPropertyDescriptors.UnserializeElementsFrom(
       "propertyDescriptor", element.GetChild("sharedPropertyDescriptors"));
   if (element.HasChild("quickCustomizationVisibility")) {

Core/GDCore/Project/EventsBasedBehavior.h

@@ -3,7 +3,8 @@
  * Copyright 2008-2016 Florian Rival (Florian.Rival@gmail.com). All rights
  * reserved. This project is released under the MIT License.
  */
-#pragma once
+#ifndef GDCORE_EVENTSBASEDBEHAVIOR_H
+#define GDCORE_EVENTSBASEDBEHAVIOR_H
 
 #include <vector>
 #include "GDCore/Project/AbstractEventsBasedEntity.h"
@@ -74,11 +75,17 @@ class GD_CORE_API EventsBasedBehavior: public AbstractEventsBasedEntity {
   }
 
   /**
-   * \brief Set that the behavior or object is private - it can't be used outside of its
+   * \brief Check if the behavior is private - it can't be used outside of its
    * extension.
    */
-  EventsBasedBehavior& SetPrivate(bool isPrivate) {
-    AbstractEventsBasedEntity::SetPrivate(isPrivate);
+  bool IsPrivate() const { return isPrivate; }
+
+  /**
+   * \brief Set that the behavior is private - it can't be used outside of its
+   * extension.
+   */
+  EventsBasedBehavior& SetPrivate(bool _isPrivate) {
+    isPrivate = _isPrivate;
     return *this;
   }
 
@@ -142,8 +149,11 @@ class GD_CORE_API EventsBasedBehavior: public AbstractEventsBasedEntity {
 
  private:
   gd::String objectType;
+  bool isPrivate = false;
   gd::PropertiesContainer sharedPropertyDescriptors;
   QuickCustomization::Visibility quickCustomizationVisibility;
 };
 
 }  // namespace gd
+
+#endif  // GDCORE_EVENTSBASEDBEHAVIOR_H

Core/GDCore/Project/EventsBasedObject.cpp

@@ -17,13 +17,18 @@ EventsBasedObject::EventsBasedObject()
     isAnimatable(false),
     isTextContainer(false),
     isInnerAreaFollowingParentSize(false),
-    isUsingLegacyInstancesRenderer(false) {
+    isUsingLegacyInstancesRenderer(false),
+    areaMinX(0),
+    areaMinY(0),
+    areaMinZ(0),
+    areaMaxX(64),
+    areaMaxY(64),
+    areaMaxZ(64) {
 }
 
 EventsBasedObject::~EventsBasedObject() {}
 
-
-void EventsBasedObject::SerializeToExternal(SerializerElement& element) const {
+void EventsBasedObject::SerializeTo(SerializerElement& element) const {
   element.SetAttribute("defaultName", defaultName);
   if (isRenderedIn3D) {
     element.SetBoolAttribute("is3D", true);
@@ -38,16 +43,20 @@ void EventsBasedObject::SerializeToExternal(SerializerElement& element) const {
     element.SetBoolAttribute("isInnerAreaFollowingParentSize", true);
   }
   element.SetBoolAttribute("isUsingLegacyInstancesRenderer", isUsingLegacyInstancesRenderer);
+  element.SetIntAttribute("areaMinX", areaMinX);
+  element.SetIntAttribute("areaMinY", areaMinY);
+  element.SetIntAttribute("areaMinZ", areaMinZ);
+  element.SetIntAttribute("areaMaxX", areaMaxX);
+  element.SetIntAttribute("areaMaxY", areaMaxY);
+  element.SetIntAttribute("areaMaxZ", areaMaxZ);
 
-  // The EventsBasedObjectVariant SerializeTo method override the name.
-  // AbstractEventsBasedEntity::SerializeTo must be done after.
-  defaultVariant.SerializeTo(element);
   AbstractEventsBasedEntity::SerializeTo(element);
-}
+  objectsContainer.SerializeObjectsTo(element.AddChild("objects"));
+  objectsContainer.SerializeFoldersTo(element.AddChild("objectsFolderStructure"));
+  objectsContainer.GetObjectGroups().SerializeTo(element.AddChild("objectsGroups"));
 
-void EventsBasedObject::SerializeTo(SerializerElement& element) const {
-  SerializeToExternal(element);
-  variants.SerializeVariantsTo(element.AddChild("variants"));
+  layers.SerializeLayersTo(element.AddChild("layers"));
+  initialInstances.SerializeTo(element.AddChild("instances"));
 }
 
 void EventsBasedObject::UnserializeFrom(gd::Project& project,
@@ -58,22 +67,36 @@ void EventsBasedObject::UnserializeFrom(gd::Project& project,
   isTextContainer = element.GetBoolAttribute("isTextContainer", false);
   isInnerAreaFollowingParentSize =
       element.GetBoolAttribute("isInnerAreaFollowingParentSize", false);
+  areaMinX = element.GetIntAttribute("areaMinX", 0);
+  areaMinY = element.GetIntAttribute("areaMinY", 0);
+  areaMinZ = element.GetIntAttribute("areaMinZ", 0);
+  areaMaxX = element.GetIntAttribute("areaMaxX", 64);
+  areaMaxY = element.GetIntAttribute("areaMaxY", 64);
+  areaMaxZ = element.GetIntAttribute("areaMaxZ", 64);
 
-  defaultVariant.UnserializeFrom(project, element);
-  defaultVariant.SetName("");
   AbstractEventsBasedEntity::UnserializeFrom(project, element);
+  objectsContainer.UnserializeObjectsFrom(project, element.GetChild("objects"));
+  if (element.HasChild("objectsFolderStructure")) {
+    objectsContainer.UnserializeFoldersFrom(project, element.GetChild("objectsFolderStructure", 0));
+  }
+  objectsContainer.AddMissingObjectsInRootFolder();
+  objectsContainer.GetObjectGroups().UnserializeFrom(
+      element.GetChild("objectsGroups"));
 
-  if (element.HasChild("variants")) {
-    variants.UnserializeVariantsFrom(project, element.GetChild("variants"));
+  if (element.HasChild("layers")) {
+    layers.UnserializeLayersFrom(element.GetChild("layers"));
+  } else {
+    layers.Reset();
   }
 
-  if (element.HasChild("isUsingLegacyInstancesRenderer")) {
+  initialInstances.UnserializeFrom(element.GetChild("instances"));
+  if (element.HasAttribute("isUsingLegacyInstancesRenderer")) {
     isUsingLegacyInstancesRenderer =
         element.GetBoolAttribute("isUsingLegacyInstancesRenderer", false);
   }
   else {
     // Compatibility with GD <= 5.4.212
-    isUsingLegacyInstancesRenderer = GetInitialInstances().GetInstancesCount() == 0;
+    isUsingLegacyInstancesRenderer = initialInstances.GetInstancesCount() == 0;
     // end of compatibility code
   }
 }

Core/GDCore/Project/EventsBasedObject.h

@@ -7,8 +7,6 @@
 
 #include <vector>
 #include "GDCore/Project/AbstractEventsBasedEntity.h"
-#include "GDCore/Project/EventsBasedObjectVariant.h"
-#include "GDCore/Project/EventsBasedObjectVariantsContainer.h"
 #include "GDCore/Project/ObjectsContainer.h"
 #include "GDCore/Project/InitialInstancesContainer.h"
 #include "GDCore/Project/LayersContainer.h"
@@ -74,15 +72,6 @@ class GD_CORE_API EventsBasedObject: public AbstractEventsBasedEntity {
     return *this;
   }
 
-  /**
-   * \brief Set that the object is private - it can't be used outside of its
-   * extension.
-   */
-  EventsBasedObject& SetPrivate(bool isPrivate) {
-    AbstractEventsBasedEntity::SetPrivate(isPrivate);
-    return *this;
-  }
-
   /**
    * \brief Declare a usage of the 3D renderer.
    */
@@ -164,38 +153,18 @@ class GD_CORE_API EventsBasedObject: public AbstractEventsBasedEntity {
    */
   bool IsTextContainer() const { return isTextContainer; }
 
-  /**
-   * \brief Get the default variant of the custom object.
-   */
-  const gd::EventsBasedObjectVariant& GetDefaultVariant() const { return defaultVariant; }
-
-  /**
-   * \brief Get the default variant of the custom object.
-   */
-  gd::EventsBasedObjectVariant& GetDefaultVariant() { return defaultVariant; }
-
-  /**
-   * \brief Get the variants of the custom object.
-   */
-  const gd::EventsBasedObjectVariantsContainer& GetVariants() const { return variants; }
-
-  /**
-   * \brief Get the variants of the custom object.
-   */
-  gd::EventsBasedObjectVariantsContainer& GetVariants() { return variants; }
-
   /** \name Layers
    */
   ///@{
   /**
    * \brief Get the layers of the custom object.
    */
-  const gd::LayersContainer& GetLayers() const { return defaultVariant.GetLayers(); }
+  const gd::LayersContainer& GetLayers() const { return layers; }
 
   /**
    * \brief Get the layers of the custom object.
    */
-  gd::LayersContainer& GetLayers() { return defaultVariant.GetLayers(); }
+  gd::LayersContainer& GetLayers() { return layers; }
   ///@}
 
   /** \name Child objects
@@ -205,14 +174,14 @@ class GD_CORE_API EventsBasedObject: public AbstractEventsBasedEntity {
    * \brief Get the objects of the custom object.
    */
   gd::ObjectsContainer& GetObjects() {
-    return defaultVariant.GetObjects();
+    return objectsContainer;
   }
 
   /**
    * \brief Get the objects of the custom object.
    */
   const gd::ObjectsContainer& GetObjects() const {
-    return defaultVariant.GetObjects();
+    return objectsContainer;
   }
   ///@}
 
@@ -223,14 +192,14 @@ class GD_CORE_API EventsBasedObject: public AbstractEventsBasedEntity {
    * \brief Get the instances of the custom object.
    */
   gd::InitialInstancesContainer& GetInitialInstances() {
-    return defaultVariant.GetInitialInstances();
+    return initialInstances;
   }
 
   /**
    * \brief Get the instances of the custom object.
    */
   const gd::InitialInstancesContainer& GetInitialInstances() const {
-    return defaultVariant.GetInitialInstances();
+    return initialInstances;
   }
 
   /**
@@ -241,14 +210,14 @@ class GD_CORE_API EventsBasedObject: public AbstractEventsBasedEntity {
    * \see EventsBasedObject::GetInitialInstances
    */
   int GetAreaMinX() const {
-    return defaultVariant.GetAreaMinX();
+    return areaMinX;
   }
 
   /**
    * \brief Set the left bound of the custom object.
    */
-  void SetAreaMinX(int areaMinX) {
-    defaultVariant.SetAreaMinX(areaMinX);
+  void SetAreaMinX(int areaMinX_) {
+    areaMinX = areaMinX_;
   }
 
   /**
@@ -259,14 +228,14 @@ class GD_CORE_API EventsBasedObject: public AbstractEventsBasedEntity {
    * \see EventsBasedObject::GetInitialInstances
    */
   int GetAreaMinY() const {
-    return defaultVariant.GetAreaMinY();
+    return areaMinY;
   }
 
   /**
    * \brief Set the top bound of the custom object.
    */
-  void SetAreaMinY(int areaMinY) {
-    defaultVariant.SetAreaMinY(areaMinY);
+  void SetAreaMinY(int areaMinY_) {
+    areaMinY = areaMinY_;
   }
 
   /**
@@ -277,14 +246,14 @@ class GD_CORE_API EventsBasedObject: public AbstractEventsBasedEntity {
    * \see EventsBasedObject::GetInitialInstances
    */
   int GetAreaMinZ() const {
-    return defaultVariant.GetAreaMinZ();
+    return areaMinZ;
   }
 
   /**
    * \brief Set the min Z bound of the custom object.
    */
-  void SetAreaMinZ(int areaMinZ) {
-    defaultVariant.SetAreaMinZ(areaMinZ);
+  void SetAreaMinZ(int areaMinZ_) {
+    areaMinZ = areaMinZ_;
   }
 
   /**
@@ -295,14 +264,14 @@ class GD_CORE_API EventsBasedObject: public AbstractEventsBasedEntity {
    * \see EventsBasedObject::GetInitialInstances
    */
   int GetAreaMaxX() const {
-    return defaultVariant.GetAreaMaxX();
+    return areaMaxX;
   }
 
   /**
    * \brief Set the right bound of the custom object.
    */
-  void SetAreaMaxX(int areaMaxX) {
-    defaultVariant.SetAreaMaxX(areaMaxX);
+  void SetAreaMaxX(int areaMaxX_) {
+    areaMaxX = areaMaxX_;
   }
 
   /**
@@ -313,14 +282,14 @@ class GD_CORE_API EventsBasedObject: public AbstractEventsBasedEntity {
    * \see EventsBasedObject::GetInitialInstances
    */
   int GetAreaMaxY() const {
-    return defaultVariant.GetAreaMaxY();
+    return areaMaxY;
   }
 
   /**
    * \brief Set the bottom bound of the custom object.
    */
-  void SetAreaMaxY(int areaMaxY) {
-    defaultVariant.SetAreaMaxY(areaMaxY);
+  void SetAreaMaxY(int areaMaxY_) {
+    areaMaxY = areaMaxY_;
   }
 
   /**
@@ -331,22 +300,16 @@ class GD_CORE_API EventsBasedObject: public AbstractEventsBasedEntity {
    * \see EventsBasedObject::GetInitialInstances
    */
   int GetAreaMaxZ() const {
-    return defaultVariant.GetAreaMaxZ();
+    return areaMaxZ;
   }
 
   /**
    * \brief Set the bottom bound of the custom object.
    */
-  void SetAreaMaxZ(int areaMaxZ) {
-    defaultVariant.SetAreaMaxZ(areaMaxZ);
+  void SetAreaMaxZ(int areaMaxZ_) {
+    areaMaxZ = areaMaxZ_;
   }
   ///@}
-  
-  /**
-   * @brief Serialize the events-based object for an extension in an external file.
-   * Variants are not serialized.
-   */
-  void SerializeToExternal(SerializerElement& element) const;
 
   void SerializeTo(SerializerElement& element) const override;
 
@@ -360,8 +323,15 @@ class GD_CORE_API EventsBasedObject: public AbstractEventsBasedEntity {
   bool isTextContainer;
   bool isInnerAreaFollowingParentSize;
   bool isUsingLegacyInstancesRenderer;
-  gd::EventsBasedObjectVariant defaultVariant;
-  gd::EventsBasedObjectVariantsContainer variants;
+  gd::InitialInstancesContainer initialInstances;
+  gd::LayersContainer layers;
+  gd::ObjectsContainer objectsContainer;
+  double areaMinX;
+  double areaMinY;
+  double areaMinZ;
+  double areaMaxX;
+  double areaMaxY;
+  double areaMaxZ;
 };
 
 }  // namespace gd

Core/GDCore/Project/EventsBasedObjectVariant.cpp

@@ -1,71 +0,0 @@
-/*
- * GDevelop Core
- * Copyright 2008-2016 Florian Rival (Florian.Rival@gmail.com). All rights
- * reserved. This project is released under the MIT License.
- */
-#include "EventsBasedObjectVariant.h"
-#include "GDCore/Project/Object.h"
-#include "GDCore/Serialization/SerializerElement.h"
-
-namespace gd {
-
-EventsBasedObjectVariant::EventsBasedObjectVariant()
-    : areaMinX(0), areaMinY(0), areaMinZ(0), areaMaxX(64), areaMaxY(64),
-      areaMaxZ(64), objectsContainer(gd::ObjectsContainer::SourceType::Object) {
-}
-
-EventsBasedObjectVariant::~EventsBasedObjectVariant() {}
-
-void EventsBasedObjectVariant::SerializeTo(SerializerElement &element) const {
-  element.SetAttribute("name", name);
-  if (!GetAssetStoreAssetId().empty() && !GetAssetStoreOriginalName().empty()) {
-    element.SetAttribute("assetStoreAssetId", GetAssetStoreAssetId());
-    element.SetAttribute("assetStoreOriginalName", GetAssetStoreOriginalName());
-  }
-  element.SetIntAttribute("areaMinX", areaMinX);
-  element.SetIntAttribute("areaMinY", areaMinY);
-  element.SetIntAttribute("areaMinZ", areaMinZ);
-  element.SetIntAttribute("areaMaxX", areaMaxX);
-  element.SetIntAttribute("areaMaxY", areaMaxY);
-  element.SetIntAttribute("areaMaxZ", areaMaxZ);
-
-  objectsContainer.SerializeObjectsTo(element.AddChild("objects"));
-  objectsContainer.SerializeFoldersTo(
-      element.AddChild("objectsFolderStructure"));
-  objectsContainer.GetObjectGroups().SerializeTo(
-      element.AddChild("objectsGroups"));
-
-  layers.SerializeLayersTo(element.AddChild("layers"));
-  initialInstances.SerializeTo(element.AddChild("instances"));
-}
-
-void EventsBasedObjectVariant::UnserializeFrom(
-    gd::Project &project, const SerializerElement &element) {
-  name = element.GetStringAttribute("name");
-  assetStoreAssetId = element.GetStringAttribute("assetStoreAssetId");
-  assetStoreOriginalName = element.GetStringAttribute("assetStoreOriginalName");
-  areaMinX = element.GetIntAttribute("areaMinX", 0);
-  areaMinY = element.GetIntAttribute("areaMinY", 0);
-  areaMinZ = element.GetIntAttribute("areaMinZ", 0);
-  areaMaxX = element.GetIntAttribute("areaMaxX", 64);
-  areaMaxY = element.GetIntAttribute("areaMaxY", 64);
-  areaMaxZ = element.GetIntAttribute("areaMaxZ", 64);
-
-  objectsContainer.UnserializeObjectsFrom(project, element.GetChild("objects"));
-  if (element.HasChild("objectsFolderStructure")) {
-    objectsContainer.UnserializeFoldersFrom(
-        project, element.GetChild("objectsFolderStructure", 0));
-  }
-  objectsContainer.AddMissingObjectsInRootFolder();
-  objectsContainer.GetObjectGroups().UnserializeFrom(
-      element.GetChild("objectsGroups"));
-
-  if (element.HasChild("layers")) {
-    layers.UnserializeLayersFrom(element.GetChild("layers"));
-  } else {
-    layers.Reset();
-  }
-  initialInstances.UnserializeFrom(element.GetChild("instances"));
-}
-
-} // namespace gd

Core/GDCore/Project/EventsBasedObjectVariant.h

@@ -1,229 +0,0 @@
-/*
- * GDevelop Core
- * Copyright 2008-2025 Florian Rival (Florian.Rival@gmail.com). All rights
- * reserved. This project is released under the MIT License.
- */
-#pragma once
-
-#include "GDCore/Project/InitialInstancesContainer.h"
-#include "GDCore/Project/LayersContainer.h"
-#include "GDCore/Project/ObjectsContainer.h"
-#include "GDCore/String.h"
-#include <vector>
-
-namespace gd {
-class SerializerElement;
-class Project;
-} // namespace gd
-
-namespace gd {
-/**
- * \brief Represents a variation of style of an events-based object.
- *
- * \ingroup PlatformDefinition
- */
-class GD_CORE_API EventsBasedObjectVariant {
-public:
-  EventsBasedObjectVariant();
-  virtual ~EventsBasedObjectVariant();
-
-  /**
-   * \brief Return a pointer to a new EventsBasedObjectVariant constructed from
-   * this one.
-   */
-  EventsBasedObjectVariant *Clone() const {
-    return new EventsBasedObjectVariant(*this);
-  };
-
-  /**
-   * \brief Get the name of the variant.
-   */
-  const gd::String &GetName() const { return name; };
-
-  /**
-   * \brief Set the name of the variant.
-   */
-  EventsBasedObjectVariant &SetName(const gd::String &name_) {
-    name = name_;
-    return *this;
-  }
-
-  /** \name Layers
-   */
-  ///@{
-  /**
-   * \brief Get the layers of the variant.
-   */
-  const gd::LayersContainer &GetLayers() const { return layers; }
-
-  /**
-   * \brief Get the layers of the variant.
-   */
-  gd::LayersContainer &GetLayers() { return layers; }
-  ///@}
-
-  /** \name Child objects
-   */
-  ///@{
-  /**
-   * \brief Get the objects of the variant.
-   */
-  gd::ObjectsContainer &GetObjects() { return objectsContainer; }
-
-  /**
-   * \brief Get the objects of the variant.
-   */
-  const gd::ObjectsContainer &GetObjects() const { return objectsContainer; }
-  ///@}
-
-  /** \name Instances
-   */
-  ///@{
-  /**
-   * \brief Get the instances of the variant.
-   */
-  gd::InitialInstancesContainer &GetInitialInstances() {
-    return initialInstances;
-  }
-
-  /**
-   * \brief Get the instances of the variant.
-   */
-  const gd::InitialInstancesContainer &GetInitialInstances() const {
-    return initialInstances;
-  }
-
-  /**
-   * \brief Get the left bound of the variant.
-   *
-   * This is used only if there is any initial instances.
-   *
-   * \see EventsBasedObjectVariant::GetInitialInstances
-   */
-  int GetAreaMinX() const { return areaMinX; }
-
-  /**
-   * \brief Set the left bound of the variant.
-   */
-  void SetAreaMinX(int areaMinX_) { areaMinX = areaMinX_; }
-
-  /**
-   * \brief Get the top bound of the variant.
-   *
-   * This is used only if there is any initial instances.
-   *
-   * \see EventsBasedObjectVariant::GetInitialInstances
-   */
-  int GetAreaMinY() const { return areaMinY; }
-
-  /**
-   * \brief Set the top bound of the variant.
-   */
-  void SetAreaMinY(int areaMinY_) { areaMinY = areaMinY_; }
-
-  /**
-   * \brief Get the min Z bound of the variant.
-   *
-   * This is used only if there is any initial instances.
-   *
-   * \see EventsBasedObjectVariant::GetInitialInstances
-   */
-  int GetAreaMinZ() const { return areaMinZ; }
-
-  /**
-   * \brief Set the min Z bound of the variant.
-   */
-  void SetAreaMinZ(int areaMinZ_) { areaMinZ = areaMinZ_; }
-
-  /**
-   * \brief Get the right bound of the variant.
-   *
-   * This is used only if there is any initial instances.
-   *
-   * \see EventsBasedObjectVariant::GetInitialInstances
-   */
-  int GetAreaMaxX() const { return areaMaxX; }
-
-  /**
-   * \brief Set the right bound of the variant.
-   */
-  void SetAreaMaxX(int areaMaxX_) { areaMaxX = areaMaxX_; }
-
-  /**
-   * \brief Get the bottom bound of the variant.
-   *
-   * This is used only if there is any initial instances.
-   *
-   * \see EventsBasedObjectVariant::GetInitialInstances
-   */
-  int GetAreaMaxY() const { return areaMaxY; }
-
-  /**
-   * \brief Set the bottom bound of the variant.
-   */
-  void SetAreaMaxY(int areaMaxY_) { areaMaxY = areaMaxY_; }
-
-  /**
-   * \brief Get the max Z bound of the variant.
-   *
-   * This is used only if there is any initial instances.
-   *
-   * \see EventsBasedObjectVariant::GetInitialInstances
-   */
-  int GetAreaMaxZ() const { return areaMaxZ; }
-
-  /**
-   * \brief Set the bottom bound of the variant.
-   */
-  void SetAreaMaxZ(int areaMaxZ_) { areaMaxZ = areaMaxZ_; }
-  ///@}
-
-  /** \brief Change the object asset store id of this variant.
-   */
-  void SetAssetStoreAssetId(const gd::String &assetStoreId_) {
-    assetStoreAssetId = assetStoreId_;
-  };
-
-  /** \brief Return the object asset store id of this variant.
-   */
-  const gd::String &GetAssetStoreAssetId() const { return assetStoreAssetId; };
-
-  /** \brief Change the original name of the variant in the asset.
-   */
-  void SetAssetStoreOriginalName(const gd::String &assetStoreOriginalName_) {
-    assetStoreOriginalName = assetStoreOriginalName_;
-  };
-
-  /** \brief Return the original name of the variant in the asset.
-   */
-  const gd::String &GetAssetStoreOriginalName() const {
-    return assetStoreOriginalName;
-  };
-
-  void SerializeTo(SerializerElement &element) const;
-
-  void UnserializeFrom(gd::Project &project, const SerializerElement &element);
-
-private:
-  gd::String name;
-  gd::InitialInstancesContainer initialInstances;
-  gd::LayersContainer layers;
-  gd::ObjectsContainer objectsContainer;
-  double areaMinX;
-  double areaMinY;
-  double areaMinZ;
-  double areaMaxX;
-  double areaMaxY;
-  double areaMaxZ;
-  /**
-   * The ID of the asset if the object comes from the store.
-   */
-  gd::String assetStoreAssetId;
-  /**
-   * The original name of the variant in the asset if the object comes from the
-   * store.
-   */
-  gd::String assetStoreOriginalName;
-};
-
-} // namespace gd

Core/GDCore/Project/EventsBasedObjectVariantsContainer.h

@@ -1,160 +0,0 @@
-/*
- * GDevelop Core
- * Copyright 2008-present Florian Rival (Florian.Rival@gmail.com). All rights
- * reserved. This project is released under the MIT License.
- */
-#pragma once
-
-#include <vector>
-#include "GDCore/Project/EventsBasedObjectVariant.h"
-#include "GDCore/String.h"
-#include "GDCore/Tools/SerializableWithNameList.h"
-
-namespace gd {
-class SerializerElement;
-}
-
-namespace gd {
-
-/**
- * \brief Used as a base class for classes that will own events-backed
- * variants.
- *
- * \see gd::EventsBasedObjectVariantContainer
- * \ingroup PlatformDefinition
- */
-class GD_CORE_API EventsBasedObjectVariantsContainer
-    : private SerializableWithNameList<gd::EventsBasedObjectVariant> {
-public:
-  EventsBasedObjectVariantsContainer() {}
-
-  EventsBasedObjectVariantsContainer(const EventsBasedObjectVariantsContainer &other) {
-    Init(other);
-  }
-
-  EventsBasedObjectVariantsContainer &operator=(const EventsBasedObjectVariantsContainer &other) {
-    if (this != &other) {
-      Init(other);
-    }
-    return *this;
-  }
-
-  /** \name Events Functions management
-   */
-  ///@{
-  /**
-   * \brief Check if the variant with the specified name exists.
-   */
-  bool HasVariantNamed(const gd::String& name) const {
-    return Has(name);
-  }
-
-  /**
-   * \brief Get the variant with the specified name.
-   *
-   * \warning Trying to access to a not existing variant will result in
-   * undefined behavior.
-   */
-  gd::EventsBasedObjectVariant& GetVariant(const gd::String& name) {
-    return Get(name);
-  }
-
-  /**
-   * \brief Get the variant with the specified name.
-   *
-   * \warning Trying to access to a not existing variant will result in
-   * undefined behavior.
-   */
-  const gd::EventsBasedObjectVariant& GetVariant(const gd::String& name) const {
-    return Get(name);
-  }
-
-  /**
-   * \brief Get the variant at the specified index in the list.
-   *
-   * \warning Trying to access to a not existing variant will result in
-   * undefined behavior.
-   */
-  gd::EventsBasedObjectVariant& GetVariant(std::size_t index) {
-    return Get(index);
-  }
-
-  /**
-   * \brief Get the variant at the specified index in the list.
-   *
-   * \warning Trying to access to a not existing variant will result in
-   * undefined behavior.
-   */
-  const gd::EventsBasedObjectVariant& GetVariant(std::size_t index) const {
-    return Get(index);
-  }
-
-  /**
-   * \brief Return the number of variants.
-   */
-  std::size_t GetVariantsCount() const { return GetCount(); }
-
-  gd::EventsBasedObjectVariant& InsertNewVariant(const gd::String& name,
-                                              std::size_t position) {
-    return InsertNew(name, position);
-  }
-  gd::EventsBasedObjectVariant& InsertVariant(const gd::EventsBasedObjectVariant& object,
-                                           std::size_t position) {
-    return Insert(object, position);
-  }
-  void RemoveVariant(const gd::String& name) { return Remove(name); }
-  void ClearVariants() { return Clear(); }
-  void MoveVariant(std::size_t oldIndex, std::size_t newIndex) {
-    return Move(oldIndex, newIndex);
-  };
-  std::size_t GetVariantPosition(const gd::EventsBasedObjectVariant& eventsFunction) {
-    return GetPosition(eventsFunction);
-  };
-
-  /**
-   * \brief Provide a raw access to the vector containing the variants.
-   */
-  const std::vector<std::unique_ptr<gd::EventsBasedObjectVariant>>& GetInternalVector()
-      const {
-    return elements;
-  };
-
-  /**
-   * \brief Provide a raw access to the vector containing the variants.
-   */
-  std::vector<std::unique_ptr<gd::EventsBasedObjectVariant>>& GetInternalVector() {
-    return elements;
-  };
-  ///@}
-
-  /** \name Serialization
-   */
-  ///@{
-  /**
-   * \brief Serialize events variants.
-   */
-  void SerializeVariantsTo(SerializerElement& element) const {
-    return SerializeElementsTo("variant", element);
-  };
-
-  /**
-   * \brief Unserialize the events variants.
-   */
-  void UnserializeVariantsFrom(gd::Project& project,
-                                      const SerializerElement& element) {
-    return UnserializeElementsFrom("variant", project, element);
-  };
-  ///@}
- protected:
-  /**
-   * Initialize object using another object. Used by copy-ctor and assign-op.
-   * Don't forget to update me if members were changed!
-   */
-  void Init(const gd::EventsBasedObjectVariantsContainer& other) {
-    return SerializableWithNameList<gd::EventsBasedObjectVariant>::Init(other);
-  };
-
-private:
-};
-
-}  // namespace gd

Core/GDCore/Project/EventsFunctionsContainer.h

@@ -33,20 +33,6 @@ public:
 
   EventsFunctionsContainer(FunctionOwner source_) : owner(source_) {}
 
-  EventsFunctionsContainer(const EventsFunctionsContainer &other)
-      : owner(other.owner) {
-    Init(other);
-  }
-
-  EventsFunctionsContainer &operator=(const EventsFunctionsContainer &other) {
-    if (this != &other) {
-      owner = other.owner;
-      Init(other);
-    }
-
-    return *this;
-  }
-
   /**
    * \brief Get the source of the function container.
    * 

Core/GDCore/Project/EventsFunctionsExtension.cpp

@@ -15,13 +15,14 @@
 namespace gd {
 
 EventsFunctionsExtension::EventsFunctionsExtension() :
-      eventsFunctionsContainer(gd::EventsFunctionsContainer::FunctionOwner::Extension),
+    gd::EventsFunctionsContainer(
+        gd::EventsFunctionsContainer::FunctionOwner::Extension),
       globalVariables(gd::VariablesContainer::SourceType::ExtensionGlobal),
       sceneVariables(gd::VariablesContainer::SourceType::ExtensionScene) {}
 
 EventsFunctionsExtension::EventsFunctionsExtension(
     const EventsFunctionsExtension& other) :
-    eventsFunctionsContainer(
+    gd::EventsFunctionsContainer(
         gd::EventsFunctionsContainer::FunctionOwner::Extension) {
   Init(other);
 }
@@ -47,15 +48,14 @@ void EventsFunctionsExtension::Init(const gd::EventsFunctionsExtension& other) {
   previewIconUrl = other.previewIconUrl;
   iconUrl = other.iconUrl;
   helpPath = other.helpPath;
-  gdevelopVersion = other.gdevelopVersion;
-  eventsFunctionsContainer = other.eventsFunctionsContainer;
+  EventsFunctionsContainer::Init(other);
   eventsBasedBehaviors = other.eventsBasedBehaviors;
   eventsBasedObjects = other.eventsBasedObjects;
   globalVariables = other.GetGlobalVariables();
   sceneVariables = other.GetSceneVariables();
 }
 
-void EventsFunctionsExtension::SerializeTo(SerializerElement& element, bool isExternal) const {
+void EventsFunctionsExtension::SerializeTo(SerializerElement& element) const {
   element.SetAttribute("version", version);
   element.SetAttribute("extensionNamespace", extensionNamespace);
   element.SetAttribute("shortDescription", shortDescription);
@@ -82,38 +82,19 @@ void EventsFunctionsExtension::SerializeTo(SerializerElement& element, bool isEx
   element.SetAttribute("previewIconUrl", previewIconUrl);
   element.SetAttribute("iconUrl", iconUrl);
   element.SetAttribute("helpPath", helpPath);
-  element.SetAttribute("gdevelopVersion", gdevelopVersion);
   auto& dependenciesElement = element.AddChild("dependencies");
   dependenciesElement.ConsiderAsArray();
   for (auto& dependency : dependencies)
     SerializeDependencyTo(dependency, dependenciesElement.AddChild(""));
 
-  if (!sourceFiles.empty()) {
-    auto& sourceFilesElement = element.AddChild("sourceFiles");
-    sourceFilesElement.ConsiderAsArray();
-    for (auto& sourceFile : sourceFiles)
-      sourceFile.SerializeTo(sourceFilesElement.AddChild(""));
-  }
-
   GetGlobalVariables().SerializeTo(element.AddChild("globalVariables"));
   GetSceneVariables().SerializeTo(element.AddChild("sceneVariables"));
 
-  eventsFunctionsContainer.SerializeEventsFunctionsTo(
-      element.AddChild("eventsFunctions"));
+  SerializeEventsFunctionsTo(element.AddChild("eventsFunctions"));
   eventsBasedBehaviors.SerializeElementsTo(
       "eventsBasedBehavior", element.AddChild("eventsBasedBehaviors"));
-  if (isExternal) {
-    auto &eventsBasedObjectElement = element.AddChild("eventsBasedObjects");
-    eventsBasedObjectElement.ConsiderAsArrayOf("eventsBasedObject");
-    for (const auto &eventsBasedObject :
-         eventsBasedObjects.GetInternalVector()) {
-      eventsBasedObject->SerializeToExternal(
-          eventsBasedObjectElement.AddChild("eventsBasedObject"));
-    }
-  } else {
-    eventsBasedObjects.SerializeElementsTo(
-        "eventsBasedObject", element.AddChild("eventsBasedObjects"));
-  }
+  eventsBasedObjects.SerializeElementsTo(
+      "eventsBasedObject", element.AddChild("eventsBasedObjects"));
 }
 
 void EventsFunctionsExtension::UnserializeFrom(
@@ -138,7 +119,6 @@ void EventsFunctionsExtension::UnserializeExtensionDeclarationFrom(
   previewIconUrl = element.GetStringAttribute("previewIconUrl");
   iconUrl = element.GetStringAttribute("iconUrl");
   helpPath = element.GetStringAttribute("helpPath");
-  gdevelopVersion = element.GetStringAttribute("gdevelopVersion");
 
   if (element.HasChild("origin")) {
     gd::String originName =
@@ -179,17 +159,6 @@ void EventsFunctionsExtension::UnserializeExtensionDeclarationFrom(
     dependencies.push_back(
         UnserializeDependencyFrom(dependenciesElement.GetChild(i)));
 
-  sourceFiles.clear();
-  if (element.HasChild("sourceFiles")) {
-    const auto& sourceFilesElement = element.GetChild("sourceFiles");
-    sourceFilesElement.ConsiderAsArray();
-    for (size_t i = 0; i < sourceFilesElement.GetChildrenCount(); ++i) {
-      SourceFileMetadata sourceFile;
-      sourceFile.UnserializeFrom(sourceFilesElement.GetChild(i));
-      sourceFiles.push_back(sourceFile);
-    }
-  }
-
   globalVariables.UnserializeFrom(element.GetChild("globalVariables"));
   sceneVariables.UnserializeFrom(element.GetChild("sceneVariables"));
 
@@ -218,8 +187,7 @@ void EventsFunctionsExtension::UnserializeExtensionDeclarationFrom(
 void EventsFunctionsExtension::UnserializeExtensionImplementationFrom(
     gd::Project& project,
     const SerializerElement& element) {
-  eventsFunctionsContainer.UnserializeEventsFunctionsFrom(
-      project, element.GetChild("eventsFunctions"));
+  UnserializeEventsFunctionsFrom(project, element.GetChild("eventsFunctions"));
   eventsBasedBehaviors.UnserializeElementsFrom(
       "eventsBasedBehavior", project, element.GetChild("eventsBasedBehaviors"));
 

Core/GDCore/Project/EventsFunctionsExtension.h

@@ -8,7 +8,6 @@
 #include <vector>
 
 #include "GDCore/Extensions/Metadata/DependencyMetadata.h"
-#include "GDCore/Extensions/Metadata/SourceFileMetadata.h"
 #include "GDCore/Project/EventsBasedBehavior.h"
 #include "GDCore/Project/EventsBasedObject.h"
 #include "GDCore/Project/EventsFunctionsContainer.h"
@@ -36,7 +35,7 @@ namespace gd {
  *
  * \ingroup PlatformDefinition
  */
-class GD_CORE_API EventsFunctionsExtension {
+class GD_CORE_API EventsFunctionsExtension : public EventsFunctionsContainer {
  public:
   EventsFunctionsExtension();
   EventsFunctionsExtension(const EventsFunctionsExtension&);
@@ -134,19 +133,6 @@ class GD_CORE_API EventsFunctionsExtension {
     return *this;
   }
 
-  /**
-   * \brief Get the GDevelop version required by this extension.
-   */
-  const gd::String& GetGDevelopVersion() const { return gdevelopVersion; };
-
-  /**
-   * \brief Set the GDevelop version required by this extension.
-   */
-  EventsFunctionsExtension& SetGDevelopVersion(const gd::String& gdevelopVersion_) {
-    gdevelopVersion = gdevelopVersion_;
-    return *this;
-  }
-
   /**
    * \brief Return a reference to the list of the events based behaviors.
    */
@@ -194,21 +180,6 @@ class GD_CORE_API EventsFunctionsExtension {
     return originIdentifier;
   }
 
-  /**
-   * \brief Return a reference to the functions of the events based behavior or object.
-   */
-  EventsFunctionsContainer& GetEventsFunctions() {
-    return eventsFunctionsContainer;
-  }
-
-  /**
-   * \brief Return a const reference to the functions of the events based
-   * behavior or object.
-   */
-  const EventsFunctionsContainer& GetEventsFunctions() const {
-    return eventsFunctionsContainer;
-  }
-
   /** \name Dependencies
    */
   ///@{
@@ -286,14 +257,7 @@ class GD_CORE_API EventsFunctionsExtension {
   /**
    * \brief Serialize the EventsFunctionsExtension to the specified element
    */
-  void SerializeTo(gd::SerializerElement& element, bool isExternal = false) const;
-
-  /**
-   * \brief Serialize the EventsFunctionsExtension to the specified element
-   */
-  void SerializeToExternal(gd::SerializerElement& element) const {
-    SerializeTo(element, true);
-  }
+  void SerializeTo(gd::SerializerElement& element) const;
 
   /**
    * \brief Load the EventsFunctionsExtension from the specified element.
@@ -325,42 +289,6 @@ class GD_CORE_API EventsFunctionsExtension {
       const gd::String& eventsFunctionName);
   ///@}
 
-  /** \name Source files
-   */
-  ///@{
-
-  /**
-   * \brief Adds a new source file.
-   */
-  gd::SourceFileMetadata& AddSourceFile() {
-    gd::SourceFileMetadata sourceFile;
-    sourceFiles.push_back(sourceFile);
-    return sourceFiles.back();
-  };
-
-  /**
-   * \brief Removes a source file.
-   */
-  void RemoveSourceFileAt(size_t index) {
-    sourceFiles.erase(sourceFiles.begin() + index);
-  };
-
-  /**
-   * \brief Returns the list of source files.
-   */
-  std::vector<gd::SourceFileMetadata>& GetAllSourceFiles() {
-    return sourceFiles;
-  };
-
-  /**
-   * \brief Returns the list of source files.
-   */
-  const std::vector<gd::SourceFileMetadata>& GetAllSourceFiles() const {
-    return sourceFiles;
-  };
-
-  ///@}
-
  private:
   /**
    * Initialize object using another object. Used by copy-ctor and assign-op.
@@ -405,13 +333,10 @@ class GD_CORE_API EventsFunctionsExtension {
   gd::String iconUrl;
   gd::String helpPath;  ///< The relative path to the help for this extension in
                         ///< the documentation (or an absolute URL).
-  gd::String gdevelopVersion;
   gd::SerializableWithNameList<EventsBasedBehavior> eventsBasedBehaviors;
   gd::SerializableWithNameList<EventsBasedObject> eventsBasedObjects;
   std::vector<gd::DependencyMetadata> dependencies;
-  std::vector<gd::SourceFileMetadata> sourceFiles;
-
-  gd::EventsFunctionsContainer eventsFunctionsContainer;
+  
   gd::VariablesContainer globalVariables;
   gd::VariablesContainer sceneVariables;
 };

Core/GDCore/Project/InitialInstancesContainer.cpp

@@ -41,16 +41,6 @@ void InitialInstancesContainer::IterateOverInstances(
   for (auto& instance : initialInstances) func(instance);
 }
 
-void InitialInstancesContainer::IterateOverInstances(
-  const std::function< bool(gd::InitialInstance &) >& func) {
-  for (auto& instance : initialInstances) {
-    bool shouldStop = func(instance);
-    if (shouldStop) {
-      return;
-    }
-  }
-}
-
 void InitialInstancesContainer::IterateOverInstancesWithZOrdering(
     gd::InitialInstanceFunctor& func, const gd::String& layerName) {
   std::vector<std::reference_wrapper<gd::InitialInstance>> sortedInstances;

Core/GDCore/Project/InitialInstancesContainer.h

@@ -87,13 +87,6 @@ class GD_CORE_API InitialInstancesContainer {
    */
   void IterateOverInstances(InitialInstanceFunctor &func);
 
-  /**
-   * \brief Apply \a func to each instance of the container.
-   * \see InitialInstanceFunctor
-   */
-  void IterateOverInstances(
-    const std::function< bool(gd::InitialInstance &) >& func);
-
   /**
    * Get the instances on the specified layer,
    * sort them regarding their Z order and then apply \a func on them.

Core/GDCore/Project/Layer.cpp

@@ -15,7 +15,6 @@ Camera Layer::badCamera;
 
 Layer::Layer()
     : renderingType(""),
-      defaultCameraBehavior("top-left-anchored-if-never-moved"),
       isVisible(true),
       isLocked(false),
       isLightingLayer(false),
@@ -41,9 +40,6 @@ void Layer::SerializeTo(SerializerElement& element) const {
   element.SetAttribute("name", GetName());
   element.SetAttribute("renderingType", GetRenderingType());
   element.SetAttribute("cameraType", GetCameraType());
-  if (GetDefaultCameraBehavior() != "top-left-anchored-if-never-moved") {
-    element.SetAttribute("defaultCameraBehavior", GetDefaultCameraBehavior());
-  }
   element.SetAttribute("visibility", GetVisibility());
   element.SetAttribute("isLocked", IsLocked());
   element.SetAttribute("isLightingLayer", IsLightingLayer());
@@ -84,7 +80,6 @@ void Layer::UnserializeFrom(const SerializerElement& element) {
   SetName(element.GetStringAttribute("name", "", "Name"));
   SetRenderingType(element.GetStringAttribute("renderingType", ""));
   SetCameraType(element.GetStringAttribute("cameraType", "perspective"));
-  SetDefaultCameraBehavior(element.GetStringAttribute("defaultCameraBehavior", "top-left-anchored-if-never-moved"));
   SetVisibility(element.GetBoolAttribute("visibility", true, "Visibility"));
   SetLocked(element.GetBoolAttribute("isLocked", false));
   SetLightingLayer(element.GetBoolAttribute("isLightingLayer", false));

Core/GDCore/Project/Layer.h

@@ -109,12 +109,6 @@ class GD_CORE_API Layer {
     renderingType = renderingType_;
   }
 
-  const gd::String& GetDefaultCameraBehavior() const { return defaultCameraBehavior; }
-
-  void SetDefaultCameraBehavior(const gd::String& defaultCameraBehavior_) {
-    defaultCameraBehavior = defaultCameraBehavior_;
-  }
-
   const gd::String& GetCameraType() const { return cameraType; }
 
   void SetCameraType(const gd::String& cameraType_) {
@@ -281,7 +275,6 @@ class GD_CORE_API Layer {
   gd::String name;           ///< The name of the layer
   gd::String renderingType;  ///< The rendering type: "" (empty), "2d", "3d" or
                              ///< "2d+3d".
-  gd::String defaultCameraBehavior;
   gd::String cameraType;
   bool isVisible;            ///< True if the layer is visible
   bool isLocked;             ///< True if the layer is locked

Core/GDCore/Project/Layout.cpp

@@ -36,10 +36,7 @@ namespace gd {
 
 gd::BehaviorsSharedData Layout::badBehaviorSharedData("", "");
 
-Layout::Layout(const Layout &other)
-    : objectsContainer(gd::ObjectsContainer::SourceType::Scene) {
-  Init(other);
-}
+Layout::Layout(const Layout& other) { Init(other); }
 
 Layout& Layout::operator=(const Layout& other) {
   if (this != &other) Init(other);
@@ -56,8 +53,7 @@ Layout::Layout()
       stopSoundsOnStartup(true),
       standardSortMethod(true),
       disableInputWhenNotFocused(true),
-      variables(gd::VariablesContainer::SourceType::Scene),
-      objectsContainer(gd::ObjectsContainer::SourceType::Scene) {}
+      variables(gd::VariablesContainer::SourceType::Scene) {}
 
 void Layout::SetName(const gd::String& name_) {
   name = name_;

Core/GDCore/Project/Object.cpp

@@ -41,11 +41,6 @@ Object::Object(const gd::String& name_,
 }
 
 void Object::Init(const gd::Object& object) {
-  CopyWithoutConfiguration(object);
-  configuration = object.configuration->Clone();
-}
-
-void Object::CopyWithoutConfiguration(const gd::Object& object) {
   persistentUuid = object.persistentUuid;
   name = object.name;
   assetStoreId = object.assetStoreId;
@@ -56,6 +51,8 @@ void Object::CopyWithoutConfiguration(const gd::Object& object) {
   for (auto& it : object.behaviors) {
     behaviors[it.first] = gd::make_unique<gd::Behavior>(*it.second);
   }
+
+  configuration = object.configuration->Clone();
 }
 
 gd::ObjectConfiguration& Object::GetConfiguration() { return *configuration; }

Core/GDCore/Project/Object.h

@@ -82,8 +82,6 @@ class GD_CORE_API Object {
     return gd::make_unique<gd::Object>(*this);
   }
 
-  void CopyWithoutConfiguration(const gd::Object& object);
-
   /**
    * \brief Return the object configuration.
    */

Core/GDCore/Project/ObjectFolderOrObject.cpp

@@ -137,15 +137,6 @@ void ObjectFolderOrObject::RemoveRecursivelyObjectNamed(
   }
 };
 
-void ObjectFolderOrObject::Clear() {
-  if (IsFolder()) {
-    for (auto& it : children) {
-      it->Clear();
-    }
-    children.clear();
-  }
-};
-
 bool ObjectFolderOrObject::IsADescendantOf(
     const ObjectFolderOrObject& otherObjectFolderOrObject) {
   if (parent == nullptr) return false;