Fix usage displayer (#6441)

* Fix wrong logic for usage displayer

* Bump version too

.circleci/config.yml

@@ -30,7 +30,7 @@ jobs:
 
       - run:
           name: Install Emscripten (for GDevelop.js)
-          command: git clone https://github.com/juj/emsdk.git && cd emsdk && ./emsdk install 1.39.6 && ./emsdk activate 1.39.6 && cd ..
+          command: git clone https://github.com/juj/emsdk.git && cd emsdk && ./emsdk install 3.1.21 && ./emsdk activate 3.1.21 && cd ..
 
       # GDevelop.js dependencies
       - restore_cache:
@@ -62,9 +62,10 @@ jobs:
 
       # Build GDevelop IDE (seems like we need to allow Node.js to use more space than usual)
       # Note: Code signing is done using CSC_LINK (see https://www.electron.build/code-signing).
+      # To test signing the code in the CI, add "export CSC_FOR_PULL_REQUEST=true && " before the command.
       - run:
           name: Build GDevelop IDE
-          command: export NODE_OPTIONS="--max-old-space-size=7168" && cd newIDE/electron-app && CI=false npm run build -- --mac --publish=never
+          command: export CSC_FOR_PULL_REQUEST=true && export NODE_OPTIONS="--max-old-space-size=7168" && cd newIDE/electron-app && CI=false npm run build -- --mac --publish=never
 
       - run:
           name: Clean dist folder to keep only installers/binaries.
@@ -106,7 +107,7 @@ jobs:
 
       - run:
           name: Install Emscripten (for GDevelop.js)
-          command: git clone https://github.com/juj/emsdk.git && cd emsdk && ./emsdk install 1.39.6 && ./emsdk activate 1.39.6 && cd ..
+          command: git clone https://github.com/juj/emsdk.git && cd emsdk && ./emsdk install 3.1.21 && ./emsdk activate 3.1.21 && cd ..
 
       - run:
           name: Install system dependencies for Electron builder
@@ -126,7 +127,8 @@ jobs:
       # Build GDevelop.js (and run tests to ensure it works)
       - run:
           name: Build GDevelop.js
-          command: cd GDevelop.js && source ../emsdk/emsdk_env.sh && npm run build && npm test && cd ..
+          # Use "--runInBand" as it's faster and avoid deadlocks on CircleCI Linux machines (probably because limited in processes number).
+          command: cd GDevelop.js && source ../emsdk/emsdk_env.sh && npm run build && npm test -- --runInBand && cd ..
 
       # GDevelop IDE dependencies (after building GDevelop.js to avoid downloading a pre-built version)
       - run:
@@ -183,7 +185,7 @@ jobs:
 
       - run:
           name: Install Emscripten (for GDevelop.js)
-          command: git clone https://github.com/juj/emsdk.git && cd emsdk && ./emsdk install 1.39.6 && ./emsdk activate 1.39.6 && cd ..
+          command: git clone https://github.com/juj/emsdk.git && cd emsdk && ./emsdk install 3.1.21 && ./emsdk activate 3.1.21 && cd ..
 
       # GDevelop.js dependencies
       - restore_cache:
@@ -199,7 +201,8 @@ jobs:
       # Build GDevelop.js (and run tests to ensure it works)
       - run:
           name: Build GDevelop.js
-          command: cd GDevelop.js && source ../emsdk/emsdk_env.sh && npm run build && npm test && cd ..
+          # Use "--runInBand" as it's faster and avoid deadlocks on CircleCI Linux machines (probably because limited in processes number).
+          command: cd GDevelop.js && source ../emsdk/emsdk_env.sh && npm run build && npm test -- --runInBand && cd ..
 
       - save_cache:
           paths:

.github/ISSUE_TEMPLATE/--automatic-crash.yml

@@ -0,0 +1,37 @@
+name: 💥 Automatic crash report
+description: Do not use this template for bug reports. This template is only for automatic crash reports.
+body:
+  - type: textarea
+    id: description
+    attributes:
+      label: Describe what you were doing when the crash happened
+      description: If applicable, add screenshots to help explain your problem.
+      placeholder: |
+        1. Went to '...'
+        2. Clicked on '...'
+        3. Scrolled down to '...'
+        4. Saw error
+  - type: input
+    id: gdevelop_version
+    attributes:
+      label: GDevelop version
+      description: |
+        The version of GDevelop used. Leave the prefilled value.
+    validations:
+      required: true
+  - type: textarea
+    id: platform_info
+    attributes:
+      label: Platform info
+      description: |
+        The platform you are using GDevelop on. Leave the prefilled value.
+  - type: textarea
+    id: error_stack
+    attributes:
+      label: Additional error context
+      description: Additonal context about the problem. Leave the prefilled value.
+  - type: textarea
+    id: component_stack
+    attributes:
+      label: Additional component context
+      description: Additonal context about the problem. Leave the prefilled value.

.github/ISSUE_TEMPLATE/--bug-report.yml

@@ -2,18 +2,21 @@ name: 🐛Bug report
 description: Create a bug report about GDevelop or the game engine
 body:
   - type: checkboxes
+    id: searched_issues
     attributes:
       label: Is there an existing issue for this?
       options:
         - label: I have searched the [existing issues](https://github.com/4ian/GDevelop/issues)
           required: true
   - type: textarea
+    id: description
     attributes:
       label: Describe the bug
       description: A clear and concise description of what the bug is.
     validations:
       required: true
   - type: textarea
+    id: reproduction_steps
     attributes:
       label: Steps to reproduce
       description: |
@@ -27,6 +30,7 @@ body:
     validations:
       required: true
   - type: dropdown
+    id: platform
     attributes:
       label: GDevelop platform
       description: Which platform of GDevelop are you using?
@@ -38,6 +42,7 @@ body:
     validations:
       required: true
   - type: input
+    id: gdevelop_version
     attributes:
       label: GDevelop version
       description: |
@@ -47,6 +52,7 @@ body:
     validations:
       required: true
   - type: textarea
+    id: platform_info
     attributes:
       label: Platform info
       value: |
@@ -66,6 +72,7 @@ body:
 
         </details>
   - type: textarea
+    id: additional_context
     attributes:
       label: Additional context
       description: Add any other context about the problem here.

.github/workflows/extract-translations.yml

@@ -26,7 +26,7 @@ jobs:
         run: sudo apt update && sudo apt install gettext -y
 
       - name: Install newIDE dependencies
-        run: npm install
+        run: npm ci
         working-directory: newIDE/app
 
       - name: Extract translations

.github/workflows/update-translations.yml

@@ -19,7 +19,7 @@ jobs:
       - uses: actions/checkout@v3
       - uses: actions/setup-node@v3
         with:
-          node-version: 16
+          node-version: 20
           cache: "npm"
           cache-dependency-path: "newIDE/app/package-lock.json"
 
@@ -58,7 +58,7 @@ jobs:
         working-directory: newIDE/app
 
       - name: Create a Pull Request with the changes
-        uses: peter-evans/create-pull-request@v5
+        uses: peter-evans/create-pull-request@v6
         with:
           commit-message: Update translations [skip ci]
           branch: chore/update-translations

.gitpod.yml

@@ -14,7 +14,7 @@ tasks:
     init: |
           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 1.39.6 && ./emsdk activate 1.39.6 && cd ..
+          git clone https://github.com/juj/emsdk.git && cd emsdk && ./emsdk install 3.1.21 && ./emsdk activate 3.1.21 && cd ..
           cd GDevelop.js
           npm install
           source ../emsdk/emsdk_env.sh && npm run build -- --dev

.travis.yml

@@ -39,7 +39,7 @@ install:
   - cd ..
 # Install Emscripten (for GDevelop.js)
   - git clone https://github.com/juj/emsdk.git
-  - cd emsdk && ./emsdk install 1.39.6 && ./emsdk activate 1.39.6 && cd ..
+  - cd emsdk && ./emsdk install 3.1.21 && ./emsdk activate 3.1.21 && cd ..
 # Install GDevelop.js dependencies
   - cd GDevelop.js && npm install && cd ..
 # Build GDevelop.js

.vscode/settings.json

@@ -113,7 +113,8 @@
     "memory_resource": "cpp",
     "__bits": "cpp",
     "__verbose_abort": "cpp",
-    "variant": "cpp"
+    "variant": "cpp",
+    "charconv": "cpp"
   },
   "files.exclude": {
     "Binaries/*build*": true,

CMakeLists.txt

@@ -60,7 +60,7 @@ if("${CMAKE_BUILD_TYPE}" STREQUAL "Release" AND NOT WIN32 AND CMAKE_COMPILER_IS_
 endif()
 
 #Activate C++11
-set(CMAKE_CXX_STANDARD 11)
+set(CMAKE_CXX_STANDARD 11) # Upgrading to C++17 would need to remove usage of bind2nd (should be easy).
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
 
 # Mark some warnings as errors
@@ -77,7 +77,8 @@ if(CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
 		-Wno-unused-private-field
 
 		# Make as much warnings considered as errors as possible (only one for now).
-		-Werror=return-stack-address)
+		-Werror=return-stack-address
+		-Werror=return-type)
 endif()
 
 # Define common directories:

Core/GDCore/Events/Builtin/ForEachChildVariableEvent.cpp

@@ -45,10 +45,39 @@ ForEachChildVariableEvent::GetAllActionsVectors() const {
   return allActions;
 }
 
+vector<pair<gd::Expression*, gd::ParameterMetadata> >
+    ForEachChildVariableEvent::GetAllExpressionsWithMetadata() {
+  vector<pair<gd::Expression*, gd::ParameterMetadata> >
+      allExpressionsWithMetadata;
+  auto metadata = gd::ParameterMetadata().SetType("scenevar");
+  allExpressionsWithMetadata.push_back(
+      std::make_pair(&iterableVariableName, metadata));
+  allExpressionsWithMetadata.push_back(
+      std::make_pair(&valueIteratorVariableName, metadata));
+  allExpressionsWithMetadata.push_back(
+      std::make_pair(&keyIteratorVariableName, metadata));
+
+  return allExpressionsWithMetadata;
+}
+vector<pair<const gd::Expression*, const gd::ParameterMetadata> >
+    ForEachChildVariableEvent::GetAllExpressionsWithMetadata() const {
+  vector<pair<const gd::Expression*, const gd::ParameterMetadata> >
+      allExpressionsWithMetadata;
+  auto metadata = gd::ParameterMetadata().SetType("scenevar");
+  allExpressionsWithMetadata.push_back(
+      std::make_pair(&iterableVariableName, metadata));
+  allExpressionsWithMetadata.push_back(
+      std::make_pair(&valueIteratorVariableName, metadata));
+  allExpressionsWithMetadata.push_back(
+      std::make_pair(&keyIteratorVariableName, metadata));
+
+  return allExpressionsWithMetadata;
+}
+
 void ForEachChildVariableEvent::SerializeTo(SerializerElement& element) const {
-  element.AddChild("iterableVariableName").SetValue(iterableVariableName);
-  element.AddChild("valueIteratorVariableName").SetValue(valueIteratorVariableName);
-  element.AddChild("keyIteratorVariableName").SetValue(keyIteratorVariableName);
+  element.AddChild("iterableVariableName").SetValue(iterableVariableName.GetPlainString());
+  element.AddChild("valueIteratorVariableName").SetValue(valueIteratorVariableName.GetPlainString());
+  element.AddChild("keyIteratorVariableName").SetValue(keyIteratorVariableName.GetPlainString());
   gd::EventsListSerialization::SerializeInstructionsTo(
       conditions, element.AddChild("conditions"));
   gd::EventsListSerialization::SerializeInstructionsTo(

Core/GDCore/Events/Builtin/ForEachChildVariableEvent.h

@@ -8,6 +8,7 @@
 #define FOREACHCHILDVARIABLEEVENT_H
 #include "GDCore/Events/Event.h"
 #include "GDCore/Events/EventsList.h"
+#include "GDCore/Events/Expression.h"
 namespace gd {
 class Instruction;
 class Project;
@@ -44,7 +45,7 @@ class GD_CORE_API ForEachChildVariableEvent : public gd::BaseEvent {
    *
    * It is the structure variable that will be iterated on.
    */
-  const gd::String& GetIterableVariableName() const { return iterableVariableName; };
+  const gd::String& GetIterableVariableName() const { return iterableVariableName.GetPlainString(); };
 
   /**
    * \brief Set the iterable variable name attached to the event.
@@ -59,7 +60,7 @@ class GD_CORE_API ForEachChildVariableEvent : public gd::BaseEvent {
    * It is the variable that will contain the value of the
    * iterable's child being iterated on.
    */
-  const gd::String& GetValueIteratorVariableName() const { return valueIteratorVariableName; };
+  const gd::String& GetValueIteratorVariableName() const { return valueIteratorVariableName.GetPlainString(); };
 
   /**
    * \brief Set the value iterator variable attached to the event.
@@ -75,7 +76,7 @@ class GD_CORE_API ForEachChildVariableEvent : public gd::BaseEvent {
    * It is the variable that will contain the name of the
    * iterable's child being iterated on.
    */
-  const gd::String& GetKeyIteratorVariableName() const { return keyIteratorVariableName; };
+  const gd::String& GetKeyIteratorVariableName() const { return keyIteratorVariableName.GetPlainString(); };
 
   /**
    * \brief Set the key iterator variable attached to the event.
@@ -92,14 +93,19 @@ class GD_CORE_API ForEachChildVariableEvent : public gd::BaseEvent {
   virtual std::vector<gd::InstructionsList*> GetAllConditionsVectors();
   virtual std::vector<gd::InstructionsList*> GetAllActionsVectors();
 
+  virtual std::vector<std::pair<const gd::Expression*, const gd::ParameterMetadata> >
+        GetAllExpressionsWithMetadata() const;
+  virtual std::vector<std::pair<gd::Expression*, gd::ParameterMetadata> >
+        GetAllExpressionsWithMetadata();
+
   virtual void SerializeTo(SerializerElement& element) const;
   virtual void UnserializeFrom(gd::Project& project,
                                const SerializerElement& element);
 
  private:
-  gd::String valueIteratorVariableName;
-  gd::String keyIteratorVariableName;
-  gd::String iterableVariableName;
+  gd::Expression valueIteratorVariableName;
+  gd::Expression keyIteratorVariableName;
+  gd::Expression iterableVariableName;
   gd::InstructionsList conditions;
   gd::InstructionsList actions;
   gd::EventsList events;

Core/GDCore/Events/Builtin/ForEachEvent.h

@@ -64,12 +64,6 @@ class GD_CORE_API ForEachEvent : public gd::BaseEvent {
   virtual void UnserializeFrom(gd::Project& project,
                                const SerializerElement& element);
 
-  std::vector<gd::Expression*> GetAllObjectExpressions() {
-    std::vector<gd::Expression*> allObjectExpressions;
-    allObjectExpressions.push_back(&objectsToPick);
-    return allObjectExpressions;
-  }
-
  private:
   gd::Expression objectsToPick;
   gd::InstructionsList conditions;

Core/GDCore/Events/Builtin/LinkEvent.cpp

@@ -131,10 +131,11 @@ void LinkEvent::SerializeTo(SerializerElement& element) const {
 
 void LinkEvent::UnserializeFrom(gd::Project& project,
                                 const SerializerElement& element) {
-  SerializerElement& includeElement = element.GetChild("include", 0, "Limites");
-
   SetTarget(element.GetChild("target", 0, "Scene").GetValue().GetString());
 
+  // Compatibility with GD <= 5
+  if (element.HasChild("include", "Limites")) {
+    SerializerElement& includeElement = element.GetChild("include", 0, "Limites");
     if (includeElement.HasAttribute("includeAll")) {
       // Compatibility with GDevelop <= 4.0.92
       if (includeElement.GetBoolAttribute("includeAll", true)) {
@@ -155,10 +156,15 @@ void LinkEvent::UnserializeFrom(gd::Project& project,
         SetIncludeStartAndEnd(includeElement.GetIntAttribute("start"),
                               includeElement.GetIntAttribute("end"));
     }
+  } else {
+    // Since GDevelop 5, links always include all events.
+    SetIncludeAllEvents();
+  }
+  // end of compatibility code
 }
 
 bool LinkEvent::AcceptVisitor(gd::EventVisitor &eventVisitor) {
-  return BaseEvent::AcceptVisitor(eventVisitor) |
+  return BaseEvent::AcceptVisitor(eventVisitor) ||
          eventVisitor.VisitLinkEvent(*this);
 }
 

Core/GDCore/Events/Builtin/RepeatEvent.cpp

@@ -35,7 +35,7 @@ vector<pair<gd::Expression*, gd::ParameterMetadata> >
     RepeatEvent::GetAllExpressionsWithMetadata() {
   vector<pair<gd::Expression*, gd::ParameterMetadata> >
       allExpressionsWithMetadata;
-  auto metadata = gd::ParameterMetadata().SetType("expression");
+  auto metadata = gd::ParameterMetadata().SetType("number");
   allExpressionsWithMetadata.push_back(
       std::make_pair(&repeatNumberExpression, metadata));
 
@@ -61,7 +61,7 @@ vector<pair<const gd::Expression*, const gd::ParameterMetadata> >
     RepeatEvent::GetAllExpressionsWithMetadata() const {
   vector<pair<const gd::Expression*, const gd::ParameterMetadata> >
       allExpressionsWithMetadata;
-  auto metadata = gd::ParameterMetadata().SetType("expression");
+  auto metadata = gd::ParameterMetadata().SetType("number");
   allExpressionsWithMetadata.push_back(
       std::make_pair(&repeatNumberExpression, metadata));
 

Core/GDCore/Events/CodeGeneration/EffectsCodeGenerator.cpp

@@ -46,10 +46,6 @@ void EffectsCodeGenerator::GenerateEffectsIncludeFiles(
   // TODO Add unit tests on this function.
   
   // TODO Merge with UsedExtensionsFinder.
-  // Default lights rely on the fact that UsedExtensionsFinder doesn't find
-  // extension usages for effects. This has the happy side effect of not
-  // including Three.js when no 3D object are in the scenes.
-  // We need to make something explicit to avoid future bugs.
 
   // See also gd::Project::ExposeResources for a method that traverse the whole
   // project (this time for resources) and

Core/GDCore/Events/CodeGeneration/EventsCodeGenerator.cpp

@@ -16,6 +16,7 @@
 #include "GDCore/Extensions/PlatformExtension.h"
 #include "GDCore/Project/Layout.h"
 #include "GDCore/Project/ObjectsContainer.h"
+#include "GDCore/Project/ObjectsContainersList.h"
 #include "GDCore/Project/Project.h"
 
 using namespace std;
@@ -68,8 +69,36 @@ gd::String EventsCodeGenerator::GenerateRelationalOperatorCall(
     }
   }
 
-  return callStartString + "(" + argumentsStr + ") " + relationalOperator +
-         " " + rhs;
+  auto lhs = callStartString + "(" + argumentsStr + ")";
+  return GenerateRelationalOperation(relationalOperator, lhs, rhs);
+}
+
+/**
+ * @brief Generate a relational operation
+ * 
+ * @param relationalOperator the operator
+ * @param lhs the left hand operand
+ * @param rhs the right hand operand
+ * @return gd::String 
+ */
+gd::String EventsCodeGenerator::GenerateRelationalOperation(
+    const gd::String& relationalOperator,
+    const gd::String& lhs,
+    const gd::String& rhs) {
+  return lhs + " " + GenerateRelationalOperatorCodes(relationalOperator) + " " + rhs;
+}
+
+const gd::String EventsCodeGenerator::GenerateRelationalOperatorCodes(const gd::String &operatorString) {
+    if (operatorString == "=") {
+        return "==";
+    }
+    if (operatorString != "<" && operatorString != ">" &&
+        operatorString != "<=" && operatorString != ">=" && operatorString != "!=" &&
+        operatorString != "startsWith" && operatorString != "endsWith" && operatorString != "contains") {
+      cout << "Warning: Bad relational operator: Set to == by default." << endl;
+      return "==";
+    }
+    return operatorString;
 }
 
 /**
@@ -295,16 +324,10 @@ gd::String EventsCodeGenerator::GenerateConditionCode(
       gd::String objectInParameter =
           condition.GetParameter(pNb).GetPlainString();
 
-      if (!GetObjectsAndGroups().HasObjectNamed(objectInParameter) &&
-          !GetGlobalObjectsAndGroups().HasObjectNamed(objectInParameter) &&
-          !GetObjectsAndGroups().GetObjectGroups().Has(objectInParameter) &&
-          !GetGlobalObjectsAndGroups().GetObjectGroups().Has(
-              objectInParameter)) {
+      if (!GetObjectsContainersList().HasObjectOrGroupNamed(objectInParameter)) {
         return "/* Unknown object - skipped. */";
       } else if (!instrInfos.parameters[pNb].GetExtraInfo().empty() &&
-                 gd::GetTypeOfObject(GetGlobalObjectsAndGroups(),
-                                     GetObjectsAndGroups(),
-                                     objectInParameter) !=
+                GetObjectsContainersList().GetTypeOfObject(objectInParameter) !=
                      instrInfos.parameters[pNb].GetExtraInfo()) {
         return "/* Mismatched object type - skipped. */";
       }
@@ -315,11 +338,10 @@ gd::String EventsCodeGenerator::GenerateConditionCode(
     gd::String objectName = condition.GetParameter(0).GetPlainString();
     if (!objectName.empty() && !instrInfos.parameters.empty()) {
       std::vector<gd::String> realObjects =
-          ExpandObjectsName(objectName, context);
+          GetObjectsContainersList().ExpandObjectName(objectName, context.GetCurrentObject());
       for (std::size_t i = 0; i < realObjects.size(); ++i) {
         // Set up the context
-        gd::String objectType = gd::GetTypeOfObject(
-            GetGlobalObjectsAndGroups(), GetObjectsAndGroups(), realObjects[i]);
+        gd::String objectType = GetObjectsContainersList().GetTypeOfObject(realObjects[i]);
         const ObjectMetadata& objInfo =
             MetadataProvider::GetObjectMetadata(platform, objectType);
 
@@ -343,13 +365,10 @@ gd::String EventsCodeGenerator::GenerateConditionCode(
     }
   } else if (instrInfos.IsBehaviorInstruction()) {
     gd::String objectName = condition.GetParameter(0).GetPlainString();
-    gd::String behaviorType =
-        gd::GetTypeOfBehavior(GetGlobalObjectsAndGroups(),
-                              GetObjectsAndGroups(),
-                              condition.GetParameter(1).GetPlainString());
+    gd::String behaviorType = GetObjectsContainersList().GetTypeOfBehavior(condition.GetParameter(1).GetPlainString());
     if (instrInfos.parameters.size() >= 2) {
       std::vector<gd::String> realObjects =
-          ExpandObjectsName(objectName, context);
+          GetObjectsContainersList().ExpandObjectName(objectName, context.GetCurrentObject());
       for (std::size_t i = 0; i < realObjects.size(); ++i) {
         // Setup context
         const BehaviorMetadata& autoInfo =
@@ -479,16 +498,10 @@ gd::String EventsCodeGenerator::GenerateActionCode(
   for (std::size_t pNb = 0; pNb < instrInfos.parameters.size(); ++pNb) {
     if (ParameterMetadata::IsObject(instrInfos.parameters[pNb].GetType())) {
       gd::String objectInParameter = action.GetParameter(pNb).GetPlainString();
-      if (!GetObjectsAndGroups().HasObjectNamed(objectInParameter) &&
-          !GetGlobalObjectsAndGroups().HasObjectNamed(objectInParameter) &&
-          !GetObjectsAndGroups().GetObjectGroups().Has(objectInParameter) &&
-          !GetGlobalObjectsAndGroups().GetObjectGroups().Has(
-              objectInParameter)) {
+      if (!GetObjectsContainersList().HasObjectOrGroupNamed(objectInParameter)) {
         return "/* Unknown object - skipped. */";
       } else if (!instrInfos.parameters[pNb].GetExtraInfo().empty() &&
-                 gd::GetTypeOfObject(GetGlobalObjectsAndGroups(),
-                                     GetObjectsAndGroups(),
-                                     objectInParameter) !=
+                 GetObjectsContainersList().GetTypeOfObject(objectInParameter) !=
                      instrInfos.parameters[pNb].GetExtraInfo()) {
         return "/* Mismatched object type - skipped. */";
       }
@@ -501,11 +514,10 @@ gd::String EventsCodeGenerator::GenerateActionCode(
 
     if (!instrInfos.parameters.empty()) {
       std::vector<gd::String> realObjects =
-          ExpandObjectsName(objectName, context);
+          GetObjectsContainersList().ExpandObjectName(objectName, context.GetCurrentObject());
       for (std::size_t i = 0; i < realObjects.size(); ++i) {
         // Setup context
-        gd::String objectType = gd::GetTypeOfObject(
-            GetGlobalObjectsAndGroups(), GetObjectsAndGroups(), realObjects[i]);
+        gd::String objectType = GetObjectsContainersList().GetTypeOfObject(realObjects[i]);
         const ObjectMetadata& objInfo =
             MetadataProvider::GetObjectMetadata(platform, objectType);
 
@@ -529,14 +541,11 @@ gd::String EventsCodeGenerator::GenerateActionCode(
     }
   } else if (instrInfos.IsBehaviorInstruction()) {
     gd::String objectName = action.GetParameter(0).GetPlainString();
-    gd::String behaviorType =
-        gd::GetTypeOfBehavior(GetGlobalObjectsAndGroups(),
-                              GetObjectsAndGroups(),
-                              action.GetParameter(1).GetPlainString());
+    gd::String behaviorType = GetObjectsContainersList().GetTypeOfBehavior(action.GetParameter(1).GetPlainString());
 
     if (instrInfos.parameters.size() >= 2) {
       std::vector<gd::String> realObjects =
-          ExpandObjectsName(objectName, context);
+          GetObjectsContainersList().ExpandObjectName(objectName, context.GetCurrentObject());
       for (std::size_t i = 0; i < realObjects.size(); ++i) {
         // Setup context
         const BehaviorMetadata& autoInfo =
@@ -657,18 +666,6 @@ gd::String EventsCodeGenerator::GenerateActionsListCode(
   return outputCode;
 }
 
-const gd::String EventsCodeGenerator::GenerateRelationalOperatorCodes(const gd::String &operatorString) {
-    if (operatorString == "=") {
-        return "==";
-    }
-    if (operatorString != "<" && operatorString != ">" &&
-        operatorString != "<=" && operatorString != ">=" && operatorString != "!=") {
-      cout << "Warning: Bad relational operator: Set to == by default." << endl;
-      return "==";
-    }
-    return operatorString;
-}
-
 gd::String EventsCodeGenerator::GenerateParameterCodes(
     const gd::Expression& parameter,
     const gd::ParameterMetadata& metadata,
@@ -693,7 +690,7 @@ gd::String EventsCodeGenerator::GenerateParameterCodes(
     argOutput =
         GenerateObject(parameter.GetPlainString(), metadata.GetType(), context);
   } else if (metadata.GetType() == "relationalOperator") {
-    argOutput += GenerateRelationalOperatorCodes(parameter.GetPlainString());
+    argOutput += parameter.GetPlainString();
     argOutput = "\"" + argOutput + "\"";
   } else if (metadata.GetType() == "operator") {
     argOutput += parameter.GetPlainString();
@@ -717,6 +714,8 @@ gd::String EventsCodeGenerator::GenerateParameterCodes(
              metadata.GetType() == "tilesetResource" ||
              metadata.GetType() == "videoResource" ||
              metadata.GetType() == "model3DResource" ||
+             metadata.GetType() == "atlasResource" ||
+             metadata.GetType() == "spineResource" ||
              // Deprecated, old parameter names:
              metadata.GetType() == "password" || metadata.GetType() == "musicfile" ||
              metadata.GetType() == "soundfile" || metadata.GetType() == "police") {
@@ -912,41 +911,6 @@ gd::String EventsCodeGenerator::ConvertToStringExplicit(
   return "\"" + ConvertToString(plainString) + "\"";
 }
 
-std::vector<gd::String> EventsCodeGenerator::ExpandObjectsName(
-    const gd::String& objectName,
-    const EventsCodeGenerationContext& context) const {
-  // Note: this logic is duplicated in EventsContextAnalyzer::ExpandObjectsName
-  std::vector<gd::String> realObjects;
-  if (globalObjectsAndGroups.GetObjectGroups().Has(objectName))
-    realObjects = globalObjectsAndGroups.GetObjectGroups()
-                      .Get(objectName)
-                      .GetAllObjectsNames();
-  else if (objectsAndGroups.GetObjectGroups().Has(objectName))
-    realObjects =
-        objectsAndGroups.GetObjectGroups().Get(objectName).GetAllObjectsNames();
-  else
-    realObjects.push_back(objectName);
-
-  // If current object is present, use it and only it.
-  if (find(realObjects.begin(),
-           realObjects.end(),
-           context.GetCurrentObject()) != realObjects.end()) {
-    realObjects.clear();
-    realObjects.push_back(context.GetCurrentObject());
-  }
-
-  // Ensure that all returned objects actually exists.
-  for (std::size_t i = 0; i < realObjects.size();) {
-    if (!objectsAndGroups.HasObjectNamed(realObjects[i]) &&
-        !globalObjectsAndGroups.HasObjectNamed(realObjects[i]))
-      realObjects.erase(realObjects.begin() + i);
-    else
-      ++i;
-  }
-
-  return realObjects;
-}
-
 void EventsCodeGenerator::DeleteUselessEvents(gd::EventsList& events) {
   for (std::size_t eId = events.size() - 1; eId < events.size(); --eId) {
     if (events[eId].CanHaveSubEvents())  // Process sub events, if any
@@ -963,6 +927,8 @@ void EventsCodeGenerator::DeleteUselessEvents(gd::EventsList& events) {
  */
 void EventsCodeGenerator::PreprocessEventList(gd::EventsList& listEvent) {
   for (std::size_t i = 0; i < listEvent.GetEventsCount(); ++i) {
+    if (listEvent[i].IsDisabled()) continue;
+
     listEvent[i].Preprocess(*this, listEvent, i);
     if (i <
         listEvent.GetEventsCount()) {  // Be sure that that there is still an
@@ -1260,12 +1226,24 @@ gd::String EventsCodeGenerator::GenerateArgumentsList(
   return argumentsStr;
 }
 
+gd::String EventsCodeGenerator::GeneratePropertyGetter(const gd::PropertiesContainer& propertiesContainer,
+                                                       const gd::NamedPropertyDescriptor& property,
+                                                       const gd::String& type,
+                                                       gd::EventsCodeGenerationContext& context) {
+  return "getProperty" + property.GetName() + "As" + type + "()";
+}
+
+gd::String EventsCodeGenerator::GenerateParameterGetter(const gd::ParameterMetadata& parameter,
+                                                        const gd::String& type,
+                                                        gd::EventsCodeGenerationContext& context) {
+  return "getParameter" + parameter.GetName() + "As" + type + "()";
+}
+
 EventsCodeGenerator::EventsCodeGenerator(const gd::Project& project_,
                                          const gd::Layout& layout,
                                          const gd::Platform& platform_)
     : platform(platform_),
-      globalObjectsAndGroups(project_),
-      objectsAndGroups(layout),
+      projectScopedContainers(gd::ProjectScopedContainers::MakeNewProjectScopedContainersForProjectAndLayout(project_, layout)),
       hasProjectAndLayout(true),
       project(&project_),
       scene(&layout),
@@ -1277,11 +1255,9 @@ EventsCodeGenerator::EventsCodeGenerator(const gd::Project& project_,
 
 EventsCodeGenerator::EventsCodeGenerator(
     const gd::Platform& platform_,
-    const gd::ObjectsContainer& globalObjectsAndGroups_,
-    const gd::ObjectsContainer& objectsAndGroups_)
+    const gd::ProjectScopedContainers& projectScopedContainers_)
     : platform(platform_),
-      globalObjectsAndGroups(globalObjectsAndGroups_),
-      objectsAndGroups(objectsAndGroups_),
+      projectScopedContainers(projectScopedContainers_),
       hasProjectAndLayout(false),
       project(nullptr),
       scene(nullptr),

Core/GDCore/Events/CodeGeneration/EventsCodeGenerator.h

@@ -12,6 +12,7 @@
 
 #include "GDCore/Events/Event.h"
 #include "GDCore/Events/Instruction.h"
+#include "GDCore/Project/ProjectScopedContainers.h"
 #include "GDCore/String.h"
 namespace gd {
 class EventsList;
@@ -19,6 +20,7 @@ class Expression;
 class Project;
 class Layout;
 class ObjectsContainer;
+class ObjectsContainersList;
 class ExternalEvents;
 class ParameterMetadata;
 class ObjectMetadata;
@@ -56,9 +58,9 @@ class GD_CORE_API EventsCodeGenerator {
    * \brief Construct a code generator for the specified
    * objects/groups and platform
    */
-  EventsCodeGenerator(const gd::Platform& platform,
-                      const gd::ObjectsContainer& globalObjectsAndGroups_,
-                      const gd::ObjectsContainer& objectsAndGroups_);
+  EventsCodeGenerator(
+      const gd::Platform& platform,
+      const gd::ProjectScopedContainers& projectScopedContainers_);
   virtual ~EventsCodeGenerator(){};
 
   /**
@@ -326,18 +328,12 @@ class GD_CORE_API EventsCodeGenerator {
    */
   bool ErrorOccurred() const { return errorOccurred; };
 
-  /**
-   * \brief Get the global objects/groups used for code generation.
-   */
-  const gd::ObjectsContainer& GetGlobalObjectsAndGroups() const {
-    return globalObjectsAndGroups;
-  }
+  const gd::ObjectsContainersList& GetObjectsContainersList() const {
+    return projectScopedContainers.GetObjectsContainersList();
+  };
 
-  /**
-   * \brief Get the objects/groups used for code generation.
-   */
-  const gd::ObjectsContainer& GetObjectsAndGroups() const {
-    return objectsAndGroups;
+  const gd::ProjectScopedContainers& GetProjectScopedContainers() const {
+    return projectScopedContainers;
   }
 
   /**
@@ -363,22 +359,6 @@ class GD_CORE_API EventsCodeGenerator {
    */
   const gd::Platform& GetPlatform() const { return platform; }
 
-  /**
-   * \brief Convert a group name to the full list of objects contained in the
-   * group.
-   *
-   * Get a list containing the "real" objects name when the events refers to \a
-   * objectName :<br> If \a objectName is really an object, the list will only
-   * contains \a objectName unchanged.<br> If \a objectName is a group, the list
-   * will contains all the objects of the group.<br> If \a objectName is the
-   * "current" object in the context ( i.e: The object being used for launching
-   * an action... ), none of the two rules below apply, and the list will only
-   * contains the context "current" object name.
-   */
-  std::vector<gd::String> ExpandObjectsName(
-      const gd::String& objectName,
-      const EventsCodeGenerationContext& context) const;
-
   /**
    * \brief Get the maximum depth of custom conditions reached during code
    * generation.
@@ -493,10 +473,15 @@ class GD_CORE_API EventsCodeGenerator {
    */
   size_t GenerateSingleUsageUniqueIdForEventsList();
 
+  virtual gd::String GenerateRelationalOperation(
+      const gd::String& relationalOperator,
+      const gd::String& lhs,
+      const gd::String& rhs);
+
+ protected:
   virtual const gd::String GenerateRelationalOperatorCodes(
       const gd::String& operatorString);
 
- protected:
   /**
    * \brief Generate the code for a single parameter.
    *
@@ -566,6 +551,12 @@ class GD_CORE_API EventsCodeGenerator {
     return ".getChild(" + ConvertToStringExplicit(childName) + ")";
   };
 
+  virtual gd::String GenerateVariableValueAs(const gd::String& type) {
+    return type == "number|string" ? ".getAsNumberOrString()"
+           : type == "string"      ? ".getAsString()"
+                                   : ".getAsNumber()";
+  }
+
   /**
    * \brief Generate the code to get the child of a variable,
    * using generated the expression.
@@ -594,6 +585,17 @@ class GD_CORE_API EventsCodeGenerator {
     return "fakeObjectListOf_" + objectName;
   }
 
+  virtual gd::String GeneratePropertyGetter(
+      const gd::PropertiesContainer& propertiesContainer,
+      const gd::NamedPropertyDescriptor& property,
+      const gd::String& type,
+      gd::EventsCodeGenerationContext& context);
+
+  virtual gd::String GenerateParameterGetter(
+      const gd::ParameterMetadata& parameter,
+      const gd::String& type,
+      gd::EventsCodeGenerationContext& context);
+
   /**
    * \brief Generate the code to reference an object which is
    * in an empty/null state.
@@ -673,7 +675,8 @@ class GD_CORE_API EventsCodeGenerator {
    * The default implementation generates C-style code : It wraps the predicate
    * inside parenthesis and add a !.
    */
-  virtual gd::String GenerateNegatedPredicate(const gd::String& predicate) const {
+  virtual gd::String GenerateNegatedPredicate(
+      const gd::String& predicate) const {
     return "!(" + predicate + ")";
   };
 
@@ -734,6 +737,7 @@ class GD_CORE_API EventsCodeGenerator {
       const std::vector<gd::String>& arguments,
       const gd::String& callStartString,
       std::size_t startFromArgument = 0);
+
   gd::String GenerateOperatorCall(const gd::InstructionMetadata& instrInfos,
                                   const std::vector<gd::String>& arguments,
                                   const gd::String& callStartString,
@@ -777,8 +781,7 @@ class GD_CORE_API EventsCodeGenerator {
 
   const gd::Platform& platform;  ///< The platform being used.
 
-  const gd::ObjectsContainer& globalObjectsAndGroups;
-  const gd::ObjectsContainer& objectsAndGroups;
+  gd::ProjectScopedContainers projectScopedContainers;
 
   bool hasProjectAndLayout;  ///< true only if project and layout are valid
                              ///< references. If false, they should not be used.

Core/GDCore/Events/CodeGeneration/ExpressionCodeGenerator.cpp

@@ -7,6 +7,7 @@
 
 #include <memory>
 #include <vector>
+#include <vector>
 
 #include "GDCore/CommonTools.h"
 #include "GDCore/Events/CodeGeneration/EventsCodeGenerationContext.h"
@@ -25,6 +26,9 @@
 #include "GDCore/IDE/Events/ExpressionValidator.h"
 #include "GDCore/Project/Layout.h"
 #include "GDCore/Project/Project.h"
+#include "GDCore/Project/VariablesContainersList.h"
+#include "GDCore/Project/ObjectsContainersList.h"
+#include "GDCore/Project/ProjectScopedContainers.h"
 #include "GDCore/IDE/Events/ExpressionTypeFinder.h"
 #include "GDCore/IDE/Events/ExpressionVariableOwnerFinder.h"
 
@@ -47,8 +51,7 @@ gd::String ExpressionCodeGenerator::GenerateExpressionCode(
   }
 
   gd::ExpressionValidator validator(codeGenerator.GetPlatform(),
-                                    codeGenerator.GetGlobalObjectsAndGroups(),
-                                    codeGenerator.GetObjectsAndGroups(),
+                                    codeGenerator.GetProjectScopedContainers(),
                                     rootType);
   node->Visit(validator);
   if (!validator.GetFatalErrors().empty()) {
@@ -100,35 +103,95 @@ void ExpressionCodeGenerator::OnVisitVariableNode(VariableNode& node) {
   // This "translation" from the type to an enum could be avoided
   // if all types were moved to an enum.
   auto type = gd::ExpressionTypeFinder::GetType(codeGenerator.GetPlatform(),
-                                            codeGenerator.GetGlobalObjectsAndGroups(),
-                                            codeGenerator.GetObjectsAndGroups(),
+                                            codeGenerator.GetProjectScopedContainers(),
                                             rootType,
                                             node);
+
+  if (gd::ParameterMetadata::IsExpression("variable", type)) {
+    // The node is a variable inside an expression waiting for a *variable* to be returned, not its value.
     EventsCodeGenerator::VariableScope scope =
         type == "globalvar"
             ? gd::EventsCodeGenerator::PROJECT_VARIABLE
             : ((type == "scenevar")
                   ? gd::EventsCodeGenerator::LAYOUT_VARIABLE
                   : gd::EventsCodeGenerator::OBJECT_VARIABLE);
+
     auto objectName = gd::ExpressionVariableOwnerFinder::GetObjectName(codeGenerator.GetPlatform(),
-                                        codeGenerator.GetGlobalObjectsAndGroups(),
-                                        codeGenerator.GetObjectsAndGroups(),
+                                          codeGenerator.GetObjectsContainersList(),
                                           rootObjectName,
                                           node);
     output += codeGenerator.GenerateGetVariable(
         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.
+
+    codeGenerator.GetProjectScopedContainers().MatchIdentifierWithName<void>(node.name, [&](){
+      // Generate the code to access the object variables.
+
+      // Defer generation of the access to the object and variable to the child,
+      // once we know the name of the variable.
+      objectNameToUseForVariableAccessor = node.name;
+      if (node.child) node.child->Visit(*this);
+      objectNameToUseForVariableAccessor = "";
+
+      output += codeGenerator.GenerateVariableValueAs(type);
+    }, [&]() {
+      if (!codeGenerator.HasProjectAndLayout()) {
+        gd::LogWarning("Tried to generate access to a variable without a project/scene - the code generator only works for global and scene variables for now.");
+        output += GenerateDefaultValue(type);
+        return;
+      }
+
+      // This could be adapted in the future if more scopes are supported.
+      EventsCodeGenerator::VariableScope scope = gd::EventsCodeGenerator::PROJECT_VARIABLE;
+      if (codeGenerator.GetProjectScopedContainers().GetVariablesContainersList().GetBottomMostVariablesContainer()->Has(node.name)) {
+        scope = gd::EventsCodeGenerator::LAYOUT_VARIABLE;
+      }
+
+      output += codeGenerator.GenerateGetVariable(node.name, scope, context, "");
+      if (node.child) node.child->Visit(*this);
+      output += codeGenerator.GenerateVariableValueAs(type);
+    }, [&]() {
+      // Properties are not supported.
+      output += GenerateDefaultValue(type);
+    }, [&]() {
+      // Parameters are not supported.
+      output += GenerateDefaultValue(type);
+    }, [&]() {
+      // The identifier does not represents a variable (or a child variable), or not at least an existing
+      // one, nor an object variable. It's invalid.
+      output += GenerateDefaultValue(type);
+    });
+  }
 }
 
 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);
+
+      // We have accessed an object variable, from now we can continue accessing the child variables
+      // (including using the bracket notation).
+      objectNameToUseForVariableAccessor = "";
+    } else {
         output += codeGenerator.GenerateVariableAccessor(node.name);
+    }
   if (node.child) node.child->Visit(*this);
 }
 
 void ExpressionCodeGenerator::OnVisitVariableBracketAccessorNode(
     VariableBracketAccessorNode& node) {
-  ExpressionCodeGenerator generator("string", "", codeGenerator, context);
+  if (!objectNameToUseForVariableAccessor.empty()) {
+    // Bracket notation can't be used to directly access a variable of an object (`MyObject["MyVariable"]`).
+    // This would be rejected by the ExpressionValidator.
+    output += codeGenerator.GenerateBadVariable();
+    return;
+  }
+
+  ExpressionCodeGenerator generator("number|string", "", codeGenerator, context);
   node.expression->Visit(generator);
   output +=
       codeGenerator.GenerateVariableBracketAccessor(generator.GetOutput());
@@ -137,10 +200,10 @@ void ExpressionCodeGenerator::OnVisitVariableBracketAccessorNode(
 
 void ExpressionCodeGenerator::OnVisitIdentifierNode(IdentifierNode& node) {
   auto type = gd::ExpressionTypeFinder::GetType(codeGenerator.GetPlatform(),
-                                            codeGenerator.GetGlobalObjectsAndGroups(),
-                                            codeGenerator.GetObjectsAndGroups(),
+                                            codeGenerator.GetProjectScopedContainers(),
                                             rootType,
                                             node);
+
   if (gd::ParameterMetadata::IsObject(type)) {
     output +=
         codeGenerator.GenerateObject(node.identifierName, type, context);
@@ -153,8 +216,7 @@ void ExpressionCodeGenerator::OnVisitIdentifierNode(IdentifierNode& node) {
                     : gd::EventsCodeGenerator::OBJECT_VARIABLE);
 
       auto objectName = gd::ExpressionVariableOwnerFinder::GetObjectName(codeGenerator.GetPlatform(),
-                                            codeGenerator.GetGlobalObjectsAndGroups(),
-                                            codeGenerator.GetObjectsAndGroups(),
+                                            codeGenerator.GetObjectsContainersList(),
                                             rootObjectName,
                                             node);
       output += codeGenerator.GenerateGetVariable(
@@ -162,30 +224,60 @@ void ExpressionCodeGenerator::OnVisitIdentifierNode(IdentifierNode& node) {
       if (!node.childIdentifierName.empty()) {
         output += codeGenerator.GenerateVariableAccessor(node.childIdentifierName);
       }
-  } else if (node.childIdentifierName.empty()) {
-    output += "/* Error during generation, unrecognized identifier type: " +
-              codeGenerator.ConvertToString(type) + " with value " +
-              codeGenerator.ConvertToString(node.identifierName) + " */ " +
-              codeGenerator.ConvertToStringExplicit(node.identifierName);
-  }
-  else {
-    // This is for function names that are put in IdentifierNode
-    // because the type is needed to tell them apart from variables.
+  } else {
+    const auto& variablesContainersList = codeGenerator.GetProjectScopedContainers().GetVariablesContainersList();
+    const auto& propertiesContainersList = codeGenerator.GetProjectScopedContainers().GetPropertiesContainersList();
+    const auto& parametersVectorsList = codeGenerator.GetProjectScopedContainers().GetParametersVectorsList();
+
+    // The node represents a variable, property, parameter or an object.
+    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);
+      output += codeGenerator.GenerateVariableValueAs(type);
+    }, [&]() {
+      if (!codeGenerator.HasProjectAndLayout()) {
+        gd::LogWarning("Tried to generate access to a variable without a project/scene - the code generator only works for global and scene variables for now.");
         output += GenerateDefaultValue(type);
+        return;
+      }
+
+      // This could be adapted in the future if more scopes are supported at runtime.
+      EventsCodeGenerator::VariableScope scope = gd::EventsCodeGenerator::PROJECT_VARIABLE;
+      if (variablesContainersList.GetBottomMostVariablesContainer()->Has(node.identifierName)) {
+        scope = gd::EventsCodeGenerator::LAYOUT_VARIABLE;
+      }
+
+      output += codeGenerator.GenerateGetVariable(node.identifierName, scope, context, "");
+      if (!node.childIdentifierName.empty()) {
+        output += codeGenerator.GenerateVariableAccessor(node.childIdentifierName);
+      }
+      output += codeGenerator.GenerateVariableValueAs(type);
+    }, [&]() {
+      const auto& propertiesContainerAndProperty = propertiesContainersList.Get(node.identifierName);
+
+      output += codeGenerator.GeneratePropertyGetter(
+        propertiesContainerAndProperty.first, propertiesContainerAndProperty.second, type, context);
+    }, [&]() {
+      const auto& parameter = gd::ParameterMetadataTools::Get(parametersVectorsList, node.identifierName);
+      output += codeGenerator.GenerateParameterGetter(parameter, type, context);
+    }, [&]() {
+      // The identifier does not represents a variable (or a child variable), or not at least an existing
+      // one, nor an object variable. It's invalid.
+      output += GenerateDefaultValue(type);
+    });
   }
 }
 
 void ExpressionCodeGenerator::OnVisitFunctionCallNode(FunctionCallNode& node) {
   auto type = gd::ExpressionTypeFinder::GetType(codeGenerator.GetPlatform(),
-                                            codeGenerator.GetGlobalObjectsAndGroups(),
-                                            codeGenerator.GetObjectsAndGroups(),
+                                            codeGenerator.GetProjectScopedContainers(),
                                             rootType,
                                             node);
 
   const gd::ExpressionMetadata &metadata = MetadataProvider::GetFunctionCallMetadata(
       codeGenerator.GetPlatform(),
-      codeGenerator.GetGlobalObjectsAndGroups(),
-      codeGenerator.GetObjectsAndGroups(),
+      codeGenerator.GetObjectsContainersList(),
       node);
 
   if (gd::MetadataProvider::IsBadExpressionMetadata(metadata)) {
@@ -236,11 +328,6 @@ gd::String ExpressionCodeGenerator::GenerateObjectFunctionCode(
     const gd::String& objectName,
     const std::vector<std::unique_ptr<ExpressionNode>>& parameters,
     const ExpressionMetadata& expressionMetadata) {
-  const gd::ObjectsContainer& globalObjectsAndGroups =
-      codeGenerator.GetGlobalObjectsAndGroups();
-  const gd::ObjectsContainer& objectsAndGroups =
-      codeGenerator.GetObjectsAndGroups();
-
   codeGenerator.AddIncludeFiles(
       expressionMetadata.GetIncludeFiles());
 
@@ -261,12 +348,11 @@ gd::String ExpressionCodeGenerator::GenerateObjectFunctionCode(
 
   // Get object(s) concerned by function call
   std::vector<gd::String> realObjects =
-      codeGenerator.ExpandObjectsName(objectName, context);
+      codeGenerator.GetObjectsContainersList().ExpandObjectName(objectName, context.GetCurrentObject());
   for (std::size_t i = 0; i < realObjects.size(); ++i) {
     context.ObjectsListNeeded(realObjects[i]);
 
-    gd::String objectType = gd::GetTypeOfObject(
-        globalObjectsAndGroups, objectsAndGroups, realObjects[i]);
+    gd::String objectType = codeGenerator.GetObjectsContainersList().GetTypeOfObject(realObjects[i]);
     const ObjectMetadata& objInfo = MetadataProvider::GetObjectMetadata(
         codeGenerator.GetPlatform(), objectType);
 
@@ -288,11 +374,6 @@ gd::String ExpressionCodeGenerator::GenerateBehaviorFunctionCode(
     const gd::String& behaviorName,
     const std::vector<std::unique_ptr<ExpressionNode>>& parameters,
     const ExpressionMetadata& expressionMetadata) {
-  const gd::ObjectsContainer& globalObjectsAndGroups =
-      codeGenerator.GetGlobalObjectsAndGroups();
-  const gd::ObjectsContainer& objectsAndGroups =
-      codeGenerator.GetObjectsAndGroups();
-
   codeGenerator.AddIncludeFiles(
       expressionMetadata.GetIncludeFiles());
 
@@ -311,12 +392,11 @@ gd::String ExpressionCodeGenerator::GenerateBehaviorFunctionCode(
 
   // Get object(s) concerned by function call
   std::vector<gd::String> realObjects =
-      codeGenerator.ExpandObjectsName(objectName, context);
+      codeGenerator.GetObjectsContainersList().ExpandObjectName(objectName, context.GetCurrentObject());
 
   gd::String functionOutput = GenerateDefaultValue(type);
 
-  gd::String behaviorType = gd::GetTypeOfBehavior(
-      globalObjectsAndGroups, objectsAndGroups, behaviorName);
+  gd::String behaviorType = codeGenerator.GetObjectsContainersList().GetTypeOfBehavior(behaviorName);
   const BehaviorMetadata& autoInfo = MetadataProvider::GetBehaviorMetadata(
       codeGenerator.GetPlatform(), behaviorType);
 
@@ -352,8 +432,7 @@ gd::String ExpressionCodeGenerator::GenerateParametersCodes(
     if (!parameterMetadata.IsCodeOnly()) {
       if (nonCodeOnlyParameterIndex < parameters.size()) {
         auto objectName = gd::ExpressionVariableOwnerFinder::GetObjectName(codeGenerator.GetPlatform(),
-                                              codeGenerator.GetGlobalObjectsAndGroups(),
-                                              codeGenerator.GetObjectsAndGroups(),
+                                              codeGenerator.GetObjectsContainersList(),
                                               rootObjectName,
                                               *parameters[nonCodeOnlyParameterIndex].get());
         ExpressionCodeGenerator generator(parameterMetadata.GetType(), objectName, codeGenerator, context);
@@ -423,8 +502,7 @@ gd::String ExpressionCodeGenerator::GenerateDefaultValue(
 
 void ExpressionCodeGenerator::OnVisitEmptyNode(EmptyNode& node) {
   auto type = gd::ExpressionTypeFinder::GetType(codeGenerator.GetPlatform(),
-                                            codeGenerator.GetGlobalObjectsAndGroups(),
-                                            codeGenerator.GetObjectsAndGroups(),
+                                            codeGenerator.GetProjectScopedContainers(),
                                             rootType,
                                             node);
   output += GenerateDefaultValue(type);
@@ -433,8 +511,7 @@ void ExpressionCodeGenerator::OnVisitEmptyNode(EmptyNode& node) {
 void ExpressionCodeGenerator::OnVisitObjectFunctionNameNode(
     ObjectFunctionNameNode& node) {
   auto type = gd::ExpressionTypeFinder::GetType(codeGenerator.GetPlatform(),
-                                            codeGenerator.GetGlobalObjectsAndGroups(),
-                                            codeGenerator.GetObjectsAndGroups(),
+                                            codeGenerator.GetProjectScopedContainers(),
                                             rootType,
                                             node);
   output += GenerateDefaultValue(type);

Core/GDCore/Events/CodeGeneration/ExpressionCodeGenerator.h

@@ -102,6 +102,7 @@ class GD_CORE_API ExpressionCodeGenerator : public ExpressionParser2NodeWorker {
       const std::vector<std::unique_ptr<ExpressionNode>>& parameters);
 
   gd::String output;
+  gd::String objectNameToUseForVariableAccessor;
   EventsCodeGenerator& codeGenerator;
   EventsCodeGenerationContext& context;
   const gd::String rootType;

Core/GDCore/Events/Event.h

@@ -281,15 +281,6 @@ class GD_CORE_API BaseEvent {
    * \brief True if the event should be folded in the events editor.
    */
   bool IsFolded() const { return folded; }
-
-  /**
-   * \brief Return a list of all objects linked to the event.
-   */
-  virtual std::vector<gd::Expression*> GetAllObjectExpressions() {
-    std::vector<gd::Expression*> allObjectExpressions;
-    return allObjectExpressions;
-  }
-
   ///@}
 
   std::weak_ptr<gd::BaseEvent>

Core/GDCore/Events/Parsers/ExpressionParser2.h

@@ -47,14 +47,9 @@ class GD_CORE_API ExpressionParser2 {
   virtual ~ExpressionParser2(){};
 
   /**
-   * Parse the given expression with the specified type.
+   * Parse the given expression into a tree of nodes.
    *
-   * \param type Type of the expression: "string", "number",
-   * type supported by gd::ParameterMetadata::IsObject, types supported by
-   * gd::ParameterMetadata::IsExpression or "unknown".
-   * \param expression The expression to parse
-   * \param objectName Specify the object name, only for the
-   * case of "objectvar" type.
+   * \param expression The expression to parse.
    *
    * \return The node representing the expression as a parsed tree.
    */
@@ -267,12 +262,11 @@ class GD_CORE_API ExpressionParser2 {
     } else if (CheckIfChar(IsDot)) {
       ExpressionParserLocation dotLocation = SkipChar();
       SkipAllWhitespaces();
-      return ObjectFunctionOrBehaviorFunction(
+      return ObjectFunctionOrBehaviorFunctionOrVariable(
           name, nameLocation, dotLocation);
     } else if (CheckIfChar(IsOpeningSquareBracket)) {
       return Variable(name, nameLocation);
-    }
-    else {
+    } else {
       auto identifier = gd::make_unique<IdentifierNode>(name);
       identifier->location = ExpressionParserLocation(
           nameLocation.GetStartPosition(), GetCurrentPosition());
@@ -283,8 +277,11 @@ class GD_CORE_API ExpressionParser2 {
 
   std::unique_ptr<VariableNode> Variable(const gd::String &name, gd::ExpressionParserLocation nameLocation) {
     auto variable = gd::make_unique<VariableNode>(name);
+
+    if (CheckIfChar(IsOpeningSquareBracket) || CheckIfChar(IsDot)) {
       variable->child = VariableAccessorOrVariableBracketAccessor();
       variable->child->parent = variable.get();
+    }
 
     variable->location = ExpressionParserLocation(
         nameLocation.GetStartPosition(), GetCurrentPosition());
@@ -308,8 +305,12 @@ class GD_CORE_API ExpressionParser2 {
                                "bracket for each opening bracket."));
       }
       SkipIfChar(IsClosingSquareBracket);
+
+      SkipAllWhitespaces();
+      if (CheckIfChar(IsOpeningSquareBracket) || CheckIfChar(IsDot)) {
         child->child = VariableAccessorOrVariableBracketAccessor();
         child->child->parent = child.get();
+      }
       child->location =
           ExpressionParserLocation(childStartPosition, GetCurrentPosition());
 
@@ -318,11 +319,18 @@ class GD_CORE_API ExpressionParser2 {
       auto dotLocation = SkipChar();
       SkipAllWhitespaces();
 
-      auto identifierAndLocation = ReadIdentifierName();
+      auto identifierAndLocation = ReadIdentifierName(/*allowDeprecatedSpacesInName=*/ false);
       auto child =
           gd::make_unique<VariableAccessorNode>(identifierAndLocation.name);
+      if (identifierAndLocation.name.empty()) {
+        child->diagnostic = RaiseSyntaxError(_("A name should be entered after the dot."));
+      }
+
+      SkipAllWhitespaces();
+      if (CheckIfChar(IsOpeningSquareBracket) || CheckIfChar(IsDot)) {
         child->child = VariableAccessorOrVariableBracketAccessor();
         child->child->parent = child.get();
+      }
       child->nameLocation = identifierAndLocation.location;
       child->dotLocation = dotLocation;
       child->location =
@@ -331,7 +339,11 @@ class GD_CORE_API ExpressionParser2 {
       return std::move(child);
     }
 
-    return std::move(gd::make_unique<VariableAccessorOrVariableBracketAccessorNode>());
+    // Should never happen, unless a node called this function without checking if the current character
+    // was a dot or an opening bracket - this means there is an error in the grammar.
+    auto unrecognisedNode = gd::make_unique<VariableAccessorOrVariableBracketAccessorNode>();
+    unrecognisedNode->diagnostic = RaiseSyntaxError(_("A dot or bracket was expected here."));
+    return std::move(unrecognisedNode);
   }
 
   std::unique_ptr<FunctionCallNode> FreeFunction(
@@ -358,27 +370,33 @@ class GD_CORE_API ExpressionParser2 {
   }
 
   std::unique_ptr<IdentifierOrFunctionCallOrObjectFunctionNameOrEmptyNode>
-  ObjectFunctionOrBehaviorFunction(
+  ObjectFunctionOrBehaviorFunctionOrVariable(
       const gd::String &parentIdentifier,
       const ExpressionParserLocation &parentIdentifierLocation,
       const ExpressionParserLocation &parentIdentifierDotLocation) {
-    auto childIdentifierAndLocation = ReadIdentifierName();
+    auto childIdentifierAndLocation = ReadIdentifierName(/*allowDeprecatedSpacesInName=*/ false);
     const gd::String &childIdentifierName = childIdentifierAndLocation.name;
     const auto &childIdentifierNameLocation =
         childIdentifierAndLocation.location;
 
+    std::unique_ptr<gd::ExpressionParserError> emptyNameError = childIdentifierName.empty() ?
+      RaiseSyntaxError(_("A name should be entered after the dot.")) : nullptr;
+
     SkipAllWhitespaces();
 
     if (IsNamespaceSeparator()) {
       ExpressionParserLocation namespaceSeparatorLocation =
           SkipNamespaceSeparator();
       SkipAllWhitespaces();
-      return BehaviorFunction(parentIdentifier,
+      auto behaviorFunction = BehaviorFunction(parentIdentifier,
                               childIdentifierName,
                               parentIdentifierLocation,
                               parentIdentifierDotLocation,
                               childIdentifierNameLocation,
                               namespaceSeparatorLocation);
+
+      if (emptyNameError) behaviorFunction->diagnostic = std::move(emptyNameError);
+      return std::move(behaviorFunction);
     } else if (CheckIfChar(IsOpeningParenthesis)) {
       ExpressionParserLocation openingParenthesisLocation = SkipChar();
 
@@ -387,7 +405,7 @@ class GD_CORE_API ExpressionParser2 {
           childIdentifierName);
       auto parametersNode = Parameters(function.get(), parentIdentifier);
       function->parameters = std::move(parametersNode.parameters),
-      function->diagnostic = std::move(parametersNode.diagnostic);
+      function->diagnostic = emptyNameError ? std::move(emptyNameError) : std::move(parametersNode.diagnostic);
 
       function->location = ExpressionParserLocation(
           parentIdentifierLocation.GetStartPosition(), GetCurrentPosition());
@@ -400,6 +418,8 @@ class GD_CORE_API ExpressionParser2 {
       return std::move(function);
     } else if (CheckIfChar(IsDot) || CheckIfChar(IsOpeningSquareBracket)) {
       auto variable = gd::make_unique<VariableNode>(parentIdentifier);
+      variable->diagnostic = std::move(emptyNameError);
+
       auto child =
           gd::make_unique<VariableAccessorNode>(childIdentifierName);
       child->child = VariableAccessorOrVariableBracketAccessor();
@@ -420,17 +440,12 @@ class GD_CORE_API ExpressionParser2 {
 
     auto node = gd::make_unique<IdentifierNode>(
         parentIdentifier, childIdentifierName);
-    if (!CheckIfChar(IsParameterSeparator) && !CheckIfChar(IsClosingParenthesis) && !IsEndReached()) {
-      node->diagnostic = RaiseSyntaxError(
-          _("An opening parenthesis (for an object expression), a double colon "
-            "(:: for a behavior expression), a dot or an opening bracket (for "
-            "a child variable) where expected."));
-    }
     node->location = ExpressionParserLocation(
         parentIdentifierLocation.GetStartPosition(), GetCurrentPosition());
     node->identifierNameLocation = parentIdentifierLocation;
     node->identifierNameDotLocation = parentIdentifierDotLocation;
     node->childIdentifierNameLocation = childIdentifierNameLocation;
+    node->diagnostic = std::move(emptyNameError);
     return std::move(node);
   }
 
@@ -503,11 +518,6 @@ class GD_CORE_API ExpressionParser2 {
     std::vector<std::unique_ptr<ExpressionNode>> parameters;
     gd::String lastObjectName = "";
 
-    // By convention, object is always the first parameter, and behavior the
-    // second one.
-    size_t parameterIndex =
-        WrittenParametersFirstIndex(objectName, behaviorName);
-
     bool previousCharacterIsParameterSeparator = false;
     while (!IsEndReached()) {
       SkipAllWhitespaces();
@@ -526,7 +536,6 @@ class GD_CORE_API ExpressionParser2 {
       SkipAllWhitespaces();
       previousCharacterIsParameterSeparator = CheckIfChar(IsParameterSeparator);
       SkipIfChar(IsParameterSeparator);
-      parameterIndex++;
     }
 
     ExpressionParserLocation invalidClosingParenthesisLocation;
@@ -625,13 +634,13 @@ class GD_CORE_API ExpressionParser2 {
     ExpressionParserLocation location;
   };
 
-  IdentifierAndLocation ReadIdentifierName() {
+  IdentifierAndLocation ReadIdentifierName(bool allowDeprecatedSpacesInName = true) {
     gd::String name;
     size_t startPosition = currentPosition;
     while (currentPosition < expression.size() &&
            (CheckIfChar(IsAllowedInIdentifier)
             // Allow whitespace in identifier name for compatibility
-            || expression[currentPosition] == ' ')) {
+            || (allowDeprecatedSpacesInName && expression[currentPosition] == ' '))) {
       name += expression[currentPosition];
       currentPosition++;
     }

Core/GDCore/Events/Parsers/ExpressionParser2Node.h

@@ -239,9 +239,10 @@ struct GD_CORE_API VariableAccessorOrVariableBracketAccessorNode : public Expres
 };
 
 /**
- * \brief A variable with bracket accessor or at least 2 "dot" accessors.
+ * \brief A variable, or object variable, with bracket accessor or at least 2 "dot" accessors.
  *
- * Example: MyVariable[MyChildren] or MyVariable.MyChildren.MyGranChildren.
+ * Example: `MyVariable["MyChildren"]` or `MyVariable.MyChildren.MyGrandChildren`.
+ * Example: `MyObject["MyVariable"]` or `MyObject.MyVariable.MyChildren`.
  *
  * Other cases like "MyVariable" or "MyVariable.MyChildren" are IdentifierNode
  * to allow handling ambiguities.
@@ -267,7 +268,7 @@ struct GD_CORE_API VariableNode : public FunctionCallOrObjectFunctionNameOrEmpty
 };
 
 /**
- * \brief A bracket accessor of a variable. Example: MyChild
+ * \brief A direct accessor to a child variable. Example: MyChild
  * in MyVariable.MyChild
  */
 struct GD_CORE_API VariableAccessorNode
@@ -285,7 +286,7 @@ struct GD_CORE_API VariableAccessorNode
 };
 
 /**
- * \brief A bracket accessor of a variable. Example: ["MyChild"]
+ * \brief A bracket accessor to a child variable. Example: ["MyChild"]
  * (in MyVariable["MyChild"]).
  */
 struct GD_CORE_API VariableBracketAccessorNode

Core/GDCore/Events/Parsers/ExpressionParser2NodePrinter.h

@@ -8,6 +8,7 @@
 
 #include <memory>
 #include <vector>
+
 #include "GDCore/Events/Parsers/ExpressionParser2Node.h"
 #include "GDCore/Events/Parsers/ExpressionParser2NodeWorker.h"
 namespace gd {
@@ -43,6 +44,11 @@ class GD_CORE_API ExpressionParser2NodePrinter
    */
   const gd::String& GetOutput() { return output; };
 
+  static gd::String PrintStringLiteral(const gd::String& str) {
+    return "\"" +
+           str.FindAndReplace("\\", "\\\\").FindAndReplace("\"", "\\\"") + "\"";
+  }
+
  protected:
   void OnVisitSubExpressionNode(SubExpressionNode& node) override {
     output += "(";
@@ -69,10 +75,7 @@ class GD_CORE_API ExpressionParser2NodePrinter
   }
   void OnVisitNumberNode(NumberNode& node) override { output += node.number; }
   void OnVisitTextNode(TextNode& node) override {
-    output +=
-        "\"" +
-        node.text.FindAndReplace("\\", "\\\\").FindAndReplace("\"", "\\\"") +
-        "\"";
+    output += PrintStringLiteral(node.text);
   }
   void OnVisitVariableNode(VariableNode& node) override {
     output += node.name;
@@ -97,8 +100,8 @@ class GD_CORE_API ExpressionParser2NodePrinter
   }
   void OnVisitObjectFunctionNameNode(ObjectFunctionNameNode& node) override {
     if (!node.behaviorFunctionName.empty()) {
-      output +=
-          node.objectName + "." + node.objectFunctionOrBehaviorName + "::" + node.behaviorFunctionName;
+      output += node.objectName + "." + node.objectFunctionOrBehaviorName +
+                "::" + node.behaviorFunctionName;
     } else {
       output += node.objectName + "." + node.objectFunctionOrBehaviorName;
     }

Core/GDCore/Events/Parsers/GrammarTerminals.h

@@ -75,10 +75,21 @@ inline bool IsZeroDigit(gd::String::value_type character) {
   return character == '0';
 }
 
+inline bool IsAdditionalReservedCharacter(gd::String::value_type character) {
+  // These characters are not part of the grammar - but are often used in programming language
+  // and could become operators or part of the grammar one day.
+  return character == '~' || character == '\'' || character == '%' ||
+         character == '#' || character == '@' || character == '|' ||
+         character == '&' || character == '`' || character == '$' ||
+         character == ';';
+
+}
+
 /**
  * Check if the given character can be used in an identifier. This is
  * any unicode character, except for:
- * `, . " () [] {} + - < > ? ^ = \ : ! / *` and whitespaces (space, line break, carriage return).
+ * `, . " () [] {} + - < > ? ^ = \ : ! / * ~ ' % # @ | & $ ;`
+ * and backtick and whitespaces (space, line break, carriage return).
  *
  * This is loosely based on what is allowed in languages like JavaScript
  * (see https://mathiasbynens.be/notes/javascript-properties), without support
@@ -96,7 +107,7 @@ inline bool IsAllowedInIdentifier(gd::String::value_type character) {
   if (!IsParameterSeparator(character) && !IsDot(character) &&
       !IsQuote(character) && !IsBracket(character) &&
       !IsExpressionOperator(character) && !IsTermOperator(character) &&
-      !IsWhitespace(character)) {
+      !IsWhitespace(character) && !IsAdditionalReservedCharacter(character)) {
     return true;
   }
 

Core/GDCore/Extensions/Builtin/AdvancedExtension.cpp

@@ -115,21 +115,23 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsAdvancedExtension(
       .AddExpression(
           "GetArgumentAsNumber",
           _("Get function parameter value"),
-          _("Get function parameter (also called \"argument\") value."),
+          _("Get function parameter (also called \"argument\") value. You don't need this most of the time as you can simply write the parameter name in an expression."),
           "",
           "res/function16.png")
       .AddParameter("functionParameterName", _("Parameter name"), "number,string,boolean")
-      .SetRelevantForFunctionEventsOnly();
+      .SetRelevantForFunctionEventsOnly()
+      .SetHidden();
 
   extension
       .AddStrExpression(
           "GetArgumentAsString",
           _("Get function parameter text"),
-          _("Get function parameter (also called \"argument\") text."),
+          _("Get function parameter (also called \"argument\") text. You don't need this most of the time as you can simply write the parameter name in an expression."),
           "",
           "res/function16.png")
       .AddParameter("functionParameterName", _("Parameter name"), "number,string,boolean")
-      .SetRelevantForFunctionEventsOnly();
+      .SetRelevantForFunctionEventsOnly()
+      .SetHidden();
 
   extension
       .AddCondition(

Core/GDCore/Extensions/Builtin/AllBuiltinExtensions.h

@@ -49,6 +49,7 @@ class GD_CORE_API BuiltinExtensionsImplementer {
   static void ImplementsAnimatableExtension(gd::PlatformExtension& extension);
   static void ImplementsEffectExtension(gd::PlatformExtension& extension);
   static void ImplementsOpacityExtension(gd::PlatformExtension& extension);
+  static void ImplementsTextContainerExtension(gd::PlatformExtension& extension);
 };
 
 }  // namespace gd

Core/GDCore/Extensions/Builtin/BaseObjectExtension.cpp

@@ -396,7 +396,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
                 _("Z order"),
                 _("Modify the Z-order of an object"),
                 _("the z-order"),
-                _("Z order"),
+                _("Layers and cameras"),
                 "res/actions/planicon24.png",
                 "res/actions/planicon.png")
 
@@ -550,7 +550,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
                    _("Z-order"),
                    _("Compare the Z-order of the specified object."),
                    _("the Z-order"),
-                   _("Z-order"),
+                   _("Layer"),
                    "res/conditions/planicon24.png",
                    "res/conditions/planicon.png")
 
@@ -617,6 +617,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
           "number", ParameterOptions::MakeNewOptions())
       .MarkAsAdvanced();
 
+  // Deprecated
   obj.AddCondition("AngleOfDisplacement",
                    _("Angle of movement (using forces)"),
                    _("Compare the angle of movement of an object according to "
@@ -626,7 +627,20 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
                    _("Movement using forces"),
                    "res/conditions/vitesse24.png",
                    "res/conditions/vitesse.png")
+      .SetHidden()
+      .AddParameter("object", _("Object"))
+      .AddParameter("expression", _("Angle, in degrees"))
+      .AddParameter("expression", _("Tolerance, in degrees"))
+      .MarkAsAdvanced();
 
+  obj.AddCondition("IsTotalForceAngleAround",
+                   _("Angle of movement (using forces)"),
+                   _("Compare the angle of movement of an object according to "
+                     "the forces applied on it."),
+                   _("Angle of movement of _PARAM0_ is _PARAM1_ ± _PARAM2_°"),
+                   _("Movement using forces"),
+                   "res/conditions/vitesse24.png",
+                   "res/conditions/vitesse.png")
       .AddParameter("object", _("Object"))
       .AddParameter("expression", _("Angle, in degrees"))
       .AddParameter("expression", _("Tolerance, in degrees"))
@@ -1137,7 +1151,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
   obj.AddExpression("ZOrder",
                     _("Z-order"),
                     _("Z-order of an object"),
-                    _("Visibility"),
+                    "",
                     "res/actions/planicon.png")
       .AddParameter("object", _("Object"));
 
@@ -1267,8 +1281,8 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
                 _("Enable an effect on the object"),
                 _("Enable effect _PARAM1_ on _PARAM0_: _PARAM2_"),
                 _("Effects"),
-                "res/actions/effect24.png",
-                "res/actions/effect.png")
+                "res/actions/effect_black.svg",
+                "res/actions/effect_black.svg")
       .AddParameter("object", _("Object"))
       .AddParameter("objectEffectName", _("Effect name"))
       .AddParameter("yesorno", _("Enable?"))
@@ -1277,53 +1291,53 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
 
   // Deprecated
   obj.AddAction("SetEffectDoubleParameter",
-                _("Effect parameter (number)"),
-                _("Change the value of a parameter of an effect.") + "\n" +
-                    _("You can find the parameter names (and change the effect "
+                _("Effect property (number)"),
+                _("Change the value of a property of an effect.") + "\n" +
+                    _("You can find the property names (and change the effect "
                       "names) in the effects window."),
                 _("Set _PARAM2_ to _PARAM3_ for effect _PARAM1_ of _PARAM0_"),
                 _("Effects"),
-                "res/actions/effect24.png",
-                "res/actions/effect.png")
+                "res/actions/effect_black.svg",
+                "res/actions/effect_black.svg")
       .AddParameter("object", _("Object"))
       .AddParameter("objectEffectName", _("Effect name"))
-      .AddParameter("objectEffectParameterName", _("Parameter name"))
+      .AddParameter("objectEffectParameterName", _("Property name"))
       .AddParameter("expression", _("New value"))
       .MarkAsSimple()
       .SetHidden();
 
   // Deprecated
   obj.AddAction("SetEffectStringParameter",
-                _("Effect parameter (string)"),
-                _("Change the value (string) of a parameter of an effect.") +
+                _("Effect property (string)"),
+                _("Change the value (string) of a property of an effect.") +
                     "\n" +
-                    _("You can find the parameter names (and change the effect "
+                    _("You can find the property names (and change the effect "
                       "names) in the effects window."),
                 _("Set _PARAM2_ to _PARAM3_ for effect _PARAM1_ of _PARAM0_"),
                 _("Effects"),
-                "res/actions/effect24.png",
-                "res/actions/effect.png")
+                "res/actions/effect_black.svg",
+                "res/actions/effect_black.svg")
       .AddParameter("object", _("Object"))
       .AddParameter("objectEffectName", _("Effect name"))
-      .AddParameter("objectEffectParameterName", _("Parameter name"))
+      .AddParameter("objectEffectParameterName", _("Property name"))
       .AddParameter("string", _("New value"))
       .MarkAsSimple()
       .SetHidden();
 
   // Deprecated
   obj.AddAction("SetEffectBooleanParameter",
-                _("Effect parameter (enable or disable)"),
-                _("Enable or disable a parameter of an effect.") + "\n" +
-                    _("You can find the parameter names (and change the effect "
+                _("Effect property (enable or disable)"),
+                _("Enable or disable a property of an effect.") + "\n" +
+                    _("You can find the property names (and change the effect "
                       "names) in the effects window."),
                 _("Enable _PARAM2_ for effect _PARAM1_ of _PARAM0_: _PARAM3_"),
                 _("Effects"),
-                "res/actions/effect24.png",
-                "res/actions/effect.png")
+                "res/actions/effect_black.svg",
+                "res/actions/effect_black.svg")
       .AddParameter("object", _("Object"))
       .AddParameter("objectEffectName", _("Effect name"))
-      .AddParameter("objectEffectParameterName", _("Parameter name"))
-      .AddParameter("yesorno", _("Enable?"))
+      .AddParameter("objectEffectParameterName", _("Property name"))
+      .AddParameter("yesorno", _("Enable this property"))
       .MarkAsSimple()
       .SetHidden();
 
@@ -1333,8 +1347,8 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
                    _("Check if the effect on an object is enabled."),
                    _("Effect _PARAM1_ of _PARAM0_ is enabled"),
                    _("Effects"),
-                   "res/actions/effect24.png",
-                   "res/actions/effect.png")
+                   "res/actions/effect_black.svg",
+                   "res/actions/effect_black.svg")
       .AddParameter("object", _("Object"))
       .AddParameter("objectEffectName", _("Effect name"))
       .MarkAsSimple()
@@ -1610,7 +1624,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
           _("Cast a ray from _PARAM1_;_PARAM2_, angle: _PARAM3_ and max "
             "distance: _PARAM4_px, against _PARAM0_, and save the "
             "result in _PARAM5_, _PARAM6_"),
-          "",
+          _("Collision"),
           "res/conditions/raycast24.png",
           "res/conditions/raycast.png")
       .AddParameter("objectList", _("Objects to test against the ray"))
@@ -1641,7 +1655,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
           _("Cast a ray from _PARAM1_;_PARAM2_ to _PARAM3_;_PARAM4_ "
             "against _PARAM0_, and save the "
             "result in _PARAM5_, _PARAM6_"),
-          "",
+          _("Collision"),
           "res/conditions/raycast24.png",
           "res/conditions/raycast.png")
       .AddParameter("objectList", _("Objects to test against the ray"))

Core/GDCore/Extensions/Builtin/CameraExtension.cpp

@@ -27,7 +27,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsCameraExtension(
   extension.AddInstructionOrExpressionGroupMetadata(_("Layers and cameras"))
       .SetIcon("res/conditions/camera24.png");
   extension.AddInstructionOrExpressionGroupMetadata(_("Effects"))
-      .SetIcon("res/actions/effect24.png");
+      .SetIcon("res/actions/effect_black.svg");
 
   extension
       .AddExpressionAndConditionAndAction(
@@ -327,7 +327,6 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsCameraExtension(
       .AddParameter("expression", _("Camera number (default : 0)"), "", true)
       .SetDefaultValue("0");
 
-  // TODO Deprecated: hide this action in a future release.
   extension
       .AddAction(
           "FixCamera",
@@ -339,6 +338,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsCameraExtension(
           "",
           "res/actions/camera24.png",
           "res/actions/camera.png")
+      .SetHidden()
       .AddCodeOnlyParameter("currentScene", "")
       .AddParameter("objectPtr", _("Object"))
       .AddParameter("expression",
@@ -386,7 +386,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsCameraExtension(
                  _("Center the camera on an object"),
                  _("Center the camera on the specified object."),
                  _("Center camera on _PARAM1_ (layer: _PARAM3_)"),
-                 "",
+                 _("Layers and cameras"),
                  "res/actions/camera24.png",
                  "res/actions/camera.png")
       .AddCodeOnlyParameter("currentScene", "")
@@ -444,58 +444,58 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsCameraExtension(
   extension
       .AddAction(
           "SetLayerEffectParameter",
-          _("Effect parameter (number)"),
-          _("Change the value of a parameter of an effect.") + "\n" +
-              _("You can find the parameter names (and change the effect "
+          _("Effect property (number)"),
+          _("Change the value of a property of an effect.") + "\n" +
+              _("You can find the property names (and change the effect "
                 "names) in the effects window."),
           _("Set _PARAM3_ to _PARAM4_ for effect _PARAM2_ of layer _PARAM1_"),
           _("Effects"),
-          "res/actions/effect24.png",
-          "res/actions/effect.png")
+          "res/actions/effect_black.svg",
+          "res/actions/effect_black.svg")
       .AddCodeOnlyParameter("currentScene", "")
       .AddParameter("layer", _("Layer"), "", true)
       .SetDefaultValue("\"\"")
       .AddParameter("layerEffectName", _("Effect name"))
-      .AddParameter("layerEffectParameterName", _("Parameter name"))
+      .AddParameter("layerEffectParameterName", _("Property name"))
       .AddParameter("expression", _("New value"))
       .MarkAsAdvanced();
 
   extension
       .AddAction(
           "SetLayerEffectStringParameter",
-          _("Effect parameter (string)"),
-          _("Change the value (string) of a parameter of an effect.") + "\n" +
-              _("You can find the parameter names (and change the effect "
+          _("Effect property (string)"),
+          _("Change the value (string) of a property of an effect.") + "\n" +
+              _("You can find the property names (and change the effect "
                 "names) in the effects window."),
           _("Set _PARAM3_ to _PARAM4_ for effect _PARAM2_ of layer _PARAM1_"),
           _("Effects"),
-          "res/actions/effect24.png",
-          "res/actions/effect.png")
+          "res/actions/effect_black.svg",
+          "res/actions/effect_black.svg")
       .AddCodeOnlyParameter("currentScene", "")
       .AddParameter("layer", _("Layer"), "", true)
       .SetDefaultValue("\"\"")
       .AddParameter("layerEffectName", _("Effect name"))
-      .AddParameter("layerEffectParameterName", _("Parameter name"))
+      .AddParameter("layerEffectParameterName", _("Property name"))
       .AddParameter("string", _("New value"))
       .MarkAsAdvanced();
 
   extension
       .AddAction(
           "SetLayerEffectBooleanParameter",
-          _("Effect parameter (enable or disable)"),
-          _("Enable or disable a parameter of an effect.") + "\n" +
-              _("You can find the parameter names (and change the effect "
+          _("Effect property (enable or disable)"),
+          _("Enable or disable a property of an effect.") + "\n" +
+              _("You can find the property names (and change the effect "
                 "names) in the effects window."),
           _("Enable _PARAM3_ for effect _PARAM2_ of layer _PARAM1_: _PARAM4_"),
           _("Effects"),
-          "res/actions/effect24.png",
-          "res/actions/effect.png")
+          "res/actions/effect_black.svg",
+          "res/actions/effect_black.svg")
       .AddCodeOnlyParameter("currentScene", "")
       .AddParameter("layer", _("Layer"), "", true)
       .SetDefaultValue("\"\"")
       .AddParameter("layerEffectName", _("Effect name"))
-      .AddParameter("layerEffectParameterName", _("Parameter name"))
-      .AddParameter("yesorno", _("Enable this parameter"))
+      .AddParameter("layerEffectParameterName", _("Property name"))
+      .AddParameter("yesorno", _("Enable this property"))
       .MarkAsAdvanced();
 
   extension
@@ -504,8 +504,8 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsCameraExtension(
                     _("The effect on a layer is enabled"),
                     _("Effect _PARAM2_ on layer _PARAM1_ is enabled"),
                     _(""),
-                    "res/actions/effect24.png",
-                    "res/actions/effect.png")
+                    "res/actions/effect_black.svg",
+                    "res/actions/effect_black.svg")
       .AddCodeOnlyParameter("currentScene", "")
       .AddParameter("layer", _("Layer"), "", true)
       .SetDefaultValue("\"\"")
@@ -518,8 +518,8 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsCameraExtension(
                  _("Enable an effect on a layer"),
                  _("Enable effect _PARAM2_ on layer _PARAM1_: _PARAM3_"),
                  _("Effects"),
-                 "res/actions/effect24.png",
-                 "res/actions/effect.png")
+                 "res/actions/effect_black.svg",
+                 "res/actions/effect_black.svg")
       .AddCodeOnlyParameter("currentScene", "")
       .AddParameter("layer", _("Layer"), "", true)
       .SetDefaultValue("\"\"")
@@ -548,7 +548,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsCameraExtension(
   extension
       .AddAction(
           "ChangeLayerTimeScale",
-          _("Change layer time scale"),
+          _("Layer time scale"),
           _("Change the time scale applied to the objects of the layer."),
           _("Set the time scale of layer _PARAM1_ to _PARAM2_"),
           "",
@@ -594,7 +594,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsCameraExtension(
   extension
       .AddAction(
           "SetLayerAmbientLightColor",
-          _("Set the ambient light color"),
+          _("Ambient light color"),
           _("Set the ambient light color of the lighting layer in format "
             "\"R;G;B\" string."),
           _("Set the ambient color of the lighting layer _PARAM1_ to _PARAM2_"),

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

@@ -23,6 +23,8 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsAnimatableExtension(
                                "Florian Rival",
                                "Open source (MIT License)")
       .SetExtensionHelpPath("/objects");
+  extension.AddInstructionOrExpressionGroupMetadata(_("Animatable capability"))
+      .SetIcon("res/actions/animation24.png");
   extension.AddInstructionOrExpressionGroupMetadata(_("Animations and images"))
       .SetIcon("res/actions/animation24.png");
 
@@ -42,7 +44,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsAnimatableExtension(
          "number",
          "Index",
          _("Animation (by number)"),
-         _("the number of the animation played by the object (the number from "
+         _("the animation played by the object using the animation number (from "
            "the animations list)"),
          _("the number of the animation"),
          _("Animations and images"),
@@ -53,13 +55,14 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsAnimatableExtension(
           "number", gd::ParameterOptions::MakeNewOptions().SetDescription(
                         _("Animation index")))
       .MarkAsSimple();
+  aut.GetAllExpressions()["Index"].SetGroup("");
 
   aut.AddExpressionAndConditionAndAction(
          "string",
          "Name",
          _("Animation (by name)"),
          _("the animation played by the object using the name of the "
-           "animation."),
+           "animation"),
          _("the animation"),
          _("Animations and images"),
          "res/actions/animation24.png")
@@ -69,10 +72,11 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsAnimatableExtension(
           "objectAnimationName", gd::ParameterOptions::MakeNewOptions().SetDescription(
                         _("Animation name")))
       .MarkAsSimple();
+  aut.GetAllStrExpressions()["Name"].SetGroup("");
 
   aut.AddScopedAction("PauseAnimation",
                 _("Pause the animation"),
-                _("Pause the animation of the object"),
+                _("Pause the animation of the object."),
                 _("Pause the animation of _PARAM0_"),
                 _("Animations and images"),
                 "res/actions/animation24.png",
@@ -83,7 +87,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsAnimatableExtension(
 
   aut.AddScopedAction("PlayAnimation",
                 _("Resume the animation"),
-                _("Resume the animation of the object"),
+                _("Resume the animation of the object."),
                 _("Resume the animation of _PARAM0_"),
                 _("Animations and images"),
                 "res/actions/animation24.png",
@@ -107,6 +111,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsAnimatableExtension(
           "number", gd::ParameterOptions::MakeNewOptions().SetDescription(
                         _("Speed scale")))
       .MarkAsSimple();
+  aut.GetAllExpressions()["SpeedScale"].SetGroup("");
 
   aut.AddScopedCondition("IsAnimationPaused",
                    _("Animation paused"),
@@ -130,6 +135,31 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsAnimatableExtension(
       .AddParameter("object", _("Object"))
       .AddParameter("behavior", _("Behavior"), "AnimatableBehavior")
       .MarkAsSimple();
+
+  aut.AddExpressionAndConditionAndAction(
+         "number",
+         "ElapsedTime",
+         _("Animation elapsed time"),
+         _("the elapsed time from the beginning of the animation (in seconds)"),
+         _("the animation elapsed time"),
+         _("Animations and images"),
+         "res/actions/animation24.png")
+      .AddParameter("object", _("Object"))
+      .AddParameter("behavior", _("Behavior"), "AnimatableBehavior")
+      .UseStandardParameters(
+          "number", gd::ParameterOptions::MakeNewOptions().SetDescription(
+                        _("Elapsed time (in seconds)")))
+      .MarkAsAdvanced();
+  aut.GetAllExpressions()["ElapsedTime"].SetGroup("");
+
+  aut.AddExpression(
+         "Duration",
+         _("Animation duration"),
+         _("Return the current animation duration (in seconds)."),
+         _("Animations and images"),
+         "res/actions/animation24.png")
+      .AddParameter("object", _("Object"))
+      .AddParameter("behavior", _("Behavior"), "AnimatableBehavior");
 }
 
 }  // namespace gd

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

@@ -24,7 +24,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsEffectExtension(
                                "Open source (MIT License)")
       .SetExtensionHelpPath("/objects");
   extension.AddInstructionOrExpressionGroupMetadata(_("Effects"))
-      .SetIcon("res/actions/effect24.png");
+      .SetIcon("res/actions/effect_black.svg");
 
   gd::BehaviorMetadata& aut = extension.AddBehavior(
       "EffectBehavior",
@@ -32,7 +32,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsEffectExtension(
       "Effect",
       _("Apply visual effects to objects."),
       "",
-      "res/actions/effect24.png",
+      "res/actions/effect_black.svg",
       "EffectBehavior",
       std::make_shared<gd::Behavior>(),
       std::make_shared<gd::BehaviorsSharedData>())
@@ -43,8 +43,8 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsEffectExtension(
                 _("Enable an effect on the object"),
                 _("Enable effect _PARAM2_ on _PARAM0_: _PARAM3_"),
                 _("Effects"),
-                "res/actions/effect24.png",
-                "res/actions/effect.png")
+                "res/actions/effect_black.svg",
+                "res/actions/effect_black.svg")
       .AddParameter("object", _("Object"))
       .AddParameter("behavior", _("Behavior"), "EffectBehavior")
       .AddParameter("objectEffectName", _("Effect name"))
@@ -52,52 +52,52 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsEffectExtension(
       .MarkAsSimple();
 
   aut.AddScopedAction("SetEffectDoubleParameter",
-                _("Effect parameter (number)"),
-                _("Change the value of a parameter of an effect.") + "\n" +
-                    _("You can find the parameter names (and change the effect "
+                _("Effect property (number)"),
+                _("Change the value of a property of an effect.") + "\n" +
+                    _("You can find the property names (and change the effect "
                       "names) in the effects window."),
                 _("Set _PARAM3_ to _PARAM4_ for effect _PARAM2_ of _PARAM0_"),
                 _("Effects"),
-                "res/actions/effect24.png",
-                "res/actions/effect.png")
+                "res/actions/effect_black.svg",
+                "res/actions/effect_black.svg")
       .AddParameter("object", _("Object"))
       .AddParameter("behavior", _("Behavior"), "EffectBehavior")
       .AddParameter("objectEffectName", _("Effect name"))
-      .AddParameter("objectEffectParameterName", _("Parameter name"))
+      .AddParameter("objectEffectParameterName", _("Property name"))
       .AddParameter("expression", _("New value"))
       .MarkAsSimple();
 
   aut.AddScopedAction("SetEffectStringParameter",
-                _("Effect parameter (string)"),
-                _("Change the value (string) of a parameter of an effect.") +
+                _("Effect property (string)"),
+                _("Change the value (string) of a property of an effect.") +
                     "\n" +
-                    _("You can find the parameter names (and change the effect "
+                    _("You can find the property names (and change the effect "
                       "names) in the effects window."),
                 _("Set _PARAM3_ to _PARAM4_ for effect _PARAM2_ of _PARAM0_"),
                 _("Effects"),
-                "res/actions/effect24.png",
-                "res/actions/effect.png")
+                "res/actions/effect_black.svg",
+                "res/actions/effect_black.svg")
       .AddParameter("object", _("Object"))
       .AddParameter("behavior", _("Behavior"), "EffectBehavior")
       .AddParameter("objectEffectName", _("Effect name"))
-      .AddParameter("objectEffectParameterName", _("Parameter name"))
+      .AddParameter("objectEffectParameterName", _("Property name"))
       .AddParameter("string", _("New value"))
       .MarkAsSimple();
 
   aut.AddScopedAction("SetEffectBooleanParameter",
-                _("Effect parameter (enable or disable)"),
-                _("Enable or disable a parameter of an effect.") + "\n" +
-                    _("You can find the parameter names (and change the effect "
+                _("Effect property (enable or disable)"),
+                _("Enable or disable a property of an effect.") + "\n" +
+                    _("You can find the property names (and change the effect "
                       "names) in the effects window."),
                 _("Enable _PARAM3_ for effect _PARAM2_ of _PARAM0_: _PARAM4_"),
                 _("Effects"),
-                "res/actions/effect24.png",
-                "res/actions/effect.png")
+                "res/actions/effect_black.svg",
+                "res/actions/effect_black.svg")
       .AddParameter("object", _("Object"))
       .AddParameter("behavior", _("Behavior"), "EffectBehavior")
       .AddParameter("objectEffectName", _("Effect name"))
-      .AddParameter("objectEffectParameterName", _("Parameter name"))
-      .AddParameter("yesorno", _("Enable?"))
+      .AddParameter("objectEffectParameterName", _("Property name"))
+      .AddParameter("yesorno", _("Enable this property"))
       .MarkAsSimple();
 
   aut.AddScopedCondition("IsEffectEnabled",
@@ -105,8 +105,8 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsEffectExtension(
                    _("Check if the effect on an object is enabled."),
                    _("Effect _PARAM2_ of _PARAM0_ is enabled"),
                    _("Effects"),
-                   "res/actions/effect24.png",
-                   "res/actions/effect.png")
+                   "res/actions/effect_black.svg",
+                   "res/actions/effect_black.svg")
       .AddParameter("object", _("Object"))
       .AddParameter("behavior", _("Behavior"), "EffectBehavior")
       .AddParameter("objectEffectName", _("Effect name"))

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

@@ -24,7 +24,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsFlippableExtension(
                                "Open source (MIT License)")
       .SetExtensionHelpPath("/objects");
   extension.AddInstructionOrExpressionGroupMetadata(_("Effects"))
-      .SetIcon("res/actions/effect24.png");
+      .SetIcon("res/actions/effect_black.svg");
 
   gd::BehaviorMetadata& aut = extension.AddBehavior(
       "FlippableBehavior",

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

@@ -23,6 +23,8 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsOpacityExtension(
                                "Florian Rival",
                                "Open source (MIT License)")
       .SetExtensionHelpPath("/objects");
+  extension.AddInstructionOrExpressionGroupMetadata(_("Opacity capability"))
+      .SetIcon("res/actions/opacity24.png");
   extension.AddInstructionOrExpressionGroupMetadata(_("Visibility"))
       .SetIcon("res/actions/opacity24.png");
 
@@ -54,6 +56,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsOpacityExtension(
                         _("Opacity (0-255)")))
       .SetFunctionName("setOpacity")
       .SetGetter("getOpacity");
+  aut.GetAllExpressions()["Value"].SetGroup("");
 }
 
 }  // namespace gd

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

@@ -22,11 +22,12 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsResizableExtension(
                                "Florian Rival",
                                "Open source (MIT License)")
       .SetExtensionHelpPath("/objects");
-  extension.AddInstructionOrExpressionGroupMetadata(_("Size"))
-      .SetIcon("res/actions/scale24_black.png");
+  extension.AddInstructionOrExpressionGroupMetadata(_("Size")).SetIcon(
+      "res/actions/scale24_black.png");
 
-  gd::BehaviorMetadata& aut = extension.AddBehavior(
-      "ResizableBehavior",
+  gd::BehaviorMetadata &aut =
+      extension
+          .AddBehavior("ResizableBehavior",
                        _("Resizable capability"),
                        "Resizable",
                        _("Change the object dimensions."),
@@ -46,9 +47,9 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsResizableExtension(
                       "res/actions/scaleWidth_black.png")
       .AddParameter("object", _("Object"))
       .AddParameter("behavior", _("Behavior"), "ResizableBehavior")
-      .UseStandardOperatorParameters("number",
-                                     ParameterOptions::MakeNewOptions().SetDescription(
-                                        _("Width")))
+      .UseStandardOperatorParameters(
+          "number",
+          ParameterOptions::MakeNewOptions().SetDescription(_("Width")))
       .MarkAsAdvanced();
 
   aut.AddScopedCondition("Width",
@@ -61,8 +62,8 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsResizableExtension(
       .AddParameter("object", _("Object"))
       .AddParameter("behavior", _("Behavior"), "ResizableBehavior")
       .UseStandardRelationalOperatorParameters(
-          "number", ParameterOptions::MakeNewOptions().SetDescription(
-                        _("Width")))
+          "number",
+          ParameterOptions::MakeNewOptions().SetDescription(_("Width")))
       .MarkAsAdvanced();
 
   aut.AddScopedAction("SetHeight",
@@ -74,9 +75,9 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsResizableExtension(
                       "res/actions/scaleHeight_black.png")
       .AddParameter("object", _("Object"))
       .AddParameter("behavior", _("Behavior"), "ResizableBehavior")
-      .UseStandardOperatorParameters("number",
-                                     ParameterOptions::MakeNewOptions().SetDescription(
-                                        _("Height")))
+      .UseStandardOperatorParameters(
+          "number",
+          ParameterOptions::MakeNewOptions().SetDescription(_("Height")))
       .MarkAsAdvanced();
 
   aut.AddScopedCondition("Height",
@@ -89,14 +90,15 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsResizableExtension(
       .AddParameter("object", _("Object"))
       .AddParameter("behavior", _("Behavior"), "ResizableBehavior")
       .UseStandardRelationalOperatorParameters(
-          "number", ParameterOptions::MakeNewOptions().SetDescription(
-                        _("Height")))
+          "number",
+          ParameterOptions::MakeNewOptions().SetDescription(_("Height")))
       .MarkAsAdvanced();
 
-  aut.AddScopedAction("SetSize",
+  aut.AddScopedAction(
+         "SetSize",
          _("Size"),
          _("Change the size of an object."),
-                _("Change the size of _PARAM0_: set to _PARAM1_ x _PARAM2_"),
+         _("Change the size of _PARAM0_: set to _PARAM2_ x _PARAM3_"),
          _("Size"),
          "res/actions/scale24_black.png",
          "res/actions/scale_black.png")

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

@@ -23,6 +23,8 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsScalableExtension(
                                "Florian Rival",
                                "Open source (MIT License)")
       .SetExtensionHelpPath("/objects");
+  extension.AddInstructionOrExpressionGroupMetadata(_("Scalable capability"))
+      .SetIcon("res/actions/scale24_black.png");
   extension.AddInstructionOrExpressionGroupMetadata(_("Size"))
       .SetIcon("res/actions/scale24_black.png");
 
@@ -44,7 +46,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsScalableExtension(
          _("Scale"),
          _("the scale of the object (default scale is 1)"),
          _("the scale"),
-         _("Scale"),
+         _("Size"),
          "res/actions/scale24_black.png")
       .AddParameter("object", _("Object"))
       .AddParameter("behavior", _("Behavior"), "ScalableBehavior")
@@ -53,6 +55,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsScalableExtension(
           gd::ParameterOptions::MakeNewOptions().SetDescription(
               _("Scale (1 by default)")))
       .MarkAsAdvanced();
+  aut.GetAllExpressions()["Value"].SetGroup("");
 
   aut.AddExpressionAndConditionAndAction(
          "number",
@@ -60,8 +63,8 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsScalableExtension(
          _("Scale on X axis"),
          _("the scale on X axis of the object (default scale is 1)"),
          _("the scale on X axis"),
-         _("Scale"),
-         "res/actions/scale24_black.png")
+         _("Size"),
+         "res/actions/scaleWidth24_black.png")
       .AddParameter("object", _("Object"))
       .AddParameter("behavior", _("Behavior"), "ScalableBehavior")
       .UseStandardParameters(
@@ -69,6 +72,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsScalableExtension(
           gd::ParameterOptions::MakeNewOptions().SetDescription(
               _("Scale (1 by default)")))
       .MarkAsAdvanced();
+  aut.GetAllExpressions()["X"].SetGroup("");
 
   aut.AddExpressionAndConditionAndAction(
          "number",
@@ -76,8 +80,8 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsScalableExtension(
          _("Scale on Y axis"),
          _("the scale on Y axis of the object (default scale is 1)"),
          _("the scale on Y axis"),
-         _("Scale"),
-         "res/actions/scale24_black.png")
+         _("Size"),
+         "res/actions/scaleHeight24_black.png")
       .AddParameter("object", _("Object"))
       .AddParameter("behavior", _("Behavior"), "ScalableBehavior")
       .UseStandardParameters(
@@ -85,6 +89,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsScalableExtension(
           gd::ParameterOptions::MakeNewOptions().SetDescription(
               _("Scale (1 by default)")))
       .MarkAsAdvanced();
+  aut.GetAllExpressions()["Y"].SetGroup("");
 }
 
 }  // namespace gd

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

@@ -0,0 +1,58 @@
+/*
+ * GDevelop Core
+ * Copyright 2008-2016 Florian Rival (Florian.Rival@gmail.com). All rights
+ * reserved. This project is released under the GNU Lesser General Public
+ * License.
+ */
+#include "GDCore/Extensions/Builtin/AllBuiltinExtensions.h"
+#include "GDCore/Extensions/Metadata/MultipleInstructionMetadata.h"
+#include "GDCore/Project/Behavior.h"
+#include "GDCore/Project/BehaviorsSharedData.h"
+#include "GDCore/Project/Object.h"
+#include "GDCore/Tools/Localization.h"
+
+using namespace std;
+namespace gd {
+
+void GD_CORE_API BuiltinExtensionsImplementer::ImplementsTextContainerExtension(
+    gd::PlatformExtension& extension) {
+  extension
+      .SetExtensionInformation("TextContainerCapability",
+                               _("Text capability"),
+                               _("Animate objects."),
+                               "Florian Rival",
+                               "Open source (MIT License)")
+      .SetExtensionHelpPath("/objects");
+  extension.AddInstructionOrExpressionGroupMetadata(_("Text capability"))
+      .SetIcon("res/conditions/text24_black.png");
+
+  gd::BehaviorMetadata& aut = extension.AddBehavior(
+      "TextContainerBehavior",
+      _("Text capability"),
+      "Text",
+      _("Access objects text."),
+      "",
+      "res/conditions/text24_black.png",
+      "TextContainerBehavior",
+      std::make_shared<gd::Behavior>(),
+      std::make_shared<gd::BehaviorsSharedData>())
+    .SetHidden();
+
+  aut.AddExpressionAndConditionAndAction(
+         "string",
+         "Value",
+         _("Text"),
+         _("the text"),
+         _("the text"),
+         "",
+         "res/conditions/text24_black.png")
+      .AddParameter("object", _("Object"))
+      .AddParameter("behavior", _("Behavior"), "TextContainerBehavior")
+      .UseStandardParameters(
+          "string", gd::ParameterOptions::MakeNewOptions().SetDescription(
+                        _("Text")))
+      .MarkAsSimple();
+  aut.GetAllStrExpressions()["Value"].SetGroup("");
+}
+
+}  // namespace gd

Core/GDCore/Extensions/Builtin/CommonInstructionsExtension.cpp

@@ -35,6 +35,8 @@ BuiltinExtensionsImplementer::ImplementsCommonInstructionsExtension(
       .AddInstructionOrExpressionGroupMetadata(_("Events and control flow"))
       .SetIcon("res/conditions/toujours24_black.png");
 
+  // This condition is deprecated as this does not bring anything new
+  // and can be confusing or misleading for beginners.
   extension
       .AddCondition("Always",
                     _("Always"),
@@ -46,7 +48,8 @@ BuiltinExtensionsImplementer::ImplementsCommonInstructionsExtension(
                     "res/conditions/toujours_black.png")
       .SetHelpPath("/all-features/advanced-conditions")
       .AddCodeOnlyParameter("conditionInverted", "")
-      .MarkAsAdvanced();
+      .MarkAsAdvanced()
+      .SetHidden();
 
   // Compatibility with GD <= 5.0.127
   extension
@@ -114,8 +117,9 @@ BuiltinExtensionsImplementer::ImplementsCommonInstructionsExtension(
 
   // Compatibility with GD <= 5.0.127
   extension
-      .AddDuplicatedCondition(
-          "Egal", "BuiltinCommonInstructions::CompareNumbers", {.unscoped = true})
+      .AddDuplicatedCondition("Egal",
+                              "BuiltinCommonInstructions::CompareNumbers",
+                              {.unscoped = true})
       .SetHidden();
   // end of compatibility code
 
@@ -135,8 +139,9 @@ BuiltinExtensionsImplementer::ImplementsCommonInstructionsExtension(
 
   // Compatibility with GD <= 5.0.127
   extension
-      .AddDuplicatedCondition(
-          "StrEqual", "BuiltinCommonInstructions::CompareStrings", {.unscoped = true})
+      .AddDuplicatedCondition("StrEqual",
+                              "BuiltinCommonInstructions::CompareStrings",
+                              {.unscoped = true})
       .SetHidden();
   // end of compatibility code
 

Core/GDCore/Extensions/Builtin/ExternalLayoutsExtension.cpp

@@ -38,6 +38,8 @@ BuiltinExtensionsImplementer::ImplementsExternalLayoutsExtension(
       .SetDefaultValue("0")
       .AddParameter("expression", _("Y position of the origin"), "", true)
       .SetDefaultValue("0")
+      .AddParameter("expression", _("Z position of the origin"), "", true)
+      .SetDefaultValue("0")
       .MarkAsAdvanced();
 }
 

Core/GDCore/Extensions/Builtin/SceneExtension.cpp

@@ -5,6 +5,7 @@
  */
 #include "AllBuiltinExtensions.h"
 #include "GDCore/Tools/Localization.h"
+#include "GDCore/Extensions/Metadata/MultipleInstructionMetadata.h"
 
 using namespace std;
 namespace gd {
@@ -57,7 +58,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsSceneExtension(
   extension
       .AddCondition("DoesSceneExist",
                     _("Does scene exist"),
-                    _("Check if scene exists."),
+                    _("Check if a scene exists."),
                     _("Scene _PARAM1_ exists"),
                     "",
                     "res/actions/texte.png",
@@ -163,6 +164,45 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsSceneExtension(
           "res/actions/window.png")
       .SetHelpPath("/interface/scene-editor/events")
       .AddCodeOnlyParameter("currentScene", "");
+
+  extension
+      .AddAction("PrioritizeLoadingOfScene",
+                 _("Preload scene"),
+                 _("Preload a scene resources as soon as possible in background."),
+                 _("Preload scene _PARAM1_ in background"),
+                 "",
+                 "res/actions/hourglass_black.svg",
+                 "res/actions/hourglass_black.svg")
+      .SetHelpPath("/all-features/resources-loading")
+      .AddCodeOnlyParameter("currentScene", "")
+      .AddParameter("sceneName", _("Name of the new scene"))
+      .MarkAsAdvanced();
+
+  extension.AddExpressionAndCondition("number",
+                                "SceneLoadingProgress",
+                                _("Scene loading progress"),
+                                _("The progress of resources loading in background for a scene (between 0 and 1)."),
+                                _("_PARAM0_ loading progress"),
+                                _(""),
+                                "res/actions/hourglass_black.svg")
+      .SetHelpPath("/all-features/resources-loading")
+      .AddCodeOnlyParameter("currentScene", "")
+      .AddParameter("sceneName", _("Scene name"))
+      .UseStandardParameters("number", ParameterOptions::MakeNewOptions())
+      .MarkAsAdvanced();
+
+  extension
+      .AddCondition("AreSceneAssetsLoaded",
+                    _("Scene preloaded"),
+                    _("Check if scene resources have finished to load in background."),
+                    _("Scene _PARAM1_ was preloaded in background"),
+                    "",
+                    "res/actions/hourglass_black.svg",
+                    "res/actions/hourglass_black.svg")
+      .SetHelpPath("/all-features/resources-loading")
+      .AddCodeOnlyParameter("currentScene", "")
+      .AddParameter("sceneName", _("Scene name"))
+      .MarkAsAdvanced();
 }
 
 }  // namespace gd

Core/GDCore/Extensions/Builtin/SpriteExtension/SpriteExtension.cpp

@@ -30,7 +30,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsSpriteExtension(
           .AddObject<SpriteObject>("Sprite",
                                    _("Sprite"),
                                    _("Animated object which can be used for "
-                                     "most elements of a game"),
+                                     "most elements of a game."),
                                    "CppPlatform/Extensions/spriteicon.png")
           .SetCategoryFullName(_("General"))
           .AddDefaultBehavior("EffectCapability::EffectBehavior")
@@ -408,6 +408,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsSpriteExtension(
       .SetHidden()
       .MarkAsSimple();
 
+  // Deprecated
   obj.AddCondition("ScaleWidth",
                    _("Scale on X axis"),
                    _("Compare the scale of the width of an object."),
@@ -415,7 +416,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsSpriteExtension(
                    _("Size"),
                    "res/conditions/scaleWidth24_black.png",
                    "res/conditions/scaleWidth_black.png")
-
+      .SetHidden()
       .AddParameter("object", _("Object"), "Sprite")
       .UseStandardRelationalOperatorParameters(
           "number",
@@ -423,6 +424,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsSpriteExtension(
               _("Scale (1 by default)")))
       .MarkAsAdvanced();
 
+  // Deprecated
   obj.AddCondition("ScaleHeight",
                    _("Scale on Y axis"),
                    _("Compare the scale of the height of an object."),
@@ -430,7 +432,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsSpriteExtension(
                    _("Size"),
                    "res/conditions/scaleHeight24_black.png",
                    "res/conditions/scaleHeight_black.png")
-
+      .SetHidden()
       .AddParameter("object", _("Object"), "Sprite")
       .UseStandardRelationalOperatorParameters(
           "number",

Core/GDCore/Extensions/Builtin/WindowExtension.cpp

@@ -87,8 +87,8 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsWindowExtension(
   extension
       .AddAction(
           "SetWindowSize",
-          _("Change the size of the game window"),
-          _("This action changes the size of the game window. Note that this "
+          _("Game window size"),
+          _("Changes the size of the game window. Note that this "
             "will only work on platform supporting this operation: games "
             "running in browsers or on mobile phones can not update their "
             "window size. Game resolution can still be updated."),

Core/GDCore/Extensions/Metadata/AbstractFunctionMetadata.h

@@ -114,6 +114,8 @@ public:
 
   /**
    * \brief Erase any existing include file and add the specified include.
+   * \deprecated Use `AddIncludeFile` instead as clearing the list is more
+   * error prone.
    */
   virtual AbstractFunctionMetadata &
   SetIncludeFile(const gd::String &includeFile) = 0;

Core/GDCore/Extensions/Metadata/BehaviorMetadata.cpp

@@ -13,12 +13,15 @@
 #include "GDCore/Extensions/PlatformExtension.h"
 #include "GDCore/Project/Behavior.h"
 #include "GDCore/Project/BehaviorsSharedData.h"
+#include "GDCore/Project/PropertyDescriptor.h"
 #include "GDCore/Tools/Localization.h"
 #include "GDCore/Tools/MakeUnique.h"
 #include "GDCore/Tools/Log.h"
 
 namespace gd {
 
+const std::map<gd::String, gd::PropertyDescriptor> BehaviorMetadata::badProperties;
+
 BehaviorMetadata::BehaviorMetadata(
     const gd::String& extensionNamespace_,
     const gd::String& nameWithNamespace,
@@ -47,8 +50,14 @@ BehaviorMetadata::BehaviorMetadata(
         "BehaviorMetadata is valid for: " + nameWithNamespace);
   }
 
-  if (instance) instance->SetTypeName(nameWithNamespace);
-  if (sharedDatasInstance) sharedDatasInstance->SetTypeName(nameWithNamespace);
+  if (instance) {
+    instance->SetTypeName(nameWithNamespace);
+    instance->InitializeContent();
+  }
+  if (sharedDatasInstance) {
+    sharedDatasInstance->SetTypeName(nameWithNamespace);
+    sharedDatasInstance->InitializeContent();
+  }
 }
 
 gd::InstructionMetadata& BehaviorMetadata::AddCondition(
@@ -405,10 +414,30 @@ gd::Behavior& BehaviorMetadata::Get() const {
   return *instance;
 }
 
+std::map<gd::String, gd::PropertyDescriptor> BehaviorMetadata::GetProperties() const {
+  if (!instance) {
+    return badProperties;
+  }
+  // TODO Properties should be declared on BehaviorMetadata directly.
+  // - Add 2 `properties` members (one for shared properties)
+  // - Add methods to declare new properties
+  return instance->GetProperties();
+}
+
 gd::BehaviorsSharedData* BehaviorMetadata::GetSharedDataInstance() const { 
   return sharedDatasInstance.get();
 }
 
+std::map<gd::String, gd::PropertyDescriptor> BehaviorMetadata::GetSharedProperties() const {
+  if (!sharedDatasInstance) {
+    return badProperties;
+  }
+  // TODO Properties should be declared on BehaviorMetadata directly.
+  // - Add 2 `properties` members (one for shared properties)
+  // - Add methods to declare new properties
+  return sharedDatasInstance->GetProperties();
+}
+
 const std::vector<gd::String>& BehaviorMetadata::GetRequiredBehaviorTypes() const {
   requiredBehaviors.clear();
   for (auto& property : Get().GetProperties()) {

Core/GDCore/Extensions/Metadata/BehaviorMetadata.h

@@ -18,6 +18,7 @@ class BehaviorsSharedData;
 class MultipleInstructionMetadata;
 class InstructionMetadata;
 class ExpressionMetadata;
+class PropertyDescriptor;
 }  // namespace gd
 
 namespace gd {
@@ -204,6 +205,8 @@ class GD_CORE_API BehaviorMetadata : public InstructionOrExpressionContainerMeta
    * \brief Erase any existing include file and add the specified include.
    * \note The requirement may vary depending on the platform: Most of the time,
    * the include file contains the declaration of the behavior.
+   * \deprecated Use `AddIncludeFile` instead as clearing the list is more
+   * error prone.
    */
   BehaviorMetadata& SetIncludeFile(const gd::String& includeFile) override;
 
@@ -302,6 +305,15 @@ class GD_CORE_API BehaviorMetadata : public InstructionOrExpressionContainerMeta
    */
   gd::Behavior& Get() const;
 
+  /**
+   * \brief Called when the IDE wants to know about the custom properties of the
+   * behavior.
+   *
+   * \return a std::map with properties names as key.
+   * \see gd::PropertyDescriptor
+   */
+  std::map<gd::String, gd::PropertyDescriptor> GetProperties() const;
+
   /**
    * \brief Return the associated gd::BehaviorsSharedData, handling behavior
    * shared data, if any (nullptr if none).
@@ -311,6 +323,15 @@ class GD_CORE_API BehaviorMetadata : public InstructionOrExpressionContainerMeta
    */
   gd::BehaviorsSharedData* GetSharedDataInstance() const;
 
+  /**
+   * \brief Called when the IDE wants to know about the custom shared properties
+   * of the behavior.
+   *
+   * \return a std::map with properties names as key.
+   * \see gd::PropertyDescriptor
+   */
+  std::map<gd::String, gd::PropertyDescriptor> GetSharedProperties() const;
+
   /**
    * \brief Return a reference to a map containing the names of the actions
    * (as keys) and the metadata associated with (as values).
@@ -357,6 +378,8 @@ class GD_CORE_API BehaviorMetadata : public InstructionOrExpressionContainerMeta
   // TODO: Nitpicking: convert these to std::unique_ptr to clarify ownership.
   std::shared_ptr<gd::Behavior> instance;
   std::shared_ptr<gd::BehaviorsSharedData> sharedDatasInstance;
+
+  static const std::map<gd::String, gd::PropertyDescriptor> badProperties;
 };
 
 }  // namespace gd

Core/GDCore/Extensions/Metadata/EffectMetadata.h

@@ -65,6 +65,8 @@ class GD_CORE_API EffectMetadata {
 
   /**
    * \brief Clear any existing include file and add the specified include file.
+   * \deprecated Use `AddIncludeFile` instead as clearing the list is more
+   * error prone.
    */
   EffectMetadata& SetIncludeFile(const gd::String& includeFile);
 

Core/GDCore/Extensions/Metadata/ExpressionMetadata.cpp

@@ -5,6 +5,7 @@
  */
 #include "ExpressionMetadata.h"
 #include "GDCore/CommonTools.h"
+#include "GDCore/Extensions/PlatformExtension.h"
 #include "GDCore/String.h"
 
 namespace gd {
@@ -48,14 +49,12 @@ gd::ExpressionMetadata& ExpressionMetadata::AddParameter(
       ((gd::ParameterMetadata::IsObject(type) ||
         gd::ParameterMetadata::IsBehavior(type))
                // Prefix with the namespace if it's not already there.
-       && !(supplementaryInformation.rfind(extensionNamespace, 0) == 0))
+               && (supplementaryInformation.find(
+                       PlatformExtension::GetNamespaceSeparator()) == gd::String::npos)
            ? (supplementaryInformation.empty()
                   ? ""
-                 : extensionNamespace +
-                       supplementaryInformation  //... so prefix it with the extension
-                                           // namespace.
-             )
-          : supplementaryInformation);  // Otherwise don't change anything
+                  : extensionNamespace + supplementaryInformation)
+           : supplementaryInformation));
 
   // TODO: Assert against supplementaryInformation === "emsc" (when running with
   // Emscripten), and warn about a missing argument when calling addParameter.

Core/GDCore/Extensions/Metadata/ExpressionMetadata.h

@@ -288,6 +288,8 @@ class GD_CORE_API ExpressionMetadata : public gd::AbstractFunctionMetadata {
 
   /**
    * \brief Erase any existing include file and add the specified include.
+   * \deprecated Use `AddIncludeFile` instead as clearing the list is more
+   * error prone.
    */
   ExpressionMetadata& SetIncludeFile(
       const gd::String& includeFile) override {

Core/GDCore/Extensions/Metadata/InstructionMetadata.cpp

@@ -8,6 +8,7 @@
 #include <algorithm>
 
 #include "GDCore/CommonTools.h"
+#include "GDCore/Extensions/PlatformExtension.h"
 #include "GDCore/Serialization/SerializerElement.h"
 #include "GDCore/Tools/Localization.h"
 #include "GDCore/Tools/Log.h"
@@ -66,15 +67,12 @@ InstructionMetadata& InstructionMetadata::AddParameter(
       ((gd::ParameterMetadata::IsObject(type) ||
         gd::ParameterMetadata::IsBehavior(type))
                // Prefix with the namespace if it's not already there.
-       && !(supplementaryInformation.rfind(extensionNamespace, 0) == 0))
+               && (supplementaryInformation.find(
+                       PlatformExtension::GetNamespaceSeparator()) == gd::String::npos)
            ? (supplementaryInformation.empty()
                   ? ""
-                 : extensionNamespace +
-                       supplementaryInformation  //... so prefix it with the
-                                                 // extension
-                                                 // namespace.
-             )
-          : supplementaryInformation);  // Otherwise don't change anything
+                  : extensionNamespace + supplementaryInformation)
+           : supplementaryInformation));
 
   // TODO: Assert against supplementaryInformation === "emsc" (when running with
   // Emscripten), and warn about a missing argument when calling addParameter.
@@ -190,7 +188,7 @@ InstructionMetadata::UseStandardRelationalOperatorParameters(
       gd::String templateSentence = _("<subject> of _PARAM0_ <operator> <value>");
 
       sentence =
-          templateSentence.FindAndReplace("<subject>", sentence)
+          templateSentence.FindAndReplace("<subject>", sentence.CapitalizeFirstLetter())
               .FindAndReplace(
                   "<operator>",
                   "_PARAM" + gd::String::From(operatorParamIndex) + "_")
@@ -200,7 +198,7 @@ InstructionMetadata::UseStandardRelationalOperatorParameters(
       gd::String templateSentence = _("<subject> <operator> <value>");
 
       sentence =
-          templateSentence.FindAndReplace("<subject>", sentence)
+          templateSentence.FindAndReplace("<subject>", sentence.CapitalizeFirstLetter())
               .FindAndReplace(
                   "<operator>",
                   "_PARAM" + gd::String::From(operatorParamIndex) + "_")

Core/GDCore/Extensions/Metadata/InstructionMetadata.h

@@ -494,6 +494,8 @@ class GD_CORE_API InstructionMetadata : public gd::AbstractFunctionMetadata {
 
   /**
    * \brief Erase any existing include file and add the specified include.
+   * \deprecated Use `AddIncludeFile` instead as clearing the list is more
+   * error prone.
    */
   InstructionMetadata &SetIncludeFile(const gd::String &includeFile) override {
     codeExtraInformation.includeFiles.clear();

Core/GDCore/Extensions/Metadata/InstructionOrExpressionContainerMetadata.h

@@ -142,6 +142,8 @@ public:
    * \brief Erase any existing include file and add the specified include.
    * \note The requirement may vary depending on the platform: Most of the time,
    * the include file contains the declaration of the behavior.
+   * \deprecated Use `AddIncludeFile` instead as clearing the list is more
+   * error prone.
    */
   virtual InstructionOrExpressionContainerMetadata &
   SetIncludeFile(const gd::String &includeFile) = 0;

Core/GDCore/Extensions/Metadata/MetadataProvider.cpp

@@ -14,6 +14,7 @@
 #include "GDCore/Extensions/Platform.h"
 #include "GDCore/Extensions/PlatformExtension.h"
 #include "GDCore/Project/Layout.h"  // For GetTypeOfObject and GetTypeOfBehavior
+#include "GDCore/Project/ObjectsContainersList.h"
 #include "GDCore/String.h"
 #include "GDCore/Events/Parsers/ExpressionParser2.h"
 
@@ -392,19 +393,18 @@ MetadataProvider::GetBehaviorAnyExpressionMetadata(const gd::Platform& platform,
 
 const gd::ExpressionMetadata& MetadataProvider::GetFunctionCallMetadata(
     const gd::Platform& platform,
-    const gd::ObjectsContainer &globalObjectsContainer,
-    const gd::ObjectsContainer &objectsContainer,
+    const gd::ObjectsContainersList &objectsContainersList,
     FunctionCallNode& node) {
 
   if (!node.behaviorName.empty()) {
     gd::String behaviorType =
-        GetTypeOfBehavior(globalObjectsContainer, objectsContainer, node.behaviorName);
+        objectsContainersList.GetTypeOfBehavior(node.behaviorName);
     return MetadataProvider::GetBehaviorAnyExpressionMetadata(
             platform, behaviorType, node.functionName);
   }
   else if (!node.objectName.empty()) {
     gd::String objectType =
-        GetTypeOfObject(globalObjectsContainer, objectsContainer, node.objectName);
+        objectsContainersList.GetTypeOfObject(node.objectName);
     return MetadataProvider::GetObjectAnyExpressionMetadata(
                   platform, objectType, node.functionName);
   }
@@ -414,8 +414,7 @@ const gd::ExpressionMetadata& MetadataProvider::GetFunctionCallMetadata(
 
 const gd::ParameterMetadata* MetadataProvider::GetFunctionCallParameterMetadata(
     const gd::Platform& platform,
-    const gd::ObjectsContainer &globalObjectsContainer,
-    const gd::ObjectsContainer &objectsContainer,
+    const gd::ObjectsContainersList &objectsContainersList,
     FunctionCallNode& functionCall,
     ExpressionNode& parameter) {
       int parameterIndex = -1;
@@ -430,16 +429,14 @@ const gd::ExpressionMetadata& MetadataProvider::GetFunctionCallMetadata(
       }
       return MetadataProvider::GetFunctionCallParameterMetadata(
           platform,
-          globalObjectsContainer,
-          objectsContainer,
+          objectsContainersList,
           functionCall,
           parameterIndex);
 }
 
 const gd::ParameterMetadata* MetadataProvider::GetFunctionCallParameterMetadata(
     const gd::Platform& platform,
-    const gd::ObjectsContainer &globalObjectsContainer,
-    const gd::ObjectsContainer &objectsContainer,
+    const gd::ObjectsContainersList &objectsContainersList,
     FunctionCallNode& functionCall,
     int parameterIndex) {
       // Search the parameter metadata index skipping invisible ones.
@@ -448,7 +445,7 @@ const gd::ExpressionMetadata& MetadataProvider::GetFunctionCallMetadata(
           ExpressionParser2::WrittenParametersFirstIndex(
               functionCall.objectName, functionCall.behaviorName);
       const gd::ExpressionMetadata &metadata = MetadataProvider::GetFunctionCallMetadata(
-          platform, globalObjectsContainer, objectsContainer, functionCall);
+          platform, objectsContainersList, functionCall);
 
       if (IsBadExpressionMetadata(metadata)) {
         return nullptr;

Core/GDCore/Extensions/Metadata/MetadataProvider.h

@@ -15,6 +15,7 @@ class ExpressionMetadata;
 class ExpressionMetadata;
 class Platform;
 class PlatformExtension;
+class ObjectsContainersList;
 struct FunctionCallNode;
 struct ExpressionNode;
 }  // namespace gd
@@ -238,21 +239,18 @@ class GD_CORE_API MetadataProvider {
 
   static const gd::ExpressionMetadata& GetFunctionCallMetadata(
     const gd::Platform& platform,
-    const gd::ObjectsContainer &globalObjectsContainer,
-    const gd::ObjectsContainer &objectsContainer,
+    const gd::ObjectsContainersList &objectsContainersList,
     FunctionCallNode& node);
 
   static const gd::ParameterMetadata* GetFunctionCallParameterMetadata(
     const gd::Platform& platform,
-    const gd::ObjectsContainer &globalObjectsContainer,
-    const gd::ObjectsContainer &objectsContainer,
+    const gd::ObjectsContainersList &objectsContainersList,
     FunctionCallNode& functionCall,
     ExpressionNode& parameter);
 
   static const gd::ParameterMetadata* GetFunctionCallParameterMetadata(
     const gd::Platform& platform,
-    const gd::ObjectsContainer &globalObjectsContainer,
-    const gd::ObjectsContainer &objectsContainer,
+    const gd::ObjectsContainersList &objectsContainersList,
     FunctionCallNode& functionCall,
     int parameterIndex);
 

Core/GDCore/Extensions/Metadata/MultipleInstructionMetadata.h

@@ -150,6 +150,10 @@ class GD_CORE_API MultipleInstructionMetadata : public AbstractFunctionMetadata
     return *this;
   }
 
+  /**
+   * \deprecated Use `AddIncludeFile` instead as clearing the list is more
+   * error prone.
+   */
   MultipleInstructionMetadata &SetIncludeFile(const gd::String &includeFile) override {
     if (expression)
       expression->SetIncludeFile(includeFile);
@@ -191,6 +195,16 @@ class GD_CORE_API MultipleInstructionMetadata : public AbstractFunctionMetadata
     return *this;
   }
 
+  /**
+   * \see gd::InstructionMetadata::SetHelpPath
+   */
+  MultipleInstructionMetadata &SetHelpPath(const gd::String &path) {
+    if (expression) expression->SetHelpPath(path);
+    if (condition) condition->SetHelpPath(path);
+    if (action) action->SetHelpPath(path);
+    return *this;
+  }
+
   /**
    * \see gd::InstructionMetadata::MarkAsSimple
    */

Core/GDCore/Extensions/Metadata/ObjectMetadata.h

@@ -264,6 +264,8 @@ class GD_CORE_API ObjectMetadata : public InstructionOrExpressionContainerMetada
    * \brief Erase any existing include file and add the specified include.
    * \note The requirement may vary depending on the platform: Most of the time,
    * the include file contains the declaration of the object.
+   * \deprecated Use `AddIncludeFile` instead as clearing the list is more
+   * error prone.
    */
   ObjectMetadata& SetIncludeFile(const gd::String& includeFile) override;
 
@@ -303,12 +305,24 @@ class GD_CORE_API ObjectMetadata : public InstructionOrExpressionContainerMetada
     return *this;
   }
 
-
   /**
-   * \brief Return true if the instruction must be hidden in the IDE.
+   * \brief Return true if the object must be hidden in the IDE.
    */
   bool IsHidden() const { return hidden; }
 
+  /**
+   * \brief Declare a usage of the 3D renderer.
+   */
+  ObjectMetadata &MarkAsRenderedIn3D() {
+    isRenderedIn3D = true;
+    return *this;
+  }
+
+  /**
+   * \brief Return true if the object uses the 3D renderer.
+   */
+  bool IsRenderedIn3D() const { return isRenderedIn3D; }
+
   std::map<gd::String, gd::InstructionMetadata> conditionsInfos;
   std::map<gd::String, gd::InstructionMetadata> actionsInfos;
   std::map<gd::String, gd::ExpressionMetadata> expressionsInfos;
@@ -329,6 +343,7 @@ class GD_CORE_API ObjectMetadata : public InstructionOrExpressionContainerMetada
   gd::String categoryFullName;
   std::set<gd::String> defaultBehaviorTypes;
   bool hidden = false;
+  bool isRenderedIn3D = false;
 
   std::shared_ptr<gd::ObjectConfiguration>
       blueprintObject;  ///< The "blueprint" object to be copied when a new

Core/GDCore/Extensions/Metadata/ParameterMetadata.h

@@ -34,6 +34,11 @@ class GD_CORE_API ParameterMetadata {
    */
   gd::ValueTypeMetadata &GetValueTypeMetadata() { return valueTypeMetadata; }
 
+  /**
+   * \brief Return the metadata of the parameter type.
+   */
+  const gd::ValueTypeMetadata &GetValueTypeMetadata() const { return valueTypeMetadata; }
+
   /**
    * \brief Set the metadata of the parameter type.
    */

Core/GDCore/Extensions/Metadata/ParameterMetadataTools.cpp

@@ -8,6 +8,7 @@
 #include "GDCore/Events/Expression.h"
 #include "GDCore/Project/Object.h"
 #include "GDCore/Project/ObjectsContainer.h"
+#include "GDCore/Project/ObjectsContainersList.h"
 #include "GDCore/Project/Project.h"
 #include "GDCore/String.h"
 #include "InstructionMetadata.h"
@@ -15,6 +16,8 @@
 #include "GDCore/Events/Parsers/ExpressionParser2NodePrinter.h"
 
 namespace gd {
+const ParameterMetadata ParameterMetadataTools::badParameterMetadata;
+
 void ParameterMetadataTools::ParametersToObjectsContainer(
     const gd::Project& project,
     const std::vector<gd::ParameterMetadata>& parameters,
@@ -57,6 +60,55 @@ void ParameterMetadataTools::ParametersToObjectsContainer(
   }
 }
 
+void ParameterMetadataTools::ForEachParameterMatchingSearch(
+    const std::vector<const std::vector<gd::ParameterMetadata>*>&
+        parametersVectorsList,
+    const gd::String& search,
+    std::function<void(const gd::ParameterMetadata&)> cb) {
+  for (auto it = parametersVectorsList.rbegin();
+       it != parametersVectorsList.rend();
+       ++it) {
+    const std::vector<gd::ParameterMetadata>* parametersVector = *it;
+
+    for (const auto& parameterMetadata: *parametersVector) {
+      if (parameterMetadata.GetName().FindCaseInsensitive(search) != gd::String::npos) cb(parameterMetadata);
+    }
+  }
+}
+
+bool ParameterMetadataTools::Has(
+      const std::vector<const std::vector<gd::ParameterMetadata>*>& parametersVectorsList,
+      const gd::String& parameterName) {
+  for (auto it = parametersVectorsList.rbegin();
+       it != parametersVectorsList.rend();
+       ++it) {
+    const std::vector<gd::ParameterMetadata>* parametersVector = *it;
+
+    for (const auto& parameterMetadata: *parametersVector) {
+      if (parameterMetadata.GetName() == parameterName) return true;
+    }
+  }
+
+  return false;
+}
+
+const gd::ParameterMetadata& ParameterMetadataTools::Get(
+    const std::vector<const std::vector<gd::ParameterMetadata>*>&
+        parametersVectorsList,
+    const gd::String& parameterName) {
+  for (auto it = parametersVectorsList.rbegin();
+       it != parametersVectorsList.rend();
+       ++it) {
+    const std::vector<gd::ParameterMetadata>* parametersVector = *it;
+
+    for (const auto& parameterMetadata: *parametersVector) {
+      if (parameterMetadata.GetName() == parameterName) return parameterMetadata;
+    }
+  }
+
+  return badParameterMetadata;
+}
+
 void ParameterMetadataTools::IterateOverParameters(
     const std::vector<gd::Expression>& parameters,
     const std::vector<gd::ParameterMetadata>& parametersMetadata,
@@ -105,8 +157,7 @@ void ParameterMetadataTools::IterateOverParametersWithIndex(
 
 void ParameterMetadataTools::IterateOverParametersWithIndex(
     const gd::Platform &platform,
-    const gd::ObjectsContainer &globalObjectsContainer,
-    const gd::ObjectsContainer &objectsContainer, FunctionCallNode &node,
+    const gd::ObjectsContainersList &objectsContainersList, FunctionCallNode &node,
     std::function<void(const gd::ParameterMetadata &parameterMetadata,
                        std::unique_ptr<gd::ExpressionNode> &parameterNode,
                        size_t parameterIndex, const gd::String &lastObjectName)>
@@ -117,8 +168,7 @@ void ParameterMetadataTools::IterateOverParametersWithIndex(
   const gd::ExpressionMetadata &metadata =
       isObjectFunction ? MetadataProvider::GetObjectAnyExpressionMetadata(
                              platform,
-                             GetTypeOfObject(globalObjectsContainer,
-                                             objectsContainer, node.objectName),
+                             objectsContainersList.GetTypeOfObject(node.objectName),
                              node.functionName)
                        : MetadataProvider::GetAnyExpressionMetadata(
                              platform, node.functionName);

Core/GDCore/Extensions/Metadata/ParameterMetadataTools.h

@@ -3,9 +3,8 @@
  * Copyright 2008-2016 Florian Rival (Florian.Rival@gmail.com). All rights
  * reserved. This project is released under the MIT License.
  */
-#if defined(GD_IDE_ONLY)
-#ifndef ParameterMetadataTools_H
-#define ParameterMetadataTools_H
+#pragma once
+#include <functional>
 #include <vector>
 #include <memory>
 #include "GDCore/String.h"
@@ -13,6 +12,7 @@ namespace gd {
 class Platform;
 class Project;
 class ObjectsContainer;
+class ObjectsContainersList;
 class ParameterMetadata;
 class Expression;
 struct FunctionCallNode;
@@ -27,6 +27,19 @@ class GD_CORE_API ParameterMetadataTools {
       const std::vector<gd::ParameterMetadata>& parameters,
       gd::ObjectsContainer& outputObjectsContainer);
 
+  static void ForEachParameterMatchingSearch(
+      const std::vector<const std::vector<gd::ParameterMetadata>*>& parametersVectorsList,
+      const gd::String& search,
+      std::function<void(const gd::ParameterMetadata&)> cb);
+
+  static bool Has(
+      const std::vector<const std::vector<gd::ParameterMetadata>*>& parametersVectorsList,
+      const gd::String& parameterName);
+
+  static const gd::ParameterMetadata& Get(
+      const std::vector<const std::vector<gd::ParameterMetadata>*>& parametersVectorsList,
+      const gd::String& parameterName);
+
   /**
    * Iterate over a list of parameters and their values.
    * Callback function is called with the parameter metadata, its value
@@ -59,8 +72,7 @@ class GD_CORE_API ParameterMetadataTools {
    */
   static void IterateOverParametersWithIndex(
       const gd::Platform &platform,
-      const gd::ObjectsContainer &globalObjectsContainer,
-      const gd::ObjectsContainer &objectsContainer, FunctionCallNode &node,
+      const gd::ObjectsContainersList &objectsContainersList, FunctionCallNode &node,
       std::function<void(const gd::ParameterMetadata &parameterMetadata,
                          std::unique_ptr<gd::ExpressionNode> &parameterNode,
                          size_t parameterIndex,
@@ -74,8 +86,8 @@ class GD_CORE_API ParameterMetadataTools {
   static size_t GetObjectParameterIndexFor(
       const std::vector<gd::ParameterMetadata>& parametersMetadata,
       size_t parameterIndex);
+
+private:
+  static const gd::ParameterMetadata badParameterMetadata;
 };
 }  // namespace gd
-
-#endif  // ParameterMetadataTools_H
-#endif

Core/GDCore/Extensions/Metadata/ValueTypeMetadata.h

@@ -121,6 +121,13 @@ class GD_CORE_API ValueTypeMetadata {
     return gd::ValueTypeMetadata::IsTypeExpression("string", name);
   }
 
+  /**
+   * \brief Return true if the type is a boolean.
+   */
+  bool IsBoolean() const {
+    return gd::ValueTypeMetadata::IsTypeExpression("boolean", name);
+  }
+
   /**
    * \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 (
@@ -131,6 +138,24 @@ class GD_CORE_API ValueTypeMetadata {
     return gd::ValueTypeMetadata::IsTypeExpression("variable", name);
   }
 
+  /**
+   * \brief Return true if the type is a variable but from a specific scope
+   * (scene, project or object). In new code, prefer to use the more generic "variable"
+   * parameter (which accepts any variable coming from an object or from containers in the scope).
+   */
+  bool IsLegacyPreScopedVariable() const {
+    return gd::ValueTypeMetadata::IsTypeLegacyPreScopedVariable(name);
+  }
+
+  /**
+   * \brief Return true if the type is a variable but from a specific scope
+   * (scene, project or object). In new code, prefer to use the more generic "variable"
+   * parameter (which accepts any variable coming from an object or from containers in the scope).
+   */
+  static bool IsTypeLegacyPreScopedVariable(const gd::String &type) {
+    return type == "scenevar" || type == "globalvar" || type == "objectvar";
+  }
+
   /**
    * \brief Return true if the type is representing one object
    * (or more, i.e: an object group).
@@ -175,8 +200,13 @@ class GD_CORE_API ValueTypeMetadata {
              parameterType == "externalLayoutName" ||
              parameterType == "leaderboardId" ||
              parameterType == "identifier";
+    } else if (type == "boolean") {
+      return parameterType == "yesorno" || parameterType == "trueorfalse";
     } else if (type == "variable") {
-      return parameterType == "objectvar" || parameterType == "globalvar" ||
+      return
+             parameterType == "variable" || // Any variable.
+             // Old, "pre-scoped" variables:
+             parameterType == "objectvar" || parameterType == "globalvar" ||
              parameterType == "scenevar";
     } else if (type == "resource") {
       return parameterType == "fontResource" ||
@@ -187,7 +217,9 @@ class GD_CORE_API ValueTypeMetadata {
              parameterType == "jsonResource" ||
              parameterType == "tilemapResource" ||
              parameterType == "tilesetResource" ||
-             parameterType == "model3DResource";
+             parameterType == "model3DResource" ||
+             parameterType == "atlasResource" ||
+             parameterType == "spineResource";
     }
     return false;
   }

Core/GDCore/Extensions/PlatformExtension.h

@@ -264,8 +264,11 @@ class GD_CORE_API PlatformExtension {
    *
    * \param name The name of the behavior
    * \param fullname The user friendly name of the behavior
+   * \param defaultName The default name of behavior instances
    * \param description The user friendly description of the behavior
+   * \param group The behavior category label
    * \param icon The icon of the behavior.
+   * \param className The name of the class implementing the behavior
    * \param instance An instance of the behavior that
    * will be used to create the behavior
    * \param sharedDatasInstance Optional
@@ -282,21 +285,6 @@ class GD_CORE_API PlatformExtension {
       std::shared_ptr<gd::Behavior> instance,
       std::shared_ptr<gd::BehaviorsSharedData> sharedDatasInstance);
 
-  /**
-   * \brief Declare a new events based behavior as being part of the extension.
-   *
-   * \param name The name of the behavior
-   * \param fullname The user friendly name of the behavior
-   * \param description The user friendly description of the behavior
-   * \param icon The icon of the behavior.
-   */
-  gd::BehaviorMetadata& AddEventsBasedBehavior(
-      const gd::String& name_,
-      const gd::String& fullname_,
-      const gd::String& description_,
-      const gd::String& group_,
-      const gd::String& icon_);
-
   /**
    * \brief Declare a new effect as being part of the extension.
    * \param name The internal name of the effect (also called effect type).

Core/GDCore/IDE/DependenciesAnalyzer.cpp

@@ -4,7 +4,6 @@
  * reserved. This project is released under the MIT License.
  */
 
-#if defined(GD_IDE_ONLY)
 #include "DependenciesAnalyzer.h"
 #include <algorithm>
 #include "GDCore/Events/Builtin/LinkEvent.h"
@@ -29,9 +28,9 @@ DependenciesAnalyzer::DependenciesAnalyzer(const gd::Project& project_,
 
 bool DependenciesAnalyzer::Analyze() {
   if (layout)
-    return Analyze(layout->GetEvents(), true);
+    return Analyze(layout->GetEvents());
   else if (externalEvents)
-    return Analyze(externalEvents->GetEvents(), true);
+    return Analyze(externalEvents->GetEvents());
 
   std::cout << "ERROR: DependenciesAnalyzer called without any layout or "
                "external events.";
@@ -40,63 +39,38 @@ bool DependenciesAnalyzer::Analyze() {
 
 DependenciesAnalyzer::~DependenciesAnalyzer() {}
 
-bool DependenciesAnalyzer::Analyze(const gd::EventsList& events, bool isOnTopLevel) {
+bool DependenciesAnalyzer::Analyze(const gd::EventsList& events) {
   for (unsigned int i = 0; i < events.size(); ++i) {
     const gd::LinkEvent* linkEvent = dynamic_cast<const gd::LinkEvent*>(&events[i]);
     if (linkEvent) {
-      DependenciesAnalyzer analyzer(*this);
-
       gd::String linked = linkEvent->GetTarget();
       if (project.HasExternalEventsNamed(linked)) {
         if (std::find(parentExternalEvents.begin(),
                       parentExternalEvents.end(),
-                      linked) != parentExternalEvents.end())
-          return false;  // Circular dependency!
-
-        externalEventsDependencies.insert(
-            linked);  // There is a direct dependency
-        if (!isOnTopLevel) notTopLevelExternalEventsDependencies.insert(linked);
-        analyzer.AddParentExternalEvents(linked);
-        if (!analyzer.Analyze(project.GetExternalEvents(linked).GetEvents(),
-                              isOnTopLevel))
-          return false;
-
-      } else if (project.HasLayoutNamed(linked)) {
-        if (std::find(parentScenes.begin(), parentScenes.end(), linked) !=
-            parentScenes.end())
-          return false;  // Circular dependency!
-
-        scenesDependencies.insert(linked);  // There is a direct dependency
-        if (!isOnTopLevel) notTopLevelScenesDependencies.insert(linked);
-        analyzer.AddParentScene(linked);
-        if (!analyzer.Analyze(project.GetLayout(linked).GetEvents(),
-                              isOnTopLevel))
+                      linked) != parentExternalEvents.end()) {
+          // Circular dependency!
           return false;
         }
-
-      // Update with indirect dependencies.
-      scenesDependencies.insert(analyzer.GetScenesDependencies().begin(),
-                                analyzer.GetScenesDependencies().end());
-      externalEventsDependencies.insert(
-          analyzer.GetExternalEventsDependencies().begin(),
-          analyzer.GetExternalEventsDependencies().end());
-      sourceFilesDependencies.insert(
-          analyzer.GetSourceFilesDependencies().begin(),
-          analyzer.GetSourceFilesDependencies().end());
-      notTopLevelScenesDependencies.insert(
-          analyzer.GetNotTopLevelScenesDependencies().begin(),
-          analyzer.GetNotTopLevelScenesDependencies().end());
-      notTopLevelExternalEventsDependencies.insert(
-          analyzer.GetNotTopLevelExternalEventsDependencies().begin(),
-          analyzer.GetNotTopLevelExternalEventsDependencies().end());
-
-      if (!isOnTopLevel) {
-        notTopLevelScenesDependencies.insert(
-            analyzer.GetScenesDependencies().begin(),
-            analyzer.GetScenesDependencies().end());
-        notTopLevelExternalEventsDependencies.insert(
-            analyzer.GetExternalEventsDependencies().begin(),
-            analyzer.GetExternalEventsDependencies().end());
+        bool wasDependencyJustAdded = externalEventsDependencies.insert(linked).second;
+        if (wasDependencyJustAdded) {
+          parentExternalEvents.push_back(linked);
+          if (!Analyze(project.GetExternalEvents(linked).GetEvents()))
+            return false;
+          parentExternalEvents.pop_back();
+        }
+      } else if (project.HasLayoutNamed(linked)) {
+        if (std::find(parentScenes.begin(), parentScenes.end(), linked) !=
+            parentScenes.end()) {
+          // Circular dependency!
+          return false;
+        }
+        bool wasDependencyJustAdded = scenesDependencies.insert(linked).second;
+        if (wasDependencyJustAdded) {
+          parentScenes.push_back(linked);
+          if (!Analyze(project.GetLayout(linked).GetEvents()))
+            return false;
+          parentScenes.pop_back();
+        }
       }
     }
 
@@ -112,45 +86,9 @@ bool DependenciesAnalyzer::Analyze(const gd::EventsList& events, bool isOnTopLev
 
     // Analyze sub events dependencies
     if (events[i].CanHaveSubEvents()) {
-      if (!Analyze(events[i].GetSubEvents(), false)) return false;
+      if (!Analyze(events[i].GetSubEvents())) return false;
     }
   }
 
   return true;
 }
-
-gd::String DependenciesAnalyzer::ExternalEventsCanBeCompiledForAScene() {
-  if (!externalEvents) {
-    std::cout << "ERROR: ExternalEventsCanBeCompiledForAScene called without "
-                 "external events set!"
-              << std::endl;
-    return "";
-  }
-
-  gd::String sceneName;
-  for (unsigned int i = 0; i < project.GetLayoutsCount(); ++i) {
-    // For each layout, compute the dependencies and the dependencies which are
-    // not coming from a top level event.
-    DependenciesAnalyzer analyzer(project, project.GetLayout(i));
-    if (!analyzer.Analyze()) continue;  // Analyze failed -> Cyclic dependencies
-    const std::set<gd::String>& dependencies =
-        analyzer.GetExternalEventsDependencies();
-    const std::set<gd::String>& notTopLevelDependencies =
-        analyzer.GetNotTopLevelExternalEventsDependencies();
-
-    // Check if the external events is a dependency, and that is is only present
-    // as a link on the top level.
-    if (dependencies.find(externalEvents->GetName()) != dependencies.end() &&
-        notTopLevelDependencies.find(externalEvents->GetName()) ==
-            notTopLevelDependencies.end()) {
-      if (!sceneName.empty())
-        return "";  // External events can be compiled only if one scene is
-                    // including them.
-      else
-        sceneName = project.GetLayout(i).GetName();
-    }
-  }
-
-  return sceneName;  // External events can be compiled and used for the scene.
-}
-#endif

Core/GDCore/IDE/DependenciesAnalyzer.h

@@ -39,11 +39,6 @@ class GD_CORE_API DependenciesAnalyzer {
 
   /**
    * \brief Constructor for analyzing the dependencies of external events.
-   *
-   * You can also call then
-   * DependenciesAnalyzer::ExternalEventsCanBeCompiledForAScene to check if the
-   * external events can be compiled separately and called by a scene. \see
-   * DependenciesAnalyzer::ExternalEventsCanBeCompiledForAScene
    */
   DependenciesAnalyzer(const gd::Project& project_,
                        const gd::ExternalEvents& externalEvents);
@@ -60,18 +55,6 @@ class GD_CORE_API DependenciesAnalyzer {
    */
   bool Analyze();
 
-  /**
-   * Check if the external events (passed in the constructor) can be compiled
-   * and called by a single scene:<br> This is possible when the link calling
-   * the external events does not have any parent event and when this situation
-   * occurs only in a single scene and not in another.
-   *
-   * \return The name of the scene which is able to call the compiled external
-   * events. If empty, no scene is able to call them. (So external events have
-   * to be included directly by links).
-   */
-  gd::String ExternalEventsCanBeCompiledForAScene();
-
   /**
    * \brief Return the scenes being dependencies of the scene or external events
    * passed in the constructor.
@@ -96,25 +79,6 @@ class GD_CORE_API DependenciesAnalyzer {
     return sourceFilesDependencies;
   };
 
-  /**
-   * \brief Return the scenes being dependencies of the scene or external events
-   * passed in the constructor, but being not top level dependencies: The links
-   * including them are not a top level events (i.e: They have a parent event).
-   */
-  const std::set<gd::String>& GetNotTopLevelScenesDependencies() const {
-    return notTopLevelScenesDependencies;
-  };
-
-  /**
-   * \brief Return the external events being dependencies of the scene or
-   * external events passed in the constructor, but being not top level
-   * dependencies: The links including them are not a top level events (i.e:
-   * They have a parent event).
-   */
-  const std::set<gd::String>& GetNotTopLevelExternalEventsDependencies() const {
-    return notTopLevelExternalEventsDependencies;
-  };
-
  private:
   /**
    * \brief Analyze the dependencies of the events.
@@ -124,32 +88,11 @@ class GD_CORE_API DependenciesAnalyzer {
    * (they have no parents). \return false if a circular dependency exists, true
    * otherwise.
    */
-  bool Analyze(const gd::EventsList& events, bool isOnTopLevel);
-
-  void AddParentScene(gd::String parentScene) {
-    parentScenes.push_back(parentScene);
-  };
-  void AddParentExternalEvents(gd::String parentExternalEvents_) {
-    parentExternalEvents.push_back(parentExternalEvents_);
-  };
-
-  /**
-   * Return true if all links pointing to external events called \a
-   * externalEventsName are only at the top level of \a events. The function
-   * return false as soon as it discover a link to external events which is not
-   * at the top level ( i.e: It has a parent event ).
-   *
-   * \warning The function assumes that there are not cyclic dependencies.
-   */
-  bool CheckIfExternalEventsIsLinkedOnlyAtTopLevel(
-      const gd::String& externalEventsName,
-      std::vector<std::shared_ptr<gd::BaseEvent> >& events);
+  bool Analyze(const gd::EventsList& events);
 
   std::set<gd::String> scenesDependencies;
   std::set<gd::String> externalEventsDependencies;
   std::set<gd::String> sourceFilesDependencies;
-  std::set<gd::String> notTopLevelScenesDependencies;
-  std::set<gd::String> notTopLevelExternalEventsDependencies;
   std::vector<gd::String>
       parentScenes;  ///< Used to check for circular dependencies.
   std::vector<gd::String>

Core/GDCore/IDE/Events/ArbitraryEventsWorker.cpp

@@ -11,6 +11,8 @@
 #include "GDCore/Events/Event.h"
 #include "GDCore/Events/EventsList.h"
 #include "GDCore/Events/Instruction.h"
+#include "GDCore/Events/Expression.h"
+#include "GDCore/Extensions/Metadata/ParameterMetadata.h"
 #include "GDCore/String.h"
 
 using namespace std;
@@ -47,7 +49,14 @@ bool ArbitraryEventsWorker::VisitEvent(gd::BaseEvent& event) {
   for (std::size_t j = 0; j < actionsVectors.size(); ++j)
     VisitInstructionList(*actionsVectors[j], false);
 
-  return false;
+  auto allExpressionsWithMetadata = event.GetAllExpressionsWithMetadata();
+  for (auto& expressionAndMetadata : allExpressionsWithMetadata) {
+    shouldDelete |= VisitEventExpression(
+      *expressionAndMetadata.first, expressionAndMetadata.second);
+  }
+
+
+  return shouldDelete;
 }
 
 bool ArbitraryEventsWorker::VisitLinkEvent(gd::LinkEvent& linkEvent) {
@@ -75,6 +84,11 @@ bool ArbitraryEventsWorker::VisitInstruction(gd::Instruction& instruction,
   return DoVisitInstruction(instruction, isCondition);
 }
 
+bool ArbitraryEventsWorker::VisitEventExpression(gd::Expression& expression,
+                                                 const gd::ParameterMetadata& metadata) {
+  return DoVisitEventExpression(expression, metadata);
+}
+
 ArbitraryEventsWorkerWithContext::~ArbitraryEventsWorkerWithContext() {}
 
 
@@ -141,6 +155,12 @@ void ReadOnlyArbitraryEventsWorker::VisitInstruction(const gd::Instruction& inst
   DoVisitInstruction(instruction, isCondition);
 }
 
+
+void ReadOnlyArbitraryEventsWorker::VisitEventExpression(const gd::Expression& expression,
+                                                 const gd::ParameterMetadata& metadata) {
+  DoVisitEventExpression(expression, metadata);
+}
+
 void ReadOnlyArbitraryEventsWorker::StopAnyEventIteration() {
   shouldStopIteration = true;
 }

Core/GDCore/IDE/Events/ArbitraryEventsWorker.h

@@ -10,6 +10,7 @@
 #include <vector>
 #include "GDCore/Events/InstructionsList.h"
 #include "GDCore/Events/EventVisitor.h"
+#include "GDCore/Project/ProjectScopedContainers.h"
 #include "GDCore/String.h"
 namespace gd {
 class Instruction;
@@ -17,6 +18,8 @@ class BaseEvent;
 class LinkEvent;
 class EventsList;
 class ObjectsContainer;
+class Expression;
+class ParameterMetadata;
 }  // namespace gd
 
 namespace gd {
@@ -47,6 +50,7 @@ class GD_CORE_API ArbitraryEventsWorker : private EventVisitor {
   void VisitInstructionList(gd::InstructionsList& instructions,
                             bool areConditions);
   bool VisitInstruction(gd::Instruction& instruction, bool isCondition);
+  bool VisitEventExpression(gd::Expression& expression, const gd::ParameterMetadata& metadata);
 
   /**
    * Called to do some work on an event list.
@@ -85,6 +89,16 @@ class GD_CORE_API ArbitraryEventsWorker : private EventVisitor {
                                   bool isCondition) {
     return false;
   };
+
+  /**
+   * Called to do some work on an expression of an event.
+   * \return true if the event must be deleted from the list, false
+   * otherwise (default).
+   */
+  virtual bool DoVisitEventExpression(gd::Expression& expression,
+                                      const gd::ParameterMetadata& metadata) {
+    return false;
+  }
 };
 
 /**
@@ -99,8 +113,7 @@ class GD_CORE_API ArbitraryEventsWorkerWithContext
     : public ArbitraryEventsWorker {
  public:
   ArbitraryEventsWorkerWithContext()
-      : currentGlobalObjectsContainer(nullptr),
-        currentObjectsContainer(nullptr){};
+      : projectScopedContainers(nullptr){};
   virtual ~ArbitraryEventsWorkerWithContext();
 
   /**
@@ -108,30 +121,27 @@ class GD_CORE_API ArbitraryEventsWorkerWithContext
    * giving the objects container on which the events are applying to.
    */
   void Launch(gd::EventsList& events,
-              const gd::ObjectsContainer& globalObjectsContainer_,
-              const gd::ObjectsContainer& objectsContainer_) {
-    currentGlobalObjectsContainer = &globalObjectsContainer_;
-    currentObjectsContainer = &objectsContainer_;
+              const gd::ProjectScopedContainers& projectScopedContainers_) {
+    projectScopedContainers = &projectScopedContainers_;
     ArbitraryEventsWorker::Launch(events);
   };
 
   void Launch(gd::EventsList& events) = delete;
 
  protected:
-  const gd::ObjectsContainer& GetGlobalObjectsContainer() {
+  const gd::ProjectScopedContainers& GetProjectScopedContainers() {
     // Pointers are guaranteed to be not nullptr after
     // Launch was called.
-    return *currentGlobalObjectsContainer;
+    return *projectScopedContainers;
   };
-  const gd::ObjectsContainer& GetObjectsContainer() {
+  const gd::ObjectsContainersList& GetObjectsContainersList() {
     // Pointers are guaranteed to be not nullptr after
     // Launch was called.
-    return *currentObjectsContainer;
+    return projectScopedContainers->GetObjectsContainersList();
   };
 
  private:
-  const gd::ObjectsContainer* currentGlobalObjectsContainer;
-  const gd::ObjectsContainer* currentObjectsContainer;
+  const gd::ProjectScopedContainers* projectScopedContainers;
 };
 
 /**
@@ -162,6 +172,7 @@ protected:
   void VisitInstructionList(const gd::InstructionsList& instructions,
                             bool areConditions);
   void VisitInstruction(const gd::Instruction& instruction, bool isCondition);
+  void VisitEventExpression(const gd::Expression& expression, const gd::ParameterMetadata& metadata);
 
   /**
    * Called to do some work on an event list.
@@ -192,6 +203,13 @@ protected:
   virtual void DoVisitInstruction(const gd::Instruction& instruction,
                                   bool isCondition) {};
 
+  /**
+   * Called to do some work on an expression of an event.
+   */
+  virtual void DoVisitEventExpression(const gd::Expression& expression,
+                                      const gd::ParameterMetadata& metadata) {
+  }
+
   bool shouldStopIteration;
 };
 
@@ -207,8 +225,7 @@ class GD_CORE_API ReadOnlyArbitraryEventsWorkerWithContext
     : public ReadOnlyArbitraryEventsWorker {
  public:
   ReadOnlyArbitraryEventsWorkerWithContext()
-      : currentGlobalObjectsContainer(nullptr),
-        currentObjectsContainer(nullptr){};
+      : projectScopedContainers(nullptr){};
   virtual ~ReadOnlyArbitraryEventsWorkerWithContext();
 
   /**
@@ -216,30 +233,22 @@ class GD_CORE_API ReadOnlyArbitraryEventsWorkerWithContext
    * giving the objects container on which the events are applying to.
    */
   void Launch(const gd::EventsList& events,
-              const gd::ObjectsContainer& globalObjectsContainer_,
-              const gd::ObjectsContainer& objectsContainer_) {
-    currentGlobalObjectsContainer = &globalObjectsContainer_;
-    currentObjectsContainer = &objectsContainer_;
+              const gd::ProjectScopedContainers& projectScopedContainers_) {
+    projectScopedContainers = &projectScopedContainers_;
     ReadOnlyArbitraryEventsWorker::Launch(events);
   };
 
   void Launch(gd::EventsList& events) = delete;
 
  protected:
-  const gd::ObjectsContainer& GetGlobalObjectsContainer() {
+  const gd::ProjectScopedContainers& GetProjectScopedContainers() {
     // Pointers are guaranteed to be not nullptr after
     // Launch was called.
-    return *currentGlobalObjectsContainer;
-  };
-  const gd::ObjectsContainer& GetObjectsContainer() {
-    // Pointers are guaranteed to be not nullptr after
-    // Launch was called.
-    return *currentObjectsContainer;
+    return *projectScopedContainers;
   };
 
  private:
-  const gd::ObjectsContainer* currentGlobalObjectsContainer;
-  const gd::ObjectsContainer* currentObjectsContainer;
+  const gd::ProjectScopedContainers* projectScopedContainers;
 };
 
 }  // namespace gd

Core/GDCore/IDE/Events/BehaviorTypeRenamer.cpp

@@ -4,7 +4,6 @@
 #include "GDCore/Extensions/Metadata/MetadataProvider.h"
 #include "GDCore/Extensions/PlatformExtension.h"
 #include "GDCore/IDE/WholeProjectRefactorer.h"
-#include "GDCore/IDE/Events/ExpressionTypeFinder.h"
 #include "GDCore/Project/Behavior.h"
 #include "GDCore/Project/Object.h"
 #include "GDCore/Project/Project.h"

Core/GDCore/IDE/Events/CustomObjectTypeRenamer.cpp

@@ -4,7 +4,6 @@
 #include "GDCore/Extensions/Metadata/MetadataProvider.h"
 #include "GDCore/Extensions/PlatformExtension.h"
 #include "GDCore/IDE/WholeProjectRefactorer.h"
-#include "GDCore/IDE/Events/ExpressionTypeFinder.h"
 #include "GDCore/Project/Behavior.h"
 #include "GDCore/Project/Object.h"
 #include "GDCore/Project/Project.h"

Core/GDCore/IDE/Events/EventsBehaviorRenamer.cpp

@@ -31,14 +31,10 @@ namespace gd {
 class GD_CORE_API ExpressionBehaviorRenamer
     : public ExpressionParser2NodeWorker {
  public:
-  ExpressionBehaviorRenamer(const gd::ObjectsContainer& globalObjectsContainer_,
-                            const gd::ObjectsContainer& objectsContainer_,
-                            const gd::String& objectName_,
+  ExpressionBehaviorRenamer(const gd::String& objectName_,
                             const gd::String& oldBehaviorName_,
                             const gd::String& newBehaviorName_)
       : hasDoneRenaming(false),
-        globalObjectsContainer(globalObjectsContainer_),
-        objectsContainer(objectsContainer_),
         objectName(objectName_),
         oldBehaviorName(oldBehaviorName_),
         newBehaviorName(newBehaviorName_){};
@@ -97,8 +93,6 @@ class GD_CORE_API ExpressionBehaviorRenamer
 
  private:
   bool hasDoneRenaming;
-  const gd::ObjectsContainer& globalObjectsContainer;
-  const gd::ObjectsContainer& objectsContainer;
   const gd::String& objectName;  // The object name for which the behavior
                                  // must be replaced.
   const gd::String& oldBehaviorName;
@@ -132,9 +126,7 @@ bool EventsBehaviorRenamer::DoVisitInstruction(gd::Instruction& instruction,
         } else {
           auto node = parameterValue.GetRootNode();
           if (node) {
-            ExpressionBehaviorRenamer renamer(GetGlobalObjectsContainer(),
-                                              GetObjectsContainer(),
-                                              objectName,
+            ExpressionBehaviorRenamer renamer(objectName,
                                               oldBehaviorName,
                                               newBehaviorName);
             node->Visit(renamer);

Core/GDCore/IDE/Events/EventsContextAnalyzer.cpp

@@ -19,6 +19,8 @@
 #include "GDCore/IDE/Events/ExpressionTypeFinder.h"
 #include "GDCore/Project/Layout.h"
 #include "GDCore/Project/Project.h"
+#include "GDCore/Project/ObjectsContainersList.h"
+#include "GDCore/Project/ProjectScopedContainers.h"
 #include "GDCore/String.h"
 
 namespace gd {
@@ -33,13 +35,11 @@ class GD_CORE_API ExpressionObjectsAnalyzer
  public:
   ExpressionObjectsAnalyzer(
         const gd::Platform &platform_,
-        const gd::ObjectsContainer &globalObjectsContainer_,
-        const gd::ObjectsContainer &objectsContainer_,
+        const gd::ProjectScopedContainers &projectScopedContainers_,
         const gd::String &rootType_,
         EventsContext& context_) :
         platform(platform_),
-        globalObjectsContainer(globalObjectsContainer_),
-        objectsContainer(objectsContainer_),
+        projectScopedContainers(projectScopedContainers_),
         rootType(rootType_),
         context(context_){};
   virtual ~ExpressionObjectsAnalyzer(){};
@@ -58,6 +58,25 @@ class GD_CORE_API ExpressionObjectsAnalyzer
   void OnVisitNumberNode(NumberNode& node) override {}
   void OnVisitTextNode(TextNode& node) override {}
   void OnVisitVariableNode(VariableNode& node) override {
+    auto type = gd::ExpressionTypeFinder::GetType(platform, projectScopedContainers, rootType, node);
+
+    if (gd::ParameterMetadata::IsExpression("variable", type)) {
+      // Nothing to do (this can't reference an object)
+    } else {
+      projectScopedContainers.MatchIdentifierWithName<void>(node.name, [&]() {
+          // This is an object variable.
+          context.AddObjectName(projectScopedContainers, node.name);
+        }, [&]() {
+          // This is a variable.
+        }, [&]() {
+          // This is a property.
+        }, [&]() {
+          // This is a parameter.
+        }, [&]() {
+          // This is something else.
+        });
+    }
+
     if (node.child) node.child->Visit(*this);
   }
   void OnVisitVariableAccessorNode(VariableAccessorNode& node) override {
@@ -69,26 +88,41 @@ class GD_CORE_API ExpressionObjectsAnalyzer
     if (node.child) node.child->Visit(*this);
   }
   void OnVisitIdentifierNode(IdentifierNode& node) override {
-    auto type = gd::ExpressionTypeFinder::GetType(platform, globalObjectsContainer, objectsContainer, rootType, node);
+    auto type = gd::ExpressionTypeFinder::GetType(platform, projectScopedContainers, rootType, node);
     if (gd::ParameterMetadata::IsObject(type)) {
-      context.AddObjectName(node.identifierName);
+      context.AddObjectName(projectScopedContainers, node.identifierName);
+    } else if (gd::ParameterMetadata::IsExpression("variable", type)) {
+      // Nothing to do (identifier is a variable but not an object).
+    } else {
+      projectScopedContainers.MatchIdentifierWithName<void>(node.identifierName, [&]() {
+          // This is an object variable.
+          context.AddObjectName(projectScopedContainers, node.identifierName);
+        }, [&]() {
+          // This is a variable.
+        }, [&]() {
+          // This is a property.
+        }, [&]() {
+          // This is a parameter.
+        }, [&]() {
+          // This is something else.
+        });
     }
   }
   void OnVisitObjectFunctionNameNode(ObjectFunctionNameNode& node) override {
     if (!node.objectName.empty()) {
-      context.AddObjectName(node.objectName);
+      context.AddObjectName(projectScopedContainers, node.objectName);
 
       if (!node.behaviorFunctionName.empty()) {
-        context.AddBehaviorName(node.objectName, node.objectFunctionOrBehaviorName);
+        context.AddBehaviorName(projectScopedContainers, node.objectName, node.objectFunctionOrBehaviorName);
       }
     }
   }
   void OnVisitFunctionCallNode(FunctionCallNode& node) override {
     if (!node.objectName.empty()) {
-      context.AddObjectName(node.objectName);
+      context.AddObjectName(projectScopedContainers, node.objectName);
 
       if (!node.behaviorName.empty()) {
-        context.AddBehaviorName(node.objectName, node.behaviorName);
+        context.AddBehaviorName(projectScopedContainers, node.objectName, node.behaviorName);
       }
     }
     for (auto& parameter : node.parameters) {
@@ -99,8 +133,7 @@ class GD_CORE_API ExpressionObjectsAnalyzer
 
  private:
   const gd::Platform &platform;
-  const gd::ObjectsContainer &globalObjectsContainer;
-  const gd::ObjectsContainer &objectsContainer;
+  const gd::ProjectScopedContainers &projectScopedContainers;
   const gd::String rootType;
 
   EventsContext& context;
@@ -121,8 +154,7 @@ bool EventsContextAnalyzer::DoVisitInstruction(gd::Instruction& instruction,
              const gd::Expression& parameterValue,
              const gd::String& lastObjectName) {
         AnalyzeParameter(platform,
-                         project,
-                         layout,
+                         GetProjectScopedContainers(),
                          parameterMetadata,
                          parameterValue,
                          context,
@@ -134,8 +166,7 @@ bool EventsContextAnalyzer::DoVisitInstruction(gd::Instruction& instruction,
 
 void EventsContextAnalyzer::AnalyzeParameter(
     const gd::Platform& platform,
-    const gd::ObjectsContainer& project,
-    const gd::ObjectsContainer& layout,
+    const gd::ProjectScopedContainers& projectScopedContainers,
     const gd::ParameterMetadata& metadata,
     const gd::Expression& parameter,
     EventsContext& context,
@@ -143,59 +174,39 @@ void EventsContextAnalyzer::AnalyzeParameter(
   const auto& value = parameter.GetPlainString();
   const auto& type = metadata.GetType();
   if (ParameterMetadata::IsObject(type)) {
-    context.AddObjectName(value);
+    context.AddObjectName(projectScopedContainers, value);
   } else if (ParameterMetadata::IsExpression("number", type)) {
     auto node = parameter.GetRootNode();
 
-    ExpressionObjectsAnalyzer analyzer(platform, project, layout, "number", context);
+    ExpressionObjectsAnalyzer analyzer(platform, projectScopedContainers, "number", context);
     node->Visit(analyzer);
   } else if (ParameterMetadata::IsExpression("string", type)) {
     auto node = parameter.GetRootNode();
 
-    ExpressionObjectsAnalyzer analyzer(platform, project, layout, "string", context);
+    ExpressionObjectsAnalyzer analyzer(platform, projectScopedContainers, "string", context);
     node->Visit(analyzer);
   } else if (ParameterMetadata::IsBehavior(type)) {
-    context.AddBehaviorName(lastObjectName, value);
+    context.AddBehaviorName(projectScopedContainers, lastObjectName, value);
   }
 }
 
-void EventsContext::AddObjectName(const gd::String& objectOrGroupName) {
-  for (auto& realObjectName : ExpandObjectsName(objectOrGroupName)) {
+void EventsContext::AddObjectName(const gd::ProjectScopedContainers& projectScopedContainers,
+                                  const gd::String& objectOrGroupName) {
+  auto& objectsContainersList = projectScopedContainers.GetObjectsContainersList();
+  for (auto& realObjectName : objectsContainersList.ExpandObjectName(objectOrGroupName)) {
     objectNames.insert(realObjectName);
   }
   referencedObjectOrGroupNames.insert(objectOrGroupName);
 }
 
-void EventsContext::AddBehaviorName(const gd::String& objectOrGroupName,
+void EventsContext::AddBehaviorName(const gd::ProjectScopedContainers& projectScopedContainers,
+                                    const gd::String& objectOrGroupName,
                                     const gd::String& behaviorName) {
-  for (auto& realObjectName : ExpandObjectsName(objectOrGroupName)) {
+                                      auto& objectsContainersList = projectScopedContainers.GetObjectsContainersList();
+  for (auto& realObjectName : objectsContainersList.ExpandObjectName(objectOrGroupName)) {
     objectOrGroupBehaviorNames[realObjectName].insert(behaviorName);
   }
   objectOrGroupBehaviorNames[objectOrGroupName].insert(behaviorName);
 }
 
-std::vector<gd::String> EventsContext::ExpandObjectsName(
-    const gd::String& objectName) {
-  // Note: this logic is duplicated in EventsCodeGenerator::ExpandObjectsName
-  std::vector<gd::String> realObjects;
-  if (project.GetObjectGroups().Has(objectName))
-    realObjects =
-        project.GetObjectGroups().Get(objectName).GetAllObjectsNames();
-  else if (layout.GetObjectGroups().Has(objectName))
-    realObjects = layout.GetObjectGroups().Get(objectName).GetAllObjectsNames();
-  else
-    realObjects.push_back(objectName);
-
-  // Ensure that all returned objects actually exists.
-  for (std::size_t i = 0; i < realObjects.size();) {
-    if (!layout.HasObjectNamed(realObjects[i]) &&
-        !project.HasObjectNamed(realObjects[i]))
-      realObjects.erase(realObjects.begin() + i);
-    else
-      ++i;
-  }
-
-  return realObjects;
-}
-
 }  // namespace gd

Core/GDCore/IDE/Events/EventsContextAnalyzer.h

@@ -15,6 +15,7 @@ namespace gd {
 class BaseEvent;
 class Platform;
 class ObjectsContainer;
+class ObjectsContainersList;
 class Project;
 class Layout;
 class EventsList;
@@ -29,12 +30,13 @@ namespace gd {
  */
 class GD_CORE_API EventsContext {
  public:
-  EventsContext(gd::ObjectsContainer& project_, gd::ObjectsContainer& layout_)
-      : project(project_), layout(layout_){};
+  EventsContext(){};
   virtual ~EventsContext(){};
 
-  void AddObjectName(const gd::String& objectOrGroupName);
-  void AddBehaviorName(const gd::String& objectOrGroupName,
+  void AddObjectName(const gd::ProjectScopedContainers& projectScopedContainers,
+                     const gd::String& objectOrGroupName);
+  void AddBehaviorName(const gd::ProjectScopedContainers& projectScopedContainers,
+                       const gd::String& objectOrGroupName,
                        const gd::String& behaviorName);
 
   /**
@@ -59,13 +61,9 @@ class GD_CORE_API EventsContext {
   }
 
  private:
-  std::vector<gd::String> ExpandObjectsName(const gd::String& objectOrGroupName);
-
   std::set<gd::String> referencedObjectOrGroupNames;
   std::set<gd::String> objectNames;
   std::map<gd::String, std::set<gd::String>> objectOrGroupBehaviorNames;
-  gd::ObjectsContainer& project;
-  gd::ObjectsContainer& layout;
 };
 
 /**
@@ -73,15 +71,10 @@ class GD_CORE_API EventsContext {
  *
  * \ingroup IDE
  */
-class GD_CORE_API EventsContextAnalyzer : public ArbitraryEventsWorker {
+class GD_CORE_API EventsContextAnalyzer : public ArbitraryEventsWorkerWithContext {
  public:
-  EventsContextAnalyzer(const gd::Platform& platform_,
-                        gd::ObjectsContainer& project_,
-                        gd::ObjectsContainer& layout_)
-      : platform(platform_),
-        project(project_),
-        layout(layout_),
-        context(project, layout){};
+  EventsContextAnalyzer(const gd::Platform& platform_)
+      : platform(platform_) {};
   virtual ~EventsContextAnalyzer(){};
 
   /**
@@ -90,8 +83,7 @@ class GD_CORE_API EventsContextAnalyzer : public ArbitraryEventsWorker {
   const EventsContext& GetEventsContext() { return context; }
 
   static void AnalyzeParameter(const gd::Platform& platform,
-                               const gd::ObjectsContainer& project,
-                               const gd::ObjectsContainer& layout,
+                               const gd::ProjectScopedContainers& projectScopedContainers,
                                const gd::ParameterMetadata& metadata,
                                const gd::Expression& parameter,
                                EventsContext& context,
@@ -102,8 +94,6 @@ class GD_CORE_API EventsContextAnalyzer : public ArbitraryEventsWorker {
                                   bool isCondition);
 
   const gd::Platform& platform;
-  gd::ObjectsContainer& project;
-  gd::ObjectsContainer& layout;
   EventsContext context;
 };
 

Core/GDCore/IDE/Events/EventsIdentifiersFinder.cpp

@@ -34,14 +34,12 @@ class GD_CORE_API IdentifierFinderExpressionNodeWorker
  public:
   IdentifierFinderExpressionNodeWorker(std::set<gd::String>& results_,
                               const gd::Platform &platform_,
-                              const gd::ObjectsContainer &globalObjectsContainer_,
-                              const gd::ObjectsContainer &objectsContainer_,
+                              const gd::ProjectScopedContainers &projectScopedContainers_,
                               const gd::String& identifierType_,
                               const gd::String& objectName_ = "")
       : results(results_),
         platform(platform_),
-        globalObjectsContainer(globalObjectsContainer_),
-        objectsContainer(objectsContainer_),
+        projectScopedContainers(projectScopedContainers_),
         identifierType(identifierType_),
         objectName(objectName_){};
   virtual ~IdentifierFinderExpressionNodeWorker(){};
@@ -79,7 +77,7 @@ class GD_CORE_API IdentifierFinderExpressionNodeWorker
     const gd::ExpressionMetadata &metadata = isObjectFunction ?
             MetadataProvider::GetObjectAnyExpressionMetadata(
                 platform,
-                GetTypeOfObject(globalObjectsContainer, objectsContainer, objectName),
+                projectScopedContainers.GetObjectsContainersList().GetTypeOfObject(objectName),
                 node.functionName):
           MetadataProvider::GetAnyExpressionMetadata(platform, node.functionName);
 
@@ -111,8 +109,7 @@ class GD_CORE_API IdentifierFinderExpressionNodeWorker
 
  private:
   const gd::Platform &platform;
-  const gd::ObjectsContainer &globalObjectsContainer;
-  const gd::ObjectsContainer &objectsContainer;
+  const gd::ProjectScopedContainers &projectScopedContainers;
 
   std::set<gd::String>& results;  ///< Reference to the std::set where argument
                                   ///< values must be stored.
@@ -166,8 +163,7 @@ class GD_CORE_API IdentifierFinderEventWorker
           IdentifierFinderExpressionNodeWorker searcher(
               results,
               platform,
-              GetGlobalObjectsContainer(),
-              GetObjectsContainer(),
+              GetProjectScopedContainers(),
               identifierType,
               objectName);
           node->Visit(searcher);
@@ -227,9 +223,10 @@ void EventsIdentifiersFinder::FindArgumentsInEventsAndDependencies(
                                         platform,
                                         identifierType,
                                         objectName);
-  eventWorker.Launch(layout.GetEvents(), project, layout);
+  eventWorker.Launch(layout.GetEvents(),
+      gd::ProjectScopedContainers::MakeNewProjectScopedContainersForProjectAndLayout(project, layout));
 
-  DependenciesAnalyzer dependenciesAnalyzer = DependenciesAnalyzer(project, layout);
+  DependenciesAnalyzer dependenciesAnalyzer(project, layout);
   dependenciesAnalyzer.Analyze();
   for (const gd::String& externalEventName : dependenciesAnalyzer.GetExternalEventsDependencies()) {
     const gd::ExternalEvents& externalEvents = project.GetExternalEvents(externalEventName);
@@ -238,7 +235,8 @@ void EventsIdentifiersFinder::FindArgumentsInEventsAndDependencies(
                                           platform,
                                           identifierType,
                                           objectName);
-    eventWorker.Launch(externalEvents.GetEvents(), project, layout);
+    eventWorker.Launch(externalEvents.GetEvents(),
+        gd::ProjectScopedContainers::MakeNewProjectScopedContainersForProjectAndLayout(project, layout));
   }
   for (const gd::String& sceneName : dependenciesAnalyzer.GetScenesDependencies()) {
     const gd::Layout& dependencyLayout = project.GetLayout(sceneName);
@@ -247,7 +245,8 @@ void EventsIdentifiersFinder::FindArgumentsInEventsAndDependencies(
                                           platform,
                                           identifierType,
                                           objectName);
-    eventWorker.Launch(dependencyLayout.GetEvents(), project, dependencyLayout);
+    eventWorker.Launch(dependencyLayout.GetEvents(),
+        gd::ProjectScopedContainers::MakeNewProjectScopedContainersForProjectAndLayout(project, dependencyLayout));
   }
 }
 

Core/GDCore/IDE/Events/EventsPropertyReplacer.cpp

@@ -0,0 +1,277 @@
+/*
+ * 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/EventsPropertyReplacer.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 properties,
+ * or signal if the instruction must be renamed if a removed property is used.
+ *
+ * \see gd::ExpressionParser2
+ */
+class GD_CORE_API ExpressionPropertyReplacer
+    : public ExpressionParser2NodeWorker {
+ public:
+  ExpressionPropertyReplacer(
+      const gd::Platform& platform_,
+      const gd::ProjectScopedContainers& projectScopedContainers_,
+      const gd::PropertiesContainer& targetPropertiesContainer_,
+      const std::unordered_map<gd::String, gd::String>& oldToNewPropertyNames_,
+      const std::unordered_set<gd::String>& removedPropertyNames_)
+      : hasDoneRenaming(false),
+        removedPropertyUsed(false),
+        platform(platform_),
+        projectScopedContainers(projectScopedContainers_),
+        targetPropertiesContainer(targetPropertiesContainer_),
+        oldToNewPropertyNames(oldToNewPropertyNames_),
+        removedPropertyNames(removedPropertyNames_){};
+  virtual ~ExpressionPropertyReplacer(){};
+
+  bool HasDoneRenaming() const { return hasDoneRenaming; }
+  bool IsRemovedPropertyUsed() const { return removedPropertyUsed; }
+
+ 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 {
+    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>(
+      GetPotentialNewName(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);
+      }, [&]() {
+        // This is a 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);
+      }, [&]() {
+        // Do nothing, it's a parameter.
+        if (node.child) node.child->Visit(*this);
+      }, [&]() {
+        // 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);
+      });
+  }
+  void OnVisitVariableAccessorNode(VariableAccessorNode& node) override {
+    if (node.child) node.child->Visit(*this);
+  }
+  void OnVisitVariableBracketAccessorNode(
+      VariableBracketAccessorNode& node) override {
+    node.expression->Visit(*this);
+    if (node.child) node.child->Visit(*this);
+  }
+  void OnVisitIdentifierNode(IdentifierNode& node) override {
+    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>(
+      GetPotentialNewName(node.identifierName),
+      [&]() {
+        // Do nothing, it's an object variable.
+      }, [&]() {
+        // Do nothing, it's a variable.
+      }, [&]() {
+        // This is a 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);
+        }
+      }, [&]() {
+        // Do nothing, it's a parameter.
+      }, [&]() {
+        // 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 {
+    for (auto& parameter : node.parameters) {
+      parameter->Visit(*this);
+    }
+  }
+  void OnVisitEmptyNode(EmptyNode& node) override {}
+
+ private:
+  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) {
+      propertyName = oldToNewPropertyNames.find(propertyName)->second;
+      hasDoneRenaming = true;
+      return true;
+    } else if (removedPropertyNames.count(propertyName) >= 1) {
+      removedPropertyUsed = true;
+      return true;
+    }
+
+    return false;  // Nothing was changed or done.
+  }
+
+  // Scope:
+  const gd::Platform& platform;
+  const gd::ProjectScopedContainers& projectScopedContainers;
+
+  // Renaming or removing to do:
+  const gd::PropertiesContainer& targetPropertiesContainer;
+  const std::unordered_map<gd::String, gd::String>& oldToNewPropertyNames;
+  const std::unordered_set<gd::String>& removedPropertyNames;
+
+  gd::String objectNameToUseForVariableAccessor;
+};
+
+bool EventsPropertyReplacer::DoVisitInstruction(gd::Instruction& instruction,
+                                                bool isCondition) {
+  const auto& metadata = isCondition
+                             ? gd::MetadataProvider::GetConditionMetadata(
+                                   platform, instruction.GetType())
+                             : gd::MetadataProvider::GetActionMetadata(
+                                   platform, instruction.GetType());
+  bool shouldDeleteInstruction = false;
+
+  gd::ParameterMetadataTools::IterateOverParametersWithIndex(
+      instruction.GetParameters(),
+      metadata.GetParameters(),
+      [&](const gd::ParameterMetadata& parameterMetadata,
+          const gd::Expression& parameterValue,
+          size_t parameterIndex,
+          const gd::String& lastObjectName) {
+        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,
+                                             oldToNewPropertyNames,
+                                             removedPropertyNames);
+          node->Visit(renamer);
+
+          if (renamer.IsRemovedPropertyUsed()) {
+            shouldDeleteInstruction = true;
+          } else if (renamer.HasDoneRenaming()) {
+            instruction.SetParameter(
+                parameterIndex, ExpressionParser2NodePrinter::PrintNode(*node));
+          }
+        }
+      });
+
+  return shouldDeleteInstruction;
+}
+
+bool EventsPropertyReplacer::DoVisitEventExpression(
+    gd::Expression& expression, const gd::ParameterMetadata& metadata) {
+  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,
+                                       oldToNewPropertyNames,
+                                       removedPropertyNames);
+    node->Visit(renamer);
+
+    if (renamer.IsRemovedPropertyUsed()) {
+      return true;
+    } else if (renamer.HasDoneRenaming()) {
+      expression = ExpressionParser2NodePrinter::PrintNode(*node);
+    }
+  }
+
+  return false;
+}
+
+EventsPropertyReplacer::~EventsPropertyReplacer() {}
+
+}  // namespace gd

Core/GDCore/IDE/Events/EventsPropertyReplacer.h

@@ -0,0 +1,56 @@
+/*
+ * 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 property by another.
+ *
+ * \ingroup IDE
+ */
+class GD_CORE_API EventsPropertyReplacer
+    : public ArbitraryEventsWorkerWithContext {
+ public:
+  EventsPropertyReplacer(
+      const gd::Platform &platform_,
+      const gd::PropertiesContainer &targetPropertiesContainer_,
+      const std::unordered_map<gd::String, gd::String> &oldToNewPropertyNames_,
+      const std::unordered_set<gd::String> &removedPropertyNames_)
+      : platform(platform_),
+        targetPropertiesContainer(targetPropertiesContainer_),
+        oldToNewPropertyNames(oldToNewPropertyNames_),
+        removedPropertyNames(removedPropertyNames_){};
+  virtual ~EventsPropertyReplacer();
+
+ private:
+  bool DoVisitInstruction(gd::Instruction &instruction,
+                          bool isCondition) override;
+  bool DoVisitEventExpression(gd::Expression &expression,
+                              const gd::ParameterMetadata &metadata) override;
+
+  const gd::Platform &platform;
+  const gd::PropertiesContainer &targetPropertiesContainer;
+  const std::unordered_map<gd::String, gd::String> &oldToNewPropertyNames;
+  const std::unordered_set<gd::String> &removedPropertyNames;
+};
+
+}  // namespace gd

Core/GDCore/IDE/Events/EventsRefactorer.cpp

@@ -20,6 +20,7 @@
 #include "GDCore/IDE/Events/InstructionSentenceFormatter.h"
 #include "GDCore/Project/ObjectsContainer.h"
 #include "GDCore/Project/EventsBasedObject.h"
+#include "GDCore/Project/ProjectScopedContainers.h"
 #include "GDCore/IDE/Events/ExpressionTypeFinder.h"
 
 using namespace std;
@@ -36,14 +37,12 @@ const gd::String EventsRefactorer::searchIgnoredCharacters = ";:,#()";
 class GD_CORE_API ExpressionObjectRenamer : public ExpressionParser2NodeWorker {
  public:
   ExpressionObjectRenamer(const gd::Platform &platform_,
-                          const gd::ObjectsContainer &globalObjectsContainer_,
-                          const gd::ObjectsContainer &objectsContainer_,
+                          const gd::ProjectScopedContainers& projectScopedContainers_,
                           const gd::String &rootType_,
                           const gd::String& objectName_,
                           const gd::String& objectNewName_)
       : platform(platform_),
-        globalObjectsContainer(globalObjectsContainer_),
-        objectsContainer(objectsContainer_),
+        projectScopedContainers(projectScopedContainers_),
         rootType(rootType_),
         hasDoneRenaming(false),
         objectName(objectName_),
@@ -51,14 +50,13 @@ class GD_CORE_API ExpressionObjectRenamer : public ExpressionParser2NodeWorker {
   virtual ~ExpressionObjectRenamer(){};
 
   static bool Rename(const gd::Platform &platform,
-                     const gd::ObjectsContainer &globalObjectsContainer,
-                     const gd::ObjectsContainer &objectsContainer,
+                     const gd::ProjectScopedContainers &projectScopedContainers,
                      const gd::String &rootType,
                      gd::ExpressionNode& node,
                      const gd::String& objectName,
                      const gd::String& objectNewName) {
-    if (gd::ExpressionValidator::HasNoErrors(platform, globalObjectsContainer, objectsContainer, rootType, node)) {
-      ExpressionObjectRenamer renamer(platform, globalObjectsContainer, objectsContainer, rootType, objectName, objectNewName);
+    if (gd::ExpressionValidator::HasNoErrors(platform, projectScopedContainers, rootType, node)) {
+      ExpressionObjectRenamer renamer(platform, projectScopedContainers, rootType, objectName, objectNewName);
       node.Visit(renamer);
 
       return renamer.HasDoneRenaming();
@@ -83,6 +81,28 @@ class GD_CORE_API ExpressionObjectRenamer : public ExpressionParser2NodeWorker {
   void OnVisitNumberNode(NumberNode& node) override {}
   void OnVisitTextNode(TextNode& node) override {}
   void OnVisitVariableNode(VariableNode& node) override {
+    auto type = gd::ExpressionTypeFinder::GetType(platform, projectScopedContainers, rootType, node);
+
+    if (gd::ValueTypeMetadata::IsTypeLegacyPreScopedVariable(type)) {
+      // Nothing to do (this can't reference an object)
+    } else {
+      if (node.name == objectName) {
+        projectScopedContainers.MatchIdentifierWithName<void>(node.name, [&]() {
+          // This is an object variable.
+          hasDoneRenaming = true;
+          node.name = objectNewName;
+        }, [&]() {
+          // This is a variable.
+        }, [&]() {
+          // This is a property.
+        }, [&]() {
+          // This is a parameter.
+        }, [&]() {
+          // This is something else.
+        });
+      }
+    }
+
     if (node.child) node.child->Visit(*this);
   }
   void OnVisitVariableAccessorNode(VariableAccessorNode& node) override {
@@ -94,11 +114,29 @@ class GD_CORE_API ExpressionObjectRenamer : public ExpressionParser2NodeWorker {
     if (node.child) node.child->Visit(*this);
   }
   void OnVisitIdentifierNode(IdentifierNode& node) override {
-    auto type = gd::ExpressionTypeFinder::GetType(platform, globalObjectsContainer, objectsContainer, rootType, node);
+    auto type = gd::ExpressionTypeFinder::GetType(platform, projectScopedContainers, rootType, node);
     if (gd::ParameterMetadata::IsObject(type) &&
         node.identifierName == objectName) {
       hasDoneRenaming = true;
       node.identifierName = objectNewName;
+    } else if (gd::ValueTypeMetadata::IsTypeLegacyPreScopedVariable(type)) {
+      // Nothing to do (this can't reference an object)
+    } else {
+      if (node.identifierName == objectName) {
+        projectScopedContainers.MatchIdentifierWithName<void>(node.identifierName, [&]() {
+          // This is an object variable.
+          hasDoneRenaming = true;
+          node.identifierName = objectNewName;
+        }, [&]() {
+          // This is a variable.
+        }, [&]() {
+          // This is a property.
+        }, [&]() {
+          // This is a parameter.
+        }, [&]() {
+          // This is something else.
+        });
+      }
     }
   }
   void OnVisitObjectFunctionNameNode(ObjectFunctionNameNode& node) override {
@@ -124,8 +162,7 @@ class GD_CORE_API ExpressionObjectRenamer : public ExpressionParser2NodeWorker {
   const gd::String& objectNewName;
 
   const gd::Platform &platform;
-  const gd::ObjectsContainer &globalObjectsContainer;
-  const gd::ObjectsContainer &objectsContainer;
+  const gd::ProjectScopedContainers &projectScopedContainers;
   const gd::String rootType;
 };
 
@@ -138,26 +175,23 @@ class GD_CORE_API ExpressionObjectRenamer : public ExpressionParser2NodeWorker {
 class GD_CORE_API ExpressionObjectFinder : public ExpressionParser2NodeWorker {
  public:
   ExpressionObjectFinder(const gd::Platform &platform_,
-                         const gd::ObjectsContainer &globalObjectsContainer_,
-                         const gd::ObjectsContainer &objectsContainer_,
+                         const gd::ProjectScopedContainers &projectScopedContainers_,
                          const gd::String &rootType_,
-                         const gd::String& objectName_)
+                         const gd::String& searchedObjectName_)
       : platform(platform_),
-        globalObjectsContainer(globalObjectsContainer_),
-        objectsContainer(objectsContainer_),
+        projectScopedContainers(projectScopedContainers_),
         rootType(rootType_),
         hasObject(false),
-        objectName(objectName_){};
+        searchedObjectName(searchedObjectName_){};
   virtual ~ExpressionObjectFinder(){};
 
   static bool CheckIfHasObject(const gd::Platform &platform,
-                               const gd::ObjectsContainer &globalObjectsContainer,
-                               const gd::ObjectsContainer &objectsContainer,
+                               const gd::ProjectScopedContainers &projectScopedContainers,
                                const gd::String &rootType,
                                gd::ExpressionNode& node,
                                const gd::String& objectName) {
-    if (gd::ExpressionValidator::HasNoErrors(platform, globalObjectsContainer, objectsContainer, rootType, node)) {
-      ExpressionObjectFinder finder(platform, globalObjectsContainer, objectsContainer, rootType, objectName);
+    if (gd::ExpressionValidator::HasNoErrors(platform, projectScopedContainers, rootType, node)) {
+      ExpressionObjectFinder finder(platform, projectScopedContainers, rootType, objectName);
       node.Visit(finder);
 
       return finder.HasFoundObject();
@@ -182,6 +216,27 @@ class GD_CORE_API ExpressionObjectFinder : public ExpressionParser2NodeWorker {
   void OnVisitNumberNode(NumberNode& node) override {}
   void OnVisitTextNode(TextNode& node) override {}
   void OnVisitVariableNode(VariableNode& node) override {
+    auto type = gd::ExpressionTypeFinder::GetType(platform, projectScopedContainers, rootType, node);
+
+    if (gd::ValueTypeMetadata::IsTypeLegacyPreScopedVariable(type)) {
+      // Nothing to do (this can't reference an object)
+    } else {
+      if (node.name == searchedObjectName) {
+        projectScopedContainers.MatchIdentifierWithName<void>(node.name, [&]() {
+          // This is an object variable.
+          hasObject = true;
+        }, [&]() {
+          // This is a variable.
+        }, [&]() {
+          // This is a property.
+        }, [&]() {
+          // This is a parameter.
+        }, [&]() {
+          // This is something else.
+        });
+      }
+    }
+
     if (node.child) node.child->Visit(*this);
   }
   void OnVisitVariableAccessorNode(VariableAccessorNode& node) override {
@@ -193,19 +248,36 @@ class GD_CORE_API ExpressionObjectFinder : public ExpressionParser2NodeWorker {
     if (node.child) node.child->Visit(*this);
   }
   void OnVisitIdentifierNode(IdentifierNode& node) override {
-    auto type = gd::ExpressionTypeFinder::GetType(platform, globalObjectsContainer, objectsContainer, rootType, node);
+    auto type = gd::ExpressionTypeFinder::GetType(platform, projectScopedContainers, rootType, node);
     if (gd::ParameterMetadata::IsObject(type) &&
-        node.identifierName == objectName) {
+        node.identifierName == searchedObjectName) {
       hasObject = true;
+    } else if (gd::ValueTypeMetadata::IsTypeLegacyPreScopedVariable(type)) {
+      // Nothing to do (this can't reference an object)
+    } else {
+      if (node.identifierName == searchedObjectName) {
+        projectScopedContainers.MatchIdentifierWithName<void>(node.identifierName, [&]() {
+          // This is an object variable.
+          hasObject = true;
+        }, [&]() {
+          // This is a variable.
+        }, [&]() {
+          // This is a property.
+        }, [&]() {
+          // This is a parameter.
+        }, [&]() {
+          // This is something else.
+        });
+      }
     }
   }
   void OnVisitObjectFunctionNameNode(ObjectFunctionNameNode& node) override {
-    if (node.objectName == objectName) {
+    if (node.objectName == searchedObjectName) {
       hasObject = true;
     }
   }
   void OnVisitFunctionCallNode(FunctionCallNode& node) override {
-    if (node.objectName == objectName) {
+    if (node.objectName == searchedObjectName) {
       hasObject = true;
     }
     for (auto& parameter : node.parameters) {
@@ -216,17 +288,15 @@ class GD_CORE_API ExpressionObjectFinder : public ExpressionParser2NodeWorker {
 
  private:
   bool hasObject;
-  const gd::String& objectName;
+  const gd::String& searchedObjectName;
 
   const gd::Platform &platform;
-  const gd::ObjectsContainer &globalObjectsContainer;
-  const gd::ObjectsContainer &objectsContainer;
+  const gd::ProjectScopedContainers &projectScopedContainers;
   const gd::String rootType;
 };
 
 bool EventsRefactorer::RenameObjectInActions(const gd::Platform& platform,
-                                             gd::ObjectsContainer& project,
-                                             gd::ObjectsContainer& layout,
+                                             gd::ProjectScopedContainers& projectScopedContainers,
                                              gd::InstructionsList& actions,
                                              gd::String oldName,
                                              gd::String newName) {
@@ -245,7 +315,7 @@ bool EventsRefactorer::RenameObjectInActions(const gd::Platform& platform,
                    "number", instrInfos.parameters[pNb].GetType())) {
         auto node = actions[aId].GetParameter(pNb).GetRootNode();
 
-        if (ExpressionObjectRenamer::Rename(platform, project, layout, "number", *node, oldName, newName)) {
+        if (ExpressionObjectRenamer::Rename(platform, projectScopedContainers, "number", *node, oldName, newName)) {
           actions[aId].SetParameter(
               pNb, ExpressionParser2NodePrinter::PrintNode(*node));
         }
@@ -255,7 +325,7 @@ bool EventsRefactorer::RenameObjectInActions(const gd::Platform& platform,
                    "string", instrInfos.parameters[pNb].GetType())) {
         auto node = actions[aId].GetParameter(pNb).GetRootNode();
 
-        if (ExpressionObjectRenamer::Rename(platform, project, layout, "string", *node, oldName, newName)) {
+        if (ExpressionObjectRenamer::Rename(platform, projectScopedContainers, "string", *node, oldName, newName)) {
           actions[aId].SetParameter(
               pNb, ExpressionParser2NodePrinter::PrintNode(*node));
         }
@@ -265,8 +335,7 @@ bool EventsRefactorer::RenameObjectInActions(const gd::Platform& platform,
     if (!actions[aId].GetSubInstructions().empty())
       somethingModified =
           RenameObjectInActions(platform,
-                                project,
-                                layout,
+                                projectScopedContainers,
                                 actions[aId].GetSubInstructions(),
                                 oldName,
                                 newName) ||
@@ -278,8 +347,7 @@ bool EventsRefactorer::RenameObjectInActions(const gd::Platform& platform,
 
 bool EventsRefactorer::RenameObjectInConditions(
     const gd::Platform& platform,
-    gd::ObjectsContainer& project,
-    gd::ObjectsContainer& layout,
+    gd::ProjectScopedContainers& projectScopedContainers,
     gd::InstructionsList& conditions,
     gd::String oldName,
     gd::String newName) {
@@ -299,7 +367,7 @@ bool EventsRefactorer::RenameObjectInConditions(
                    "number", instrInfos.parameters[pNb].GetType())) {
         auto node = conditions[cId].GetParameter(pNb).GetRootNode();
 
-        if (ExpressionObjectRenamer::Rename(platform, project, layout, "number", *node, oldName, newName)) {
+        if (ExpressionObjectRenamer::Rename(platform, projectScopedContainers, "number", *node, oldName, newName)) {
           conditions[cId].SetParameter(
               pNb, ExpressionParser2NodePrinter::PrintNode(*node));
         }
@@ -309,7 +377,7 @@ bool EventsRefactorer::RenameObjectInConditions(
                    "string", instrInfos.parameters[pNb].GetType())) {
         auto node = conditions[cId].GetParameter(pNb).GetRootNode();
 
-        if (ExpressionObjectRenamer::Rename(platform, project, layout, "string", *node, oldName, newName)) {
+        if (ExpressionObjectRenamer::Rename(platform, projectScopedContainers, "string", *node, oldName, newName)) {
           conditions[cId].SetParameter(
               pNb, ExpressionParser2NodePrinter::PrintNode(*node));
         }
@@ -319,8 +387,7 @@ bool EventsRefactorer::RenameObjectInConditions(
     if (!conditions[cId].GetSubInstructions().empty())
       somethingModified =
           RenameObjectInConditions(platform,
-                                   project,
-                                   layout,
+                                   projectScopedContainers,
                                    conditions[cId].GetSubInstructions(),
                                    oldName,
                                    newName) ||
@@ -332,8 +399,7 @@ bool EventsRefactorer::RenameObjectInConditions(
 
 bool EventsRefactorer::RenameObjectInEventParameters(
     const gd::Platform& platform,
-    gd::ObjectsContainer& project,
-    gd::ObjectsContainer& layout,
+    gd::ProjectScopedContainers& projectScopedContainers,
     gd::Expression& expression,
     gd::ParameterMetadata parameterMetadata,
     gd::String oldName,
@@ -348,7 +414,7 @@ bool EventsRefactorer::RenameObjectInEventParameters(
                                            parameterMetadata.GetType())) {
     auto node = expression.GetRootNode();
 
-    if (ExpressionObjectRenamer::Rename(platform, project, layout, "number", *node, oldName, newName)) {
+    if (ExpressionObjectRenamer::Rename(platform, projectScopedContainers, "number", *node, oldName, newName)) {
       expression = ExpressionParser2NodePrinter::PrintNode(*node);
     }
   }
@@ -357,7 +423,7 @@ bool EventsRefactorer::RenameObjectInEventParameters(
                                            parameterMetadata.GetType())) {
     auto node = expression.GetRootNode();
 
-    if (ExpressionObjectRenamer::Rename(platform, project, layout, "string", *node, oldName, newName)) {
+    if (ExpressionObjectRenamer::Rename(platform, projectScopedContainers, "string", *node, oldName, newName)) {
       expression = ExpressionParser2NodePrinter::PrintNode(*node);
     }
   }
@@ -366,8 +432,7 @@ bool EventsRefactorer::RenameObjectInEventParameters(
 }
 
 void EventsRefactorer::RenameObjectInEvents(const gd::Platform& platform,
-                                            gd::ObjectsContainer& project,
-                                            gd::ObjectsContainer& layout,
+                                            gd::ProjectScopedContainers& projectScopedContainers,
                                             gd::EventsList& events,
                                             gd::String oldName,
                                             gd::String newName) {
@@ -376,14 +441,14 @@ void EventsRefactorer::RenameObjectInEvents(const gd::Platform& platform,
         events[i].GetAllConditionsVectors();
     for (std::size_t j = 0; j < conditionsVectors.size(); ++j) {
       bool somethingModified = RenameObjectInConditions(
-          platform, project, layout, *conditionsVectors[j], oldName, newName);
+          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, project, layout, *actionsVectors[j], oldName, newName);
+          platform, projectScopedContainers, *actionsVectors[j], oldName, newName);
     }
 
     vector<pair<gd::Expression*, gd::ParameterMetadata>>
@@ -393,8 +458,7 @@ void EventsRefactorer::RenameObjectInEvents(const gd::Platform& platform,
       gd::ParameterMetadata parameterMetadata =
           expressionsWithMetadata[j].second;
       bool somethingModified = RenameObjectInEventParameters(platform,
-                                                             project,
-                                                             layout,
+                                                             projectScopedContainers,
                                                              *expression,
                                                              parameterMetadata,
                                                              oldName,
@@ -403,8 +467,7 @@ void EventsRefactorer::RenameObjectInEvents(const gd::Platform& platform,
 
     if (events[i].CanHaveSubEvents())
       RenameObjectInEvents(platform,
-                           project,
-                           layout,
+                           projectScopedContainers,
                            events[i].GetSubEvents(),
                            oldName,
                            newName);
@@ -412,8 +475,7 @@ void EventsRefactorer::RenameObjectInEvents(const gd::Platform& platform,
 }
 
 bool EventsRefactorer::RemoveObjectInActions(const gd::Platform& platform,
-                                             gd::ObjectsContainer& globalObjectsContainer,
-                                             gd::ObjectsContainer& objectsContainer,
+                                             gd::ProjectScopedContainers& projectScopedContainers,
                                              gd::InstructionsList& actions,
                                              gd::String name) {
   bool somethingModified = false;
@@ -435,7 +497,7 @@ bool EventsRefactorer::RemoveObjectInActions(const gd::Platform& platform,
                    "number", instrInfos.parameters[pNb].GetType())) {
         auto node = actions[aId].GetParameter(pNb).GetRootNode();
 
-        if (ExpressionObjectFinder::CheckIfHasObject(platform, globalObjectsContainer, objectsContainer, "number", *node, name)) {
+        if (ExpressionObjectFinder::CheckIfHasObject(platform, projectScopedContainers, "number", *node, name)) {
           deleteMe = true;
           break;
         }
@@ -445,7 +507,7 @@ bool EventsRefactorer::RemoveObjectInActions(const gd::Platform& platform,
                    "string", instrInfos.parameters[pNb].GetType())) {
         auto node = actions[aId].GetParameter(pNb).GetRootNode();
 
-        if (ExpressionObjectFinder::CheckIfHasObject(platform, globalObjectsContainer, objectsContainer, "string", *node, name)) {
+        if (ExpressionObjectFinder::CheckIfHasObject(platform, projectScopedContainers, "string", *node, name)) {
           deleteMe = true;
           break;
         }
@@ -459,8 +521,7 @@ bool EventsRefactorer::RemoveObjectInActions(const gd::Platform& platform,
     } else if (!actions[aId].GetSubInstructions().empty())
       somethingModified =
           RemoveObjectInActions(platform,
-                                globalObjectsContainer,
-                                objectsContainer,
+                                projectScopedContainers,
                                 actions[aId].GetSubInstructions(),
                                 name) ||
           somethingModified;
@@ -471,8 +532,7 @@ bool EventsRefactorer::RemoveObjectInActions(const gd::Platform& platform,
 
 bool EventsRefactorer::RemoveObjectInConditions(
     const gd::Platform& platform,
-    gd::ObjectsContainer& globalObjectsContainer,
-    gd::ObjectsContainer& objectsContainer,
+    gd::ProjectScopedContainers& projectScopedContainers,
     gd::InstructionsList& conditions,
     gd::String name) {
   bool somethingModified = false;
@@ -495,7 +555,7 @@ bool EventsRefactorer::RemoveObjectInConditions(
                    "number", instrInfos.parameters[pNb].GetType())) {
         auto node = conditions[cId].GetParameter(pNb).GetRootNode();
 
-        if (ExpressionObjectFinder::CheckIfHasObject(platform, globalObjectsContainer, objectsContainer, "number", *node, name)) {
+        if (ExpressionObjectFinder::CheckIfHasObject(platform, projectScopedContainers, "number", *node, name)) {
           deleteMe = true;
           break;
         }
@@ -505,7 +565,7 @@ bool EventsRefactorer::RemoveObjectInConditions(
                    "string", instrInfos.parameters[pNb].GetType())) {
         auto node = conditions[cId].GetParameter(pNb).GetRootNode();
 
-        if (ExpressionObjectFinder::CheckIfHasObject(platform, globalObjectsContainer, objectsContainer, "string", *node, name)) {
+        if (ExpressionObjectFinder::CheckIfHasObject(platform, projectScopedContainers, "string", *node, name)) {
           deleteMe = true;
           break;
         }
@@ -519,8 +579,7 @@ bool EventsRefactorer::RemoveObjectInConditions(
     } else if (!conditions[cId].GetSubInstructions().empty())
       somethingModified =
           RemoveObjectInConditions(platform,
-                                   globalObjectsContainer,
-                                   objectsContainer,
+                                   projectScopedContainers,
                                    conditions[cId].GetSubInstructions(),
                                    name) ||
           somethingModified;
@@ -530,8 +589,7 @@ bool EventsRefactorer::RemoveObjectInConditions(
 }
 
 void EventsRefactorer::RemoveObjectInEvents(const gd::Platform& platform,
-                                            gd::ObjectsContainer& globalObjectsContainer,
-                                            gd::ObjectsContainer& objectsContainer,
+                                            gd::ProjectScopedContainers& projectScopedContainers,
                                             gd::EventsList& events,
                                             gd::String name) {
   for (std::size_t i = 0; i < events.size(); ++i) {
@@ -539,19 +597,19 @@ void EventsRefactorer::RemoveObjectInEvents(const gd::Platform& platform,
         events[i].GetAllConditionsVectors();
     for (std::size_t j = 0; j < conditionsVectors.size(); ++j) {
       bool conditionsModified = RemoveObjectInConditions(
-          platform, globalObjectsContainer, objectsContainer, *conditionsVectors[j], name);
+          platform, projectScopedContainers, *conditionsVectors[j], name);
     }
 
     vector<gd::InstructionsList*> actionsVectors =
         events[i].GetAllActionsVectors();
     for (std::size_t j = 0; j < actionsVectors.size(); ++j) {
       bool actionsModified = RemoveObjectInActions(
-          platform, globalObjectsContainer, objectsContainer, *actionsVectors[j], name);
+          platform, projectScopedContainers, *actionsVectors[j], name);
     }
 
     if (events[i].CanHaveSubEvents())
       RemoveObjectInEvents(
-          platform, globalObjectsContainer, objectsContainer, events[i].GetSubEvents(), name);
+          platform, projectScopedContainers, events[i].GetSubEvents(), name);
   }
 }
 
@@ -587,20 +645,20 @@ std::vector<EventsSearchResult> EventsRefactorer::ReplaceStringInEvents(
   for (std::size_t i = 0; i < events.size(); ++i) {
     bool eventModified = false;
 
-    std::vector<gd::Expression*> allObjectExpressions =
-        events[i].GetAllObjectExpressions();
-    for (std::size_t j = 0; j < allObjectExpressions.size(); ++j) {
+    auto allExpressionsWithMetadata = events[i].GetAllExpressionsWithMetadata();
+    for (auto& expressionAndMetadata : allExpressionsWithMetadata) {
+      gd::Expression* expression = expressionAndMetadata.first;
+
       gd::String newExpressionPlainString =
-          matchCase ? allObjectExpressions[j]->GetPlainString().FindAndReplace(
+          matchCase ? expression->GetPlainString().FindAndReplace(
                           toReplace, newString, true)
                     : ReplaceAllOccurrencesCaseInsensitive(
-                          allObjectExpressions[j]->GetPlainString(),
+                          expression->GetPlainString(),
                           toReplace,
                           newString);
 
-      if (newExpressionPlainString !=
-          allObjectExpressions[j]->GetPlainString()) {
-        *allObjectExpressions[j] = gd::Expression(newExpressionPlainString);
+      if (newExpressionPlainString != expression->GetPlainString()) {
+        *expression = gd::Expression(newExpressionPlainString);
 
         if (!eventModified) {
           modifiedEvents.push_back(EventsSearchResult(
@@ -815,14 +873,14 @@ vector<EventsSearchResult> EventsRefactorer::SearchInEvents(
   for (std::size_t i = 0; i < events.size(); ++i) {
     bool eventAddedInResults = false;
 
-    std::vector<gd::Expression*> allObjectExpressions =
-        events[i].GetAllObjectExpressions();
-    for (std::size_t j = 0; j < allObjectExpressions.size(); ++j) {
+    auto allExpressionsWithMetadata = events[i].GetAllExpressionsWithMetadata();
+    for (auto& expressionAndMetadata : allExpressionsWithMetadata) {
+      gd::Expression* expression = expressionAndMetadata.first;
+
       size_t foundPosition =
           matchCase
-              ? allObjectExpressions[j]->GetPlainString().find(search)
-              : allObjectExpressions[j]->GetPlainString().FindCaseInsensitive(
-                    search);
+              ? expression->GetPlainString().find(search)
+              : expression->GetPlainString().FindCaseInsensitive(search);
 
       if (foundPosition != gd::String::npos && !eventAddedInResults) {
         results.push_back(EventsSearchResult(

Core/GDCore/IDE/Events/EventsRefactorer.h

@@ -14,6 +14,8 @@
 namespace gd {
 class EventsList;
 class ObjectsContainer;
+class ObjectsContainersList;
+class ProjectScopedContainers;
 class Platform;
 class ExternalEvents;
 class BaseEvent;
@@ -79,8 +81,7 @@ class GD_CORE_API EventsRefactorer {
    * events ).
    */
   static void RenameObjectInEvents(const gd::Platform& platform,
-                                   gd::ObjectsContainer& project,
-                                   gd::ObjectsContainer& layout,
+                                   gd::ProjectScopedContainers& projectScopedContainers,
                                    gd::EventsList& events,
                                    gd::String oldName,
                                    gd::String newName);
@@ -89,8 +90,7 @@ class GD_CORE_API EventsRefactorer {
    * Remove all actions or conditions using an object
    */
   static void RemoveObjectInEvents(const gd::Platform& platform,
-                                   gd::ObjectsContainer& project,
-                                   gd::ObjectsContainer& layout,
+                                   gd::ProjectScopedContainers& projectScopedContainers,
                                    gd::EventsList& events,
                                    gd::String name);
 
@@ -136,8 +136,7 @@ class GD_CORE_API EventsRefactorer {
    * \return true if something was modified.
    */
   static bool RenameObjectInActions(const gd::Platform& platform,
-                                    gd::ObjectsContainer& project,
-                                    gd::ObjectsContainer& layout,
+                                    gd::ProjectScopedContainers& projectScopedContainers,
                                     gd::InstructionsList& instructions,
                                     gd::String oldName,
                                     gd::String newName);
@@ -149,8 +148,7 @@ class GD_CORE_API EventsRefactorer {
    * \return true if something was modified.
    */
   static bool RenameObjectInConditions(const gd::Platform& platform,
-                                       gd::ObjectsContainer& project,
-                                       gd::ObjectsContainer& layout,
+                                       gd::ProjectScopedContainers& projectScopedContainers,
                                        gd::InstructionsList& instructions,
                                        gd::String oldName,
                                        gd::String newName);
@@ -163,8 +161,7 @@ class GD_CORE_API EventsRefactorer {
    */
   static bool RenameObjectInEventParameters(
       const gd::Platform& platform,
-      gd::ObjectsContainer& project,
-      gd::ObjectsContainer& layout,
+      gd::ProjectScopedContainers& projectScopedContainers,
       gd::Expression& expression,
       gd::ParameterMetadata parameterMetadata,
       gd::String oldName,
@@ -176,8 +173,7 @@ class GD_CORE_API EventsRefactorer {
    * \return true if something was modified.
    */
   static bool RemoveObjectInConditions(const gd::Platform& platform,
-                                       gd::ObjectsContainer& project,
-                                       gd::ObjectsContainer& layout,
+                                       gd::ProjectScopedContainers& projectScopedContainers,
                                        gd::InstructionsList& conditions,
                                        gd::String name);
 
@@ -187,8 +183,7 @@ class GD_CORE_API EventsRefactorer {
    * \return true if something was modified.
    */
   static bool RemoveObjectInActions(const gd::Platform& platform,
-                                    gd::ObjectsContainer& project,
-                                    gd::ObjectsContainer& layout,
+                                    gd::ProjectScopedContainers& projectScopedContainers,
                                     gd::InstructionsList& conditions,
                                     gd::String name);
 

Core/GDCore/IDE/Events/EventsVariableReplacer.cpp

@@ -0,0 +1,404 @@
+/*
+ * 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/EventsVariableReplacer.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/IDE/Events/ExpressionVariableOwnerFinder.h"
+#include "GDCore/Project/Layout.h"
+#include "GDCore/Project/Project.h"
+#include "GDCore/Project/ProjectScopedContainers.h"
+#include "GDCore/Project/VariablesContainer.h"
+#include "GDCore/String.h"
+#include "GDCore/Tools/Log.h"
+
+namespace gd {
+
+/**
+ * \brief Go through the nodes and rename variables,
+ * or signal if the instruction must be renamed if a removed variable is used.
+ *
+ * \see gd::ExpressionParser2
+ */
+class GD_CORE_API ExpressionVariableReplacer
+    : public ExpressionParser2NodeWorker {
+ public:
+  ExpressionVariableReplacer(
+      const gd::Platform& platform_,
+      const gd::ProjectScopedContainers& projectScopedContainers_,
+      const gd::VariablesContainer& targetVariablesContainer_,
+      const std::unordered_map<gd::String, gd::String>& oldToNewVariableNames_,
+      const std::unordered_set<gd::String>& removedVariableNames_)
+      : hasDoneRenaming(false),
+        removedVariableUsed(false),
+        platform(platform_),
+        projectScopedContainers(projectScopedContainers_),
+        forcedInitialVariablesContainer(nullptr),
+        targetVariablesContainer(targetVariablesContainer_),
+        oldToNewVariableNames(oldToNewVariableNames_),
+        removedVariableNames(removedVariableNames_){};
+  virtual ~ExpressionVariableReplacer(){};
+
+  void SetForcedInitialVariablesContainer(
+      const gd::VariablesContainer* forcedInitialVariablesContainer_) {
+    forcedInitialVariablesContainer = forcedInitialVariablesContainer_;
+  }
+
+  bool HasDoneRenaming() const { return hasDoneRenaming; }
+  bool IsRemovedVariableUsed() const { return removedVariableUsed; }
+
+ 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 {
+    // The node represents a variable or an object name on which a variable
+    // will be accessed.
+
+    if (forcedInitialVariablesContainer) {
+      // A scope was forced. Honor it: it means this node represents a variable
+      // of the forced variables container.
+      if (forcedInitialVariablesContainer == &targetVariablesContainer) {
+        RenameOrRemoveVariableOfTargetVariableContainer(node.name);
+      }
+
+      if (node.child) node.child->Visit(*this);
+      return;
+    }
+
+    // Match the potential *new* name of the variable, because refactorings are
+    // done after changes in the variables container.
+    projectScopedContainers.MatchIdentifierWithName<void>(
+        GetPotentialNewName(node.name),
+        [&]() {
+          // This represents an object.
+          // Remember the object name.
+          objectNameToUseForVariableAccessor = node.name;
+          if (node.child) node.child->Visit(*this);
+          objectNameToUseForVariableAccessor = "";
+        },
+        [&]() {
+          // This is a variable.
+          if (projectScopedContainers.GetVariablesContainersList()
+                  .HasVariablesContainer(targetVariablesContainer)) {
+            // The node represents a variable, that can come from the target
+            // (because the target is in the scope), replace or remove it:
+            RenameOrRemoveVariableOfTargetVariableContainer(node.name);
+          }
+
+          if (node.child) node.child->Visit(*this);
+        },
+        [&]() {
+          // This is a property.
+          if (node.child) node.child->Visit(*this);
+        },
+        [&]() {
+          // This is a parameter.
+          if (node.child) node.child->Visit(*this);
+        },
+        [&]() {
+          // This is something else - potentially a deleted variable.
+          if (projectScopedContainers.GetVariablesContainersList()
+                  .HasVariablesContainer(targetVariablesContainer)) {
+            // The node represents a variable, that can come from the target
+            // (because the target is in the scope), replace or remove it:
+            RenameOrRemoveVariableOfTargetVariableContainer(node.name);
+          }
+
+          if (node.child) node.child->Visit(*this);
+        });
+  }
+  void OnVisitVariableAccessorNode(VariableAccessorNode& node) override {
+    auto& objectsContainersList =
+        projectScopedContainers.GetObjectsContainersList();
+    if (!objectNameToUseForVariableAccessor.empty()) {
+      if (objectsContainersList.HasObjectOrGroupVariablesContainer(
+              objectNameToUseForVariableAccessor, targetVariablesContainer)) {
+        // The node represents an object variable, and this object variables are
+        // the target. Do the replacement or removals:
+        RenameOrRemoveVariableOfTargetVariableContainer(node.name);
+      }
+    }
+    objectNameToUseForVariableAccessor = "";
+
+    if (node.child) node.child->Visit(*this);
+  }
+  void OnVisitVariableBracketAccessorNode(
+      VariableBracketAccessorNode& node) override {
+    objectNameToUseForVariableAccessor = "";
+
+    node.expression->Visit(*this);
+    if (node.child) node.child->Visit(*this);
+  }
+  void OnVisitIdentifierNode(IdentifierNode& node) override {
+    auto& objectsContainersList =
+        projectScopedContainers.GetObjectsContainersList();
+
+    // The node represents a variable or an object variable in an expression
+    // (and if it's a variable reference or a value does not have any importance
+    // here).
+
+    if (forcedInitialVariablesContainer) {
+      // A scope was forced. Honor it: it means this node represents a variable
+      // of the forced variables container.
+      if (forcedInitialVariablesContainer == &targetVariablesContainer) {
+        RenameOrRemoveVariableOfTargetVariableContainer(node.identifierName);
+      }
+      return;
+    }
+
+    // Match the potential *new* name of the variable, because refactorings are
+    // done after changes in the variables container.
+    projectScopedContainers.MatchIdentifierWithName<void>(
+        GetPotentialNewName(node.identifierName),
+        [&]() {
+          // This represents an object.
+          if (objectsContainersList.HasObjectOrGroupVariablesContainer(
+                  node.identifierName, targetVariablesContainer)) {
+            // The node represents an object variable, and this object variables
+            // are the target. Do the replacement or removals:
+            RenameOrRemoveVariableOfTargetVariableContainer(
+                node.childIdentifierName);
+          }
+        },
+        [&]() {
+          // This is a variable.
+          if (projectScopedContainers.GetVariablesContainersList()
+                  .HasVariablesContainer(targetVariablesContainer)) {
+            // The node represents a variable, that can come from the target
+            // (because the target is in the scope), replace or remove it:
+            RenameOrRemoveVariableOfTargetVariableContainer(
+                node.identifierName);
+          }
+        },
+        [&]() {
+          // This is a property.
+        },
+        [&]() {
+          // This is a parameter.
+        },
+        [&]() {
+          // This is something else - potentially a deleted variable.
+          if (projectScopedContainers.GetVariablesContainersList()
+                  .HasVariablesContainer(targetVariablesContainer)) {
+            // The node represents a variable, that can come from the target
+            // (because the target is in the scope), replace or remove it:
+            RenameOrRemoveVariableOfTargetVariableContainer(
+                node.identifierName);
+          }
+        });
+  }
+  void OnVisitObjectFunctionNameNode(ObjectFunctionNameNode& node) override {}
+  void OnVisitFunctionCallNode(FunctionCallNode& node) override {
+    const gd::ExpressionMetadata& metadata =
+        MetadataProvider::GetFunctionCallMetadata(
+            platform, projectScopedContainers.GetObjectsContainersList(), node);
+
+    for (size_t parameterIndex = 0; parameterIndex < node.parameters.size();
+         ++parameterIndex) {
+      const gd::ParameterMetadata* parameterMetadata =
+          MetadataProvider::GetFunctionCallParameterMetadata(
+              platform,
+              projectScopedContainers.GetObjectsContainersList(),
+              node,
+              parameterIndex);
+
+      // Handle legacy pre-scoped variable parameters: in this case, we
+      // force the "scope" at which starts the evalution of variables.
+      if (parameterMetadata && parameterMetadata->GetValueTypeMetadata()
+                                   .IsLegacyPreScopedVariable()) {
+        const gd::VariablesContainer* oldForcedInitialVariablesContainer =
+            forcedInitialVariablesContainer;
+
+        forcedInitialVariablesContainer = nullptr;
+        if (parameterMetadata->GetType() == "globalvar") {
+          forcedInitialVariablesContainer =
+              projectScopedContainers.GetVariablesContainersList()
+                  .GetTopMostVariablesContainer();
+        } else if (parameterMetadata->GetType() == "scenevar") {
+          forcedInitialVariablesContainer =
+              projectScopedContainers.GetVariablesContainersList()
+                  .GetBottomMostVariablesContainer();
+        } else if (parameterMetadata->GetType() == "objectvar") {
+          auto objectName = gd::ExpressionVariableOwnerFinder::GetObjectName(
+              platform,
+              projectScopedContainers.GetObjectsContainersList(),
+              node.objectName,
+              *node.parameters[parameterIndex].get());
+          forcedInitialVariablesContainer =
+              projectScopedContainers.GetObjectsContainersList()
+                  .GetObjectOrGroupVariablesContainer(objectName);
+        }
+
+        node.parameters[parameterIndex]->Visit(*this);
+        forcedInitialVariablesContainer = oldForcedInitialVariablesContainer;
+      } else {
+        // For any other parameter, there is no special treatment being needed.
+        node.parameters[parameterIndex]->Visit(*this);
+      }
+    }
+  }
+  void OnVisitEmptyNode(EmptyNode& node) override {}
+
+ private:
+  bool hasDoneRenaming;
+  bool removedVariableUsed;
+
+  const gd::String& GetPotentialNewName(const gd::String& oldName) {
+    return oldToNewVariableNames.count(oldName) >= 1
+            ? oldToNewVariableNames.find(oldName)->second
+            : oldName;
+  }
+
+  bool RenameOrRemoveVariableOfTargetVariableContainer(
+      gd::String& variableName) {
+    if (oldToNewVariableNames.count(variableName) >= 1) {
+      variableName = oldToNewVariableNames.find(variableName)->second;
+      hasDoneRenaming = true;
+      return true;
+    } else if (removedVariableNames.count(variableName) >= 1) {
+      removedVariableUsed = true;
+      return true;
+    }
+
+    return false;  // Nothing was changed or done.
+  }
+
+  // Scope:
+  const gd::Platform& platform;
+  const gd::ProjectScopedContainers& projectScopedContainers;
+  const gd::VariablesContainer* forcedInitialVariablesContainer;
+
+  // Renaming or removing to do:
+  const gd::VariablesContainer& targetVariablesContainer;
+  const std::unordered_map<gd::String, gd::String>& oldToNewVariableNames;
+  const std::unordered_set<gd::String>& removedVariableNames;
+
+  gd::String objectNameToUseForVariableAccessor;
+};
+
+const gd::VariablesContainer*
+EventsVariableReplacer::FindForcedVariablesContainerIfAny(
+    const gd::String& type, const gd::String& lastObjectName) {
+  // Handle legacy pre-scoped variable parameters: in this case, we
+  // force the "scope" at which starts the evalution of variables.
+  if (type == "objectvar") {
+    return GetProjectScopedContainers()
+        .GetObjectsContainersList()
+        .GetObjectOrGroupVariablesContainer(lastObjectName);
+  } else if (type == "globalvar") {
+    return GetProjectScopedContainers()
+        .GetVariablesContainersList()
+        .GetTopMostVariablesContainer();
+  } else if (type == "scenevar") {
+    return GetProjectScopedContainers()
+        .GetVariablesContainersList()
+        .GetBottomMostVariablesContainer();
+  }
+
+  return nullptr;
+}
+
+bool EventsVariableReplacer::DoVisitInstruction(gd::Instruction& instruction,
+                                                bool isCondition) {
+  const auto& metadata = isCondition
+                             ? gd::MetadataProvider::GetConditionMetadata(
+                                   platform, instruction.GetType())
+                             : gd::MetadataProvider::GetActionMetadata(
+                                   platform, instruction.GetType());
+  bool shouldDeleteInstruction = false;
+
+  gd::ParameterMetadataTools::IterateOverParametersWithIndex(
+      instruction.GetParameters(),
+      metadata.GetParameters(),
+      [&](const gd::ParameterMetadata& parameterMetadata,
+          const gd::Expression& parameterValue,
+          size_t parameterIndex,
+          const gd::String& lastObjectName) {
+        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 variables.
+
+        auto node = parameterValue.GetRootNode();
+        if (node) {
+          ExpressionVariableReplacer renamer(platform,
+                                             GetProjectScopedContainers(),
+                                             targetVariablesContainer,
+                                             oldToNewVariableNames,
+                                             removedVariableNames);
+          renamer.SetForcedInitialVariablesContainer(
+              FindForcedVariablesContainerIfAny(type, lastObjectName));
+          node->Visit(renamer);
+
+          if (renamer.IsRemovedVariableUsed()) {
+            shouldDeleteInstruction = true;
+          } else if (renamer.HasDoneRenaming()) {
+            instruction.SetParameter(
+                parameterIndex, ExpressionParser2NodePrinter::PrintNode(*node));
+          }
+        }
+      });
+
+  return shouldDeleteInstruction;
+}
+
+bool EventsVariableReplacer::DoVisitEventExpression(
+    gd::Expression& expression, const gd::ParameterMetadata& metadata) {
+  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 variables.
+
+  auto node = expression.GetRootNode();
+  if (node) {
+    ExpressionVariableReplacer renamer(platform,
+                                       GetProjectScopedContainers(),
+                                       targetVariablesContainer,
+                                       oldToNewVariableNames,
+                                       removedVariableNames);
+    renamer.SetForcedInitialVariablesContainer(
+        FindForcedVariablesContainerIfAny(type, ""));
+    node->Visit(renamer);
+
+    if (renamer.IsRemovedVariableUsed()) {
+      return true;
+    } else if (renamer.HasDoneRenaming()) {
+      expression = ExpressionParser2NodePrinter::PrintNode(*node);
+    }
+  }
+
+  return false;
+}
+
+EventsVariableReplacer::~EventsVariableReplacer() {}
+
+}  // namespace gd

Core/GDCore/IDE/Events/EventsVariableReplacer.h

@@ -0,0 +1,60 @@
+/*
+ * 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 VariablesContainer;
+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 variable by another.
+ *
+ * \ingroup IDE
+ */
+class GD_CORE_API EventsVariableReplacer
+    : public ArbitraryEventsWorkerWithContext {
+ public:
+  EventsVariableReplacer(
+      const gd::Platform &platform_,
+      const gd::VariablesContainer &targetVariablesContainer_,
+      const std::unordered_map<gd::String, gd::String> &oldToNewVariableNames_,
+      const std::unordered_set<gd::String> &removedVariableNames_)
+      : platform(platform_),
+        targetVariablesContainer(targetVariablesContainer_),
+        oldToNewVariableNames(oldToNewVariableNames_),
+        removedVariableNames(removedVariableNames_){};
+  virtual ~EventsVariableReplacer();
+
+ private:
+  bool DoVisitInstruction(gd::Instruction &instruction,
+                          bool isCondition) override;
+  bool DoVisitEventExpression(gd::Expression &expression,
+                              const gd::ParameterMetadata &metadata) override;
+
+  const gd::VariablesContainer *FindForcedVariablesContainerIfAny(
+      const gd::String &type, const gd::String &lastObjectName);
+
+  const gd::Platform &platform;
+  const gd::VariablesContainer &targetVariablesContainer;
+  gd::String objectName;
+  const std::unordered_map<gd::String, gd::String> &oldToNewVariableNames;
+  const std::unordered_set<gd::String> &removedVariableNames;
+};
+
+}  // namespace gd

Core/GDCore/IDE/Events/EventsVariablesFinder.cpp

@@ -17,6 +17,7 @@
 #include "GDCore/Project/Layout.h"
 #include "GDCore/Project/Object.h"
 #include "GDCore/Project/Project.h"
+#include "GDCore/Project/ProjectScopedContainers.h"
 #include "GDCore/Project/ExternalEvents.h"
 #include "GDCore/IDE/DependenciesAnalyzer.h"
 
@@ -34,14 +35,12 @@ class GD_CORE_API VariableFinderExpressionNodeWorker
  public:
   VariableFinderExpressionNodeWorker(std::set<gd::String>& results_,
                               const gd::Platform &platform_,
-                              const gd::ObjectsContainer &globalObjectsContainer_,
-                              const gd::ObjectsContainer &objectsContainer_,
+                              const gd::ProjectScopedContainers &projectScopedContainers_,
                               const gd::String& parameterType_,
                               const gd::String& objectName_ = "")
       : results(results_),
         platform(platform_),
-        globalObjectsContainer(globalObjectsContainer_),
-        objectsContainer(objectsContainer_),
+        projectScopedContainers(projectScopedContainers_),
         parameterType(parameterType_),
         objectName(objectName_){};
   virtual ~VariableFinderExpressionNodeWorker(){};
@@ -60,6 +59,9 @@ class GD_CORE_API VariableFinderExpressionNodeWorker
   void OnVisitNumberNode(NumberNode& node) override {}
   void OnVisitTextNode(TextNode& node) override {}
   void OnVisitVariableNode(VariableNode& node) override {
+    // We don't check variables or object variables here, because object variables only work
+    // if the variable is already declared.
+
     if (node.child) node.child->Visit(*this);
   }
   void OnVisitVariableAccessorNode(VariableAccessorNode& node) override {
@@ -70,7 +72,10 @@ class GD_CORE_API VariableFinderExpressionNodeWorker
     node.expression->Visit(*this);
     if (node.child) node.child->Visit(*this);
   }
-  void OnVisitIdentifierNode(IdentifierNode& node) override {}
+  void OnVisitIdentifierNode(IdentifierNode& node) override {
+    // We don't check object variables here, because object variables only work
+    // if the variable is already declared.
+  }
   void OnVisitObjectFunctionNameNode(ObjectFunctionNameNode& node) override {}
   void OnVisitFunctionCallNode(FunctionCallNode& node) override {
     bool considerFunction = objectName.empty() || node.objectName == objectName;
@@ -79,7 +84,7 @@ class GD_CORE_API VariableFinderExpressionNodeWorker
     const gd::ExpressionMetadata &metadata = isObjectFunction ?
             MetadataProvider::GetObjectAnyExpressionMetadata(
                 platform,
-                GetTypeOfObject(globalObjectsContainer, objectsContainer, objectName),
+                projectScopedContainers.GetObjectsContainersList().GetTypeOfObject(objectName),
                 node.functionName):
             MetadataProvider::GetAnyExpressionMetadata(platform, node.functionName);
 
@@ -110,8 +115,7 @@ class GD_CORE_API VariableFinderExpressionNodeWorker
 
  private:
   const gd::Platform &platform;
-  const gd::ObjectsContainer &globalObjectsContainer;
-  const gd::ObjectsContainer &objectsContainer;
+  const gd::ProjectScopedContainers &projectScopedContainers;
 
   std::set<gd::String>& results;  ///< Reference to the std::set where argument
                                   ///< values must be stored.
@@ -163,8 +167,7 @@ class GD_CORE_API VariableFinderEventWorker
           VariableFinderExpressionNodeWorker searcher(
               results,
               platform,
-              GetGlobalObjectsContainer(),
-              GetObjectsContainer(),
+              GetProjectScopedContainers(),
               parameterType,
               objectName);
           node->Visit(searcher);
@@ -252,9 +255,10 @@ void EventsVariablesFinder::FindArgumentsInEventsAndDependencies(
                                         platform,
                                         parameterType,
                                         objectName);
-  eventWorker.Launch(layout.GetEvents(), project, layout);
+  eventWorker.Launch(layout.GetEvents(),
+      gd::ProjectScopedContainers::MakeNewProjectScopedContainersForProjectAndLayout(project, layout));
 
-  DependenciesAnalyzer dependenciesAnalyzer = DependenciesAnalyzer(project, layout);
+  DependenciesAnalyzer dependenciesAnalyzer(project, layout);
   dependenciesAnalyzer.Analyze();
   for (const gd::String& externalEventName : dependenciesAnalyzer.GetExternalEventsDependencies()) {
     const gd::ExternalEvents& externalEvents = project.GetExternalEvents(externalEventName);
@@ -263,7 +267,8 @@ void EventsVariablesFinder::FindArgumentsInEventsAndDependencies(
                                           platform,
                                           parameterType,
                                           objectName);
-    eventWorker.Launch(externalEvents.GetEvents(), project, layout);
+    eventWorker.Launch(externalEvents.GetEvents(),
+        gd::ProjectScopedContainers::MakeNewProjectScopedContainersForProjectAndLayout(project, layout));
   }
   for (const gd::String& sceneName : dependenciesAnalyzer.GetScenesDependencies()) {
     const gd::Layout& dependencyLayout = project.GetLayout(sceneName);
@@ -272,7 +277,8 @@ void EventsVariablesFinder::FindArgumentsInEventsAndDependencies(
                                           platform,
                                           parameterType,
                                           objectName);
-    eventWorker.Launch(dependencyLayout.GetEvents(), project, dependencyLayout);
+    eventWorker.Launch(dependencyLayout.GetEvents(),
+        gd::ProjectScopedContainers::MakeNewProjectScopedContainersForProjectAndLayout(project, dependencyLayout));
   }
 }
 

Core/GDCore/IDE/Events/ExpressionCompletionFinder.cpp

@@ -10,21 +10,15 @@ namespace gd {
 const gd::ParameterMetadata
     ExpressionCompletionDescription::badParameterMetadata;
 
+const gd::ObjectConfiguration
+    ExpressionCompletionDescription::badObjectConfiguration;
+
 /**
  * \brief Turn an ExpressionCompletionDescription to a string.
  */
 std::ostream& operator<<(std::ostream& os,
                          ExpressionCompletionDescription const& value) {
-  os << "{ " << value.GetCompletionKind() << ", " << value.GetType() << ", "
-     << value.GetPrefix() << ", " << value.GetObjectName() << ", "
-     << value.GetBehaviorName() << ", "
-     << (value.IsExact() ? "exact" : "non-exact") << ", "
-     << (value.IsLastParameter() ? "last parameter" : "not last parameter")
-     << ", "
-     << (value.HasParameterMetadata()
-             ? gd::String::From(&value.GetParameterMetadata())
-             : "no parameter metadata")
-     << " }";
+  os << value.ToString();
   return os;
 }
 

Core/GDCore/IDE/Events/ExpressionLeftSideTypeFinder.h

@@ -14,7 +14,7 @@
 #include "GDCore/Extensions/Metadata/MetadataProvider.h"
 #include "GDCore/Extensions/Metadata/ObjectMetadata.h"
 #include "GDCore/Extensions/Metadata/ParameterMetadata.h"
-#include "GDCore/Project/Layout.h"  // For GetTypeOfObject and GetTypeOfBehavior
+#include "GDCore/Project/ProjectScopedContainers.h"
 #include "GDCore/Tools/Localization.h"
 
 namespace gd {
@@ -40,11 +40,10 @@ class GD_CORE_API ExpressionLeftSideTypeFinder : public ExpressionParser2NodeWor
    * operations.
    */
   static const gd::String GetType(const gd::Platform &platform,
-                      const gd::ObjectsContainer &globalObjectsContainer,
-                      const gd::ObjectsContainer &objectsContainer,
+                      const gd::ProjectScopedContainers &projectScopedContainers,
                       gd::ExpressionNode& node) {
     gd::ExpressionLeftSideTypeFinder typeFinder(
-        platform, globalObjectsContainer, objectsContainer);
+        platform, projectScopedContainers);
     node.Visit(typeFinder);
     return typeFinder.GetType();
   }
@@ -53,11 +52,9 @@ class GD_CORE_API ExpressionLeftSideTypeFinder : public ExpressionParser2NodeWor
 
  protected:
   ExpressionLeftSideTypeFinder(const gd::Platform &platform_,
-                       const gd::ObjectsContainer &globalObjectsContainer_,
-                       const gd::ObjectsContainer &objectsContainer_)
+                       const gd::ProjectScopedContainers &projectScopedContainers_)
       : platform(platform_),
-        globalObjectsContainer(globalObjectsContainer_),
-        objectsContainer(objectsContainer_),
+        projectScopedContainers(projectScopedContainers_),
         type("unknown") {};
 
   const gd::String &GetType() {
@@ -69,6 +66,14 @@ class GD_CORE_API ExpressionLeftSideTypeFinder : public ExpressionParser2NodeWor
   }
   void OnVisitOperatorNode(OperatorNode& node) override {
     node.leftHandSide->Visit(*this);
+
+    // The type is decided by the first operand, unless it can (`number|string`)
+    // or should (`unknown`) be refined, in which case we go for the right
+    // operand (which got visited knowing the type of the first operand, so it's
+    // equal or strictly more precise than the left operand).
+    if (type == "unknown" || type == "number|string") {
+      node.rightHandSide->Visit(*this);
+    }
   }
   void OnVisitUnaryOperatorNode(UnaryOperatorNode& node) override {
     node.factor->Visit(*this);
@@ -85,7 +90,7 @@ class GD_CORE_API ExpressionLeftSideTypeFinder : public ExpressionParser2NodeWor
   }
   void OnVisitFunctionCallNode(FunctionCallNode& node) override {
     const gd::ExpressionMetadata &metadata = MetadataProvider::GetFunctionCallMetadata(
-        platform, globalObjectsContainer, objectsContainer, node);
+        platform, projectScopedContainers.GetObjectsContainersList(), node);
     if (gd::MetadataProvider::IsBadExpressionMetadata(metadata)) {
       type = "unknown";
     }
@@ -95,12 +100,99 @@ class GD_CORE_API ExpressionLeftSideTypeFinder : public ExpressionParser2NodeWor
   }
   void OnVisitVariableNode(VariableNode& node) override {
     type = "unknown";
+
+    projectScopedContainers.MatchIdentifierWithName<void>(node.name,
+      [&]() {
+        // This represents an object.
+        // We could store it to explore the type of the variable, but in practice this
+        // is only called for structures/arrays with 2 levels, and we don't support structure
+        // type identification for now.
+      },
+      [&]() {
+        // This is a variable.
+        // We could store it to explore the type of the variable, but in practice this
+        // is only called for structures/arrays with 2 levels, and we don't support structure
+        // type identification for now.
+      }, [&]() {
+        // This is a property with more than one child - this is unsupported.
+      }, [&]() {
+        // This is a parameter with more than one child - this is unsupported.
+      }, [&]() {
+        // This is something else.
+        type = "unknown";
+      });
   }
   void OnVisitVariableAccessorNode(VariableAccessorNode& node) override {
     type = "unknown";
   }
   void OnVisitIdentifierNode(IdentifierNode& node) override {
     type = "unknown";
+    projectScopedContainers.MatchIdentifierWithName<void>(node.identifierName,
+      [&]() {
+        // It's an object variable.
+        if (projectScopedContainers.GetObjectsContainersList()
+                .HasObjectOrGroupWithVariableNamed(
+                    node.identifierName, node.childIdentifierName)
+              == ObjectsContainersList::VariableExistence::DoesNotExist) {
+          type = "unknown";
+          return;
+        }
+
+        auto variableType =
+            projectScopedContainers.GetObjectsContainersList()
+                .GetTypeOfObjectOrGroupVariable(node.identifierName,
+                                                node.childIdentifierName);
+        ReadTypeFromVariable(variableType);
+      },
+      [&]() {
+        // It's a variable.
+        const auto& variable =
+            projectScopedContainers.GetVariablesContainersList().Get(
+                node.identifierName);
+
+        if (node.childIdentifierName.empty()) {
+          ReadTypeFromVariable(variable.GetType());
+        } else {
+          if (!variable.HasChild(node.childIdentifierName)) {
+            type = "unknown";
+            return;
+          }
+
+          ReadTypeFromVariable(
+              variable.GetChild(node.childIdentifierName).GetType());
+        }
+      }, [&]() {
+        // This is a property.
+        const gd::NamedPropertyDescriptor& property = projectScopedContainers
+            .GetPropertiesContainersList().Get(node.identifierName).second;
+
+        if (property.GetType() == "Number") {
+          type = "number";
+        } else if (property.GetType() == "Boolean") {
+          // Nothing - we don't know the precise type (this could be used a string or as a number)
+        } else {
+          // Assume type is String or equivalent.
+          type = "string";
+        }
+      }, [&]() {
+        // It's a parameter.
+
+        const auto& parametersVectorsList = projectScopedContainers.GetParametersVectorsList();
+        const auto& parameter = gd::ParameterMetadataTools::Get(parametersVectorsList, node.identifierName);
+        const auto& valueTypeMetadata = parameter.GetValueTypeMetadata();
+        if (valueTypeMetadata.IsNumber()) {
+          type = "number";
+        } else if (valueTypeMetadata.IsString()) {
+          type = "string";
+        } else if (valueTypeMetadata.IsBoolean()) {
+          // Nothing - we don't know the precise type (this could be used as a string or as a number).
+        } else {
+          type = "unknown";
+        }
+      }, [&]() {
+        // This is something else.
+        type = "unknown";
+      });
   }
   void OnVisitEmptyNode(EmptyNode& node) override {
     type = "unknown";
@@ -110,11 +202,18 @@ class GD_CORE_API ExpressionLeftSideTypeFinder : public ExpressionParser2NodeWor
   }
 
  private:
+  void ReadTypeFromVariable(gd::Variable::Type variableType) {
+    if (variableType == gd::Variable::Number) {
+      type = "number";
+    } else if (variableType == gd::Variable::String) {
+      type = "string";
+    }
+  }
+
   gd::String type;
 
   const gd::Platform &platform;
-  const gd::ObjectsContainer &globalObjectsContainer;
-  const gd::ObjectsContainer &objectsContainer;
+  const gd::ProjectScopedContainers &projectScopedContainers;
   const gd::String rootType;
 };
 

Core/GDCore/IDE/Events/ExpressionTypeFinder.h

@@ -15,7 +15,7 @@
 #include "GDCore/Extensions/Metadata/MetadataProvider.h"
 #include "GDCore/Extensions/Metadata/ObjectMetadata.h"
 #include "GDCore/Extensions/Metadata/ParameterMetadata.h"
-#include "GDCore/Project/Layout.h" // For GetTypeOfObject and GetTypeOfBehavior
+#include "GDCore/Project/ProjectScopedContainers.h"
 #include "GDCore/Tools/Localization.h"
 
 namespace gd {
@@ -50,12 +50,11 @@ class GD_CORE_API ExpressionTypeFinder : public ExpressionParser2NodeWorker {
    * sub-expression that a given node represents.
    */
   static const gd::String GetType(const gd::Platform &platform,
-                      const gd::ObjectsContainer &globalObjectsContainer,
-                      const gd::ObjectsContainer &objectsContainer,
+                      const gd::ProjectScopedContainers &projectScopedContainers,
                       const gd::String &rootType,
                       gd::ExpressionNode& node) {
     gd::ExpressionTypeFinder typeFinder(
-        platform, globalObjectsContainer, objectsContainer, rootType);
+        platform, projectScopedContainers, rootType);
     node.Visit(typeFinder);
     return typeFinder.GetType();
   }
@@ -64,12 +63,10 @@ class GD_CORE_API ExpressionTypeFinder : public ExpressionParser2NodeWorker {
 
  protected:
   ExpressionTypeFinder(const gd::Platform &platform_,
-                       const gd::ObjectsContainer &globalObjectsContainer_,
-                       const gd::ObjectsContainer &objectsContainer_,
+                       const gd::ProjectScopedContainers &projectScopedContainers_,
                        const gd::String &rootType_)
       : platform(platform_),
-        globalObjectsContainer(globalObjectsContainer_),
-        objectsContainer(objectsContainer_),
+        projectScopedContainers(projectScopedContainers_),
         rootType(rootType_),
         type(ExpressionTypeFinder::unknownType),
         child(nullptr) {};
@@ -115,9 +112,12 @@ class GD_CORE_API ExpressionTypeFinder : public ExpressionParser2NodeWorker {
     }
     auto leftSideType = gd::ExpressionLeftSideTypeFinder::GetType(
         platform,
-        globalObjectsContainer,
-        objectsContainer,
+        projectScopedContainers,
         node);
+
+    // If we can infer a definitive number or string type, use it.
+    // Otherwise, we only know that it's number or string, and this can even
+    // be used as is at runtime.
     if (leftSideType == ExpressionTypeFinder::numberType
      || leftSideType == ExpressionTypeFinder::stringType) {
       type = leftSideType;
@@ -129,7 +129,7 @@ class GD_CORE_API ExpressionTypeFinder : public ExpressionParser2NodeWorker {
   void OnVisitFunctionCallNode(FunctionCallNode& node) override {
     if (child == nullptr) {
       const gd::ExpressionMetadata &metadata = MetadataProvider::GetFunctionCallMetadata(
-          platform, globalObjectsContainer, objectsContainer, node);
+          platform, projectScopedContainers.GetObjectsContainersList(), node);
       if (gd::MetadataProvider::IsBadExpressionMetadata(metadata)) {
         VisitParent(node);
       }
@@ -141,8 +141,7 @@ class GD_CORE_API ExpressionTypeFinder : public ExpressionParser2NodeWorker {
       const gd::ParameterMetadata* parameterMetadata =
           gd::MetadataProvider::GetFunctionCallParameterMetadata(
               platform,
-              globalObjectsContainer,
-              objectsContainer,
+              projectScopedContainers.GetObjectsContainersList(),
               node,
               *child);
       if (parameterMetadata == nullptr || parameterMetadata->GetType().empty()) {
@@ -163,8 +162,7 @@ class GD_CORE_API ExpressionTypeFinder : public ExpressionParser2NodeWorker {
     else if (rootType == ExpressionTypeFinder::numberOrStringType) {
       auto leftSideType = gd::ExpressionLeftSideTypeFinder::GetType(
           platform,
-          globalObjectsContainer,
-          objectsContainer,
+          projectScopedContainers,
           node);
       if (leftSideType == ExpressionTypeFinder::numberType
        || leftSideType == ExpressionTypeFinder::stringType) {
@@ -188,8 +186,7 @@ class GD_CORE_API ExpressionTypeFinder : public ExpressionParser2NodeWorker {
   ExpressionNode *child;
 
   const gd::Platform &platform;
-  const gd::ObjectsContainer &globalObjectsContainer;
-  const gd::ObjectsContainer &objectsContainer;
+  const gd::ProjectScopedContainers &projectScopedContainers;
   const gd::String rootType;
 };
 

Core/GDCore/IDE/Events/ExpressionValidator.cpp

@@ -11,16 +11,20 @@
 
 #include "GDCore/CommonTools.h"
 #include "GDCore/Events/Expression.h"
+#include "GDCore/Events/Parsers/ExpressionParser2.h"
 #include "GDCore/Extensions/Metadata/ExpressionMetadata.h"
 #include "GDCore/Extensions/Metadata/InstructionMetadata.h"
 #include "GDCore/Extensions/Metadata/MetadataProvider.h"
 #include "GDCore/Extensions/Metadata/ObjectMetadata.h"
 #include "GDCore/Extensions/Platform.h"
 #include "GDCore/Project/Layout.h"
+#include "GDCore/Project/ObjectsContainersList.h"
 #include "GDCore/Project/Project.h"
+#include "GDCore/Project/ProjectScopedContainers.h"
+#include "GDCore/Project/Variable.h"
+#include "GDCore/Project/VariablesContainersList.h"
 #include "GDCore/Tools/Localization.h"
 #include "GDCore/Tools/MakeUnique.h"
-#include "GDCore/Events/Parsers/ExpressionParser2.h"
 
 using namespace std;
 
@@ -59,60 +63,217 @@ size_t GetMaximumParametersNumber(
 
 }  // namespace
 
-ExpressionValidator::Type ExpressionValidator::ValidateFunction(const gd::FunctionCallNode& function) {
+bool ExpressionValidator::ValidateObjectVariableOrVariableOrProperty(
+    const gd::IdentifierNode& identifier) {
+  auto validateVariableTypeForExpression =
+      [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`."),
+                         identifier.identifierNameLocation);
+        } else if (type == Variable::Array) {
+          RaiseTypeError(_("You need to specify the name of the child variable "
+                           "to access. For example: `MyVariable[0]`."),
+                         identifier.identifierNameLocation);
 
+        } else {
+          // Number, string or boolean variables can be used in expressions.
+          return;
+        }
+      };
+
+  const auto& variablesContainersList = projectScopedContainers.GetVariablesContainersList();
+  const auto& objectsContainersList = projectScopedContainers.GetObjectsContainersList();
+  const auto& propertiesContainersList = projectScopedContainers.GetPropertiesContainersList();
+  const auto& parametersVectorsList = projectScopedContainers.GetParametersVectorsList();
+
+  // Unless we find something precise (like a variable or property or parameter with a known type),
+  // we consider this node will be of the type required by the parent.
+  childType = parentType;
+
+  return projectScopedContainers.MatchIdentifierWithName<bool>(identifier.identifierName,
+    [&]() {
+      // This represents an object.
+      if (identifier.childIdentifierName.empty()) {
+        RaiseTypeError(_("An object variable or expression should be entered."),
+                        identifier.identifierNameLocation);
+
+        return true; // We should have found a variable.
+      }
+
+      auto variableExistence = objectsContainersList.HasObjectOrGroupWithVariableNamed(identifier.identifierName, identifier.childIdentifierName);
+
+      if (variableExistence == gd::ObjectsContainersList::DoesNotExist) {
+        RaiseTypeError(_("This variable does not exist on this object or group."),
+                        identifier.childIdentifierNameLocation);
+
+        return true; // We should have found a variable.
+      }
+      else if (variableExistence == gd::ObjectsContainersList::ExistsOnlyOnSomeObjectsOfTheGroup) {
+        RaiseTypeError(_("This variable only exists on some objects of the group. It must be declared for all objects."),
+                        identifier.childIdentifierNameLocation);
+
+        return true; // We should have found a variable.
+      }
+      else if (variableExistence == gd::ObjectsContainersList::GroupIsEmpty) {
+        RaiseTypeError(_("This group is empty. Add an object to this group first."),
+                        identifier.identifierNameLocation);
+
+        return true; // We should have found a variable.
+      }
+
+      auto variableType = objectsContainersList.GetTypeOfObjectOrGroupVariable(identifier.identifierName, identifier.childIdentifierName);
+      ReadChildTypeFromVariable(variableType);
+
+      return true; // We found a variable.
+    }, [&]() {
+      // This is a variable.
+
+      // Try to identify a declared variable with the name (and maybe the child
+      // variable).
+      const gd::Variable& variable =
+          variablesContainersList.Get(identifier.identifierName);
+
+      if (identifier.childIdentifierName.empty()) {
+        // Just the root variable is accessed, check it can be used in an
+        // expression.
+        validateVariableTypeForExpression(variable.GetType());
+        ReadChildTypeFromVariable(variable.GetType());
+
+        return true; // We found a variable.
+      } else {
+        // A child variable is accessed, check it can be used in an expression.
+        if (!variable.HasChild(identifier.childIdentifierName)) {
+          RaiseTypeError(_("No child variable with this name found."),
+                        identifier.childIdentifierNameLocation);
+
+          return true; // We should have found a variable.
+        }
+
+        const gd::Variable& childVariable =
+            variable.GetChild(identifier.childIdentifierName);
+        ReadChildTypeFromVariable(childVariable.GetType());
+        return true; // We found a variable.
+      }
+    }, [&]() {
+      // This is a property.
+      if (!identifier.childIdentifierName.empty()) {
+        RaiseTypeError(_("Accessing a child variable of a property is not possible - just write the property name."),
+            identifier.childIdentifierNameLocation);
+
+        return true; // We found a property, even if the child is not allowed.
+      }
+
+      const gd::NamedPropertyDescriptor& property = projectScopedContainers
+          .GetPropertiesContainersList().Get(identifier.identifierName).second;
+
+      if (property.GetType() == "Number") {
+       childType = Type::Number;
+      } else if (property.GetType() == "Boolean") {
+        // Nothing - we don't know the precise type (this could be used a string or as a number)
+      } else {
+        // Assume type is String or equivalent.
+        childType = Type::String;
+      }
+
+      return true; // We found a property.
+    }, [&]() {
+      // This is a parameter.
+      if (!identifier.childIdentifierName.empty()) {
+        RaiseTypeError(_("Accessing a child variable of a parameter is not possible - just write the parameter name."),
+            identifier.childIdentifierNameLocation);
+
+        return true; // We found a parameter, even if the child is not allowed.
+      }
+
+      const auto& parameter = gd::ParameterMetadataTools::Get(parametersVectorsList, identifier.identifierName);
+      const auto& valueTypeMetadata = parameter.GetValueTypeMetadata();
+      if (valueTypeMetadata.IsNumber()) {
+        childType = Type::Number;
+      } else if (valueTypeMetadata.IsString()) {
+        childType = Type::String;
+      } else if (valueTypeMetadata.IsBoolean()) {
+        // 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."),
+            identifier.identifierNameLocation);
+
+        return true; // We found a parameter, even though the type is incompatible.
+      }
+
+      return true; // We found a parameter.
+    }, [&]() {
+      // This is something else.
+      return false;
+    });
+}
+
+ExpressionValidator::Type ExpressionValidator::ValidateFunction(
+    const gd::FunctionCallNode& function) {
   ReportAnyError(function);
 
-  gd::String objectType = function.objectName.empty() ? "" :
-      GetTypeOfObject(globalObjectsContainer, objectsContainer, function.objectName);
+  auto& objectsContainersList = projectScopedContainers.GetObjectsContainersList();
 
-  gd::String behaviorType = function.behaviorName.empty() ? "" :
-      GetTypeOfBehavior(globalObjectsContainer, objectsContainer, function.behaviorName);
+  gd::String objectType =
+      function.objectName.empty()
+          ? ""
+          : objectsContainersList.GetTypeOfObject(function.objectName);
 
-  const gd::ExpressionMetadata &metadata = function.behaviorName.empty() ?
-      function.objectName.empty() ?
-          MetadataProvider::GetAnyExpressionMetadata(platform, function.functionName) :
-          MetadataProvider::GetObjectAnyExpressionMetadata(
-              platform, objectType, function.functionName) : 
-      MetadataProvider::GetBehaviorAnyExpressionMetadata(
+  gd::String behaviorType = function.behaviorName.empty()
+                                ? ""
+                                : objectsContainersList.GetTypeOfBehavior(function.behaviorName);
+
+  const gd::ExpressionMetadata& metadata =
+      function.behaviorName.empty()
+          ? function.objectName.empty()
+                ? MetadataProvider::GetAnyExpressionMetadata(
+                      platform, function.functionName)
+                : MetadataProvider::GetObjectAnyExpressionMetadata(
+                      platform, objectType, function.functionName)
+          : MetadataProvider::GetBehaviorAnyExpressionMetadata(
                 platform, behaviorType, function.functionName);
 
   Type returnType = StringToType(metadata.GetReturnType());
 
   if (!function.objectName.empty() &&
-      !globalObjectsContainer.HasObjectNamed(function.objectName) &&
-      !globalObjectsContainer.GetObjectGroups().Has(function.objectName) &&
-      !objectsContainer.HasObjectNamed(function.objectName) &&
-      !objectsContainer.GetObjectGroups().Has(function.objectName)) {
+      !objectsContainersList.HasObjectOrGroupNamed(function.objectName)) {
     RaiseTypeError(_("This object doesn't exist."),
-                   function.objectNameLocation, /*isFatal=*/false);
+                   function.objectNameLocation,
+                   /*isFatal=*/false);
     return returnType;
   }
 
   if (!function.behaviorName.empty() &&
-      !gd::HasBehaviorInObjectOrGroup(globalObjectsContainer, objectsContainer,
-                                     function.objectName,
+      !objectsContainersList.HasBehaviorInObjectOrGroup(function.objectName,
                                       function.behaviorName)) {
     RaiseTypeError(_("This behavior is not attached to this object."),
-                   function.behaviorNameLocation, /*isFatal=*/false);
+                   function.behaviorNameLocation,
+                   /*isFatal=*/false);
     return returnType;
   }
 
   if (!function.objectName.empty() &&
-    // If the function needs a capability on the object that may not be covered
-    // by all objects, check it now.
+      // If the function needs a capability on the object that may not be
+      // covered by all objects, check it now.
       !metadata.GetRequiredBaseObjectCapability().empty()) {
     const gd::ObjectMetadata& objectMetadata =
         MetadataProvider::GetObjectMetadata(platform, objectType);
   }
 
   if (gd::MetadataProvider::IsBadExpressionMetadata(metadata)) {
-    RaiseError(
-        "invalid_function_name",
+    if (function.functionName.empty()) {
+      RaiseError("invalid_function_name",
+               _("Enter the name of the function to call."),
+               function.location);
+    } else {
+      RaiseError("invalid_function_name",
                _("Cannot find an expression with this name: ") +
                    function.functionName + "\n" +
                    _("Double check that you've not made any typo in the name."),
                function.location);
+    }
     return returnType;
   }
 
@@ -152,8 +313,8 @@ ExpressionValidator::Type ExpressionValidator::ValidateFunction(const gd::Functi
   } else {
     if (parentType != returnType) {
       RaiseTypeError(
-          _("You tried to use an expression with the wrong return type:") + " " +
-            TypeToString(returnType),
+          _("You tried to use an expression with the wrong return type:") +
+              " " + TypeToString(returnType),
           function.location);
       return returnType;
     }
@@ -162,10 +323,12 @@ ExpressionValidator::Type ExpressionValidator::ValidateFunction(const gd::Functi
   // Validate parameters count
   size_t minParametersCount = GetMinimumParametersNumber(
       metadata.parameters,
-      ExpressionParser2::WrittenParametersFirstIndex(function.objectName, function.behaviorName));
+      ExpressionParser2::WrittenParametersFirstIndex(function.objectName,
+                                                     function.behaviorName));
   size_t maxParametersCount = GetMaximumParametersNumber(
       metadata.parameters,
-      ExpressionParser2::WrittenParametersFirstIndex(function.objectName, function.behaviorName));
+      ExpressionParser2::WrittenParametersFirstIndex(function.objectName,
+                                                     function.behaviorName));
   if (function.parameters.size() < minParametersCount ||
       function.parameters.size() > maxParametersCount) {
     gd::String expectedCountMessage =
@@ -179,17 +342,17 @@ ExpressionValidator::Type ExpressionValidator::ValidateFunction(const gd::Functi
     if (function.parameters.size() < minParametersCount) {
       RaiseError(
           "too_few_parameters",
-          _("You have not entered enough parameters for the expression.") + " " +
-              expectedCountMessage,
+          _("You have not entered enough parameters for the expression.") +
+              " " + expectedCountMessage,
           function.location);
     } else {
       RaiseError(
           "extra_parameter",
           _("This parameter was not expected by this expression. Remove it "
-          "or verify that you've entered the proper expression name.") + " " +
-              expectedCountMessage,
-          ExpressionParserLocation(
-              function.parameters[maxParametersCount]->location.GetStartPosition(),
+            "or verify that you've entered the proper expression name.") +
+              " " + expectedCountMessage,
+          ExpressionParserLocation(function.parameters[maxParametersCount]
+                                       ->location.GetStartPosition(),
                                    function.location.GetEndPosition() - 1));
     }
     return returnType;
@@ -197,10 +360,11 @@ ExpressionValidator::Type ExpressionValidator::ValidateFunction(const gd::Functi
 
   // TODO: reverse the order of diagnostic?
   size_t writtenParametersFirstIndex =
-      ExpressionParser2::WrittenParametersFirstIndex(
-          function.objectName, function.behaviorName);
+      ExpressionParser2::WrittenParametersFirstIndex(function.objectName,
+                                                     function.behaviorName);
   int metadataIndex = writtenParametersFirstIndex;
-  for (int parameterIndex = 0; parameterIndex < function.parameters.size(); parameterIndex++) {
+  for (int parameterIndex = 0; parameterIndex < function.parameters.size();
+       parameterIndex++) {
     auto& parameter = function.parameters[parameterIndex];
     while (metadata.GetParameters()[metadataIndex].IsCodeOnly()) {
       // The sizes are already checked above.
@@ -208,7 +372,8 @@ ExpressionValidator::Type ExpressionValidator::ValidateFunction(const gd::Functi
     }
     auto& parameterMetadata = metadata.GetParameters()[metadataIndex];
 
-    if (!parameterMetadata.IsOptional() || dynamic_cast<EmptyNode*>(parameter.get()) == nullptr) {
+    if (!parameterMetadata.IsOptional() ||
+        dynamic_cast<EmptyNode*>(parameter.get()) == nullptr) {
       auto currentParentType = parentType;
       parentType = StringToType(parameterMetadata.GetType());
       parameter->Visit(*this);
@@ -217,10 +382,9 @@ ExpressionValidator::Type ExpressionValidator::ValidateFunction(const gd::Functi
       const gd::String& expectedParameterType = parameterMetadata.GetType();
       if (gd::ParameterMetadata::IsExpression(
               ExpressionValidator::variableTypeString, expectedParameterType)) {
-        if (dynamic_cast<IdentifierNode *>(parameter.get()) == nullptr
-         && dynamic_cast<VariableNode *>(parameter.get()) == nullptr) {
-          RaiseError(
-                  "malformed_variable_parameter",
+        if (dynamic_cast<IdentifierNode*>(parameter.get()) == nullptr &&
+            dynamic_cast<VariableNode*>(parameter.get()) == nullptr) {
+          RaiseError("malformed_variable_parameter",
                      _("A variable name was expected but something else was "
                        "written. Enter just the name of the variable for this "
                        "parameter."),
@@ -228,8 +392,7 @@ ExpressionValidator::Type ExpressionValidator::ValidateFunction(const gd::Functi
         }
       } else if (gd::ParameterMetadata::IsObject(expectedParameterType)) {
         if (dynamic_cast<IdentifierNode*>(parameter.get()) == nullptr) {
-          RaiseError(
-                  "malformed_object_parameter",
+          RaiseError("malformed_object_parameter",
                      _("An object name was expected but something else was "
                        "written. Enter just the name of the object for this "
                        "parameter."),
@@ -238,11 +401,12 @@ ExpressionValidator::Type ExpressionValidator::ValidateFunction(const gd::Functi
       }
       // String and number are already checked in children.
       else if (!gd::ParameterMetadata::IsExpression(
-               ExpressionValidator::numberTypeString, expectedParameterType)
-            && !gd::ParameterMetadata::IsExpression(
-              ExpressionValidator::stringTypeString, expectedParameterType)) {
-        RaiseError(
-                "unknown_parameter_type",
+                   ExpressionValidator::numberTypeString,
+                   expectedParameterType) &&
+               !gd::ParameterMetadata::IsExpression(
+                   ExpressionValidator::stringTypeString,
+                   expectedParameterType)) {
+        RaiseError("unknown_parameter_type",
                    _("This function is improperly set up. Reach out to the "
                      "extension developer or a GDevelop maintainer to fix "
                      "this issue"),
@@ -258,7 +422,8 @@ ExpressionValidator::Type ExpressionValidator::ValidateFunction(const gd::Functi
 const gd::String ExpressionValidator::unknownTypeString = "unknown";
 const gd::String ExpressionValidator::numberTypeString = "number";
 const gd::String ExpressionValidator::stringTypeString = "string";
-  const gd::String ExpressionValidator::numberOrStringTypeString = "number|string";
+const gd::String ExpressionValidator::numberOrStringTypeString =
+    "number|string";
 const gd::String ExpressionValidator::variableTypeString = "variable";
 const gd::String ExpressionValidator::objectTypeString = "object";
 const gd::String ExpressionValidator::emptyTypeString = "empty";
@@ -283,24 +448,28 @@ ExpressionValidator::Type ExpressionValidator::ValidateFunction(const gd::Functi
   return unknownTypeString;
 }
 
-  ExpressionValidator::Type ExpressionValidator::StringToType(const gd::String &type) {
-    if (type == ExpressionValidator::numberTypeString
-     || gd::ParameterMetadata::IsExpression(ExpressionValidator::numberTypeString, type)) {
+ExpressionValidator::Type ExpressionValidator::StringToType(
+    const gd::String& type) {
+  if (type == ExpressionValidator::numberTypeString ||
+      gd::ParameterMetadata::IsExpression(ExpressionValidator::numberTypeString,
+                                          type)) {
     return Type::Number;
   }
-    if (type == ExpressionValidator::stringTypeString
-     || gd::ParameterMetadata::IsExpression(ExpressionValidator::stringTypeString, type)) {
+  if (type == ExpressionValidator::stringTypeString ||
+      gd::ParameterMetadata::IsExpression(ExpressionValidator::stringTypeString,
+                                          type)) {
     return Type::String;
   }
   if (type == ExpressionValidator::numberOrStringTypeString) {
     return Type::NumberOrString;
   }
-    if (type == ExpressionValidator::variableTypeString
-     || gd::ParameterMetadata::IsExpression(ExpressionValidator::variableTypeString, type)) {
+  if (type == ExpressionValidator::variableTypeString ||
+      gd::ParameterMetadata::IsExpression(
+          ExpressionValidator::variableTypeString, type)) {
     return Type::Variable;
   }
-    if (type == ExpressionValidator::objectTypeString
-     || gd::ParameterMetadata::IsObject(type)) {
+  if (type == ExpressionValidator::objectTypeString ||
+      gd::ParameterMetadata::IsObject(type)) {
     return Type::Object;
   }
   return Type::Unknown;

Core/GDCore/IDE/Events/ExpressionValidator.h

@@ -13,13 +13,18 @@
 #include "GDCore/Tools/MakeUnique.h"
 #include "GDCore/Tools/Localization.h"
 #include "GDCore/Extensions/Metadata/ExpressionMetadata.h"
+#include "GDCore/Project/ProjectScopedContainers.h"
+#include "GDCore/Project/VariablesContainersList.h"
 
 namespace gd {
 class Expression;
 class ObjectsContainer;
+class VariablesContainer;
 class Platform;
 class ParameterMetadata;
 class ExpressionMetadata;
+class VariablesContainersList;
+class ProjectScopedContainers;
 }  // namespace gd
 
 namespace gd {
@@ -33,14 +38,13 @@ namespace gd {
 class GD_CORE_API ExpressionValidator : public ExpressionParser2NodeWorker {
  public:
   ExpressionValidator(const gd::Platform &platform_,
-                      const gd::ObjectsContainer &globalObjectsContainer_,
-                      const gd::ObjectsContainer &objectsContainer_,
+                      const gd::ProjectScopedContainers & projectScopedContainers_,
                       const gd::String &rootType_)
       : platform(platform_),
-        globalObjectsContainer(globalObjectsContainer_),
-        objectsContainer(objectsContainer_),
+        projectScopedContainers(projectScopedContainers_),
         parentType(StringToType(gd::ParameterMetadata::GetExpressionValueType(rootType_))),
-        childType(Type::Unknown) {};
+        childType(Type::Unknown),
+        forbidsUsageOfBracketsBecauseParentIsObject(false) {};
   virtual ~ExpressionValidator(){};
 
   /**
@@ -48,11 +52,10 @@ class GD_CORE_API ExpressionValidator : public ExpressionParser2NodeWorker {
    * any error including non-fatal ones.
    */
   static bool HasNoErrors(const gd::Platform &platform,
-                      const gd::ObjectsContainer &globalObjectsContainer,
-                      const gd::ObjectsContainer &objectsContainer,
+                      const gd::ProjectScopedContainers & projectScopedContainers,
                       const gd::String &rootType,
                       gd::ExpressionNode& node) {
-    gd::ExpressionValidator validator(platform, globalObjectsContainer, objectsContainer, rootType);
+    gd::ExpressionValidator validator(platform, projectScopedContainers, rootType);
     node.Visit(validator);
     return validator.GetAllErrors().empty();
   }
@@ -121,7 +124,11 @@ class GD_CORE_API ExpressionValidator : public ExpressionParser2NodeWorker {
     node.rightHandSide->Visit(*this);
     const Type rightType = childType;
 
-    childType = leftType;
+    // The type is decided by the first operand, unless it can (`number|string`)
+    // or should (`unknown`) be refined, in which case we go for the right
+    // operand (which got visited knowing the type of the first operand, so it's
+    // equal or strictly more precise than the left operand).
+    childType = (leftType == Type::Unknown || leftType == Type::NumberOrString) ? leftType : rightType;
   }
   void OnVisitUnaryOperatorNode(UnaryOperatorNode& node) override {
     ReportAnyError(node);
@@ -185,28 +192,69 @@ class GD_CORE_API ExpressionValidator : public ExpressionParser2NodeWorker {
   }
   void OnVisitVariableNode(VariableNode& node) override {
     ReportAnyError(node);
+
+    if (parentType == Type::Variable) {
+      childType = Type::Variable;
+
       if (node.child) {
         node.child->Visit(*this);
       }
-    childType = Type::Variable;
-    if (parentType == Type::String) {
-      RaiseTypeError(_("Variables must be surrounded by VariableString()."),
+    } 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;
+
+      const auto& variablesContainersList = projectScopedContainers.GetVariablesContainersList();
+      const auto& objectsContainersList = projectScopedContainers.GetObjectsContainersList();
+      const auto& propertiesContainerList = projectScopedContainers.GetPropertiesContainersList();
+
+      forbidsUsageOfBracketsBecauseParentIsObject = false;
+      projectScopedContainers.MatchIdentifierWithName<void>(node.name,
+        [&]() {
+          // This represents an object.
+
+          // While understood by the parser, it's forbidden to use the bracket notation just after
+          // an object name (`MyObject["MyVariable"]`).
+          forbidsUsageOfBracketsBecauseParentIsObject = true;
+        }, [&]() {
+          // This is a variable.
+        }, [&]() {
+          // This is a property.
+          // Being in this node implies that there is at least a child - which is not supported for properties.
+          RaiseTypeError(_("Accessing a child variable of a property is not possible - just write the property name."),
               node.location);
-    } else if (parentType == Type::Number) {
-      RaiseTypeError(_("Variables must be surrounded by Variable()."),
+        }, [&]() {
+          // This is a parameter.
+          // Being in this node implies that there is at least a child - which is not supported for parameters.
+          RaiseTypeError(_("Accessing a child variable of a parameter is not possible - just write the parameter name."),
               node.location);
-    } else if (parentType == Type::NumberOrString) {
-      RaiseTypeError(
-          _("Variables must be surrounded by Variable() or VariableString()."),
+        }, [&]() {
+          // This is something else.
+          RaiseTypeError(_("No object, variable or property with this name found."),
               node.location);
-    } else if (parentType != Type::Variable) {
+        });
+
+      if (node.child) {
+        node.child->Visit(*this);
+      }
+
+      forbidsUsageOfBracketsBecauseParentIsObject = false;
+    } else {
       RaiseTypeError(_("You entered a variable, but this type was expected:") +
                          " " + TypeToString(parentType),
                      node.location);
+
+      if (node.child) {
+        node.child->Visit(*this);
+      }
     }
   }
   void OnVisitVariableAccessorNode(VariableAccessorNode& node) override {
     ReportAnyError(node);
+
+    // In the case we accessed an object variable (`MyObject.MyVariable`),
+    // brackets can now be used (`MyObject.MyVariable["MyChildVariable"]` is now valid).
+    forbidsUsageOfBracketsBecauseParentIsObject = false;
+
     if (node.child) {
       node.child->Visit(*this);
     }
@@ -215,6 +263,15 @@ class GD_CORE_API ExpressionValidator : public ExpressionParser2NodeWorker {
       VariableBracketAccessorNode& node) override {
     ReportAnyError(node);
 
+    if (forbidsUsageOfBracketsBecauseParentIsObject) {
+      RaiseError("brackets_not_allowed_for_objects",
+                 _("You can't use the brackets to access an object variable. "
+                   "Use a dot followed by the variable name, like this: "
+                   "`MyObject.MyVariable`."),
+                 node.location);
+    }
+    forbidsUsageOfBracketsBecauseParentIsObject = false;
+
     Type currentParentType = parentType;
     parentType = Type::NumberOrString;
     node.expression->Visit(*this);
@@ -227,27 +284,39 @@ class GD_CORE_API ExpressionValidator : public ExpressionParser2NodeWorker {
   void OnVisitIdentifierNode(IdentifierNode& node) override {
     ReportAnyError(node);
     if (parentType == Type::String) {
+      if (!ValidateObjectVariableOrVariableOrProperty(node)) {
+        // The identifier is not a variable, so either the variable is not properly declared
+        // or it's a text without quotes.
         RaiseTypeError(_("You must wrap your text inside double quotes "
                               "(example: \"Hello world\")."),
                             node.location);
       }
+    }
     else if (parentType == Type::Number) {
+      if (!ValidateObjectVariableOrVariableOrProperty(node)) {
+        // The identifier is not a variable, so the variable is not properly declared.
         RaiseTypeError(
             _("You must enter a number."), node.location);
       }
+    }
     else if (parentType == Type::NumberOrString) {
+      if (!ValidateObjectVariableOrVariableOrProperty(node)) {
+        // The identifier is not a variable, so either the variable is not properly declared
+        // or it's a text without quotes.
         RaiseTypeError(
-          _("You must enter a number or a text, wrapped inside double quotes "
-            "(example: \"Hello world\")."),
+            _("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::Object && parentType != Type::Variable) {
       // It can't happen.
       RaiseTypeError(
           _("You've entered a name, but this type was expected:") + " " + TypeToString(parentType),
           node.location);
-    }
       childType = parentType;
+    } else {
+      childType = parentType;
+    }
   }
   void OnVisitObjectFunctionNameNode(ObjectFunctionNameNode& node) override {
     ReportAnyError(node);
@@ -278,6 +347,7 @@ class GD_CORE_API ExpressionValidator : public ExpressionParser2NodeWorker {
  private:
   enum Type {Unknown = 0, Number, String, NumberOrString, Variable, Object, Empty};
   Type ValidateFunction(const gd::FunctionCallNode& function);
+  bool ValidateObjectVariableOrVariableOrProperty(const gd::IdentifierNode& identifier);
 
   void ReportAnyError(const ExpressionNode& node, bool isFatal = true) {
     if (node.diagnostic && node.diagnostic->IsError()) {
@@ -315,6 +385,16 @@ class GD_CORE_API ExpressionValidator : public ExpressionParser2NodeWorker {
     RaiseError("invalid_operator", message, location);
   }
 
+  void ReadChildTypeFromVariable(gd::Variable::Type variableType) {
+    if (variableType == gd::Variable::Number) {
+      childType = Type::Number;
+    } else if (variableType == gd::Variable::String) {
+      childType = Type::String;
+    } else {
+      // Nothing - we don't know the precise type (this could be used as a string or as a number).
+    }
+  }
+
   static Type StringToType(const gd::String &type);
   static const gd::String &TypeToString(Type type);
   static const gd::String unknownTypeString;
@@ -329,11 +409,11 @@ class GD_CORE_API ExpressionValidator : public ExpressionParser2NodeWorker {
   std::vector<ExpressionParserDiagnostic*> fatalErrors;
   std::vector<ExpressionParserDiagnostic*> allErrors;
   std::vector<std::unique_ptr<ExpressionParserDiagnostic>> supplementalErrors;
-  Type childType;
-  Type parentType;
+  Type childType; ///< The type "discovered" down the tree and passed up.
+  Type parentType; ///< The type "required" by the top of the tree.
+  bool forbidsUsageOfBracketsBecauseParentIsObject;
   const gd::Platform &platform;
-  const gd::ObjectsContainer &globalObjectsContainer;
-  const gd::ObjectsContainer &objectsContainer;
+  const gd::ProjectScopedContainers &projectScopedContainers;
 };
 
 }  // namespace gd

Core/GDCore/IDE/Events/ExpressionVariableOwnerFinder.h

@@ -15,6 +15,7 @@
 #include "GDCore/Extensions/Metadata/ObjectMetadata.h"
 #include "GDCore/Extensions/Metadata/ParameterMetadata.h"
 #include "GDCore/Project/Layout.h"  // For GetTypeOfObject and GetTypeOfBehavior
+#include "GDCore/Project/ObjectsContainersList.h"
 #include "GDCore/Tools/Localization.h"
 
 namespace gd {
@@ -31,6 +32,10 @@ namespace gd {
  * \brief Find the object name that should be used as a context of the
  * expression or sub-expression that a given node represents.
  *
+ * This is needed because of the legacy convention where a "objectvar"
+ * parameter represents a variable of the object represented by the previous "object"
+ * parameter.
+ *
  * \see gd::ExpressionParser2
  */
 class GD_CORE_API ExpressionVariableOwnerFinder : public ExpressionParser2NodeWorker {
@@ -41,12 +46,11 @@ class GD_CORE_API ExpressionVariableOwnerFinder : public ExpressionParser2NodeWo
    * context of the expression or sub-expression that a given node represents.
    */
   static const gd::String GetObjectName(const gd::Platform &platform,
-                      const gd::ObjectsContainer &globalObjectsContainer,
-                      const gd::ObjectsContainer &objectsContainer,
+                      const gd::ObjectsContainersList &objectsContainersList,
                       const gd::String& rootObjectName,
                       gd::ExpressionNode& node) {
     gd::ExpressionVariableOwnerFinder typeFinder(
-        platform, globalObjectsContainer, objectsContainer, rootObjectName);
+        platform, objectsContainersList, rootObjectName);
     node.Visit(typeFinder);
     return typeFinder.GetObjectName();
   }
@@ -55,12 +59,10 @@ class GD_CORE_API ExpressionVariableOwnerFinder : public ExpressionParser2NodeWo
 
  protected:
   ExpressionVariableOwnerFinder(const gd::Platform &platform_,
-                       const gd::ObjectsContainer &globalObjectsContainer_,
-                       const gd::ObjectsContainer &objectsContainer_,
+                       const gd::ObjectsContainersList &objectsContainersList_,
                        const gd::String& rootObjectName_)
       : platform(platform_),
-        globalObjectsContainer(globalObjectsContainer_),
-        objectsContainer(objectsContainer_),
+        objectsContainersList(objectsContainersList_),
         rootObjectName(rootObjectName_),
         objectName(""),
         variableNode(nullptr) {};
@@ -127,8 +129,7 @@ class GD_CORE_API ExpressionVariableOwnerFinder : public ExpressionParser2NodeWo
     const gd::ParameterMetadata* parameterMetadata =
         MetadataProvider::GetFunctionCallParameterMetadata(
             platform,
-            globalObjectsContainer,
-            objectsContainer,
+            objectsContainersList,
             functionCall,
             parameterIndex);
     if (parameterMetadata == nullptr
@@ -143,8 +144,7 @@ class GD_CORE_API ExpressionVariableOwnerFinder : public ExpressionParser2NodeWo
       const gd::ParameterMetadata* previousParameterMetadata =
           MetadataProvider::GetFunctionCallParameterMetadata(
               platform,
-              globalObjectsContainer,
-              objectsContainer,
+              objectsContainersList,
               functionCall,
               previousIndex);
       if (previousParameterMetadata != nullptr
@@ -162,8 +162,7 @@ class GD_CORE_API ExpressionVariableOwnerFinder : public ExpressionParser2NodeWo
   gd::ExpressionNode *variableNode;
 
   const gd::Platform &platform;
-  const gd::ObjectsContainer &globalObjectsContainer;
-  const gd::ObjectsContainer &objectsContainer;
+  const gd::ObjectsContainersList &objectsContainersList;
   const gd::String &rootObjectName;
 };
 

Core/GDCore/IDE/Events/ExpressionVariableParentFinder.h

@@ -0,0 +1,374 @@
+/*
+ * 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 <memory>
+#include <vector>
+
+#include "GDCore/Events/Parsers/ExpressionParser2Node.h"
+#include "GDCore/Events/Parsers/ExpressionParser2NodeWorker.h"
+#include "GDCore/Extensions/Metadata/ExpressionMetadata.h"
+#include "GDCore/Extensions/Metadata/MetadataProvider.h"
+#include "GDCore/Extensions/Metadata/ObjectMetadata.h"
+#include "GDCore/Extensions/Metadata/ParameterMetadata.h"
+#include "GDCore/Project/ProjectScopedContainers.h"
+#include "GDCore/Project/Variable.h"
+#include "GDCore/Tools/Localization.h"
+
+namespace gd {
+class Expression;
+class ObjectsContainer;
+class Platform;
+class ParameterMetadata;
+class ExpressionMetadata;
+}  // namespace gd
+
+namespace gd {
+
+/**
+ * \brief Contains a variables container or a variable. Useful
+ * to refer to the parent of a variable (which can be a VariablesContainer
+ * or another Variable).
+ */
+struct VariableAndItsParent {
+  const gd::VariablesContainer* parentVariablesContainer;
+  const gd::Variable* parentVariable;
+};
+
+/**
+ * \brief Find the last parent (i.e: the variables container) of a node
+ * representing a variable.
+ *
+ * Useful for completions, to know which variables can be entered in a node.
+ *
+ * \see gd::ExpressionParser2
+ */
+class GD_CORE_API ExpressionVariableParentFinder
+    : public ExpressionParser2NodeWorker {
+ public:
+  static VariableAndItsParent GetLastParentOfNode(
+      const gd::Platform& platform,
+      const gd::ProjectScopedContainers& projectScopedContainers,
+      gd::ExpressionNode& node) {
+    gd::ExpressionVariableParentFinder typeFinder(platform,
+                                                  projectScopedContainers);
+    node.Visit(typeFinder);
+    return typeFinder.variableAndItsParent;
+  }
+
+  virtual ~ExpressionVariableParentFinder(){};
+
+ protected:
+  ExpressionVariableParentFinder(
+      const gd::Platform& platform_,
+      const gd::ProjectScopedContainers& projectScopedContainers_)
+      : platform(platform_),
+        projectScopedContainers(projectScopedContainers_),
+        variableNode(nullptr),
+        thisIsALegacyPrescopedVariable(false),
+        bailOutBecauseEmptyVariableName(false),
+        legacyPrescopedVariablesContainer(nullptr),
+        variableAndItsParent{} {};
+
+  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 {
+    if (variableNode != nullptr) {
+      // This is not possible
+      return;
+    }
+    variableNode = &node;
+
+    // Check if the parent is a function call, in which we might be dealing
+    // with a legacy pre-scoped variable parameter:
+    if (node.parent) node.parent->Visit(*this);
+
+    if (thisIsALegacyPrescopedVariable) {
+      // The node represents a variable name, and the variables container
+      // containing it was identified in the FunctionCallNode.
+      childVariableNames.insert(childVariableNames.begin(), node.name);
+      if (legacyPrescopedVariablesContainer)
+        variableAndItsParent = WalkUntilLastParent(
+            *legacyPrescopedVariablesContainer, childVariableNames);
+    } else {
+      // Otherwise, the identifier is to be interpreted as usual:
+      // it can be an object (on which a variable is accessed),
+      // or a variable.
+      projectScopedContainers.MatchIdentifierWithName<void>(
+          node.name,
+          [&]() {
+            // This is an object.
+            const auto* variablesContainer =
+                projectScopedContainers.GetObjectsContainersList()
+                    .GetObjectOrGroupVariablesContainer(node.name);
+            if (variablesContainer)
+              variableAndItsParent =
+                  WalkUntilLastParent(*variablesContainer, childVariableNames);
+          },
+          [&]() {
+            // This is a variable.
+            if (projectScopedContainers.GetVariablesContainersList().Has(
+                    node.name)) {
+              variableAndItsParent = WalkUntilLastParent(
+                  projectScopedContainers.GetVariablesContainersList().Get(
+                      node.name),
+                  childVariableNames);
+            }
+          },
+          [&]() {
+            // Ignore properties here.
+            // There is no support for "children" of properties.
+          },
+          [&]() {
+            // Ignore parameters here.
+            // There is no support for "children" of parameters.
+          },
+          [&]() {
+            // Ignore unrecognised identifiers here.
+          });
+    }
+  }
+  void OnVisitVariableAccessorNode(VariableAccessorNode& node) override {
+    if (node.name.empty() && node.child) {
+      // A variable accessor should always have a name if it has a child (i.e:
+      // another accessor). While the parser may have generated an empty name,
+      // flag this so we avoid finding a wrong parent (and so, run the risk of
+      // giving wrong autocompletions).
+      bailOutBecauseEmptyVariableName = true;
+    }
+    childVariableNames.insert(childVariableNames.begin(), node.name);
+    if (node.parent) node.parent->Visit(*this);
+  }
+  void OnVisitIdentifierNode(IdentifierNode& node) override {
+    if (variableNode != nullptr) {
+      // This is not possible
+      return;
+    }
+    // This node is not necessarily a variable node.
+    // It will be checked when visiting the FunctionCallNode, just after.
+    variableNode = &node;
+
+    // Check if the parent is a function call, in which we might be dealing
+    // with a legacy pre-scoped variable parameter:
+    if (node.parent) node.parent->Visit(*this);
+
+    if (thisIsALegacyPrescopedVariable) {
+      // The identifier represents a variable name, and the variables container
+      // containing it was identified in the FunctionCallNode.
+      if (!node.childIdentifierName.empty())
+        childVariableNames.insert(childVariableNames.begin(),
+                                  node.childIdentifierName);
+      childVariableNames.insert(childVariableNames.begin(),
+                                node.identifierName);
+
+      if (legacyPrescopedVariablesContainer)
+        variableAndItsParent = WalkUntilLastParent(
+            *legacyPrescopedVariablesContainer, childVariableNames);
+
+    } else {
+      // Otherwise, the identifier is to be interpreted as usual:
+      // it can be an object (on which a variable is accessed),
+      // or a variable.
+      projectScopedContainers.MatchIdentifierWithName<void>(
+          node.identifierName,
+          [&]() {
+            // This is an object.
+            if (!node.childIdentifierName.empty())
+              childVariableNames.insert(childVariableNames.begin(),
+                                        node.childIdentifierName);
+
+            const auto* variablesContainer =
+                projectScopedContainers.GetObjectsContainersList()
+                    .GetObjectOrGroupVariablesContainer(node.identifierName);
+            if (variablesContainer)
+              variableAndItsParent =
+                  WalkUntilLastParent(*variablesContainer, childVariableNames);
+          },
+          [&]() {
+            // This is a variable.
+            if (!node.childIdentifierName.empty())
+              childVariableNames.insert(childVariableNames.begin(),
+                                        node.childIdentifierName);
+
+            if (projectScopedContainers.GetVariablesContainersList().Has(
+                    node.identifierName)) {
+              variableAndItsParent = WalkUntilLastParent(
+                  projectScopedContainers.GetVariablesContainersList().Get(
+                      node.identifierName),
+                  childVariableNames);
+            }
+          },
+          [&]() {
+            // Ignore properties here.
+            // There is no support for "children" of properties.
+          },
+          [&]() {
+            // Ignore parameters here.
+            // There is no support for "children" of properties.
+          },
+          [&]() {
+            // Ignore unrecognised identifiers here.
+          });
+    }
+  }
+  void OnVisitEmptyNode(EmptyNode& node) override {}
+  void OnVisitObjectFunctionNameNode(ObjectFunctionNameNode& node) override {}
+  void OnVisitVariableBracketAccessorNode(
+      VariableBracketAccessorNode& node) override {
+    // Add a child with an empty name, which will be interpreted as
+    // "take the first child/item of the structure/array".
+    childVariableNames.insert(childVariableNames.begin(), "");
+    if (node.parent) node.parent->Visit(*this);
+  }
+  void OnVisitFunctionCallNode(FunctionCallNode& functionCall) override {
+    if (variableNode == nullptr) {
+      return;
+    }
+    int parameterIndex = -1;
+    for (int i = 0; i < functionCall.parameters.size(); i++) {
+      if (functionCall.parameters.at(i).get() == variableNode) {
+        parameterIndex = i;
+        break;
+      }
+    }
+    if (parameterIndex < 0) {
+      return;
+    }
+
+    const auto& objectsContainersList =
+        projectScopedContainers.GetObjectsContainersList();
+
+    const gd::ParameterMetadata* parameterMetadata =
+        MetadataProvider::GetFunctionCallParameterMetadata(
+            platform, objectsContainersList, functionCall, parameterIndex);
+    if (parameterMetadata == nullptr) return;  // Unexpected
+
+    // Support for legacy pre-scoped variables:
+    if (parameterMetadata->GetValueTypeMetadata().IsLegacyPreScopedVariable()) {
+      if (parameterMetadata->GetType() == "objectvar") {
+        // Legacy convention where a "objectvar"
+        // parameter represents a variable of the object represented by the
+        // previous "object" parameter. The object on which the function is
+        // called is returned if no previous parameters are objects.
+        gd::String objectName = functionCall.objectName;
+        for (int previousIndex = parameterIndex - 1; previousIndex >= 0;
+             previousIndex--) {
+          const gd::ParameterMetadata* previousParameterMetadata =
+              MetadataProvider::GetFunctionCallParameterMetadata(
+                  platform, objectsContainersList, functionCall, previousIndex);
+          if (previousParameterMetadata != nullptr &&
+              gd::ParameterMetadata::IsObject(
+                  previousParameterMetadata->GetType())) {
+            auto previousParameterNode =
+                functionCall.parameters[previousIndex].get();
+            IdentifierNode* objectNode =
+                dynamic_cast<IdentifierNode*>(previousParameterNode);
+            objectName = objectNode->identifierName;
+            break;
+          }
+        }
+
+        legacyPrescopedVariablesContainer =
+            projectScopedContainers.GetObjectsContainersList()
+                .GetObjectOrGroupVariablesContainer(objectName);
+        thisIsALegacyPrescopedVariable = true;
+      } else if (parameterMetadata->GetType() == "scenevar") {
+        legacyPrescopedVariablesContainer =
+            projectScopedContainers.GetVariablesContainersList()
+                .GetBottomMostVariablesContainer();
+        thisIsALegacyPrescopedVariable = true;
+      } else if (parameterMetadata->GetType() == "globalvar") {
+        legacyPrescopedVariablesContainer =
+            projectScopedContainers.GetVariablesContainersList()
+                .GetTopMostVariablesContainer();
+        thisIsALegacyPrescopedVariable = true;
+      }
+    } else {
+      thisIsALegacyPrescopedVariable = false;
+      legacyPrescopedVariablesContainer = nullptr;
+    }
+  }
+
+ private:
+  VariableAndItsParent WalkUntilLastParent(
+      const gd::Variable& variable,
+      const std::vector<gd::String>& childVariableNames,
+      size_t startIndex = 0) {
+    if (bailOutBecauseEmptyVariableName)
+      return {};  // Do not even attempt to find the parent if we had an issue
+                  // when visiting nodes.
+
+    const gd::Variable* currentVariable = &variable;
+
+    // Walk until size - 1 as we want the last parent.
+    for (size_t index = startIndex; index + 1 < childVariableNames.size();
+         ++index) {
+      const gd::String& childName = childVariableNames[index];
+
+      if (childName.empty()) {
+        if (currentVariable->GetChildrenCount() == 0) {
+          // The array or structure is empty, we can't walk through it - there
+          // is no "parent".
+          return {};
+        }
+
+        if (currentVariable->GetType() == gd::Variable::Array) {
+          currentVariable = &currentVariable->GetAtIndex(0);
+        } else {
+          currentVariable =
+              currentVariable->GetAllChildren().begin()->second.get();
+        }
+      } else {
+        if (!currentVariable->HasChild(childName)) {
+          // Non existing child - there is no "parent".
+          return {};
+        }
+
+        currentVariable = &currentVariable->GetChild(childName);
+      }
+    }
+
+    // Return the last parent of the chain of variables (so not the last
+    // variable but the one before it).
+    return {.parentVariable = currentVariable};
+  }
+
+  VariableAndItsParent WalkUntilLastParent(
+      const gd::VariablesContainer& variablesContainer,
+      const std::vector<gd::String>& childVariableNames) {
+    if (bailOutBecauseEmptyVariableName)
+      return {};  // Do not even attempt to find the parent if we had an issue
+                  // when visiting nodes.
+    if (childVariableNames.empty())
+      return {};  // There is no "parent" to the variables container itself.
+
+    const gd::String& firstChildName = *childVariableNames.begin();
+
+    const gd::Variable* variable = variablesContainer.Has(firstChildName)
+                                       ? &variablesContainer.Get(firstChildName)
+                                       : nullptr;
+    if (childVariableNames.size() == 1 || !variable)
+      return {// Only one child: the parent is the variables container itself.
+              .parentVariablesContainer = &variablesContainer};
+
+    return WalkUntilLastParent(*variable, childVariableNames, 1);
+  }
+
+  gd::ExpressionNode* variableNode;
+  std::vector<gd::String> childVariableNames;
+  bool thisIsALegacyPrescopedVariable;
+  bool bailOutBecauseEmptyVariableName;
+  const gd::VariablesContainer* legacyPrescopedVariablesContainer;
+  VariableAndItsParent variableAndItsParent;
+
+  const gd::Platform& platform;
+  const gd::ProjectScopedContainers& projectScopedContainers;
+};
+
+}  // namespace gd

Core/GDCore/IDE/Events/ExpressionsParameterMover.cpp

@@ -31,16 +31,14 @@ namespace gd {
 class GD_CORE_API ExpressionParameterMover
     : public ExpressionParser2NodeWorker {
  public:
-  ExpressionParameterMover(const gd::ObjectsContainer& globalObjectsContainer_,
-                           const gd::ObjectsContainer& objectsContainer_,
+  ExpressionParameterMover(const gd::ProjectScopedContainers& projectScopedContainers_,
                            const gd::String& behaviorType_,
                            const gd::String& objectType_,
                            const gd::String& functionName_,
                            std::size_t oldIndex_,
                            std::size_t newIndex_)
       : hasDoneMoving(false),
-        globalObjectsContainer(globalObjectsContainer_),
-        objectsContainer(objectsContainer_),
+        projectScopedContainers(projectScopedContainers_),
         behaviorType(behaviorType_),
         objectType(objectType_),
         functionName(functionName_),
@@ -98,16 +96,16 @@ class GD_CORE_API ExpressionParameterMover
         // This refactor only applies on events object functions
         // and events object functions doesn't exist yet.
         // This is a dead code.
-        const gd::String& thisObjectType = gd::GetTypeOfObject(
-            globalObjectsContainer, objectsContainer, node.objectName);
+        const gd::String& thisObjectType = projectScopedContainers
+            .GetObjectsContainersList().GetTypeOfObject(node.objectName);
         if (thisObjectType == objectType) {
           moveParameter(node.parameters, 1);
           hasDoneMoving = true;
         }
       } else if (!behaviorType.empty() && !node.behaviorName.empty()) {
         // Move parameter of a behavior function
-        const gd::String& thisBehaviorType = gd::GetTypeOfBehavior(
-            globalObjectsContainer, objectsContainer, node.behaviorName);
+        const gd::String& thisBehaviorType = projectScopedContainers
+            .GetObjectsContainersList().GetTypeOfBehavior(node.behaviorName);
         if (thisBehaviorType == behaviorType) {
           moveParameter(node.parameters, 2);
           hasDoneMoving = true;
@@ -126,8 +124,7 @@ class GD_CORE_API ExpressionParameterMover
 
  private:
   bool hasDoneMoving;
-  const gd::ObjectsContainer& globalObjectsContainer;
-  const gd::ObjectsContainer& objectsContainer;
+  const gd::ProjectScopedContainers& projectScopedContainers;
   const gd::String& behaviorType;  // The behavior type of the function which
                                    // must have a parameter moved (optional).
   const gd::String& objectType;    // The object type of the function which
@@ -155,8 +152,7 @@ bool ExpressionsParameterMover::DoVisitInstruction(gd::Instruction& instruction,
 
     auto node = expression.GetRootNode();
     if (node) {
-      ExpressionParameterMover mover(GetGlobalObjectsContainer(),
-                                     GetObjectsContainer(),
+      ExpressionParameterMover mover(GetProjectScopedContainers(),
                                      behaviorType,
                                      objectType,
                                      functionName,

Core/GDCore/IDE/Events/ExpressionsRenamer.cpp

@@ -23,22 +23,20 @@
 namespace gd {
 
 /**
- * \brief Go through the nodes and change the given object name to a new one.
+ * \brief Go through the nodes and change the given function name to a new name.
  *
  * \see gd::ExpressionParser2
  */
 class GD_CORE_API ExpressionFunctionRenamer
     : public ExpressionParser2NodeWorker {
  public:
-  ExpressionFunctionRenamer(const gd::ObjectsContainer& globalObjectsContainer_,
-                            const gd::ObjectsContainer& objectsContainer_,
+  ExpressionFunctionRenamer(const gd::ProjectScopedContainers& projectScopedContainers_,
                             const gd::String& behaviorType_,
                             const gd::String& objectType_,
                             const gd::String& oldFunctionName_,
                             const gd::String& newFunctionName_)
       : hasDoneRenaming(false),
-        globalObjectsContainer(globalObjectsContainer_),
-        objectsContainer(objectsContainer_),
+        projectScopedContainers(projectScopedContainers_),
         behaviorType(behaviorType_),
         objectType(objectType_),
         oldFunctionName(oldFunctionName_),
@@ -71,15 +69,17 @@ class GD_CORE_API ExpressionFunctionRenamer
     node.expression->Visit(*this);
     if (node.child) node.child->Visit(*this);
   }
-  void OnVisitIdentifierNode(IdentifierNode& node) override {}
+  void OnVisitIdentifierNode(IdentifierNode& node) override {
+    // Nothing to do as this is either a variable, an object variable a property or something else
+    // but not an expression.
+  }
   void OnVisitObjectFunctionNameNode(ObjectFunctionNameNode& node) override {
     if (!node.behaviorFunctionName.empty()) {
       // Behavior function name
       if (!behaviorType.empty() &&
           node.behaviorFunctionName == oldFunctionName) {
-        const gd::String& thisBehaviorType =
-            gd::GetTypeOfBehavior(globalObjectsContainer,
-                                  objectsContainer,
+        const gd::String& thisBehaviorType = projectScopedContainers
+          .GetObjectsContainersList().GetTypeOfBehavior(
             node.objectFunctionOrBehaviorName);
         if (thisBehaviorType == behaviorType) {
           node.behaviorFunctionName = newFunctionName;
@@ -90,8 +90,8 @@ class GD_CORE_API ExpressionFunctionRenamer
       // Object function name
       if (behaviorType.empty() && !objectType.empty() &&
           node.objectFunctionOrBehaviorName == oldFunctionName) {
-        const gd::String& thisObjectType = gd::GetTypeOfObject(
-            globalObjectsContainer, objectsContainer, node.objectName);
+        const gd::String& thisObjectType = projectScopedContainers
+            .GetObjectsContainersList().GetTypeOfObject(node.objectName);
         if (thisObjectType == objectType) {
           node.objectFunctionOrBehaviorName = newFunctionName;
           hasDoneRenaming = true;
@@ -104,16 +104,16 @@ class GD_CORE_API ExpressionFunctionRenamer
       if (behaviorType.empty() && !objectType.empty() &&
           !node.objectName.empty()) {
         // Replace an object function
-        const gd::String& thisObjectType = gd::GetTypeOfObject(
-            globalObjectsContainer, objectsContainer, node.objectName);
+        const gd::String& thisObjectType = projectScopedContainers
+            .GetObjectsContainersList().GetTypeOfObject(node.objectName);
         if (thisObjectType == objectType) {
           node.functionName = newFunctionName;
           hasDoneRenaming = true;
         }
       } else if (!behaviorType.empty() && !node.behaviorName.empty()) {
         // Replace a behavior function
-        const gd::String& thisBehaviorType = gd::GetTypeOfBehavior(
-            globalObjectsContainer, objectsContainer, node.behaviorName);
+        const gd::String& thisBehaviorType = projectScopedContainers
+            .GetObjectsContainersList().GetTypeOfBehavior(node.behaviorName);
         if (thisBehaviorType == behaviorType) {
           node.functionName = newFunctionName;
           hasDoneRenaming = true;
@@ -132,8 +132,7 @@ class GD_CORE_API ExpressionFunctionRenamer
 
  private:
   bool hasDoneRenaming;
-  const gd::ObjectsContainer& globalObjectsContainer;
-  const gd::ObjectsContainer& objectsContainer;
+  const gd::ProjectScopedContainers& projectScopedContainers;
   const gd::String& behaviorType;  // The behavior type for which the expression
                                    // must be replaced (optional).
   const gd::String& objectType;    // The object type for which the expression
@@ -159,8 +158,7 @@ bool ExpressionsRenamer::DoVisitInstruction(gd::Instruction& instruction,
 
     auto node = expression.GetRootNode();
     if (node) {
-      ExpressionFunctionRenamer renamer(GetGlobalObjectsContainer(),
-                                        GetObjectsContainer(),
+      ExpressionFunctionRenamer renamer(GetProjectScopedContainers(),
                                         behaviorType,
                                         objectType,
                                         oldFunctionName,

Core/GDCore/IDE/Events/ProjectElementRenamer.cpp

@@ -34,13 +34,12 @@ class GD_CORE_API ExpressionIdentifierStringFinder
 public:
   ExpressionIdentifierStringFinder(
       const gd::Platform &platform_,
-      const gd::ObjectsContainer &globalObjectsContainer_,
-      const gd::ObjectsContainer &objectsContainer_,
+      const gd::ProjectScopedContainers& projectScopedContainers_,
       const gd::String &expressionPlainString_,
       const gd::String &parameterType_, const gd::String &objectName_,
       const gd::String &layerName_, const gd::String &oldName_)
-      : platform(platform_), globalObjectsContainer(globalObjectsContainer_),
-        objectsContainer(objectsContainer_),
+      : platform(platform_),
+        projectScopedContainers(projectScopedContainers_),
         expressionPlainString(expressionPlainString_),
         parameterType(parameterType_), objectName(objectName_),
         layerName(layerName_), oldName(oldName_){};
@@ -82,7 +81,7 @@ protected:
   void OnVisitFunctionCallNode(FunctionCallNode &node) override {
     gd::String lastLayerName;
     gd::ParameterMetadataTools::IterateOverParametersWithIndex(
-        platform, globalObjectsContainer, objectsContainer, node,
+        platform, projectScopedContainers.GetObjectsContainersList(), node,
         [&](const gd::ParameterMetadata &parameterMetadata,
             std::unique_ptr<gd::ExpressionNode> &parameterNode,
             size_t parameterIndex, const gd::String &lastObjectName) {
@@ -123,8 +122,7 @@ protected:
 
 private:
   const gd::Platform &platform;
-  const gd::ObjectsContainer &globalObjectsContainer;
-  const gd::ObjectsContainer &objectsContainer;
+  const gd::ProjectScopedContainers &projectScopedContainers;
   /// It's used to extract parameter content.
   const gd::String &expressionPlainString;
   const gd::String &oldName;
@@ -176,7 +174,7 @@ bool ProjectElementRenamer::DoVisitInstruction(gd::Instruction &instruction,
         auto node = parameterValue.GetRootNode();
         if (node) {
           ExpressionIdentifierStringFinder finder(
-              platform, GetGlobalObjectsContainer(), GetObjectsContainer(),
+              platform, GetProjectScopedContainers(),
               parameterValue.GetPlainString(), parameterType, objectName,
               layerName, oldName);
           node->Visit(finder);

Core/GDCore/IDE/Events/UsedExtensionsFinder.cpp

@@ -25,6 +25,9 @@ const UsedExtensionsResult UsedExtensionsFinder::ScanProject(gd::Project& projec
 void UsedExtensionsFinder::DoVisitObject(gd::Object &object) {
   auto metadata = gd::MetadataProvider::GetExtensionAndObjectMetadata(
       project.GetCurrentPlatform(), object.GetType());
+  if (metadata.GetMetadata().IsRenderedIn3D()) {
+    result.MarkAsHaving3DObjects();
+  }
   result.GetUsedExtensions().insert(metadata.GetExtension().GetName());
   for (auto &&includeFile : metadata.GetMetadata().includeFiles) {
     result.GetUsedIncludeFiles().insert(includeFile);
@@ -108,6 +111,33 @@ void UsedExtensionsFinder::OnVisitUnaryOperatorNode(UnaryOperatorNode& node) {
 // Add variable extension and visit sub-expressions on variable nodes
 void UsedExtensionsFinder::OnVisitVariableNode(VariableNode& node) {
   result.GetUsedExtensions().insert("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);
+        result.GetUsedExtensions().insert(metadata.GetExtension().GetName());
+        for (auto &&includeFile : metadata.GetMetadata().includeFiles) {
+          result.GetUsedIncludeFiles().insert(includeFile);
+        }
+      }, [&]() {
+        // This is a variable.
+      }, [&]() {
+        // This is a property.
+      }, [&]() {
+        // This is a parameter.
+      }, [&]() {
+        // This is something else.
+      });
+  }
+
   if (node.child) node.child->Visit(*this);
 };
 
@@ -127,9 +157,10 @@ void UsedExtensionsFinder::OnVisitVariableBracketAccessorNode(
 // Add extensions bound to Objects/Behaviors/Functions
 void UsedExtensionsFinder::OnVisitIdentifierNode(IdentifierNode &node) {
   auto type = gd::ExpressionTypeFinder::GetType(
-      project.GetCurrentPlatform(), GetGlobalObjectsContainer(),
-      GetObjectsContainer(), rootType, node);
-  if (gd::ParameterMetadata::IsObject(type)) {
+      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);
     result.GetUsedExtensions().insert(metadata.GetExtension().GetName());

Core/GDCore/IDE/Events/UsedExtensionsFinder.h

@@ -44,6 +44,13 @@ public:
     return usedRequiredFiles;
   }
 
+  /**
+   * \brief Return true when at least 1 object uses the 3D renderer.
+   */
+  bool Has3DObjects() const {
+    return has3DObjects;
+  }
+
   /**
    * The extensions used by the project (or part of it).
    */
@@ -59,10 +66,15 @@ public:
    */
   std::set<gd::String> &GetUsedRequiredFiles() { return usedRequiredFiles; }
 
+  void MarkAsHaving3DObjects() {
+    has3DObjects = true;
+  }
+
 private:
   std::set<gd::String> usedExtensions;
   std::set<gd::String> usedIncludeFiles;
   std::set<gd::String> usedRequiredFiles;
+  bool has3DObjects = false;
 };
 
 class GD_CORE_API UsedExtensionsFinder

Core/GDCore/IDE/ExtensionsLoader.cpp

@@ -43,7 +43,6 @@ void ExtensionsLoader::LoadAllExtensions(const gd::String &directory,
   struct dirent *lecture;
   DIR *rep;
   rep = opendir(directory.c_str());
-  int l = 0;
 
   if (rep == NULL) {
     cout << "Unable to open Extensions (" << directory << ") directory."
@@ -63,8 +62,6 @@ void ExtensionsLoader::LoadAllExtensions(const gd::String &directory,
 
       LoadExtension(directory + "/" + lec, platform, forgiving);
       librariesLoaded.push_back(directory + "/" + lec);
-
-      l++;
     }
   }
 
@@ -103,7 +100,6 @@ void ExtensionsLoader::ExtensionsLoadingDone(const gd::String &directory) {
   struct dirent *lecture;
   DIR *rep;
   rep = opendir(directory.c_str());
-  int l = 0;
 
   if (rep == NULL) {
     cout << "Unable to open Extensions (" << directory << ") directory."
@@ -118,7 +114,6 @@ void ExtensionsLoader::ExtensionsLoadingDone(const gd::String &directory) {
         lec.find(".xgd" + suffix, lec.length() - 4 - suffix.length()) !=
             string::npos) {
       librariesLoaded.push_back(directory + "/" + lec);
-      l++;
     }
   }
 

Core/GDCore/IDE/ObjectAssetSerializer.cpp

@@ -0,0 +1,111 @@
+/*
+ * GDevelop Core
+ * Copyright 2008-2023 Florian Rival (Florian.Rival@gmail.com). All rights
+ * reserved. This project is released under the MIT License.
+ */
+#include "ObjectAssetSerializer.h"
+
+#include <algorithm>
+
+#include "GDCore/Extensions/Builtin/SpriteExtension/SpriteObject.h"
+#include "GDCore/Extensions/Metadata/BehaviorMetadata.h"
+#include "GDCore/Extensions/Metadata/MetadataProvider.h"
+#include "GDCore/Extensions/Platform.h"
+#include "GDCore/Extensions/PlatformExtension.h"
+#include "GDCore/IDE/Project/AssetResourcePathCleaner.h"
+#include "GDCore/IDE/Project/ResourcesInUseHelper.h"
+#include "GDCore/IDE/Project/ResourcesRenamer.h"
+#include "GDCore/Project/Behavior.h"
+#include "GDCore/Project/CustomBehavior.h"
+#include "GDCore/Project/EventsFunctionsExtension.h"
+#include "GDCore/Project/Layout.h"
+#include "GDCore/Project/Object.h"
+#include "GDCore/Project/Project.h"
+#include "GDCore/Project/PropertyDescriptor.h"
+#include "GDCore/Serialization/SerializerElement.h"
+#include "GDCore/Tools/Log.h"
+
+namespace gd {
+
+gd::String
+ObjectAssetSerializer::GetObjectExtensionName(const gd::Object &object) {
+  const gd::String &type = object.GetType();
+  const auto separatorIndex =
+      type.find(PlatformExtension::GetNamespaceSeparator());
+  return separatorIndex != std::string::npos ? type.substr(0, separatorIndex)
+                                             : "";
+}
+
+void ObjectAssetSerializer::SerializeTo(
+    gd::Project &project, const gd::Object &object,
+    const gd::String &objectFullName, SerializerElement &element,
+    std::vector<gd::String> &usedResourceNames) {
+  auto cleanObject = object.Clone();
+  cleanObject->GetVariables().Clear();
+  cleanObject->GetEffects().Clear();
+  for (auto &&behaviorName : cleanObject->GetAllBehaviorNames()) {
+    cleanObject->RemoveBehavior(behaviorName);
+  }
+
+  gd::String extensionName = GetObjectExtensionName(*cleanObject);
+
+  element.SetAttribute("id", "");
+  element.SetAttribute("name", "");
+  element.SetAttribute("license", "");
+  if (project.HasEventsFunctionsExtensionNamed(extensionName)) {
+    auto &extension = project.GetEventsFunctionsExtension(extensionName);
+    element.SetAttribute("description", extension.GetShortDescription());
+  }
+  element.SetAttribute("gdevelopVersion", "");
+  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");
+  tagsElement.ConsiderAsArrayOf("tag");
+
+  SerializerElement &objectAssetsElement = element.AddChild("objectAssets");
+  objectAssetsElement.ConsiderAsArrayOf("objectAsset");
+  SerializerElement &objectAssetElement =
+      objectAssetsElement.AddChild("objectAsset");
+
+  cleanObject->SerializeTo(objectAssetElement.AddChild("object"));
+
+  SerializerElement &resourcesElement =
+      objectAssetElement.AddChild("resources");
+  resourcesElement.ConsiderAsArrayOf("resource");
+  auto &resourcesManager = project.GetResourcesManager();
+  gd::ResourcesInUseHelper resourcesInUse(resourcesManager);
+  cleanObject->GetConfiguration().ExposeResources(resourcesInUse);
+  for (auto &&resourceName : resourcesInUse.GetAllResources()) {
+    if (resourceName.length() == 0) {
+      continue;
+    }
+    usedResourceNames.push_back(resourceName);
+    auto &resource = resourcesManager.GetResource(resourceName);
+    SerializerElement &resourceElement = resourcesElement.AddChild("resource");
+    resource.SerializeTo(resourceElement);
+    resourceElement.SetAttribute("kind", resource.GetKind());
+    resourceElement.SetAttribute("name", resource.GetName());
+  }
+
+  SerializerElement &requiredExtensionsElement =
+      objectAssetElement.AddChild("requiredExtensions");
+  requiredExtensionsElement.ConsiderAsArrayOf("requiredExtension");
+  if (project.HasEventsFunctionsExtensionNamed(extensionName)) {
+    SerializerElement &requiredExtensionElement =
+        requiredExtensionsElement.AddChild("requiredExtension");
+    requiredExtensionElement.SetAttribute("extensionName", extensionName);
+    requiredExtensionElement.SetAttribute("extensionVersion", "1.0.0");
+  }
+
+  // TODO This can be removed when the asset script no longer require it.
+  SerializerElement &customizationElement =
+      objectAssetElement.AddChild("customization");
+  customizationElement.ConsiderAsArrayOf("empty");
+}
+} // namespace gd

Core/GDCore/IDE/ObjectAssetSerializer.h

@@ -0,0 +1,57 @@
+/*
+ * GDevelop Core
+ * Copyright 2008-2023 Florian Rival (Florian.Rival@gmail.com). All rights
+ * reserved. This project is released under the MIT License.
+ */
+#pragma once
+#include <map>
+#include <vector>
+
+#include "GDCore/String.h"
+
+namespace gd {
+class Object;
+class ExtensionDependency;
+class PropertyDescriptor;
+class Project;
+class Layout;
+class ArbitraryResourceWorker;
+class InitialInstance;
+class SerializerElement;
+class EffectsContainer;
+class AbstractFileSystem;
+} // namespace gd
+
+namespace gd {
+
+/**
+ * \brief Serialize objects into an asset for the store.
+ *
+ * \ingroup IDE
+ */
+class GD_CORE_API ObjectAssetSerializer {
+public:
+  /**
+   * \brief Serialize an object into an asset.
+   *
+   * \param project The project that contains the object and its resources.
+   * It's not actually modified.
+   * \param object The object to serialize as an asset.
+   * \param objectFullName The object name with spaces instead of PascalCase.
+   * \param element The element where the asset is serialize.
+   * \param usedResourceNames Return the names of the resources used by the asset.
+   */
+  static void
+  SerializeTo(gd::Project &project, const gd::Object &object,
+              const gd::String &objectFullName, SerializerElement &element,
+              std::vector<gd::String> &usedResourceNames);
+
+  ~ObjectAssetSerializer(){};
+
+private:
+  ObjectAssetSerializer(){};
+
+  static gd::String GetObjectExtensionName(const gd::Object &object);
+};
+
+} // namespace gd

Core/GDCore/IDE/Project/ArbitraryResourceWorker.cpp

@@ -52,6 +52,16 @@ void ArbitraryResourceWorker::ExposeModel3D(gd::String& resourceName){
     // do.
 };
 
+void ArbitraryResourceWorker::ExposeAtlas(gd::String& resourceName){
+    // Nothing to do by default - each child class can define here the action to
+    // do.
+};
+
+void ArbitraryResourceWorker::ExposeSpine(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.
@@ -63,15 +73,11 @@ void ArbitraryResourceWorker::ExposeBitmapFont(gd::String& bitmapFontName){
 };
 
 void ArbitraryResourceWorker::ExposeAudio(gd::String& audioName) {
-  for (auto resources : GetResources()) {
-    if (!resources) continue;
-
-    if (resources->HasResource(audioName) &&
-        resources->GetResource(audioName).GetKind() == "audio") {
+  if (resourcesManager->HasResource(audioName) &&
+      resourcesManager->GetResource(audioName).GetKind() == "audio") {
     // Nothing to do, the audio is a reference to a proper resource.
     return;
   }
-  }
 
   // For compatibility with older projects (where events were referring to files
   // directly), we consider that this resource name is a filename, and so expose
@@ -80,15 +86,11 @@ void ArbitraryResourceWorker::ExposeAudio(gd::String& audioName) {
 };
 
 void ArbitraryResourceWorker::ExposeFont(gd::String& fontName) {
-  for (auto resources : GetResources()) {
-    if (!resources) continue;
-
-    if (resources->HasResource(fontName) &&
-        resources->GetResource(fontName).GetKind() == "font") {
+  if (resourcesManager->HasResource(fontName) &&
+      resourcesManager->GetResource(fontName).GetKind() == "font") {
     // Nothing to do, the font is a reference to a proper resource.
     return;
   }
-  }
 
   // For compatibility with older projects (where events were referring to files
   // directly), we consider that this resource name is a filename, and so expose
@@ -96,12 +98,7 @@ void ArbitraryResourceWorker::ExposeFont(gd::String& fontName) {
   ExposeFile(fontName);
 };
 
-void ArbitraryResourceWorker::ExposeResources(
-    gd::ResourcesManager* resourcesManager) {
-  if (!resourcesManager) return;
-
-  resourcesManagers.push_back(resourcesManager);
-
+void ArbitraryResourceWorker::ExposeResources() {
   std::vector<gd::String> resources = resourcesManager->GetAllResourceNames();
   for (std::size_t i = 0; i < resources.size(); i++) {
     if (resourcesManager->GetResource(resources[i]).UseFile())
@@ -110,9 +107,6 @@ void ArbitraryResourceWorker::ExposeResources(
 }
 
 void ArbitraryResourceWorker::ExposeEmbeddeds(gd::String& resourceName) {
-  if (resourcesManagers.empty()) return;
-  gd::ResourcesManager* resourcesManager = resourcesManagers[0];
-
   gd::Resource& resource = resourcesManager->GetResource(resourceName);
 
   if (!resource.GetMetadata().empty()) {
@@ -136,6 +130,7 @@ void ArbitraryResourceWorker::ExposeEmbeddeds(gd::String& resourceName) {
 
           gd::String potentiallyUpdatedTargetResourceName = targetResourceName;
           ExposeResourceWithType(targetResource.GetKind(), potentiallyUpdatedTargetResourceName);
+          ExposeEmbeddeds(potentiallyUpdatedTargetResourceName);
 
           if (potentiallyUpdatedTargetResourceName != targetResourceName) {
             // The resource name was renamed. Also update the mapping.
@@ -176,6 +171,7 @@ void ArbitraryResourceWorker::ExposeResourceWithType(
   }
   if (resourceType == "tilemap") {
     ExposeTilemap(resourceName);
+    ExposeEmbeddeds(resourceName);
     return;
   }
   if (resourceType == "tileset") {
@@ -184,12 +180,21 @@ void ArbitraryResourceWorker::ExposeResourceWithType(
   }
   if (resourceType == "json") {
     ExposeJson(resourceName);
+    ExposeEmbeddeds(resourceName);
     return;
   }
   if (resourceType == "video") {
     ExposeVideo(resourceName);
     return;
   }
+  if (resourceType == "atlas") {
+    ExposeAtlas(resourceName);
+    return;
+  }
+  if (resourceType == "spine") {
+    ExposeSpine(resourceName);
+    return;
+  }
   gd::LogError("Unexpected resource type: " + resourceType + " for: " + resourceName);
   return;
 }
@@ -243,10 +248,12 @@ bool ResourceWorkerInEventsWorker::DoVisitInstruction(gd::Instruction& instructi
         } else if (parameterMetadata.GetType() == "jsonResource") {
           gd::String updatedParameterValue = parameterValue;
           worker.ExposeJson(updatedParameterValue);
+          worker.ExposeEmbeddeds(updatedParameterValue);
           instruction.SetParameter(parameterIndex, updatedParameterValue);
         } else if (parameterMetadata.GetType() == "tilemapResource") {
           gd::String updatedParameterValue = parameterValue;
           worker.ExposeTilemap(updatedParameterValue);
+          worker.ExposeEmbeddeds(updatedParameterValue);
           instruction.SetParameter(parameterIndex, updatedParameterValue);
         } else if (parameterMetadata.GetType() == "tilesetResource") {
           gd::String updatedParameterValue = parameterValue;
@@ -256,19 +263,20 @@ bool ResourceWorkerInEventsWorker::DoVisitInstruction(gd::Instruction& instructi
           gd::String updatedParameterValue = parameterValue;
           worker.ExposeModel3D(updatedParameterValue);
           instruction.SetParameter(parameterIndex, updatedParameterValue);
+        } else if (parameterMetadata.GetType() == "atlasResource") {
+          gd::String updatedParameterValue = parameterValue;
+          worker.ExposeAtlas(updatedParameterValue);
+          instruction.SetParameter(parameterIndex, updatedParameterValue);
+        } else if (parameterMetadata.GetType() == "spineResource") {
+          gd::String updatedParameterValue = parameterValue;
+          worker.ExposeSpine(updatedParameterValue);
+          instruction.SetParameter(parameterIndex, updatedParameterValue);
         }
       });
 
   return false;
 };
 
-void LaunchResourceWorkerOnEvents(const gd::Project& project,
-                                  gd::EventsList& events,
-                                  gd::ArbitraryResourceWorker& worker) {
-  gd::ResourceWorkerInEventsWorker eventsWorker(project, worker);
-  eventsWorker.Launch(events);
-}
-
 gd::ResourceWorkerInEventsWorker
 GetResourceWorkerOnEvents(const gd::Project &project,
                           gd::ArbitraryResourceWorker &worker) {
@@ -293,8 +301,8 @@ void ResourceWorkerInObjectsWorker::DoVisitBehavior(gd::Behavior &behavior){
 gd::ResourceWorkerInObjectsWorker
 GetResourceWorkerOnObjects(const gd::Project &project,
                            gd::ArbitraryResourceWorker &worker) {
-  gd::ResourceWorkerInObjectsWorker eventsWorker(project, worker);
-  return eventsWorker;
+  gd::ResourceWorkerInObjectsWorker resourcesWorker(project, worker);
+  return resourcesWorker;
 }
 
 }  // namespace gd

Core/GDCore/IDE/Project/ArbitraryResourceWorker.h

@@ -37,13 +37,14 @@ namespace gd {
  * \see ResourcesMergingHelper
  * \see gd::ResourcesInUseHelper
  *
- * \see gd::LaunchResourceWorkerOnEvents
+ * \see gd::GetResourceWorkerOnEvents
  *
  * \ingroup IDE
  */
 class GD_CORE_API ArbitraryResourceWorker {
 public:
-  ArbitraryResourceWorker(){};
+  ArbitraryResourceWorker(gd::ResourcesManager &resourcesManager_)
+      : resourcesManager(&resourcesManager_){};
   virtual ~ArbitraryResourceWorker();
 
   /**
@@ -52,7 +53,7 @@ class GD_CORE_API ArbitraryResourceWorker {
    * first to ensure that resources are known so that images, shaders & audio
    * can make reference to them.
    */
-  void ExposeResources(gd::ResourcesManager *resourcesManager);
+  void ExposeResources();
 
   /**
    * \brief Expose a resource from a given type.
@@ -96,6 +97,16 @@ class GD_CORE_API ArbitraryResourceWorker {
    */
   virtual void ExposeModel3D(gd::String &resourceName);
   
+  /**
+   * \brief Expose an atlas, which is always a reference to a "atlas" resource.
+   */
+  virtual void ExposeAtlas(gd::String &resourceName);
+
+  /**
+   * \brief Expose an spine, which is always a reference to a "spine" resource.
+   */
+  virtual void ExposeSpine(gd::String &resourceName);
+
   /**
    * \brief Expose a video, which is always a reference to a "video" resource.
    */
@@ -123,9 +134,7 @@ class GD_CORE_API ArbitraryResourceWorker {
   virtual void ExposeEmbeddeds(gd::String &resourceName);
 
 protected:
-  const std::vector<gd::ResourcesManager *> &GetResources() {
-    return resourcesManagers;
-  };
+  gd::ResourcesManager * resourcesManager;
 
  private:
   /**
@@ -133,8 +142,6 @@ class GD_CORE_API ArbitraryResourceWorker {
    * exposed as file (see ExposeFile).
    */
   void ExposeResource(gd::Resource &resource);
-
-  std::vector<gd::ResourcesManager *> resourcesManagers;
 };
 
 /**

Core/GDCore/IDE/Project/AssetResourcePathCleaner.cpp

@@ -0,0 +1,74 @@
+/*
+ * GDevelop Core
+ * Copyright 2008-2023 Florian Rival (Florian.Rival@gmail.com). All rights
+ * reserved. This project is released under the MIT License.
+ */
+
+#include "AssetResourcePathCleaner.h"
+#include "GDCore/Project/Project.h"
+#include "GDCore/Project/ResourcesManager.h"
+#include "GDCore/String.h"
+
+namespace gd {
+void AssetResourcePathCleaner::ExposeImage(gd::String &imageName) {
+  ExposeResourceAsFile(imageName);
+}
+
+void AssetResourcePathCleaner::ExposeAudio(gd::String &audioName) {
+  ExposeResourceAsFile(audioName);
+}
+
+void AssetResourcePathCleaner::ExposeFont(gd::String &fontName) {
+  ExposeResourceAsFile(fontName);
+}
+
+void AssetResourcePathCleaner::ExposeJson(gd::String &jsonName) {
+  ExposeResourceAsFile(jsonName);
+}
+
+void AssetResourcePathCleaner::ExposeTilemap(gd::String &tilemapName) {
+  ExposeResourceAsFile(tilemapName);
+}
+
+void AssetResourcePathCleaner::ExposeTileset(gd::String &tilesetName) {
+  ExposeResourceAsFile(tilesetName);
+}
+
+void AssetResourcePathCleaner::ExposeVideo(gd::String &videoName) {
+  ExposeResourceAsFile(videoName);
+}
+
+void AssetResourcePathCleaner::ExposeBitmapFont(gd::String &bitmapFontName) {
+  ExposeResourceAsFile(bitmapFontName);
+}
+
+void AssetResourcePathCleaner::ExposeResourceAsFile(gd::String &resourceName) {
+
+  auto &resource = resourcesManager->GetResource(resourceName);
+  gd::String file = resource.GetFile();
+  ExposeFile(file);
+
+  resourcesNameReverseMap[file] = resourceName;
+  resourceName = file;
+}
+
+void AssetResourcePathCleaner::ExposeFile(gd::String &resourceFilePath) {
+
+  size_t slashPos = resourceFilePath.find_last_of("/");
+  size_t antiSlashPos = resourceFilePath.find_last_of("\\");
+  size_t baseNamePos =
+      slashPos == String::npos
+          ? antiSlashPos == String::npos ? 0 : (antiSlashPos + 1)
+      : antiSlashPos == String::npos ? (slashPos + 1)
+      : slashPos > antiSlashPos      ? (slashPos + 1)
+                                     : (antiSlashPos + 1);
+  gd::String baseName =
+      baseNamePos != 0
+          ? resourceFilePath.substr(baseNamePos, resourceFilePath.length())
+          : resourceFilePath;
+
+  resourcesFileNameMap[resourceFilePath] = baseName;
+  resourceFilePath = baseName;
+}
+
+} // namespace gd

Core/GDCore/IDE/Project/AssetResourcePathCleaner.h

@@ -0,0 +1,65 @@
+/*
+ * GDevelop Core
+ * Copyright 2008-2023 Florian Rival (Florian.Rival@gmail.com). All rights
+ * reserved. This project is released under the MIT License.
+ */
+#pragma once
+
+#include "GDCore/IDE/Project/ArbitraryResourceWorker.h"
+#include "GDCore/IDE/Project/ResourcesMergingHelper.h"
+#include "GDCore/String.h"
+#include <map>
+#include <memory>
+#include <vector>
+
+namespace gd {
+class AbstractFileSystem;
+class Project;
+} // namespace gd
+
+namespace gd {
+
+/**
+ * \brief AssetResourcePathCleaner is used when exporting an object as an asset.
+ * It removes the folder from the path.
+ *
+ * \see ArbitraryResourceWorker
+ *
+ * \ingroup IDE
+ */
+class GD_CORE_API AssetResourcePathCleaner : public ArbitraryResourceWorker {
+public:
+  AssetResourcePathCleaner(
+      gd::ResourcesManager &resourcesManager,
+      std::map<gd::String, gd::String> &resourcesFileNameMap_,
+      std::map<gd::String, gd::String> &resourcesNameReverseMap_)
+      : ArbitraryResourceWorker(resourcesManager),
+        resourcesFileNameMap(resourcesFileNameMap_),
+        resourcesNameReverseMap(resourcesNameReverseMap_){};
+  virtual ~AssetResourcePathCleaner(){};
+
+  void ExposeImage(gd::String &imageName) override;
+  void ExposeAudio(gd::String &audioName) override;
+  void ExposeFont(gd::String &fontName) override;
+  void ExposeJson(gd::String &jsonName) override;
+  void ExposeTilemap(gd::String &tilemapName) override;
+  void ExposeTileset(gd::String &tilesetName) override;
+  void ExposeVideo(gd::String &videoName) override;
+  void ExposeBitmapFont(gd::String &bitmapFontName) override;
+  void ExposeFile(gd::String &resource) override;
+
+protected:
+  void ExposeResourceAsFile(gd::String &resourceName);
+
+  /**
+   * New file names that can be accessed by their original name.
+   */
+  std::map<gd::String, gd::String> &resourcesFileNameMap;
+
+  /**
+   * Original resource names that can be accessed by their new name.
+   */
+  std::map<gd::String, gd::String> &resourcesNameReverseMap;
+};
+
+} // namespace gd

Core/GDCore/IDE/Project/ObjectsUsingResourceCollector.cpp

@@ -0,0 +1,19 @@
+#include "ObjectsUsingResourceCollector.h"
+
+#include "GDCore/Project/Object.h"
+#include "GDCore/Project/Project.h"
+
+namespace gd {
+
+void ObjectsUsingResourceCollector::DoVisitObject(gd::Object& object) {
+  gd::ResourceNameMatcher resourceNameMatcher(*resourcesManager, resourceName);
+
+  object.GetConfiguration().ExposeResources(resourceNameMatcher);
+  if (resourceNameMatcher.AnyResourceMatches()) {
+    objectNames.push_back(object.GetName());
+  }
+};
+
+ObjectsUsingResourceCollector::~ObjectsUsingResourceCollector() {}
+
+}  // namespace gd

Core/GDCore/IDE/Project/ObjectsUsingResourceCollector.h

@@ -0,0 +1,97 @@
+/*
+ * 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 <vector>
+
+#include "GDCore/IDE/Project/ArbitraryObjectsWorker.h"
+#include "GDCore/IDE/Project/ArbitraryResourceWorker.h"
+#include "GDCore/String.h"
+
+namespace gd {
+class Object;
+}  // namespace gd
+
+namespace gd {
+
+class GD_CORE_API ObjectsUsingResourceCollector
+    : public ArbitraryObjectsWorker {
+public:
+  ObjectsUsingResourceCollector(gd::ResourcesManager &resourcesManager_,
+                                const gd::String &resourceName_)
+      : resourcesManager(&resourcesManager_), resourceName(resourceName_){};
+  virtual ~ObjectsUsingResourceCollector();
+
+  std::vector<gd::String>& GetObjectNames() { return objectNames; }
+
+ private:
+  void DoVisitObject(gd::Object& object) override;
+
+  std::vector<gd::String> objectNames;
+  gd::String resourceName;
+  gd::ResourcesManager *resourcesManager;
+};
+
+class GD_CORE_API ResourceNameMatcher : public ArbitraryResourceWorker {
+public:
+  ResourceNameMatcher(gd::ResourcesManager &resourcesManager,
+                      const gd::String &resourceName_)
+      : resourceName(resourceName_),
+        matchesResourceName(false), gd::ArbitraryResourceWorker(
+                                        resourcesManager){};
+  virtual ~ResourceNameMatcher(){};
+
+  bool AnyResourceMatches() { return matchesResourceName; }
+  void Reset() { matchesResourceName = false; }
+
+ private:
+  virtual void ExposeFile(gd::String& resource) override{
+      /*Don't care, we just read resource names*/
+  };
+  virtual void ExposeImage(gd::String& otherResourceName) override {
+    MatchResourceName(otherResourceName);
+  };
+  virtual void ExposeAudio(gd::String& otherResourceName) override {
+    MatchResourceName(otherResourceName);
+  };
+  virtual void ExposeFont(gd::String& otherResourceName) override {
+    MatchResourceName(otherResourceName);
+  };
+  virtual void ExposeJson(gd::String& otherResourceName) override {
+    MatchResourceName(otherResourceName);
+  };
+  virtual void ExposeTilemap(gd::String& otherResourceName) override {
+    MatchResourceName(otherResourceName);
+  };
+  virtual void ExposeTileset(gd::String& otherResourceName) override {
+    MatchResourceName(otherResourceName);
+  };
+  virtual void ExposeVideo(gd::String& otherResourceName) override {
+    MatchResourceName(otherResourceName);
+  };
+  virtual void ExposeBitmapFont(gd::String& otherResourceName) override {
+    MatchResourceName(otherResourceName);
+  };
+  virtual void ExposeModel3D(gd::String& otherResourceName) override {
+    MatchResourceName(otherResourceName);
+  };
+  virtual void ExposeAtlas(gd::String& otherResourceName) override {
+    MatchResourceName(otherResourceName);
+  };
+  virtual void ExposeSpine(gd::String& otherResourceName) override {
+    MatchResourceName(otherResourceName);
+  };
+
+  void MatchResourceName(gd::String& otherResourceName) {
+    if (otherResourceName == resourceName) matchesResourceName = true;
+  }
+
+  gd::String resourceName;
+  bool matchesResourceName;
+};
+
+};  // namespace gd

Core/GDCore/IDE/Project/ProjectResourcesAdder.cpp

@@ -18,8 +18,9 @@ namespace gd {
 std::vector<gd::String> ProjectResourcesAdder::GetAllUseless(
     gd::Project& project, const gd::String& resourceType) {
   std::vector<gd::String> unusedResources;
+
   // Search for resources used in the project
-  gd::ResourcesInUseHelper resourcesInUse;
+  gd::ResourcesInUseHelper resourcesInUse(project.GetResourcesManager());
   gd::ResourceExposer::ExposeWholeProjectResources(project, resourcesInUse);
   std::set<gd::String>& usedResources = resourcesInUse.GetAll(resourceType);
 

Core/GDCore/IDE/Project/ProjectResourcesCopier.cpp

@@ -25,8 +25,29 @@ bool ProjectResourcesCopier::CopyAllResourcesTo(
     bool updateOriginalProject,
     bool preserveAbsoluteFilenames,
     bool preserveDirectoryStructure) {
+  if (updateOriginalProject) {
+    gd::ProjectResourcesCopier::CopyAllResourcesTo(
+        originalProject, originalProject, fs, destinationDirectory,
+        preserveAbsoluteFilenames, preserveDirectoryStructure);
+  } else {
+    gd::Project clonedProject = originalProject;
+    gd::ProjectResourcesCopier::CopyAllResourcesTo(
+        originalProject, clonedProject, fs, destinationDirectory,
+        preserveAbsoluteFilenames, preserveDirectoryStructure);
+  }
+  return true;
+}
+
+bool ProjectResourcesCopier::CopyAllResourcesTo(
+    gd::Project& originalProject,
+    gd::Project& clonedProject,
+    AbstractFileSystem& fs,
+    gd::String destinationDirectory,
+    bool preserveAbsoluteFilenames,
+    bool preserveDirectoryStructure) {
+
   // Check if there are some resources with absolute filenames
-  gd::ResourcesAbsolutePathChecker absolutePathChecker(fs);
+  gd::ResourcesAbsolutePathChecker absolutePathChecker(originalProject.GetResourcesManager(), fs);
   gd::ResourceExposer::ExposeWholeProjectResources(originalProject, absolutePathChecker);
 
   auto projectDirectory = fs.DirNameFrom(originalProject.GetProjectFile());
@@ -34,24 +55,18 @@ bool ProjectResourcesCopier::CopyAllResourcesTo(
             << destinationDirectory << "..." << std::endl;
 
   // Get the resources to be copied
-  gd::ResourcesMergingHelper resourcesMergingHelper(fs);
+  gd::ResourcesMergingHelper resourcesMergingHelper(
+      clonedProject.GetResourcesManager(), fs);
   resourcesMergingHelper.SetBaseDirectory(projectDirectory);
   resourcesMergingHelper.PreserveDirectoriesStructure(
       preserveDirectoryStructure);
-  resourcesMergingHelper.PreserveAbsoluteFilenames(
-      preserveAbsoluteFilenames);
-
-  if (updateOriginalProject) {
-    gd::ResourceExposer::ExposeWholeProjectResources(originalProject, resourcesMergingHelper);
-  } else {
-    std::shared_ptr<gd::Project> project(new gd::Project(originalProject));
-    gd::ResourceExposer::ExposeWholeProjectResources(*project, resourcesMergingHelper);
-  }
+  resourcesMergingHelper.PreserveAbsoluteFilenames(preserveAbsoluteFilenames);
+  gd::ResourceExposer::ExposeWholeProjectResources(clonedProject,
+                                                    resourcesMergingHelper);
 
   // Copy resources
   map<gd::String, gd::String>& resourcesNewFilename =
       resourcesMergingHelper.GetAllResourcesOldAndNewFilename();
-  unsigned int i = 0;
   for (map<gd::String, gd::String>::const_iterator it =
            resourcesNewFilename.begin();
        it != resourcesNewFilename.end();
@@ -71,8 +86,6 @@ bool ProjectResourcesCopier::CopyAllResourcesTo(
                        destinationFile + _("\"."));
       }
     }
-
-    ++i;
   }
 
   return true;

Core/GDCore/IDE/Project/ProjectResourcesCopier.h

@@ -3,9 +3,10 @@
  * Copyright 2008-present Florian Rival (Florian.Rival@gmail.com). All rights
  * reserved. This project is released under the MIT License.
  */
-#ifndef PROJECTRESOURCESCOPIER_H
-#define PROJECTRESOURCESCOPIER_H
+#pragma once
+
 #include "GDCore/String.h"
+
 namespace gd {
 class Project;
 class AbstractFileSystem;
@@ -47,8 +48,14 @@ class GD_CORE_API ProjectResourcesCopier {
                                  bool updateOriginalProject,
                                  bool preserveAbsoluteFilenames = true,
                                  bool preserveDirectoryStructure = true);
+
+private:
+  static bool CopyAllResourcesTo(gd::Project& originalProject,
+                                 gd::Project& clonedProject,
+                                 gd::AbstractFileSystem& fs,
+                                 gd::String destinationDirectory,
+                                 bool preserveAbsoluteFilenames = true,
+                                 bool preserveDirectoryStructure = true);
 };
 
 }  // namespace gd
-
-#endif  // PROJECTRESOURCESCOPIER_H