Fix missing flippingZ accessors (#6968)

- Don't show in changelog

.circleci/config.yml

@@ -11,13 +11,24 @@
 version: 2.1
 orbs:
   aws-cli: circleci/aws-cli@2.0.6
+  macos: circleci/macos@2.5.1 # For Rosetta (see below)
+  node: circleci/node@5.2.0 # For a recent npm version (see below)
 jobs:
   # Build the **entire** app for macOS.
   build-macos:
     macos:
       xcode: 14.2.0
+    resource_class: macos.m1.large.gen1
     steps:
       - checkout
+      # Install Rosetta for AWS CLI and disable TSO to speed up S3 uploads (https://support.circleci.com/hc/en-us/articles/19334402064027-Troubleshooting-slow-uploads-to-S3-for-jobs-using-an-m1-macOS-resource-class)
+      - macos/install-rosetta
+      - run: sudo sysctl net.inet.tcp.tso=0
+
+      # Install a recent version of npm to workaround a notarization issue because of a symlink made by npm: https://github.com/electron-userland/electron-builder/issues/7755
+      # Node.js v20.14.0 comes with npm v10.7.0.
+      - node/install:
+          node-version: "20.14.0"
 
       # System dependencies (for Emscripten and upload)
       - run:
@@ -30,7 +41,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:
@@ -107,7 +118,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
@@ -127,7 +138,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:
@@ -184,7 +196,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:
@@ -200,7 +212,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:

.gitattributes

@@ -1,12 +1,11 @@
 Core/GDCore/Serialization/rapidjson/rapidjson.h/* linguist-vendored
-Core/GDCore/TinyXml/* linguist-vendored
 Extensions/ParticleSystem/SPARK/* linguist-vendored
 Extensions/PhysicsBehavior/Box2D/* linguist-vendored
 Extensions/PhysicsBehavior/box2djs/* linguist-vendored
 Extensions/Physics2Behavior/box2d.js linguist-vendored
 Extensions/BBText/pixi-multistyle-text/* linguist-vendored
 Extensions/P2P/A_peer.js linguist-vendored
+Extensions/Multiplayer/peer.js linguist-vendored
 Extensions/Shopify/shopify-buy.umd.polyfilled.min.js linguist-vendored
 Extensions/TileMap/pako/* linguist-vendored
 Extensions/TileMap/pixi-tilemap/* linguist-vendored
-Extensions/TweenBehavior/shifty.js linguist-vendored

.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
+        - 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/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

.semaphore/semaphore.yml

@@ -56,6 +56,7 @@ blocks:
         - name: GDJS typing and documentation generation
           commands:
             - checkout
+            - cache restore newIDE-app-node_modules-$SEMAPHORE_GIT_BRANCH-revision-$(checksum newIDE/app/package-lock.json)
             - cache restore GDJS-node_modules-$SEMAPHORE_GIT_BRANCH-revision-$(checksum GDJS/package-lock.json)
             - cache restore GDJS-tests-node_modules-$SEMAPHORE_GIT_BRANCH-revision-$(checksum GDJS/tests/package-lock.json)
             - cd GDJS

.travis.yml

@@ -17,11 +17,11 @@ cache:
 addons:
   apt:
     sources:
-    - ubuntu-toolchain-r-test
+      - ubuntu-toolchain-r-test
     packages:
-    # Build dependencies:
-    - cmake
-    - p7zip-full
+      # Build dependencies:
+      - cmake
+      - p7zip-full
 
 before_install:
   # This workaround is required to avoid libstdc++ errors (Emscripten requires a recent version of libstdc++)
@@ -29,47 +29,48 @@ before_install:
   - sudo dpkg --force-all -i libstdc++6
 
 install:
-# Ensure we use a recent version of Node.js (and npm).
+  # Ensure we use a recent version of Node.js (and npm).
   - nvm install v16 && nvm use v16
-#Compile the tests only for GDCore
+  #Compile the tests only for GDCore
   - mkdir .build-tests
   - cd .build-tests
   - cmake -DBUILD_GDJS=FALSE -DBUILD_TESTS=TRUE -DCMAKE_CXX_COMPILER=$(which $CXX) -DCMAKE_C_COMPILER=$(which $CC) ..
   - make -j 4
   - 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 ..
-# Install GDevelop.js dependencies
+  # Install Emscripten (for GDevelop.js)
+  # Specify the tag for the core repository to avois breaking changes.
+  - git clone --depth 1 --branch 3.1.21 https://github.com/juj/emsdk.git
+  - cd emsdk && ./emsdk install 3.1.21 && ./emsdk activate 3.1.21 && cd ..
+  # Install GDevelop.js dependencies
   - cd GDevelop.js && npm install && cd ..
-# Build GDevelop.js
-# (in a subshell to avoid Emscripten polluting the Node.js and npm version for the rest of the build)
+  # Build GDevelop.js
+  # (in a subshell to avoid Emscripten polluting the Node.js and npm version for the rest of the build)
   - (set -e; cd GDevelop.js && source ../emsdk/emsdk_env.sh && npm run build && cd ..)
-# Install newIDE tests dependencies
+  # Install newIDE tests dependencies
   - npm -v
   - cd newIDE/app && npm install
   - cd ../..
-# Install GDJS tests dependencies
+  # Install GDJS tests dependencies
   - cd GDJS && npm install && cd tests && npm install
   - cd ../..
 
 script:
-# GDCore tests:
+  # GDCore tests:
   - cd .build-tests
   - Core/GDCore_tests
   - cd ..
-# GDevelop.js tests
+  # GDevelop.js tests
   - cd GDevelop.js
   - npm test
   - cd ..
-# newIDE tests:
+  # newIDE tests:
   - cd newIDE/app
   - npm test
   - npm run flow
   - npm run check-format
   - npm run check-script-types
   - cd ../..
-# GDJS tests:
+  # GDJS tests:
   - cd GDJS
   - npm run check-format
   - cd ..

.vscode/GDevelopExtensions.code-snippets

@@ -107,7 +107,7 @@
     "description": "Define a parameter in a GDevelop extension definition.",
     "prefix": "gdparam",
     "body": [
-      ".addParameter('${1|string,expression,object,behavior,yesorno,stringWithSelector,scenevar,globalvar,objectvar,objectList,objectListWithoutPicking,color,key,sceneName,file,layer,relationalOperator,operator,trueorfalse,musicfile,soundfile,police,mouse,passwordjoyaxis,camera,objectPtr,forceMultiplier|}', '${2:Parameter description}', '${3:Optional parameter data}', /*parameterIsOptional=*/${4|false,true|})"
+      ".addParameter('${1|string,expression,object,behavior,yesorno,stringWithSelector,scenevar,globalvar,objectvar,objectList,objectListWithoutPicking,color,key,sceneName,file,layer,relationalOperator,operator,trueorfalse,musicfile,soundfile,mouse,passwordjoyaxis,camera,objectPtr,forceMultiplier|}', '${2:Parameter description}', '${3:Optional parameter data}', /*parameterIsOptional=*/${4|false,true|})"
     ]
   },
   "Add code only parameter": {

.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,

.vscode/tasks.json

@@ -8,6 +8,7 @@
       "group": "build",
       "label": "Start development server",
       "detail": "Starts the GDevelop development server.",
+      "options": { "env": { "NODE_OPTIONS": "--max-old-space-size=8192" } },
       "problemMatcher": [
         {
           "owner": "cra",

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) # Upgrading to C++17 would need to remove usage of bind2nd (should be easy).
+set(CMAKE_CXX_STANDARD 11) # Upgrading to C++17 should be tried.
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
 
 # Mark some warnings as errors

Core/CMakeLists.txt

@@ -11,6 +11,11 @@ set(CMAKE_CXX_USE_RESPONSE_FILE_FOR_INCLUDES 1)
 set(GDCORE_include_dir ${GD_base_dir}/Core PARENT_SCOPE)
 set(GDCORE_lib_dir ${GD_base_dir}/Binaries/Output/${CMAKE_BUILD_TYPE}_${CMAKE_SYSTEM_NAME} PARENT_SCOPE)
 
+# Create VersionPriv.h - only useful for testing.
+if (NOT EMSCRIPTEN)
+	file(WRITE "${GD_base_dir}/Core/GDCore/Tools/VersionPriv.h" "#define GD_VERSION_STRING \"0.0.0-0\"")
+endif()
+
 # Dependencies on external libraries:
 #
 

Core/GDCore/DocMainPage.h

@@ -58,99 +58,7 @@
  * Common functions and tools for programming.
  */
 
-/**
- * \defgroup TinyXml Integrated TinyXml library
- *
- * See the full documentation of TinyXml [here](http://www.grinninglizard.com/tinyxmldocs/index.html).
- */
-
 /**
  * \defgroup SpriteObjectExtension Standard Sprite Object extension
  * \ingroup BuiltinExtensions
- */
-
-/**
- * \class TiXmlAttribute
- * \brief Part of the tinyxml library
- * \ingroup TinyXml
- */
-/**
- * \class TiXmlAttributeSet
- * \brief Part of the tinyxml library
- * \ingroup TinyXml
- */
-/**
- * \class TiXmlBase
- * \brief Part of the tinyxml library
- * \ingroup TinyXml
- */
-/**
- * \class TiXmlComment
- * \brief Part of the tinyxml library
- * \ingroup TinyXml
- */
-/**
- * \class TiXmlCursor
- * \brief Part of the tinyxml library
- * \ingroup TinyXml
- */
-/**
- * \class TiXmlDeclaration
- * \brief Part of the tinyxml library
- * \ingroup TinyXml
- */
-/**
- * \class TiXmlDocument
- * \brief Part of the tinyxml library
- * \ingroup TinyXml
- */
-/**
- * \class TiXmlElement
- * \brief Part of the tinyxml library
- * \ingroup TinyXml
- */
-/**
- * \class TiXmlHandle
- * \brief Part of the tinyxml library
- * \ingroup TinyXml
- */
-/**
- * \class TiXmlNode
- * \brief Part of the tinyxml library
- * \ingroup TinyXml
- */
-/**
- * \class TiXmlOutStream
- * \brief Part of the tinyxml library
- * \ingroup TinyXml
- */
-/**
- * \class TiXmlParsingData
- * \brief Part of the tinyxml library
- * \ingroup TinyXml
- */
-/**
- * \class TiXmlPrinter
- * \brief Part of the tinyxml library
- * \ingroup TinyXml
- */
-/**
- * \class TiXmlString
- * \brief Part of the tinyxml library
- * \ingroup TinyXml
- */
-/**
- * \class TiXmlText
- * \brief Part of the tinyxml library
- * \ingroup TinyXml
- */
-/**
- * \class TiXmlUnknown
- * \brief Part of the tinyxml library
- * \ingroup TinyXml
- */
-/**
- * \class TiXmlVisitor
- * \brief Part of the tinyxml library
- * \ingroup TinyXml
- */
+ */

Core/GDCore/Events/Builtin/ForEachChildVariableEvent.cpp

@@ -49,7 +49,8 @@ vector<pair<gd::Expression*, gd::ParameterMetadata> >
     ForEachChildVariableEvent::GetAllExpressionsWithMetadata() {
   vector<pair<gd::Expression*, gd::ParameterMetadata> >
       allExpressionsWithMetadata;
-  auto metadata = gd::ParameterMetadata().SetType("scenevar");
+  auto metadata = gd::ParameterMetadata().SetType("variable");
+  metadata.SetExtraInfo("AllowUndeclaredVariable");
   allExpressionsWithMetadata.push_back(
       std::make_pair(&iterableVariableName, metadata));
   allExpressionsWithMetadata.push_back(
@@ -63,7 +64,8 @@ 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");
+  auto metadata = gd::ParameterMetadata().SetType("variable");
+  metadata.SetExtraInfo("AllowUndeclaredVariable");
   allExpressionsWithMetadata.push_back(
       std::make_pair(&iterableVariableName, metadata));
   allExpressionsWithMetadata.push_back(

Core/GDCore/Events/Builtin/ForEachEvent.cpp

@@ -8,7 +8,6 @@
 #include "GDCore/Events/Serialization.h"
 #include "GDCore/Events/Tools/EventsCodeNameMangler.h"
 #include "GDCore/Serialization/SerializerElement.h"
-#include "GDCore/TinyXml/tinyxml.h"
 
 using namespace std;
 

Core/GDCore/Events/Builtin/GroupEvent.cpp

@@ -10,7 +10,6 @@
 #include "GDCore/Events/CodeGeneration/EventsCodeGenerator.h"
 #include "GDCore/Events/Serialization.h"
 #include "GDCore/Serialization/SerializerElement.h"
-#include "GDCore/TinyXml/tinyxml.h"
 
 using namespace std;
 

Core/GDCore/Events/Builtin/LinkEvent.cpp

@@ -164,7 +164,7 @@ void LinkEvent::UnserializeFrom(gd::Project& project,
 }
 
 bool LinkEvent::AcceptVisitor(gd::EventVisitor &eventVisitor) {
-  return BaseEvent::AcceptVisitor(eventVisitor) |
+  return BaseEvent::AcceptVisitor(eventVisitor) ||
          eventVisitor.VisitLinkEvent(*this);
 }
 

Core/GDCore/Events/Builtin/RepeatEvent.h

@@ -4,8 +4,8 @@
  * reserved. This project is released under the MIT License.
  */
 
-#ifndef GDCORE_REPEATEVENT_H
-#define GDCORE_REPEATEVENT_H
+#pragma once
+
 #include "GDCore/Events/Event.h"
 #include "GDCore/Events/EventsList.h"
 namespace gd {
@@ -36,10 +36,10 @@ class GD_CORE_API RepeatEvent : public gd::BaseEvent {
   const gd::InstructionsList& GetActions() const { return actions; };
   gd::InstructionsList& GetActions() { return actions; };
 
-  const gd::String& GetRepeatExpression() const {
-    return repeatNumberExpression.GetPlainString();
+  const gd::Expression& GetRepeatExpression() const {
+    return repeatNumberExpression;
   };
-  void SetRepeatExpression(gd::String repeatNumberExpression_) {
+  void SetRepeatExpressionPlainString(gd::String repeatNumberExpression_) {
     repeatNumberExpression = gd::Expression(repeatNumberExpression_);
   };
 
@@ -68,5 +68,3 @@ class GD_CORE_API RepeatEvent : public gd::BaseEvent {
 };
 
 }  // namespace gd
-
-#endif  // GDCORE_REPEATEVENT_H

Core/GDCore/Events/Builtin/StandardEvent.cpp

@@ -15,7 +15,8 @@ using namespace std;
 
 namespace gd {
 
-StandardEvent::StandardEvent() : BaseEvent() {}
+StandardEvent::StandardEvent()
+    : BaseEvent(), variables(gd::VariablesContainer::SourceType::Local) {}
 
 StandardEvent::~StandardEvent(){};
 
@@ -57,6 +58,9 @@ void StandardEvent::SerializeTo(SerializerElement& element) const {
   if (!events.IsEmpty())
     gd::EventsListSerialization::SerializeEventsTo(events,
                                                   element.AddChild("events"));
+  if (HasVariables()) {
+    variables.SerializeTo(element.AddChild("variables"));
+  }
 }
 
 void StandardEvent::UnserializeFrom(gd::Project& project,
@@ -71,6 +75,11 @@ void StandardEvent::UnserializeFrom(gd::Project& project,
     gd::EventsListSerialization::UnserializeEventsFrom(
         project, events, element.GetChild("events", 0, "Events"));
   }
+
+  variables.Clear();
+  if (element.HasChild("variables")) {
+    variables.UnserializeFrom(element.GetChild("variables"));
+  }
 }
 
 }  // namespace gd

Core/GDCore/Events/Builtin/StandardEvent.h

@@ -4,13 +4,13 @@
  * reserved. This project is released under the MIT License.
  */
 
-#if defined(GD_IDE_ONLY)
-#ifndef GDCORE_STANDARDEVENT_H
-#define GDCORE_STANDARDEVENT_H
+#pragma once
+
 #include "GDCore/Events/Event.h"
 #include "GDCore/Events/EventsList.h"
 #include "GDCore/Events/Instruction.h"
 #include "GDCore/Events/InstructionsList.h"
+#include "GDCore/Project/VariablesContainer.h"
 namespace gd {
 class Instruction;
 class Project;
@@ -33,6 +33,10 @@ class GD_CORE_API StandardEvent : public gd::BaseEvent {
   virtual const gd::EventsList& GetSubEvents() const { return events; };
   virtual gd::EventsList& GetSubEvents() { return events; };
 
+  virtual bool CanHaveVariables() const { return true; }
+  virtual const gd::VariablesContainer& GetVariables() const { return variables; };
+  virtual gd::VariablesContainer& GetVariables() { return variables; };
+
   const gd::InstructionsList& GetConditions() const { return conditions; };
   gd::InstructionsList& GetConditions() { return conditions; };
 
@@ -53,9 +57,7 @@ class GD_CORE_API StandardEvent : public gd::BaseEvent {
   gd::InstructionsList conditions;
   gd::InstructionsList actions;
   EventsList events;
+  VariablesContainer variables;
 };
 
 }  // namespace gd
-
-#endif  // GDCORE_STANDARDEVENT_H
-#endif

Core/GDCore/Events/CodeGeneration/DiagnosticReport.h

@@ -0,0 +1,117 @@
+/*
+ * 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/String.h"
+#include "GDCore/Tools/MakeUnique.h"
+
+namespace gd {
+
+/**
+ * \brief 
+ */
+class GD_CORE_API ProjectDiagnostic {
+public:
+  enum ErrorType {
+    UndeclaredVariable,
+    MissingBehavior,
+    UnknownObject,
+    MismatchedObjectType,
+  };
+
+  ProjectDiagnostic(ErrorType type_, const gd::String &message_,
+                    const gd::String &actualValue_,
+                    const gd::String &expectedValue_, const gd::String &objectName_ = "")
+      : type(type_), message(message_), actualValue(actualValue_), expectedValue(expectedValue_),
+        objectName(objectName_){};
+  virtual ~ProjectDiagnostic(){};
+
+  ErrorType GetType() const { return type; };
+  const gd::String &GetMessage() const { return message; }
+  const gd::String &GetObjectName() const { return objectName; }
+  const gd::String &GetActualValue() const { return actualValue; }
+  const gd::String &GetExpectedValue() const { return expectedValue; }
+
+private:
+  ErrorType type;
+  gd::String message;
+  gd::String objectName;
+  gd::String actualValue;
+  gd::String expectedValue;
+};
+
+/**
+ * \brief 
+ */
+class GD_CORE_API DiagnosticReport {
+public:
+  DiagnosticReport(){};
+  virtual ~DiagnosticReport(){};
+
+  void Add(const gd::ProjectDiagnostic &projectDiagnostic) {
+    projectDiagnostics.push_back(
+        gd::make_unique<gd::ProjectDiagnostic>(projectDiagnostic));
+  };
+
+  const ProjectDiagnostic &Get(std::size_t index) const {
+    return *projectDiagnostics[index].get();
+  };
+
+  std::size_t Count() const { return projectDiagnostics.size(); };
+
+  const gd::String &GetSceneName() const { return sceneName; }
+
+  void SetSceneName(const gd::String &sceneName_) {
+    sceneName = sceneName_;
+  }
+
+private:
+  std::vector<std::unique_ptr<gd::ProjectDiagnostic>> projectDiagnostics;
+  gd::String sceneName;
+};
+
+/**
+ * \brief 
+ */
+class GD_CORE_API WholeProjectDiagnosticReport {
+public:
+  WholeProjectDiagnosticReport(){};
+  virtual ~WholeProjectDiagnosticReport(){};
+
+  const DiagnosticReport &Get(std::size_t index) const {
+    return *diagnosticReports[index].get();
+  };
+
+  void Clear() {
+    diagnosticReports.clear();
+  };
+
+  DiagnosticReport& AddNewDiagnosticReportForScene(const gd::String &sceneName) {
+    auto diagnosticReport = gd::make_unique<gd::DiagnosticReport>();
+    diagnosticReport->SetSceneName(sceneName);
+    diagnosticReports.push_back(std::move(diagnosticReport));
+    return *diagnosticReports[diagnosticReports.size() - 1].get();
+  };
+
+  std::size_t Count() const { return diagnosticReports.size(); };
+
+  bool HasAnyIssue() {
+    for (auto& diagnosticReport : diagnosticReports) {
+      if (diagnosticReport->Count() > 0) {
+        return true;
+      }
+    }
+    return false;
+  }
+
+private:
+  std::vector<std::unique_ptr<gd::DiagnosticReport>> diagnosticReports;
+};
+
+} // namespace gd

Core/GDCore/Events/CodeGeneration/EffectsCodeGenerator.cpp

@@ -15,6 +15,7 @@
 #include "GDCore/Project/Layout.h"
 #include "GDCore/Project/Object.h"
 #include "GDCore/Project/Project.h"
+#include "GDCore/Project/EventsFunctionsExtension.h"
 #include "GDCore/IDE/ProjectBrowserHelper.h"
 
 namespace gd {
@@ -46,10 +47,9 @@ 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.
+
+  // TODO Factorize with the iteration on all effects for resource exposure.
+  // TODO Implement an ArbitraryEffectWorker and add a method in ProjectBrowserHelper
 
   // See also gd::Project::ExposeResources for a method that traverse the whole
   // project (this time for resources) and
@@ -72,6 +72,27 @@ void EffectsCodeGenerator::GenerateEffectsIncludeFiles(
 
   // Add objects effects
   gd::ProjectBrowserHelper::ExposeProjectObjects(project, effectsCodeGenerator);
+
+  // Add event-based objects layouts effects
+  for (std::size_t s = 0; s < project.GetEventsFunctionsExtensionsCount();
+       s++) {
+    auto &eventsFunctionExtension = project.GetEventsFunctionsExtension(s);
+
+    auto &eventsBasedObjects = eventsFunctionExtension.GetEventsBasedObjects();
+    for (std::size_t objectIndex = 0;
+         objectIndex < eventsBasedObjects.GetCount(); ++objectIndex) {
+      auto &eventsBasedObject = eventsBasedObjects.Get(objectIndex);
+
+      auto &layers = eventsBasedObject.GetLayers();
+      for (std::size_t l = 0; l < layers.GetLayersCount(); ++l) {
+        auto &effects = layers.GetLayer(l).GetEffects();
+        for (std::size_t e = 0; e < effects.GetEffectsCount(); ++e) {
+          auto &effect = effects.GetEffect(e);
+          effectsCodeGenerator.AddEffectIncludeFiles(effect);
+        }
+      }
+    }
+  }
 }
 
 }  // namespace gd

Core/GDCore/Events/CodeGeneration/EventsCodeGenerationContext.h

@@ -3,8 +3,8 @@
  * Copyright 2008-2016 Florian Rival (Florian.Rival@gmail.com). All rights
  * reserved. This project is released under the MIT License.
  */
-#ifndef EVENTSCODEGENERATIONCONTEXT_H
-#define EVENTSCODEGENERATIONCONTEXT_H
+#pragma once
+
 #include <map>
 #include <memory>
 #include <set>
@@ -325,4 +325,3 @@ class GD_CORE_API EventsCodeGenerationContext {
 };
 
 }  // namespace gd
-#endif  // EVENTSCODEGENERATIONCONTEXT_H

Core/GDCore/Events/CodeGeneration/EventsCodeGenerator.cpp

@@ -14,6 +14,7 @@
 #include "GDCore/Extensions/Metadata/ParameterMetadataTools.h"
 #include "GDCore/Extensions/Platform.h"
 #include "GDCore/Extensions/PlatformExtension.h"
+#include "GDCore/IDE/Events/ExpressionVariableNameFinder.h"
 #include "GDCore/Project/Layout.h"
 #include "GDCore/Project/ObjectsContainer.h"
 #include "GDCore/Project/ObjectsContainersList.h"
@@ -41,14 +42,15 @@ gd::String EventsCodeGenerator::GenerateRelationalOperatorCall(
     const vector<gd::String>& arguments,
     const gd::String& callStartString,
     std::size_t startFromArgument) {
-  std::size_t relationalOperatorIndex = instrInfos.parameters.size();
-  for (std::size_t i = startFromArgument; i < instrInfos.parameters.size();
+  std::size_t relationalOperatorIndex = instrInfos.parameters.GetParametersCount();
+  for (std::size_t i = startFromArgument; i < instrInfos.parameters.GetParametersCount();
        ++i) {
-    if (instrInfos.parameters[i].GetType() == "relationalOperator")
+    if (instrInfos.parameters.GetParameter(i).GetType() == "relationalOperator") {
       relationalOperatorIndex = i;
+    }
   }
   // Ensure that there is at least one parameter after the relational operator
-  if (relationalOperatorIndex + 1 >= instrInfos.parameters.size()) {
+  if (relationalOperatorIndex + 1 >= instrInfos.parameters.GetParametersCount()) {
     ReportError();
     return "";
   }
@@ -69,8 +71,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;
 }
 
 /**
@@ -93,14 +123,16 @@ gd::String EventsCodeGenerator::GenerateOperatorCall(
     const gd::String& callStartString,
     const gd::String& getterStartString,
     std::size_t startFromArgument) {
-  std::size_t operatorIndex = instrInfos.parameters.size();
-  for (std::size_t i = startFromArgument; i < instrInfos.parameters.size();
+  std::size_t operatorIndex = instrInfos.parameters.GetParametersCount();
+  for (std::size_t i = startFromArgument; i < instrInfos.parameters.GetParametersCount();
        ++i) {
-    if (instrInfos.parameters[i].GetType() == "operator") operatorIndex = i;
+    if (instrInfos.parameters.GetParameter(i).GetType() == "operator") {
+      operatorIndex = i;
+    }
   }
 
   // Ensure that there is at least one parameter after the operator
-  if (operatorIndex + 1 >= instrInfos.parameters.size()) {
+  if (operatorIndex + 1 >= instrInfos.parameters.GetParametersCount()) {
     ReportError();
     return "";
   }
@@ -162,14 +194,16 @@ gd::String EventsCodeGenerator::GenerateCompoundOperatorCall(
     const vector<gd::String>& arguments,
     const gd::String& callStartString,
     std::size_t startFromArgument) {
-  std::size_t operatorIndex = instrInfos.parameters.size();
-  for (std::size_t i = startFromArgument; i < instrInfos.parameters.size();
+  std::size_t operatorIndex = instrInfos.parameters.GetParametersCount();
+  for (std::size_t i = startFromArgument; i < instrInfos.parameters.GetParametersCount();
        ++i) {
-    if (instrInfos.parameters[i].GetType() == "operator") operatorIndex = i;
+    if (instrInfos.parameters.GetParameter(i).GetType() == "operator") {
+      operatorIndex = i;
+    }
   }
 
   // Ensure that there is at least one parameter after the operator
-  if (operatorIndex + 1 >= instrInfos.parameters.size()) {
+  if (operatorIndex + 1 >= instrInfos.parameters.GetParametersCount()) {
     ReportError();
     return "";
   }
@@ -213,25 +247,27 @@ gd::String EventsCodeGenerator::GenerateMutatorCall(
     const vector<gd::String>& arguments,
     const gd::String& callStartString,
     std::size_t startFromArgument) {
-  std::size_t operatorIndex = instrInfos.parameters.size();
-  for (std::size_t i = startFromArgument; i < instrInfos.parameters.size();
+  std::size_t operatorIndex = instrInfos.parameters.GetParametersCount();
+  for (std::size_t i = startFromArgument; i < instrInfos.parameters.GetParametersCount();
        ++i) {
-    if (instrInfos.parameters[i].GetType() == "operator") operatorIndex = i;
+    if (instrInfos.parameters.GetParameter(i).GetType() == "operator") {
+      operatorIndex = i;
+    }
   }
 
   // Ensure that there is at least one parameter after the operator
-  if (operatorIndex + 1 >= instrInfos.parameters.size()) {
+  if (operatorIndex + 1 >= instrInfos.parameters.GetParametersCount()) {
     ReportError();
     return "";
   }
 
   gd::String operatorStr = arguments[operatorIndex];
-  if (operatorStr.size() > 2)
+  if (operatorStr.size() > 2 && operatorStr[0] == '\"') {
     operatorStr = operatorStr.substr(
         1,
         operatorStr.length() - 1 -
             1);  // Operator contains quote which must be removed.
-
+  }
   auto mutators = instrInfos.codeExtraInformation.optionalMutators;
   auto mutator = mutators.find(operatorStr);
   if (mutator == mutators.end()) {
@@ -251,6 +287,9 @@ gd::String EventsCodeGenerator::GenerateMutatorCall(
       argumentsStr += arguments[i];
     }
   }
+  if (instrInfos.GetManipulatedType() == "boolean") {
+    return callStartString + "(" + argumentsStr + ")." + mutator->second;
+  }
 
   return callStartString + "(" + argumentsStr + ")." + mutator->second + "(" +
          rhs + ")";
@@ -284,23 +323,36 @@ gd::String EventsCodeGenerator::GenerateConditionCode(
   }
 
   // Insert code only parameters and be sure there is no lack of parameter.
-  while (condition.GetParameters().size() < instrInfos.parameters.size()) {
+  while (condition.GetParameters().size() < instrInfos.parameters.GetParametersCount()) {
     vector<gd::Expression> parameters = condition.GetParameters();
     parameters.push_back(gd::Expression(""));
     condition.SetParameters(parameters);
   }
 
+  gd::EventsCodeGenerator::CheckBehaviorParameters(condition, instrInfos);
   // Verify that there are no mismatches between object type in parameters.
-  for (std::size_t pNb = 0; pNb < instrInfos.parameters.size(); ++pNb) {
-    if (ParameterMetadata::IsObject(instrInfos.parameters[pNb].GetType())) {
+  for (std::size_t pNb = 0; pNb < instrInfos.parameters.GetParametersCount(); ++pNb) {
+    if (ParameterMetadata::IsObject(instrInfos.parameters.GetParameter(pNb).GetType())) {
       gd::String objectInParameter =
           condition.GetParameter(pNb).GetPlainString();
 
-      if (!GetObjectsContainersList().HasObjectOrGroupNamed(objectInParameter)) {
+      const auto &expectedObjectType =
+          instrInfos.parameters.GetParameter(pNb).GetExtraInfo();
+      const auto &actualObjectType =
+          GetObjectsContainersList().GetTypeOfObject(objectInParameter);
+      if (!GetObjectsContainersList().HasObjectOrGroupNamed(
+              objectInParameter)) {
+        gd::ProjectDiagnostic projectDiagnostic(
+            gd::ProjectDiagnostic::ErrorType::UnknownObject, "",
+            objectInParameter, "");
+        diagnosticReport->Add(projectDiagnostic);
         return "/* Unknown object - skipped. */";
-      } else if (!instrInfos.parameters[pNb].GetExtraInfo().empty() &&
-                GetObjectsContainersList().GetTypeOfObject(objectInParameter) !=
-                     instrInfos.parameters[pNb].GetExtraInfo()) {
+      } else if (!expectedObjectType.empty() &&
+                 actualObjectType != expectedObjectType) {
+        gd::ProjectDiagnostic projectDiagnostic(
+            gd::ProjectDiagnostic::ErrorType::MismatchedObjectType, "",
+            actualObjectType, expectedObjectType, objectInParameter);
+        diagnosticReport->Add(projectDiagnostic);
         return "/* Mismatched object type - skipped. */";
       }
     }
@@ -308,7 +360,7 @@ gd::String EventsCodeGenerator::GenerateConditionCode(
 
   if (instrInfos.IsObjectInstruction()) {
     gd::String objectName = condition.GetParameter(0).GetPlainString();
-    if (!objectName.empty() && !instrInfos.parameters.empty()) {
+    if (!objectName.empty() && instrInfos.parameters.GetParametersCount() > 0) {
       std::vector<gd::String> realObjects =
           GetObjectsContainersList().ExpandObjectName(objectName, context.GetCurrentObject());
       for (std::size_t i = 0; i < realObjects.size(); ++i) {
@@ -336,15 +388,22 @@ gd::String EventsCodeGenerator::GenerateConditionCode(
       }
     }
   } else if (instrInfos.IsBehaviorInstruction()) {
-    gd::String objectName = condition.GetParameter(0).GetPlainString();
-    gd::String behaviorType = GetObjectsContainersList().GetTypeOfBehavior(condition.GetParameter(1).GetPlainString());
-    if (instrInfos.parameters.size() >= 2) {
+    if (instrInfos.parameters.GetParametersCount() >= 2) {
+      const gd::String &objectName = condition.GetParameter(0).GetPlainString();
+      const gd::String &behaviorName =
+          condition.GetParameter(1).GetPlainString();
+      const gd::String &actualBehaviorType =
+          GetObjectsContainersList().GetTypeOfBehavior(behaviorName);
+
       std::vector<gd::String> realObjects =
-          GetObjectsContainersList().ExpandObjectName(objectName, context.GetCurrentObject());
+          GetObjectsContainersList().ExpandObjectName(
+              objectName, context.GetCurrentObject());
+
+      const BehaviorMetadata &autoInfo =
+          MetadataProvider::GetBehaviorMetadata(platform, actualBehaviorType);
+
       for (std::size_t i = 0; i < realObjects.size(); ++i) {
         // Setup context
-        const BehaviorMetadata& autoInfo =
-            MetadataProvider::GetBehaviorMetadata(platform, behaviorType);
         AddIncludeFiles(autoInfo.includeFiles);
         context.SetCurrentObject(realObjects[i]);
         context.ObjectsListNeeded(realObjects[i]);
@@ -354,7 +413,7 @@ gd::String EventsCodeGenerator::GenerateConditionCode(
             condition.GetParameters(), instrInfos.parameters, context);
         conditionCode += GenerateBehaviorCondition(
             realObjects[i],
-            condition.GetParameter(1).GetPlainString(),
+            behaviorName,
             autoInfo,
             arguments,
             instrInfos,
@@ -429,6 +488,33 @@ gd::String EventsCodeGenerator::GenerateConditionsListCode(
   return outputCode;
 }
 
+void EventsCodeGenerator::CheckBehaviorParameters(
+    const gd::Instruction &instruction,
+    const gd::InstructionMetadata &instrInfos) {
+  gd::ParameterMetadataTools::IterateOverParameters(
+      instruction.GetParameters(), instrInfos.parameters,
+      [this](const gd::ParameterMetadata &parameterMetadata,
+             const gd::Expression &parameterValue,
+             const gd::String &lastObjectName) {
+        if (ParameterMetadata::IsBehavior(parameterMetadata.GetType())) {
+          const gd::String &behaviorName = parameterValue.GetPlainString();
+          const gd::String &actualBehaviorType =
+              GetObjectsContainersList().GetTypeOfBehaviorInObjectOrGroup(
+                  lastObjectName, behaviorName);
+          const gd::String &expectedBehaviorType =
+              parameterMetadata.GetExtraInfo();
+
+          if (!expectedBehaviorType.empty() &&
+              actualBehaviorType != expectedBehaviorType) {
+            gd::ProjectDiagnostic projectDiagnostic(
+                gd::ProjectDiagnostic::ErrorType::MissingBehavior, "",
+                actualBehaviorType, expectedBehaviorType, lastObjectName);
+            diagnosticReport->Add(projectDiagnostic);
+          }
+        }
+      });
+}
+
 /**
  * Generate code for an action.
  */
@@ -460,21 +546,35 @@ gd::String EventsCodeGenerator::GenerateActionCode(
           : instrInfos.codeExtraInformation.functionCallName;
 
   // Be sure there is no lack of parameter.
-  while (action.GetParameters().size() < instrInfos.parameters.size()) {
+  while (action.GetParameters().size() < instrInfos.parameters.GetParametersCount()) {
     vector<gd::Expression> parameters = action.GetParameters();
     parameters.push_back(gd::Expression(""));
     action.SetParameters(parameters);
   }
 
+  gd::EventsCodeGenerator::CheckBehaviorParameters(action, instrInfos);
   // Verify that there are no mismatches between object type in parameters.
-  for (std::size_t pNb = 0; pNb < instrInfos.parameters.size(); ++pNb) {
-    if (ParameterMetadata::IsObject(instrInfos.parameters[pNb].GetType())) {
+  for (std::size_t pNb = 0; pNb < instrInfos.parameters.GetParametersCount(); ++pNb) {
+    if (ParameterMetadata::IsObject(instrInfos.parameters.GetParameter(pNb).GetType())) {
       gd::String objectInParameter = action.GetParameter(pNb).GetPlainString();
-      if (!GetObjectsContainersList().HasObjectOrGroupNamed(objectInParameter)) {
+
+      const auto &expectedObjectType =
+          instrInfos.parameters.GetParameter(pNb).GetExtraInfo();
+      const auto &actualObjectType =
+          GetObjectsContainersList().GetTypeOfObject(objectInParameter);
+      if (!GetObjectsContainersList().HasObjectOrGroupNamed(
+              objectInParameter)) {
+        gd::ProjectDiagnostic projectDiagnostic(
+            gd::ProjectDiagnostic::ErrorType::UnknownObject, "",
+            objectInParameter, "");
+        diagnosticReport->Add(projectDiagnostic);
         return "/* Unknown object - skipped. */";
-      } else if (!instrInfos.parameters[pNb].GetExtraInfo().empty() &&
-                 GetObjectsContainersList().GetTypeOfObject(objectInParameter) !=
-                     instrInfos.parameters[pNb].GetExtraInfo()) {
+      } else if (!expectedObjectType.empty() &&
+                 actualObjectType != expectedObjectType) {
+        gd::ProjectDiagnostic projectDiagnostic(
+            gd::ProjectDiagnostic::ErrorType::MismatchedObjectType, "",
+            actualObjectType, expectedObjectType, objectInParameter);
+        diagnosticReport->Add(projectDiagnostic);
         return "/* Mismatched object type - skipped. */";
       }
     }
@@ -484,7 +584,7 @@ gd::String EventsCodeGenerator::GenerateActionCode(
   if (instrInfos.IsObjectInstruction()) {
     gd::String objectName = action.GetParameter(0).GetPlainString();
 
-    if (!instrInfos.parameters.empty()) {
+    if (instrInfos.parameters.GetParametersCount() > 0) {
       std::vector<gd::String> realObjects =
           GetObjectsContainersList().ExpandObjectName(objectName, context.GetCurrentObject());
       for (std::size_t i = 0; i < realObjects.size(); ++i) {
@@ -512,17 +612,22 @@ gd::String EventsCodeGenerator::GenerateActionCode(
       }
     }
   } else if (instrInfos.IsBehaviorInstruction()) {
-    gd::String objectName = action.GetParameter(0).GetPlainString();
-    gd::String behaviorType = GetObjectsContainersList().GetTypeOfBehavior(action.GetParameter(1).GetPlainString());
+    if (instrInfos.parameters.GetParametersCount() >= 2) {
+      const gd::String &objectName = action.GetParameter(0).GetPlainString();
+      const gd::String &behaviorName = action.GetParameter(1).GetPlainString();
+      const gd::String &actualBehaviorType =
+          GetObjectsContainersList().GetTypeOfBehavior(behaviorName);
 
-    if (instrInfos.parameters.size() >= 2) {
       std::vector<gd::String> realObjects =
-          GetObjectsContainersList().ExpandObjectName(objectName, context.GetCurrentObject());
+          GetObjectsContainersList().ExpandObjectName(
+              objectName, context.GetCurrentObject());
+
+      const BehaviorMetadata &autoInfo =
+          MetadataProvider::GetBehaviorMetadata(platform, actualBehaviorType);
+
+      AddIncludeFiles(autoInfo.includeFiles);
       for (std::size_t i = 0; i < realObjects.size(); ++i) {
         // Setup context
-        const BehaviorMetadata& autoInfo =
-            MetadataProvider::GetBehaviorMetadata(platform, behaviorType);
-        AddIncludeFiles(autoInfo.includeFiles);
         context.SetCurrentObject(realObjects[i]);
         context.ObjectsListNeeded(realObjects[i]);
 
@@ -531,7 +636,7 @@ gd::String EventsCodeGenerator::GenerateActionCode(
             action.GetParameters(), instrInfos.parameters, context);
         actionCode +=
             GenerateBehaviorAction(realObjects[i],
-                                   action.GetParameter(1).GetPlainString(),
+                                   behaviorName,
                                    autoInfo,
                                    functionCallName,
                                    arguments,
@@ -555,6 +660,29 @@ gd::String EventsCodeGenerator::GenerateActionCode(
   return actionCode;
 }
 
+gd::String EventsCodeGenerator::GenerateLocalVariablesStackAccessor() {
+  return (HasProjectAndLayout() ? GetCodeNamespace()
+                                : "eventsFunctionContext") +
+         ".localVariables";
+}
+
+gd::String EventsCodeGenerator::GenerateAnyOrSceneVariableGetter(
+    const gd::Expression &variableExpression,
+    EventsCodeGenerationContext &context) {
+  const auto variableName = gd::ExpressionVariableNameFinder::GetVariableName(
+      *variableExpression.GetRootNode());
+
+  gd::String variableParameterType =
+      GetProjectScopedContainers().GetVariablesContainersList().Has(
+          variableName)
+          ? "variable"
+          : "scenevar";
+
+  return gd::ExpressionCodeGenerator::GenerateExpressionCode(
+      *this, context, variableParameterType,
+      variableExpression.GetPlainString(), "", "AllowUndeclaredVariable");
+}
+
 const EventsCodeGenerator::CallbackDescriptor
 EventsCodeGenerator::GenerateCallback(
     const gd::String& callbackID,
@@ -579,14 +707,23 @@ EventsCodeGenerator::GenerateCallback(
     actionsCode += "} //End of subevents\n";
   }
 
+  gd::String restoreLocalVariablesCode;
+  restoreLocalVariablesCode +=
+      "asyncObjectsList.restoreLocalVariablesContainers(" +
+      GenerateLocalVariablesStackAccessor() + ");\n";
+
   // Compose the callback function and add outside main
   const gd::String actionsDeclarationsCode =
       GenerateObjectsDeclarationCode(callbackContext);
 
+  const gd::String clearLocalVariablesCode =
+      GenerateLocalVariablesStackAccessor() + ".length = 0;\n";
+
   const gd::String callbackCode = callbackFunctionName + " = function (" +
                                   GenerateEventsParameters(callbackContext) +
-                                  ") {\n" + actionsDeclarationsCode +
-                                  actionsCode + "}\n";
+                                  ") {\n" + restoreLocalVariablesCode +
+                                  actionsDeclarationsCode + actionsCode +
+                                  clearLocalVariablesCode + "}\n";
 
   AddCustomCodeOutsideMain(callbackCode);
 
@@ -638,18 +775,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,
@@ -661,25 +786,26 @@ gd::String EventsCodeGenerator::GenerateParameterCodes(
 
   if (ParameterMetadata::IsExpression("number", metadata.GetType())) {
     argOutput = gd::ExpressionCodeGenerator::GenerateExpressionCode(
-        *this, context, "number", parameter, lastObjectName);
+        *this, context, "number", parameter, lastObjectName, metadata.GetExtraInfo());
   } else if (ParameterMetadata::IsExpression("string", metadata.GetType())) {
     argOutput = gd::ExpressionCodeGenerator::GenerateExpressionCode(
-        *this, context, "string", parameter, lastObjectName);
+        *this, context, "string", parameter, lastObjectName, metadata.GetExtraInfo());
   } else if (ParameterMetadata::IsExpression("variable", metadata.GetType())) {
     argOutput = gd::ExpressionCodeGenerator::GenerateExpressionCode(
-        *this, context, metadata.GetType(), parameter, lastObjectName);
+        *this, context, metadata.GetType(), parameter, lastObjectName, metadata.GetExtraInfo());
   } else if (ParameterMetadata::IsObject(metadata.GetType())) {
     // It would be possible to run a gd::ExpressionCodeGenerator if later
     // objects can have nested objects, or function returning objects.
     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();
     if (argOutput != "=" && argOutput != "+" && argOutput != "-" &&
-        argOutput != "/" && argOutput != "*") {
+        argOutput != "/" && argOutput != "*" && argOutput != "True" &&
+        argOutput != "False" && argOutput != "Toggle") {
       cout << "Warning: Bad operator: Set to = by default." << endl;
       argOutput = "=";
     }
@@ -698,9 +824,11 @@ 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") {
+             metadata.GetType() == "soundfile") {
     argOutput = "\"" + ConvertToString(parameter.GetPlainString()) + "\"";
   } else if (metadata.GetType() == "mouse") {
     argOutput = "\"" + ConvertToString(parameter.GetPlainString()) + "\"";
@@ -742,7 +870,7 @@ gd::String EventsCodeGenerator::GenerateParameterCodes(
 
 vector<gd::String> EventsCodeGenerator::GenerateParametersCodes(
     const vector<gd::Expression>& parameters,
-    const vector<gd::ParameterMetadata>& parametersInfo,
+    const ParameterMetadataContainer& parametersInfo,
     EventsCodeGenerationContext& context,
     std::vector<std::pair<gd::String, gd::String> >*
         supplementaryParametersTypes) {
@@ -847,6 +975,11 @@ gd::String EventsCodeGenerator::GenerateEventsListCode(
     gd::EventsList& events, EventsCodeGenerationContext& parentContext) {
   gd::String output;
   for (std::size_t eId = 0; eId < events.size(); ++eId) {
+    auto& event = events[eId];
+    if (event.HasVariables()) {
+      GetProjectScopedContainers().GetVariablesContainersList().Push(event.GetVariables());
+    }
+
     // Each event has its own context : Objects picked in an event are totally
     // different than the one picked in another.
     gd::EventsCodeGenerationContext newContext;
@@ -867,13 +1000,17 @@ gd::String EventsCodeGenerator::GenerateEventsListCode(
 
     auto& context = reuseParentContext ? reusedContext : newContext;
 
-    gd::String eventCoreCode = events[eId].GenerateEventCode(*this, context);
+    gd::String eventCoreCode = event.GenerateEventCode(*this, context);
     gd::String scopeBegin = GenerateScopeBegin(context);
     gd::String scopeEnd = GenerateScopeEnd(context);
     gd::String declarationsCode = GenerateObjectsDeclarationCode(context);
 
     output += "\n" + scopeBegin + "\n" + declarationsCode + "\n" +
               eventCoreCode + "\n" + scopeEnd + "\n";
+
+    if (event.HasVariables()) {
+      GetProjectScopedContainers().GetVariablesContainersList().Pop();
+    }
   }
 
   return output;
@@ -970,10 +1107,10 @@ gd::String EventsCodeGenerator::GenerateFreeCondition(
 
   // Add logical not if needed
   bool conditionAlreadyTakeCareOfInversion = false;
-  for (std::size_t i = 0; i < instrInfos.parameters.size();
+  for (std::size_t i = 0; i < instrInfos.parameters.GetParametersCount();
        ++i)  // Some conditions already have a "conditionInverted" parameter
   {
-    if (instrInfos.parameters[i].GetType() == "conditionInverted")
+    if (instrInfos.parameters.GetParameter(i).GetType() == "conditionInverted")
       conditionAlreadyTakeCareOfInversion = true;
   }
   if (!conditionAlreadyTakeCareOfInversion && conditionInverted)
@@ -994,7 +1131,7 @@ gd::String EventsCodeGenerator::GenerateObjectCondition(
   // Prepare call
   // Add a static_cast if necessary
   gd::String objectFunctionCallNamePart =
-      (!instrInfos.parameters[0].GetExtraInfo().empty())
+      (!instrInfos.parameters.GetParameter(0).GetExtraInfo().empty())
           ? "static_cast<" + objInfo.className + "*>(" +
                 GetObjectListName(objectName, context) + "[i])->" +
                 instrInfos.codeExtraInformation.functionCallName
@@ -1049,7 +1186,13 @@ gd::String EventsCodeGenerator::GenerateFreeAction(
   // Generate call
   gd::String call;
   if (instrInfos.codeExtraInformation.type == "number" ||
-      instrInfos.codeExtraInformation.type == "string") {
+      instrInfos.codeExtraInformation.type == "string" ||
+      // Boolean actions declared with addExpressionAndConditionAndAction uses
+      // MutatorAndOrAccessor even though they don't declare an operator parameter.
+      // Boolean operators are only used with SetMutators or SetCustomCodeGenerator.
+      (instrInfos.codeExtraInformation.type == "boolean" &&
+       instrInfos.codeExtraInformation.accessType ==
+           gd::InstructionMetadata::ExtraInformation::AccessType::Mutators)) {
     if (instrInfos.codeExtraInformation.accessType ==
         gd::InstructionMetadata::ExtraInformation::MutatorAndOrAccessor)
       call = GenerateOperatorCall(
@@ -1212,13 +1355,13 @@ gd::String EventsCodeGenerator::GeneratePropertyGetter(const gd::PropertiesConta
                                                        const gd::NamedPropertyDescriptor& property,
                                                        const gd::String& type,
                                                        gd::EventsCodeGenerationContext& context) {
-  return "getProperty" + property.GetName() + "()";
+  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() + "()";
+  return "getParameter" + parameter.GetName() + "As" + type + "()";
 }
 
 EventsCodeGenerator::EventsCodeGenerator(const gd::Project& project_,
@@ -1233,7 +1376,8 @@ EventsCodeGenerator::EventsCodeGenerator(const gd::Project& project_,
       compilationForRuntime(false),
       maxCustomConditionsDepth(0),
       maxConditionsListsSize(0),
-      eventsListNextUniqueId(0){};
+      eventsListNextUniqueId(0),
+      diagnosticReport(nullptr){};
 
 EventsCodeGenerator::EventsCodeGenerator(
     const gd::Platform& platform_,
@@ -1247,6 +1391,7 @@ EventsCodeGenerator::EventsCodeGenerator(
       compilationForRuntime(false),
       maxCustomConditionsDepth(0),
       maxConditionsListsSize(0),
-      eventsListNextUniqueId(0){};
+      eventsListNextUniqueId(0),
+      diagnosticReport(nullptr){};
 
 }  // namespace gd

Core/GDCore/Events/CodeGeneration/EventsCodeGenerator.h

@@ -3,8 +3,7 @@
  * Copyright 2008-present Florian Rival (Florian.Rival@gmail.com). All rights
  * reserved. This project is released under the MIT License.
  */
-#ifndef GDCORE_EVENTSCODEGENERATOR_H
-#define GDCORE_EVENTSCODEGENERATOR_H
+#pragma once
 
 #include <set>
 #include <utility>
@@ -12,8 +11,10 @@
 
 #include "GDCore/Events/Event.h"
 #include "GDCore/Events/Instruction.h"
-#include "GDCore/String.h"
+#include "GDCore/Events/CodeGeneration/DiagnosticReport.h"
 #include "GDCore/Project/ProjectScopedContainers.h"
+#include "GDCore/String.h"
+
 namespace gd {
 class EventsList;
 class Expression;
@@ -58,8 +59,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::ProjectScopedContainers& projectScopedContainers_);
+  EventsCodeGenerator(
+      const gd::Platform& platform,
+      const gd::ProjectScopedContainers& projectScopedContainers_);
   virtual ~EventsCodeGenerator(){};
 
   /**
@@ -126,7 +128,7 @@ class GD_CORE_API EventsCodeGenerator {
    */
   std::vector<gd::String> GenerateParametersCodes(
       const std::vector<gd::Expression>& parameters,
-      const std::vector<gd::ParameterMetadata>& parametersInfo,
+      const ParameterMetadataContainer& parametersInfo,
       EventsCodeGenerationContext& context,
       std::vector<std::pair<gd::String, gd::String> >*
           supplementaryParametersTypes = 0);
@@ -335,6 +337,16 @@ class GD_CORE_API EventsCodeGenerator {
     return projectScopedContainers;
   }
 
+  /**
+   * @brief Give access to the project scoped containers as code generation might
+   * push and pop variable containers (for local variables).
+   * This could be passed as a parameter recursively in code generation, but this requires
+   * heavy refactoring. Instead, we use this single instance.
+   */
+  gd::ProjectScopedContainers& GetProjectScopedContainers() {
+    return projectScopedContainers;
+  }
+
   /**
    * \brief Return true if the code generation is done for a given project and
    * layout. If not, this means that the code is generated for a function.
@@ -371,6 +383,14 @@ class GD_CORE_API EventsCodeGenerator {
    */
   size_t GetMaxConditionsListsSize() const { return maxConditionsListsSize; }
 
+  void SetDiagnosticReport(gd::DiagnosticReport* diagnosticReport_) {
+    diagnosticReport = diagnosticReport_;
+  }
+
+  gd::DiagnosticReport* GetDiagnosticReport() {
+    return diagnosticReport;
+  }
+
   /**
    * \brief Generate the full name for accessing to a boolean variable used for
    * conditions.
@@ -447,7 +467,7 @@ class GD_CORE_API EventsCodeGenerator {
    */
   virtual gd::String GetCodeNamespace() { return ""; };
 
-  enum VariableScope { LAYOUT_VARIABLE = 0, PROJECT_VARIABLE, OBJECT_VARIABLE };
+  enum VariableScope { LAYOUT_VARIABLE = 0, PROJECT_VARIABLE, OBJECT_VARIABLE, ANY_VARIABLE };
 
   /**
    * Generate a single unique number for the specified instruction.
@@ -472,10 +492,28 @@ class GD_CORE_API EventsCodeGenerator {
    */
   size_t GenerateSingleUsageUniqueIdForEventsList();
 
+  virtual gd::String GenerateRelationalOperation(
+      const gd::String& relationalOperator,
+      const gd::String& lhs,
+      const gd::String& rhs);
+
+  /**
+   * \brief Generate the code to access the local variables stack.
+   */
+  virtual gd::String GenerateLocalVariablesStackAccessor();
+
+  /**
+   * \brief Generate an any variable getter that fallbacks on scene variable for
+   * compatibility reason.
+   */
+  gd::String
+  GenerateAnyOrSceneVariableGetter(const gd::Expression &variableExpression,
+                                   EventsCodeGenerationContext &context);
+
+protected:
   virtual const gd::String GenerateRelationalOperatorCodes(
       const gd::String& operatorString);
 
- protected:
   /**
    * \brief Generate the code for a single parameter.
    *
@@ -490,7 +528,7 @@ class GD_CORE_API EventsCodeGenerator {
   parameter -> string
    * - operator : Used to update a value using a setter and a getter -> string
    * - key, mouse, objectvar, scenevar, globalvar, password, musicfile,
-  soundfile, police -> string
+  soundfile -> string
    * - trueorfalse, yesorno -> boolean ( See GenerateTrue/GenerateFalse ).
    *
    * <br><br>
@@ -528,11 +566,15 @@ class GD_CORE_API EventsCodeGenerator {
       const VariableScope& scope,
       gd::EventsCodeGenerationContext& context,
       const gd::String& objectName) {
+    // This code is only used as a mock.
+    // See the real implementation in GDJS.
     if (scope == LAYOUT_VARIABLE) {
       return "getLayoutVariable(" + variableName + ")";
 
     } else if (scope == PROJECT_VARIABLE) {
       return "getProjectVariable(" + variableName + ")";
+    } else if (scope == ANY_VARIABLE) {
+      return "getAnyVariable(" + variableName + ")";
     }
 
     return "getVariableForObject(" + objectName + ", " + variableName + ")";
@@ -546,7 +588,9 @@ class GD_CORE_API EventsCodeGenerator {
   };
 
   virtual gd::String GenerateVariableValueAs(const gd::String& type) {
-    return type == "string" ? ".getAsString()" : ".getAsNumber()";
+    return type == "number|string" ? ".getAsNumberOrString()"
+           : type == "string"      ? ".getAsString()"
+                                   : ".getAsNumber()";
   }
 
   /**
@@ -577,14 +621,16 @@ 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 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);
+  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
@@ -665,7 +711,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 + ")";
   };
 
@@ -726,6 +773,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,
@@ -767,6 +815,10 @@ class GD_CORE_API EventsCodeGenerator {
   virtual gd::String GenerateGetBehaviorNameCode(
       const gd::String& behaviorName);
 
+  void CheckBehaviorParameters(
+      const gd::Instruction &instruction,
+      const gd::InstructionMetadata &instrInfos);
+
   const gd::Platform& platform;  ///< The platform being used.
 
   gd::ProjectScopedContainers projectScopedContainers;
@@ -797,8 +849,9 @@ class GD_CORE_API EventsCodeGenerator {
       instructionUniqueIds;  ///< The unique ids generated for instructions.
   size_t eventsListNextUniqueId;  ///< The next identifier to use for an events
                                   ///< list function name.
+
+  gd::DiagnosticReport* diagnosticReport;
 };
 
 }  // namespace gd
 
-#endif  // GDCORE_EVENTSCODEGENERATOR_H

Core/GDCore/Events/CodeGeneration/ExpressionCodeGenerator.cpp

@@ -31,6 +31,7 @@
 #include "GDCore/Project/ProjectScopedContainers.h"
 #include "GDCore/IDE/Events/ExpressionTypeFinder.h"
 #include "GDCore/IDE/Events/ExpressionVariableOwnerFinder.h"
+#include "GDCore/Events/CodeGeneration/DiagnosticReport.h"
 
 namespace gd {
 
@@ -39,7 +40,8 @@ gd::String ExpressionCodeGenerator::GenerateExpressionCode(
     EventsCodeGenerationContext& context,
     const gd::String& rootType,
     const gd::Expression& expression,
-    const gd::String& rootObjectName) {
+    const gd::String& rootObjectName,
+    const gd::String& extraInfo) {
   ExpressionCodeGenerator generator(rootType, rootObjectName, codeGenerator, context);
 
   auto node = expression.GetRootNode();
@@ -52,13 +54,34 @@ gd::String ExpressionCodeGenerator::GenerateExpressionCode(
 
   gd::ExpressionValidator validator(codeGenerator.GetPlatform(),
                                     codeGenerator.GetProjectScopedContainers(),
-                                    rootType);
+                                    rootType,
+                                    extraInfo);
   node->Visit(validator);
   if (!validator.GetFatalErrors().empty()) {
     std::cout << "Error: \"" << validator.GetFatalErrors()[0]->GetMessage()
               << "\" in: \"" << expression.GetPlainString() << "\" ("
               << rootType << ")" << std::endl;
 
+    auto *diagnosticReport = codeGenerator.GetDiagnosticReport();
+    if (diagnosticReport) {
+      for (auto *error : validator.GetFatalErrors()) {
+        if (error->GetType() ==
+                gd::ExpressionParserError::ErrorType::UndeclaredVariable ||
+            error->GetType() ==
+                gd::ExpressionParserError::ErrorType::UnknownIdentifier) {
+                  
+          const auto& variableName = error->GetActualValue();
+          if (!variableName.empty()) {
+            gd::ProjectDiagnostic projectDiagnostic(
+                gd::ProjectDiagnostic::ErrorType::UndeclaredVariable,
+                error->GetMessage(), error->GetActualValue(),
+                "", error->GetObjectName());
+            diagnosticReport->Add(projectDiagnostic);
+          }
+        }
+      }
+    }
+
     return generator.GenerateDefaultValue(rootType);
   }
 
@@ -103,18 +126,20 @@ 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.GetObjectsContainersList(),
+                                            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"
+        type == "variable"
+            ? gd::EventsCodeGenerator::ANY_VARIABLE
+        : type == "globalvar"
             ? gd::EventsCodeGenerator::PROJECT_VARIABLE
-            : ((type == "scenevar")
+            : type == "scenevar"
                   ? gd::EventsCodeGenerator::LAYOUT_VARIABLE
-                  : gd::EventsCodeGenerator::OBJECT_VARIABLE);
+                  : gd::EventsCodeGenerator::OBJECT_VARIABLE;
 
     auto objectName = gd::ExpressionVariableOwnerFinder::GetObjectName(codeGenerator.GetPlatform(),
                                           codeGenerator.GetObjectsContainersList(),
@@ -137,19 +162,8 @@ void ExpressionCodeGenerator::OnVisitVariableNode(VariableNode& node) {
 
       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, "");
+      output += codeGenerator.GenerateGetVariable(
+          node.name, gd::EventsCodeGenerator::ANY_VARIABLE, context, "");
       if (node.child) node.child->Visit(*this);
       output += codeGenerator.GenerateVariableValueAs(type);
     }, [&]() {
@@ -191,7 +205,7 @@ void ExpressionCodeGenerator::OnVisitVariableBracketAccessorNode(
     return;
   }
 
-  ExpressionCodeGenerator generator("string", "", codeGenerator, context);
+  ExpressionCodeGenerator generator("number|string", "", codeGenerator, context);
   node.expression->Visit(generator);
   output +=
       codeGenerator.GenerateVariableBracketAccessor(generator.GetOutput());
@@ -200,7 +214,7 @@ void ExpressionCodeGenerator::OnVisitVariableBracketAccessorNode(
 
 void ExpressionCodeGenerator::OnVisitIdentifierNode(IdentifierNode& node) {
   auto type = gd::ExpressionTypeFinder::GetType(codeGenerator.GetPlatform(),
-                                            codeGenerator.GetObjectsContainersList(),
+                                            codeGenerator.GetProjectScopedContainers(),
                                             rootType,
                                             node);
 
@@ -209,11 +223,13 @@ void ExpressionCodeGenerator::OnVisitIdentifierNode(IdentifierNode& node) {
         codeGenerator.GenerateObject(node.identifierName, type, context);
   } else if (gd::ParameterMetadata::IsExpression("variable", type)) {
       EventsCodeGenerator::VariableScope scope =
-          type == "globalvar"
+        type == "variable"
+            ? gd::EventsCodeGenerator::ANY_VARIABLE
+        : type == "globalvar"
               ? gd::EventsCodeGenerator::PROJECT_VARIABLE
-              : ((type == "scenevar")
+              : type == "scenevar"
                     ? gd::EventsCodeGenerator::LAYOUT_VARIABLE
-                    : gd::EventsCodeGenerator::OBJECT_VARIABLE);
+                    : gd::EventsCodeGenerator::OBJECT_VARIABLE;
 
       auto objectName = gd::ExpressionVariableOwnerFinder::GetObjectName(codeGenerator.GetPlatform(),
                                             codeGenerator.GetObjectsContainersList(),
@@ -236,19 +252,9 @@ void ExpressionCodeGenerator::OnVisitIdentifierNode(IdentifierNode& node) {
         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, "");
+      output += codeGenerator.GenerateGetVariable(
+          node.identifierName, gd::EventsCodeGenerator::ANY_VARIABLE, context,
+          "");
       if (!node.childIdentifierName.empty()) {
         output += codeGenerator.GenerateVariableAccessor(node.childIdentifierName);
       }
@@ -271,7 +277,7 @@ void ExpressionCodeGenerator::OnVisitIdentifierNode(IdentifierNode& node) {
 
 void ExpressionCodeGenerator::OnVisitFunctionCallNode(FunctionCallNode& node) {
   auto type = gd::ExpressionTypeFinder::GetType(codeGenerator.GetPlatform(),
-                                            codeGenerator.GetObjectsContainersList(),
+                                            codeGenerator.GetProjectScopedContainers(),
                                             rootType,
                                             node);
 
@@ -424,11 +430,11 @@ gd::String ExpressionCodeGenerator::GenerateParametersCodes(
   size_t nonCodeOnlyParameterIndex = 0;
   gd::String parametersCode;
   for (std::size_t i = initialParameterIndex;
-       i < expressionMetadata.parameters.size();
+       i < expressionMetadata.GetParameters().GetParametersCount();
        ++i) {
     if (i != initialParameterIndex) parametersCode += ", ";
 
-    auto& parameterMetadata = expressionMetadata.parameters[i];
+    auto& parameterMetadata = expressionMetadata.GetParameters().GetParameter(i);
     if (!parameterMetadata.IsCodeOnly()) {
       if (nonCodeOnlyParameterIndex < parameters.size()) {
         auto objectName = gd::ExpressionVariableOwnerFinder::GetObjectName(codeGenerator.GetPlatform(),
@@ -502,7 +508,7 @@ gd::String ExpressionCodeGenerator::GenerateDefaultValue(
 
 void ExpressionCodeGenerator::OnVisitEmptyNode(EmptyNode& node) {
   auto type = gd::ExpressionTypeFinder::GetType(codeGenerator.GetPlatform(),
-                                            codeGenerator.GetObjectsContainersList(),
+                                            codeGenerator.GetProjectScopedContainers(),
                                             rootType,
                                             node);
   output += GenerateDefaultValue(type);
@@ -511,7 +517,7 @@ void ExpressionCodeGenerator::OnVisitEmptyNode(EmptyNode& node) {
 void ExpressionCodeGenerator::OnVisitObjectFunctionNameNode(
     ObjectFunctionNameNode& node) {
   auto type = gd::ExpressionTypeFinder::GetType(codeGenerator.GetPlatform(),
-                                            codeGenerator.GetObjectsContainersList(),
+                                            codeGenerator.GetProjectScopedContainers(),
                                             rootType,
                                             node);
   output += GenerateDefaultValue(type);

Core/GDCore/Events/CodeGeneration/ExpressionCodeGenerator.h

@@ -59,7 +59,8 @@ class GD_CORE_API ExpressionCodeGenerator : public ExpressionParser2NodeWorker {
                                            EventsCodeGenerationContext& context,
                                            const gd::String& type,
                                            const gd::Expression& expression,
-                                           const gd::String& objectName = "");
+                                           const gd::String& objectName = "",
+                                           const gd::String& extraInfo = "");
 
   const gd::String& GetOutput() { return output; };
 

Core/GDCore/Events/Event.cpp

@@ -17,6 +17,7 @@
 namespace gd {
 
 EventsList BaseEvent::badSubEvents;
+VariablesContainer BaseEvent::badLocalVariables;
 std::vector<gd::String> BaseEvent::emptyDependencies;
 gd::String BaseEvent::emptySourceFile;
 
@@ -28,6 +29,8 @@ BaseEvent::BaseEvent()
 
 bool BaseEvent::HasSubEvents() const { return !GetSubEvents().IsEmpty(); }
 
+bool BaseEvent::HasVariables() const { return GetVariables().Count() > 0; }
+
 gd::String BaseEvent::GenerateEventCode(
     gd::EventsCodeGenerator& codeGenerator,
     gd::EventsCodeGenerationContext& context) {

Core/GDCore/Events/Event.h

@@ -3,9 +3,7 @@
  * 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 GDCORE_EVENT_H
-#define GDCORE_EVENT_H
+#pragma once
 
 #include <iostream>
 #include <memory>
@@ -26,6 +24,7 @@ class SerializerElement;
 class Instruction;
 class EventVisitor;
 class ReadOnlyEventVisitor;
+class VariablesContainer;
 }  // namespace gd
 
 namespace gd {
@@ -92,6 +91,32 @@ class GD_CORE_API BaseEvent {
    */
   bool HasSubEvents() const;
 
+  /**
+   * Derived class have to redefine this function, so as to return true, if they
+   * can have local variables.
+   */
+  virtual bool CanHaveVariables() const { return false; }
+
+  /**
+   * Return the local variables, if applicable.
+   */
+  virtual const gd::VariablesContainer& GetVariables() const {
+    return badLocalVariables;
+  };
+
+  /**
+   * Return the local variables, if applicable.
+   */
+  virtual gd::VariablesContainer& GetVariables() {
+    return badLocalVariables;
+  };
+
+  /**
+   * \brief Return true if the events has local variables.
+   * \warning This is only applicable when CanHaveVariables() return true.
+   */
+  bool HasVariables() const;
+
   /**
    * \brief Return a list of all conditions of the event.
    * \note Used to preprocess or search in the conditions.
@@ -301,6 +326,7 @@ class GD_CORE_API BaseEvent {
                     ///< Used for saving the event for instance.
 
   static gd::EventsList badSubEvents;
+  static gd::VariablesContainer badLocalVariables;
   static std::vector<gd::String> emptyDependencies;
   static gd::String emptySourceFile;
 };
@@ -325,6 +351,3 @@ class EmptyEvent : public BaseEvent {
 };
 
 }  // namespace gd
-
-#endif  // GDCORE_EVENT_H
-#endif

Core/GDCore/Events/EventsList.h

@@ -18,7 +18,6 @@ class BaseEvent;
 namespace gd {
 class SerializerElement;
 }
-class TiXmlElement;
 
 #undef CreateEvent
 

Core/GDCore/Events/Parsers/ExpressionParser2.h

@@ -38,7 +38,7 @@ using namespace gd::GrammarTerminals;
  * parser by refactoring out the dependency on gd::MetadataProvider (injecting
  * instead functions to be called to query supported functions).
  *
- * \see gd::ExpressionParserDiagnostic
+ * \see gd::ExpressionParserError
  * \see gd::ExpressionNode
  */
 class GD_CORE_API ExpressionParser2 {
@@ -277,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);
-    variable->child = VariableAccessorOrVariableBracketAccessor();
-    variable->child->parent = variable.get();
+
+    if (CheckIfChar(IsOpeningSquareBracket) || CheckIfChar(IsDot)) {
+      variable->child = VariableAccessorOrVariableBracketAccessor();
+      variable->child->parent = variable.get();
+    }
 
     variable->location = ExpressionParserLocation(
         nameLocation.GetStartPosition(), GetCurrentPosition());
@@ -302,8 +305,12 @@ class GD_CORE_API ExpressionParser2 {
                                "bracket for each opening bracket."));
       }
       SkipIfChar(IsClosingSquareBracket);
-      child->child = VariableAccessorOrVariableBracketAccessor();
-      child->child->parent = child.get();
+
+      SkipAllWhitespaces();
+      if (CheckIfChar(IsOpeningSquareBracket) || CheckIfChar(IsDot)) {
+        child->child = VariableAccessorOrVariableBracketAccessor();
+        child->child->parent = child.get();
+      }
       child->location =
           ExpressionParserLocation(childStartPosition, GetCurrentPosition());
 
@@ -315,8 +322,15 @@ class GD_CORE_API ExpressionParser2 {
       auto identifierAndLocation = ReadIdentifierName(/*allowDeprecatedSpacesInName=*/ false);
       auto child =
           gd::make_unique<VariableAccessorNode>(identifierAndLocation.name);
-      child->child = VariableAccessorOrVariableBracketAccessor();
-      child->child->parent = child.get();
+      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 =
@@ -325,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(
@@ -361,18 +379,24 @@ class GD_CORE_API ExpressionParser2 {
     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();
 
@@ -381,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());
@@ -394,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();
@@ -419,6 +445,7 @@ class GD_CORE_API ExpressionParser2 {
     node->identifierNameLocation = parentIdentifierLocation;
     node->identifierNameDotLocation = parentIdentifierDotLocation;
     node->childIdentifierNameLocation = childIdentifierNameLocation;
+    node->diagnostic = std::move(emptyNameError);
     return std::move(node);
   }
 
@@ -491,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();
@@ -514,7 +536,6 @@ class GD_CORE_API ExpressionParser2 {
       SkipAllWhitespaces();
       previousCharacterIsParameterSeparator = CheckIfChar(IsParameterSeparator);
       SkipIfChar(IsParameterSeparator);
-      parameterIndex++;
     }
 
     ExpressionParserLocation invalidClosingParenthesisLocation;
@@ -526,28 +547,28 @@ class GD_CORE_API ExpressionParser2 {
   }
   ///@}
 
-  std::unique_ptr<ExpressionParserDiagnostic> ValidateOperator(
+  std::unique_ptr<ExpressionParserError> ValidateOperator(
       gd::String::value_type operatorChar) {
     if (operatorChar == '+' || operatorChar == '-' || operatorChar == '/' ||
         operatorChar == '*') {
-      return gd::make_unique<ExpressionParserDiagnostic>();
+      return std::unique_ptr<ExpressionParserError>(nullptr);
     }
     return gd::make_unique<ExpressionParserError>(
-        "invalid_operator",
+        gd::ExpressionParserError::ErrorType::InvalidOperator,
         _("You've used an operator that is not supported. Operator should be "
           "either +, -, / or *."),
         GetCurrentPosition());
   }
 
-  std::unique_ptr<ExpressionParserDiagnostic> ValidateUnaryOperator(
+  std::unique_ptr<ExpressionParserError> ValidateUnaryOperator(
       gd::String::value_type operatorChar,
       size_t position) {
     if (operatorChar == '+' || operatorChar == '-') {
-      return gd::make_unique<ExpressionParserDiagnostic>();
+      return std::unique_ptr<ExpressionParserError>(nullptr);
     }
 
     return gd::make_unique<ExpressionParserError>(
-        "invalid_operator",
+        gd::ExpressionParserError::ErrorType::InvalidOperator,
         _("You've used an \"unary\" operator that is not supported. Operator "
           "should be "
           "either + or -."),
@@ -698,13 +719,15 @@ class GD_CORE_API ExpressionParser2 {
   std::unique_ptr<ExpressionParserError> RaiseSyntaxError(
       const gd::String &message) {
     return std::move(gd::make_unique<ExpressionParserError>(
-        "syntax_error", message, GetCurrentPosition()));
+        gd::ExpressionParserError::ErrorType::SyntaxError, message,
+        GetCurrentPosition()));
   }
 
   std::unique_ptr<ExpressionParserError> RaiseTypeError(
       const gd::String &message, size_t beginningPosition) {
     return std::move(gd::make_unique<ExpressionParserError>(
-        "type_error", message, beginningPosition, GetCurrentPosition()));
+        gd::ExpressionParserError::ErrorType::MismatchedType, message,
+        beginningPosition, GetCurrentPosition()));
   }
   ///@}
 

Core/GDCore/Events/Parsers/ExpressionParser2Node.cpp

@@ -6,5 +6,5 @@
 #include "ExpressionParser2Node.h"
 
 namespace gd {
-gd::String ExpressionParserDiagnostic::noMessage = "";
+
 }

Core/GDCore/Events/Parsers/ExpressionParser2Node.h

@@ -3,14 +3,14 @@
  * Copyright 2008-present Florian Rival (Florian.Rival@gmail.com). All rights
  * reserved. This project is released under the MIT License.
  */
-#ifndef GDCORE_EXPRESSIONPARSER2NODES_H
-#define GDCORE_EXPRESSIONPARSER2NODES_H
+#pragma once
 
 #include <memory>
 #include <vector>
 
 #include "ExpressionParser2NodeWorker.h"
 #include "GDCore/String.h"
+
 namespace gd {
 class Expression;
 class ObjectsContainer;
@@ -40,50 +40,57 @@ struct GD_CORE_API ExpressionParserLocation {
   size_t endPosition;
 };
 
-/**
- * \brief A diagnostic that can be attached to a gd::ExpressionNode.
- */
-struct GD_CORE_API ExpressionParserDiagnostic {
-  virtual ~ExpressionParserDiagnostic() = default;
-  virtual bool IsError() { return false; }
-  virtual const gd::String &GetMessage() { return noMessage; }
-  virtual size_t GetStartPosition() { return 0; }
-  virtual size_t GetEndPosition() { return 0; }
-
- private:
-  static gd::String noMessage;
-};
-
 /**
  * \brief An error that can be attached to a gd::ExpressionNode.
  */
-struct GD_CORE_API ExpressionParserError : public ExpressionParserDiagnostic {
-  ExpressionParserError(const gd::String &type_,
+struct GD_CORE_API ExpressionParserError {
+  enum ErrorType {
+    SyntaxError,
+    InvalidOperator,
+    MismatchedType,
+    UndeclaredVariable,
+    UnknownIdentifier,
+    BracketsNotAllowedForObjects,
+    TooFewParameters,
+    TooManyParameters,
+    InvalidFunctionName,
+    MalformedVariableParameter,
+    MalformedObjectParameter,
+    UnknownParameterType,
+    MissingBehavior,
+    VariableNameCollision,
+  };
+
+  ExpressionParserError(gd::ExpressionParserError::ErrorType type_,
                         const gd::String &message_,
-                        const ExpressionParserLocation &location_)
-      : type(type_), message(message_), location(location_){};
-  ExpressionParserError(const gd::String &type_,
-                        const gd::String &message_,
-                        size_t position_)
+                        const ExpressionParserLocation &location_,
+                        const gd::String &actualValue_ = "",
+                        const gd::String &objectName_ = "")
+      : type(type_), message(message_), location(location_),
+        actualValue(actualValue_), objectName(objectName_){};
+  ExpressionParserError(gd::ExpressionParserError::ErrorType type_,
+                        const gd::String &message_, size_t position_)
       : type(type_), message(message_), location(position_){};
-  ExpressionParserError(const gd::String &type_,
-                        const gd::String &message_,
-                        size_t startPosition_,
+  ExpressionParserError(gd::ExpressionParserError::ErrorType type_,
+                        const gd::String &message_, size_t startPosition_,
                         size_t endPosition_)
-      : type(type_),
-        message(message_),
+      : type(type_), message(message_),
         location(startPosition_, endPosition_){};
   virtual ~ExpressionParserError(){};
 
-  bool IsError() override { return true; }
-  const gd::String &GetMessage() override { return message; }
-  size_t GetStartPosition() override { return location.GetStartPosition(); }
-  size_t GetEndPosition() override { return location.GetEndPosition(); }
+  gd::ExpressionParserError::ErrorType GetType() { return type; }
+  const gd::String &GetMessage() { return message; }
+  const gd::String &GetObjectName() { return objectName; }
+  const gd::String &GetActualValue() { return actualValue; }
+  size_t GetStartPosition() { return location.GetStartPosition(); }
+  size_t GetEndPosition() { return location.GetEndPosition(); }
 
- private:
-  gd::String type;
+private:
+  gd::ExpressionParserError::ErrorType type;
   gd::String message;
   ExpressionParserLocation location;
+  gd::String objectName;
+  gd::String actualValue;
 };
 
 /**
@@ -95,7 +102,7 @@ struct GD_CORE_API ExpressionNode {
   virtual ~ExpressionNode(){};
   virtual void Visit(ExpressionParser2NodeWorker &worker){};
 
-  std::unique_ptr<ExpressionParserDiagnostic> diagnostic;
+  std::unique_ptr<ExpressionParserError> diagnostic;
   ExpressionParserLocation location;  ///< The location of the entire node. Some
                                       /// nodes might have other locations
                                       /// stored inside them. For example, a
@@ -425,5 +432,3 @@ struct GD_CORE_API EmptyNode : public FunctionCallOrObjectFunctionNameOrEmptyNod
 };
 
 }  // namespace gd
-
-#endif

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/Serialization.cpp

@@ -182,10 +182,10 @@ void EventsListSerialization::UpdateInstructionsFromGD2x(
     // Common updates for some parameters
     const std::vector<gd::Expression>& parameters = instr.GetParameters();
     for (std::size_t j = 0;
-         j < parameters.size() && j < metadata.parameters.size();
+         j < parameters.size() && j < metadata.parameters.GetParametersCount();
          ++j) {
-      if (metadata.parameters[j].GetType() == "relationalOperator" ||
-          metadata.parameters[j].GetType() == "operator") {
+      if (metadata.parameters.GetParameter(j).GetType() == "relationalOperator" ||
+          metadata.parameters.GetParameter(j).GetType() == "operator") {
         if (j == parameters.size() - 1) {
           std::cout << "ERROR: No more parameters after a [relational]operator "
                        "when trying to update an instruction from GD2.x";

Core/GDCore/Extensions/Builtin/AdvancedExtension.cpp

@@ -66,6 +66,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsAdvancedExtension(
       .SetRelevantForFunctionEventsOnly()
       .MarkAsAdvanced();
 
+  // Deprecated
   extension
       .AddAction("CopyArgumentToVariable",
                  _("Copy function parameter to variable"),
@@ -78,9 +79,25 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsAdvancedExtension(
       .SetHelpPath("/events/functions/return")
       .AddParameter("functionParameterName", _("Parameter name"), "variable")
       .AddParameter("scenevar", _("Scene variable"))
+      .SetHidden()
+      .MarkAsAdvanced();
+
+  extension
+      .AddAction("CopyArgumentToVariable2",
+                 _("Copy function parameter to variable"),
+                 _("Copy a function parameter (also called \"argument\") to a variable. "
+                 "The parameter type must be a variable."),
+                 _("Copy the parameter _PARAM0_ into the variable _PARAM1_"),
+                 "",
+                 "res/function32.png",
+                 "res/function32.png")
+      .SetHelpPath("/events/functions/return")
+      .AddParameter("functionParameterName", _("Parameter name"), "variable")
+      .AddParameter("variable", _("Variable"))
       .SetRelevantForFunctionEventsOnly()
       .MarkAsAdvanced();
 
+  // Deprecated
   extension
       .AddAction("CopyVariableToArgument",
                  _("Copy variable to function parameter"),
@@ -93,6 +110,21 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsAdvancedExtension(
       .SetHelpPath("/events/functions/return")
       .AddParameter("functionParameterName", _("Parameter name"), "variable")
       .AddParameter("scenevar", _("Scene variable"))
+      .SetHidden()
+      .MarkAsAdvanced();
+
+  extension
+      .AddAction("CopyVariableToArgument2",
+                 _("Copy variable to function parameter"),
+                 _("Copy a variable to function parameter (also called \"argument\"). "
+                 "The parameter type must be a variable."),
+                 _("Copy the variable _PARAM1_ into the parameter _PARAM0_"),
+                 "",
+                 "res/function32.png",
+                 "res/function32.png")
+      .SetHelpPath("/events/functions/return")
+      .AddParameter("functionParameterName", _("Parameter name"), "variable")
+      .AddParameter("variable", _("Variable"))
       .SetRelevantForFunctionEventsOnly()
       .MarkAsAdvanced();
 
@@ -115,21 +147,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")
 
@@ -417,6 +417,93 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
       .SetDefaultValue("\"\"")
       .MarkAsAdvanced();
 
+  obj.AddAction("SetNumberObjectVariable",
+                _("Change variable value"),
+                _("Modify the number value of an object variable."),
+                _("the variable _PARAM1_"),
+                _("Variables"),
+                "res/actions/var24.png",
+                "res/actions/var.png")
+
+      .AddParameter("object", _("Object"))
+      .AddParameter("objectvar", _("Variable"))
+      .UseStandardOperatorParameters("number",
+                                     ParameterOptions::MakeNewOptions())
+      .SetRelevantForLayoutEventsOnly();
+
+  obj.AddAction("SetStringObjectVariable",
+                _("Change text variable"),
+                _("Modify the text of an object variable."),
+                _("the variable _PARAM1_"),
+                _("Variables"),
+                "res/actions/var24.png",
+                "res/actions/var.png")
+
+      .AddParameter("object", _("Object"))
+      .AddParameter("objectvar", _("Variable"))
+      .UseStandardOperatorParameters("string",
+                                     ParameterOptions::MakeNewOptions())
+      .SetRelevantForLayoutEventsOnly();
+
+  obj.AddAction("SetBooleanObjectVariable",
+                _("Change boolean variable"),
+                _("Modify the boolean value of an object variable."),
+                _("Change the variable _PARAM1_ of _PARAM0_: _PARAM2_"),
+                _("Variables"),
+                "res/actions/var24.png",
+                "res/actions/var.png")
+      .AddParameter("object", _("Object"))
+      .AddParameter("objectvar", _("Variable"))
+      .AddParameter("operator", _("Value"), "boolean")
+      // This parameter allows to keep the operand expression
+      // when the editor switch between variable instructions.
+      .AddCodeOnlyParameter("yesorno", _("Value"))
+      .SetRelevantForLayoutEventsOnly();
+
+  obj.AddCondition("NumberObjectVariable",
+                   _("Variable value"),
+                   _("Compare the number value of an object variable."),
+                   _("the variable _PARAM1_"),
+                   _("Variables"),
+                   "res/conditions/var24.png",
+                   "res/conditions/var.png")
+
+      .AddParameter("object", _("Object"))
+      .AddParameter("objectvar", _("Variable"))
+      .UseStandardRelationalOperatorParameters(
+          "number", ParameterOptions::MakeNewOptions())
+      .SetRelevantForLayoutEventsOnly();
+
+  obj.AddCondition("StringObjectVariable",
+                   _("Text variable"),
+                   _("Compare the text of an object variable."),
+                   _("the variable _PARAM1_"),
+                   _("Variables"),
+                   "res/conditions/var24.png",
+                   "res/conditions/var.png")
+
+      .AddParameter("object", _("Object"))
+      .AddParameter("objectvar", _("Variable"))
+      .UseStandardRelationalOperatorParameters(
+          "string", ParameterOptions::MakeNewOptions())
+      .SetRelevantForLayoutEventsOnly();
+
+  obj.AddCondition("BooleanObjectVariable",
+                   _("Boolean variable"),
+                   _("Compare the boolean value of an object variable."),
+                   _("The variable _PARAM1_ of _PARAM0_ is _PARAM2_"),
+                   _("Variables"),
+                   "res/conditions/var24.png",
+                   "res/conditions/var.png")
+      .AddParameter("object", _("Object"))
+      .AddParameter("objectvar", _("Variable"))
+      .AddParameter("trueorfalse", _("Check if the value is"))
+      .SetDefaultValue("true")
+      // This parameter allows to keep the operand expression
+      // when the editor switch between variable instructions.
+      .AddCodeOnlyParameter("yesorno", _("Value"))
+      .SetRelevantForLayoutEventsOnly();
+
   obj.AddAction("ModVarObjet",
                 _("Change number variable"),
                 _("Modify the number value of an object variable."),
@@ -428,7 +515,8 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
       .AddParameter("object", _("Object"))
       .AddParameter("objectvar", _("Variable"))
       .UseStandardOperatorParameters("number",
-                                     ParameterOptions::MakeNewOptions());
+                                     ParameterOptions::MakeNewOptions())
+      .SetRelevantForFunctionEventsOnly();
 
   obj.AddAction("ModVarObjetTxt",
                 _("Change text variable"),
@@ -441,7 +529,8 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
       .AddParameter("object", _("Object"))
       .AddParameter("objectvar", _("Variable"))
       .UseStandardOperatorParameters("string",
-                                     ParameterOptions::MakeNewOptions());
+                                     ParameterOptions::MakeNewOptions())
+      .SetRelevantForFunctionEventsOnly();
 
   obj.AddAction("SetObjectVariableAsBoolean",
                 _("Change boolean variable"),
@@ -454,7 +543,8 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
 
       .AddParameter("object", _("Object"))
       .AddParameter("objectvar", _("Variable"))
-      .AddParameter("trueorfalse", _("New Value:"));
+      .AddParameter("trueorfalse", _("New Value:"))
+      .SetRelevantForFunctionEventsOnly();
 
   obj.AddAction(
          "ToggleObjectVariableAsBoolean",
@@ -469,7 +559,8 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
          "res/actions/var.png")
 
       .AddParameter("object", _("Object"))
-      .AddParameter("objectvar", _("Variable"));
+      .AddParameter("objectvar", _("Variable"))
+      .SetRelevantForFunctionEventsOnly();
 
   obj.AddCondition("ObjectVariableChildExists",
                    _("Child existence"),
@@ -550,7 +641,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 +708,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 +718,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"))
@@ -643,7 +748,8 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
       .AddParameter("object", _("Object"))
       .AddParameter("objectvar", _("Variable"))
       .UseStandardRelationalOperatorParameters(
-          "number", ParameterOptions::MakeNewOptions());
+          "number", ParameterOptions::MakeNewOptions())
+      .SetRelevantForFunctionEventsOnly();
 
   obj.AddCondition("VarObjetTxt",
                    _("Text variable"),
@@ -656,7 +762,8 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
       .AddParameter("object", _("Object"))
       .AddParameter("objectvar", _("Variable"))
       .UseStandardRelationalOperatorParameters(
-          "string", ParameterOptions::MakeNewOptions());
+          "string", ParameterOptions::MakeNewOptions())
+      .SetRelevantForFunctionEventsOnly();
 
   obj.AddCondition("ObjectVariableAsBoolean",
                    _("Boolean variable"),
@@ -669,7 +776,8 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
       .AddParameter("object", _("Object"))
       .AddParameter("objectvar", _("Variable"))
       .AddParameter("trueorfalse", _("Check if the value is"))
-      .SetDefaultValue("true");
+      .SetDefaultValue("true")
+      .SetRelevantForFunctionEventsOnly();
 
   obj.AddCondition("VarObjetDef",
                    "Variable defined",
@@ -683,6 +791,48 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
       .AddParameter("string", _("Variable"))
       .SetHidden();  // Deprecated.
 
+  obj.AddAction(
+         "PushStringToObjectVariable",
+         _("Add text variable"),
+         _("Adds a text (string) to the end of an object array variable."),
+         _("Add value _PARAM2_ to array variable _PARAM1_ of _PARAM0_"),
+         _("Variables/Arrays and structures"),
+         "res/actions/var24.png",
+         "res/actions/var.png")
+      .AddParameter("object", _("Object"))
+      .AddParameter("objectvar", _("Array variable"))
+      .AddParameter("string", _("Text to add"))
+      .MarkAsAdvanced()
+      .SetRelevantForLayoutEventsOnly();
+
+  obj.AddAction("PushNumberToObjectVariable",
+                _("Add variable array value"),
+                _("Adds a number to the end of an object array variable."),
+                _("Add value _PARAM2_ to array variable _PARAM1_ of _PARAM0_"),
+                _("Variables/Arrays and structures"),
+                "res/actions/var24.png",
+                "res/actions/var.png")
+      .AddParameter("object", _("Object"))
+      .AddParameter("objectvar", _("Array variable"))
+      .AddParameter("expression", _("Number to add"))
+      .MarkAsAdvanced()
+      .SetRelevantForLayoutEventsOnly();
+
+  obj.AddAction(
+         "PushBooleanToObjectVariable",
+         _("Add boolean variable"),
+         _("Adds a boolean to the end of an object array variable."),
+         _("Add value _PARAM2_ to array variable _PARAM1_ of _PARAM0_"),
+         _("Variables/Arrays and structures"),
+         "res/actions/var24.png",
+         "res/actions/var.png")
+      .AddParameter("object", _("Object"))
+      .AddParameter("objectvar", _("Array variable"))
+      .AddParameter("trueorfalse", _("Boolean to add"))
+      .MarkAsAdvanced()
+      .SetRelevantForLayoutEventsOnly();
+
+  // Deprecated
   obj.AddAction(
          "ObjectVariablePush",
          _("Add existing variable"),
@@ -694,6 +844,23 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
       .AddParameter("object", _("Object"))
       .AddParameter("objectvar", _("Array variable"))
       .AddParameter("scenevar", _("Scene variable with the content to add"))
+      .SetParameterLongDescription(_("The content of the object variable will "
+                                     "*be copied* and added at the "
+                                     "end of the array."))
+      .MarkAsAdvanced()
+      .SetHidden();
+
+  obj.AddAction(
+         "ObjectVariablePush2",
+         _("Add existing variable"),
+         _("Adds an existing variable to the end of an object array variable."),
+         _("Add variable _PARAM2_ to array variable _PARAM1_ of _PARAM0_"),
+         _("Variables/Arrays and structures"),
+         "res/actions/var24.png",
+         "res/actions/var.png")
+      .AddParameter("object", _("Object"))
+      .AddParameter("objectvar", _("Array variable"))
+      .AddParameter("variable", _("Scene variable with the content to add"))
       .SetParameterLongDescription(_("The content of the object variable will "
                                      "*be copied* and added at the "
                                      "end of the array."))
@@ -710,7 +877,8 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
       .AddParameter("object", _("Object"))
       .AddParameter("objectvar", _("Array variable"))
       .AddParameter("string", _("Text to add"))
-      .MarkAsAdvanced();
+      .MarkAsAdvanced()
+      .SetRelevantForFunctionEventsOnly();
 
   obj.AddAction("ObjectVariablePushNumber",
                 _("Add number variable"),
@@ -722,7 +890,8 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
       .AddParameter("object", _("Object"))
       .AddParameter("objectvar", _("Array variable"))
       .AddParameter("expression", _("Number to add"))
-      .MarkAsAdvanced();
+      .MarkAsAdvanced()
+      .SetRelevantForFunctionEventsOnly();
 
   obj.AddAction(
          "ObjectVariablePushBool",
@@ -735,7 +904,8 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
       .AddParameter("object", _("Object"))
       .AddParameter("objectvar", _("Array variable"))
       .AddParameter("trueorfalse", _("Boolean to add"))
-      .MarkAsAdvanced();
+      .MarkAsAdvanced()
+      .SetRelevantForFunctionEventsOnly();
 
   obj.AddAction(
          "ObjectVariableRemoveAt",
@@ -1137,7 +1307,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"));
 
@@ -1189,7 +1359,8 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
                     _("Variables"),
                     "res/actions/var.png")
       .AddParameter("object", _("Object"))
-      .AddParameter("objectvar", _("Variable"));
+      .AddParameter("objectvar", _("Variable"))
+      .SetRelevantForFunctionEventsOnly();
 
   obj.AddExpression(
          "VariableChildCount",
@@ -1206,7 +1377,8 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
                        _("Variables"),
                        "res/actions/var.png")
       .AddParameter("object", _("Object"))
-      .AddParameter("objectvar", _("Variable"));
+      .AddParameter("objectvar", _("Variable"))
+      .SetRelevantForFunctionEventsOnly();
 
   obj.AddExpression("ObjectTimerElapsedTime",
                     _("Object timer value"),
@@ -1267,8 +1439,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?"))
@@ -1283,8 +1455,8 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
                       "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", _("Property name"))
@@ -1301,8 +1473,8 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
                       "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", _("Property name"))
@@ -1318,8 +1490,8 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
                       "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", _("Property name"))
@@ -1333,8 +1505,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 +1782,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 +1813,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,25 @@ 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
+      .AddCondition(
+          "CameraZoom",
+          _("Camera zoom"),
+          _("Compare the zoom of a camera of a layer."),
+          _("Zoom of camera _PARAM2_ of layer _PARAM1_"),
+          "",
+          "res/conditions/camera24.png",
+          "res/conditions/camera.png")
+      .AddCodeOnlyParameter("currentScene", "")
+      .AddParameter("layer", _("Layer"), "", true)
+      .SetDefaultValue("\"\"")
+      .AddParameter("expression", _("Camera number (default : 0)"), "", true)
+      .SetDefaultValue("0")
+      .UseStandardRelationalOperatorParameters(
+          "number", gd::ParameterOptions::MakeNewOptions().SetDescription(
+              _("Zoom")))
+      .MarkAsAdvanced();
+
   extension
       .AddAction(
           "FixCamera",
@@ -339,6 +357,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 +405,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", "")
@@ -450,8 +469,8 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsCameraExtension(
                 "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("\"\"")
@@ -469,8 +488,8 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsCameraExtension(
                 "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("\"\"")
@@ -488,8 +507,8 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsCameraExtension(
                 "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("\"\"")
@@ -504,8 +523,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 +537,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 +567,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 +613,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,6 +55,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsAnimatableExtension(
           "number", gd::ParameterOptions::MakeNewOptions().SetDescription(
                         _("Animation index")))
       .MarkAsSimple();
+  aut.GetAllExpressions()["Index"].SetGroup("");
 
   aut.AddExpressionAndConditionAndAction(
          "string",
@@ -69,6 +72,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsAnimatableExtension(
           "objectAnimationName", gd::ParameterOptions::MakeNewOptions().SetDescription(
                         _("Animation name")))
       .MarkAsSimple();
+  aut.GetAllStrExpressions()["Name"].SetGroup("");
 
   aut.AddScopedAction("PauseAnimation",
                 _("Pause the animation"),
@@ -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"))
@@ -58,8 +58,8 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsEffectExtension(
                       "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"))
@@ -75,8 +75,8 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsEffectExtension(
                       "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"))
@@ -91,8 +91,8 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsEffectExtension(
                       "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"))
@@ -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/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,7 +63,7 @@ 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"),
+         _("Size"),
          "res/actions/scaleWidth24_black.png")
       .AddParameter("object", _("Object"))
       .AddParameter("behavior", _("Behavior"), "ScalableBehavior")
@@ -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,7 +80,7 @@ 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"),
+         _("Size"),
          "res/actions/scaleHeight24_black.png")
       .AddParameter("object", _("Object"))
       .AddParameter("behavior", _("Behavior"), "ScalableBehavior")
@@ -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/CommonConversionsExtension.cpp

@@ -68,19 +68,22 @@ BuiltinExtensionsImplementer::ImplementsCommonConversionsExtension(
 
   extension
       .AddStrExpression("ToJSON",
-                        _("Convert scene variable to JSON"),
-                        _("Convert a scene variable to JSON"),
+                        _("Convert variable to JSON"),
+                        _("Convert a variable to JSON"),
                         _("JSON"),
                         "res/conditions/toujours24_black.png")
-      .AddParameter("scenevar", _("Scene variable to be stringified"));
+      .AddParameter("variable", _("The variable to be stringified"),
+                    "AllowUndeclaredVariable");
 
+  // Deprecated
   extension
       .AddStrExpression("GlobalVarToJSON",
                         _("Convert global variable to JSON"),
                         _("Convert a global variable to JSON"),
                         _("JSON"),
                         "res/conditions/toujours24_black.png")
-      .AddParameter("globalvar", _("The global variable to be stringified"));
+      .AddParameter("globalvar", _("The global variable to be stringified"))
+      .SetHidden();
 
   extension
       .AddStrExpression("ObjectVarToJSON",
@@ -91,6 +94,7 @@ BuiltinExtensionsImplementer::ImplementsCommonConversionsExtension(
       .AddParameter("objectPtr", _("The object with the variable"))
       .AddParameter("objectvar", _("The object variable to be stringified"));
 
+  // Deprecated
   extension
       .AddAction(
           "JSONToVariableStructure",
@@ -102,8 +106,10 @@ BuiltinExtensionsImplementer::ImplementsCommonConversionsExtension(
           "res/actions/net.png")
       .AddParameter("string", _("JSON string"))
       .AddParameter("scenevar", _("Variable where store the JSON object"))
-      .MarkAsAdvanced();
+      .MarkAsAdvanced()
+      .SetHidden();
 
+  // Deprecated
   extension
       .AddAction("JSONToGlobalVariableStructure",
                  _("Convert JSON to global variable"),
@@ -116,6 +122,20 @@ BuiltinExtensionsImplementer::ImplementsCommonConversionsExtension(
       .AddParameter("string", _("JSON string"))
       .AddParameter("globalvar",
                     _("Global variable where store the JSON object"))
+      .MarkAsAdvanced()
+      .SetHidden();
+
+  extension
+      .AddAction(
+          "JSONToVariableStructure2",
+          _("Convert JSON to a variable"),
+          _("Parse a JSON object and store it into a variable"),
+          _("Convert JSON string _PARAM0_ and store it into variable _PARAM1_"),
+          "",
+          "res/actions/net24.png",
+          "res/actions/net.png")
+      .AddParameter("string", _("JSON string"))
+      .AddParameter("variable", _("Variable where to store the JSON object"))
       .MarkAsAdvanced();
 
   extension

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/FileExtension.cpp

@@ -98,6 +98,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsFileExtension(
       .AddParameter("string", _("Group"))
       .AddParameter("string", _("Text"));
 
+  // Deprecated
   extension
       .AddAction(
           "LireFichierExp",
@@ -114,8 +115,27 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsFileExtension(
       .AddParameter("string", _("Storage name"))
       .AddParameter("string", _("Group"))
       .AddCodeOnlyParameter("currentScene", "")
-      .AddParameter("scenevar", _("Scene variables"));
+      .AddParameter("scenevar", _("Scene variable"))
+      .SetHidden();
 
+  extension
+      .AddAction(
+          "ReadNumberFromStorage",
+          _("Load a value"),
+          _("Load the value saved in the specified element and store it in a "
+            "variable.\nSpecify the structure leading to the element using / "
+            "(example : Root/Level/Current)\nSpaces are forbidden in element "
+            "names."),
+          _("Load _PARAM1_ from storage _PARAM0_ and store value in _PARAM3_"),
+          "",
+          "res/actions/fichier24.png",
+          "res/actions/fichier.png")
+      .AddParameter("string", _("Storage name"))
+      .AddParameter("string", _("Group"))
+      .AddCodeOnlyParameter("currentScene", "")
+      .AddParameter("variable", _("Variable"));
+
+  // Deprecated
   extension
       .AddAction(
           "LireFichierTxt",
@@ -133,7 +153,26 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsFileExtension(
       .AddParameter("string", _("Storage name"))
       .AddParameter("string", _("Group"))
       .AddCodeOnlyParameter("currentScene", "")
-      .AddParameter("scenevar", _("Scene variables"));
+      .AddParameter("scenevar", _("Scene variable"))
+      .SetHidden();
+
+  extension
+      .AddAction(
+          "ReadStringFromStorage",
+          _("Load a text"),
+          _("Load the text saved in the specified element and store it in a "
+            "variable.\nSpecify the structure leading to the element using / "
+            "(example : Root/Level/Current)\nSpaces are forbidden in element "
+            "names."),
+          _("Load _PARAM1_ from storage _PARAM0_ and store as text in "
+            "_PARAM3_"),
+          "",
+          "res/actions/fichier24.png",
+          "res/actions/fichier.png")
+      .AddParameter("string", _("Storage name"))
+      .AddParameter("string", _("Group"))
+      .AddCodeOnlyParameter("currentScene", "")
+      .AddParameter("variable", _("Variable"));
 
   extension
       .AddAction("DeleteGroupFichier",

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/Animation.cpp

@@ -6,8 +6,6 @@
 
 #include "GDCore/Extensions/Builtin/SpriteExtension/Animation.h"
 #include <vector>
-#include "GDCore/Extensions/Builtin/SpriteExtension/Direction.h"
-#include "GDCore/Extensions/Builtin/SpriteExtension/Sprite.h"
 #include "GDCore/String.h"
 
 namespace gd {

Core/GDCore/Extensions/Builtin/SpriteExtension/Animation.h

@@ -4,13 +4,11 @@
  * reserved. This project is released under the MIT License.
  */
 
-#ifndef GDCORE_ANIMATION_H
-#define GDCORE_ANIMATION_H
+#pragma once
+
 #include <vector>
 #include "GDCore/String.h"
-namespace gd {
-class Direction;
-}
+#include "GDCore/Extensions/Builtin/SpriteExtension/Direction.h"
 
 namespace gd {
 
@@ -93,4 +91,3 @@ class GD_CORE_API Animation {
 };
 
 }  // namespace gd
-#endif  // GDCORE_ANIMATION_H

Core/GDCore/Extensions/Builtin/SpriteExtension/Direction.h

@@ -3,12 +3,12 @@
  * Copyright 2008-2016 Florian Rival (Florian.Rival@gmail.com). All rights
  * reserved. This project is released under the MIT License.
  */
-#ifndef GDCORE_DIRECTION_H
-#define GDCORE_DIRECTION_H
+#pragma once
+
 #include <vector>
 #include "GDCore/String.h"
+#include "GDCore/Extensions/Builtin/SpriteExtension/Sprite.h"
 namespace gd {
-class Sprite;
 class SerializerElement;
 }
 
@@ -142,4 +142,3 @@ class GD_CORE_API Direction {
 };
 
 }  // namespace gd
-#endif  // GDCORE_DIRECTION_H

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

@@ -0,0 +1,164 @@
+/*
+ * GDevelop Core
+ * Copyright 2008-2016 Florian Rival (Florian.Rival@gmail.com). All rights
+ * reserved. This project is released under the MIT License.
+ */
+
+#include "GDCore/Extensions/Builtin/SpriteExtension/SpriteAnimationList.h"
+
+#include <algorithm>
+
+#include "GDCore/CommonTools.h"
+#include "GDCore/Extensions/Builtin/SpriteExtension/Animation.h"
+#include "GDCore/Extensions/Builtin/SpriteExtension/Direction.h"
+#include "GDCore/IDE/Project/ArbitraryResourceWorker.h"
+#include "GDCore/Project/InitialInstance.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/Localization.h"
+
+namespace gd {
+
+Animation SpriteAnimationList::badAnimation;
+
+SpriteAnimationList::SpriteAnimationList()
+    : adaptCollisionMaskAutomatically(true) {}
+
+SpriteAnimationList::~SpriteAnimationList(){};
+
+void SpriteAnimationList::UnserializeFrom(const gd::SerializerElement& element) {
+  adaptCollisionMaskAutomatically =
+      element.GetBoolAttribute("adaptCollisionMaskAutomatically", false);
+
+  RemoveAllAnimations();
+  const gd::SerializerElement& animationsElement =
+      element.GetChild("animations", 0, "Animations");
+  animationsElement.ConsiderAsArrayOf("animation", "Animation");
+  for (std::size_t i = 0; i < animationsElement.GetChildrenCount(); ++i) {
+    const gd::SerializerElement& animationElement =
+        animationsElement.GetChild(i);
+    Animation newAnimation;
+
+    newAnimation.useMultipleDirections = animationElement.GetBoolAttribute(
+        "useMultipleDirections", false, "typeNormal");
+    newAnimation.SetName(animationElement.GetStringAttribute("name", ""));
+
+    // Compatibility with GD <= 3.3
+    if (animationElement.HasChild("Direction")) {
+      for (std::size_t j = 0;
+           j < animationElement.GetChildrenCount("Direction");
+           ++j) {
+        Direction direction;
+        direction.UnserializeFrom(animationElement.GetChild("Direction", j));
+
+        newAnimation.SetDirectionsCount(newAnimation.GetDirectionsCount() + 1);
+        newAnimation.SetDirection(direction,
+                                  newAnimation.GetDirectionsCount() - 1);
+      }
+    }
+    // End of compatibility code
+    else {
+      const gd::SerializerElement& directionsElement =
+          animationElement.GetChild("directions");
+      directionsElement.ConsiderAsArrayOf("direction");
+      for (std::size_t j = 0; j < directionsElement.GetChildrenCount(); ++j) {
+        Direction direction;
+        direction.UnserializeFrom(directionsElement.GetChild(j));
+
+        newAnimation.SetDirectionsCount(newAnimation.GetDirectionsCount() + 1);
+        newAnimation.SetDirection(direction,
+                                  newAnimation.GetDirectionsCount() - 1);
+      }
+    }
+
+    AddAnimation(newAnimation);
+  }
+}
+
+void SpriteAnimationList::SerializeTo(gd::SerializerElement& element) const {
+  element.SetAttribute("adaptCollisionMaskAutomatically",
+                       adaptCollisionMaskAutomatically);
+
+  // Animations
+  gd::SerializerElement& animationsElement = element.AddChild("animations");
+  animationsElement.ConsiderAsArrayOf("animation");
+  for (std::size_t k = 0; k < GetAnimationsCount(); k++) {
+    gd::SerializerElement& animationElement =
+        animationsElement.AddChild("animation");
+
+    animationElement.SetAttribute("useMultipleDirections",
+                                  GetAnimation(k).useMultipleDirections);
+    animationElement.SetAttribute("name", GetAnimation(k).GetName());
+
+    gd::SerializerElement& directionsElement =
+        animationElement.AddChild("directions");
+    directionsElement.ConsiderAsArrayOf("direction");
+    for (std::size_t l = 0; l < GetAnimation(k).GetDirectionsCount(); l++) {
+      GetAnimation(k).GetDirection(l).SerializeTo(
+          directionsElement.AddChild("direction"));
+    }
+  }
+}
+
+void SpriteAnimationList::ExposeResources(gd::ArbitraryResourceWorker& worker) {
+  for (std::size_t j = 0; j < GetAnimationsCount(); j++) {
+    for (std::size_t k = 0; k < GetAnimation(j).GetDirectionsCount(); k++) {
+      for (std::size_t l = 0;
+           l < GetAnimation(j).GetDirection(k).GetSpritesCount();
+           l++) {
+        worker.ExposeImage(
+            GetAnimation(j).GetDirection(k).GetSprite(l).GetImageName());
+      }
+    }
+  }
+}
+
+bool SpriteAnimationList::HasAnimationNamed(const gd::String &name) const {
+  return !name.empty() && (find_if(animations.begin(), animations.end(),
+                                   [&name](const Animation &animation) {
+                                     return animation.GetName() == name;
+                                   }) != animations.end());
+}
+
+const Animation& SpriteAnimationList::GetAnimation(std::size_t nb) const {
+  if (nb >= animations.size()) return badAnimation;
+
+  return animations[nb];
+}
+
+Animation& SpriteAnimationList::GetAnimation(std::size_t nb) {
+  if (nb >= animations.size()) return badAnimation;
+
+  return animations[nb];
+}
+
+void SpriteAnimationList::AddAnimation(const Animation& animation) {
+  animations.push_back(animation);
+}
+
+bool SpriteAnimationList::RemoveAnimation(std::size_t nb) {
+  if (nb >= GetAnimationsCount()) return false;
+
+  animations.erase(animations.begin() + nb);
+  return true;
+}
+
+void SpriteAnimationList::SwapAnimations(std::size_t firstIndex,
+                                  std::size_t secondIndex) {
+  if (firstIndex < animations.size() && secondIndex < animations.size() &&
+      firstIndex != secondIndex)
+    std::swap(animations[firstIndex], animations[secondIndex]);
+}
+
+void SpriteAnimationList::MoveAnimation(std::size_t oldIndex, std::size_t newIndex) {
+  if (oldIndex >= animations.size() || newIndex >= animations.size()) return;
+
+  auto animation = animations[oldIndex];
+  animations.erase(animations.begin() + oldIndex);
+  animations.insert(animations.begin() + newIndex, animation);
+}
+
+}  // namespace gd

Core/GDCore/Extensions/Builtin/SpriteExtension/SpriteAnimationList.h

@@ -0,0 +1,124 @@
+/*
+ * GDevelop Core
+ * Copyright 2008-2016 Florian Rival (Florian.Rival@gmail.com). All rights
+ * reserved. This project is released under the MIT License.
+ */
+
+#pragma once
+
+#include "GDCore/Extensions/Builtin/SpriteExtension/Animation.h"
+
+namespace gd {
+class InitialInstance;
+class SerializerElement;
+class PropertyDescriptor;
+class ArbitraryResourceWorker;
+}  // namespace gd
+
+namespace gd {
+
+/**
+ * \brief A list of animations, containing directions with images and collision mask.
+ * 
+ * It's used in the configuration of object that implements image-based animations.
+ *
+ * \see Animation
+ * \see Direction
+ * \see Sprite
+ * \ingroup SpriteObjectExtension
+ */
+class GD_CORE_API SpriteAnimationList {
+ public:
+  SpriteAnimationList();
+  virtual ~SpriteAnimationList();
+
+  void ExposeResources(gd::ArbitraryResourceWorker& worker);
+
+  /**
+   * \brief Return the animation at the specified index.
+   * If the index is out of bound, a "bad animation" object is returned.
+   */
+  const Animation& GetAnimation(std::size_t nb) const;
+
+  /**
+   * \brief Return the animation at the specified index.
+   * If the index is out of bound, a "bad animation" object is returned.
+   */
+  Animation& GetAnimation(std::size_t nb);
+
+  /**
+   * \brief Return the number of animations this object has.
+   */
+  std::size_t GetAnimationsCount() const { return animations.size(); };
+
+  /**
+   * \brief Return true if an animation exists for a given name.
+   */
+  bool HasAnimationNamed(const gd::String &name) const;
+
+  /**
+   * \brief Add an animation at the end of the existing ones.
+   */
+  void AddAnimation(const Animation& animation);
+
+  /**
+   * \brief Remove an animation.
+   */
+  bool RemoveAnimation(std::size_t nb);
+
+  /**
+   * \brief Remove all animations.
+   */
+  void RemoveAllAnimations() { animations.clear(); }
+
+  /**
+   * \brief Return true if the object hasn't any animation.
+   */
+  bool HasNoAnimations() const { return animations.empty(); }
+
+  /**
+   * \brief Swap the position of two animations
+   */
+  void SwapAnimations(std::size_t firstIndex, std::size_t secondIndex);
+
+  /**
+   * \brief Change the position of the specified animation
+   */
+  void MoveAnimation(std::size_t oldIndex, std::size_t newIndex);
+
+  /**
+   * \brief Return a read-only reference to the vector containing all the
+   * animation of the object.
+   */
+  const std::vector<Animation>& GetAllAnimations() const { return animations; }
+
+  /**
+   * @brief Check if the collision mask adapts automatically to the animation.
+   */
+  bool AdaptCollisionMaskAutomatically() const {
+    return adaptCollisionMaskAutomatically;
+  }
+
+  /**
+   * @brief Set if the collision mask adapts automatically to the animation.
+   */
+  void SetAdaptCollisionMaskAutomatically(bool enable) {
+    adaptCollisionMaskAutomatically = enable;
+  }
+
+  void UnserializeFrom(const gd::SerializerElement& element);
+  void SerializeTo(gd::SerializerElement& element) const;
+
+ private:
+
+  mutable std::vector<Animation> animations;
+
+  static Animation badAnimation;         //< Bad animation when an out of bound
+                                         // animation is requested.
+  bool adaptCollisionMaskAutomatically;  ///< If set to true, the collision
+                                         ///< mask will be automatically
+                                         ///< adapted to the animation of the
+                                         ///< object.
+};
+
+}  // 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/SpriteExtension/SpriteObject.cpp

@@ -23,88 +23,25 @@
 
 namespace gd {
 
-Animation SpriteObject::badAnimation;
-
 SpriteObject::SpriteObject()
-    : updateIfNotVisible(false), adaptCollisionMaskAutomatically(true) {}
+    : updateIfNotVisible(false),
+      preScale(1) {}
 
 SpriteObject::~SpriteObject(){};
 
 void SpriteObject::DoUnserializeFrom(gd::Project& project,
                                      const gd::SerializerElement& element) {
   updateIfNotVisible = element.GetBoolAttribute("updateIfNotVisible", true);
-  adaptCollisionMaskAutomatically =
-      element.GetBoolAttribute("adaptCollisionMaskAutomatically", false);
-
-  RemoveAllAnimations();
-  const gd::SerializerElement& animationsElement =
-      element.GetChild("animations", 0, "Animations");
-  animationsElement.ConsiderAsArrayOf("animation", "Animation");
-  for (std::size_t i = 0; i < animationsElement.GetChildrenCount(); ++i) {
-    const gd::SerializerElement& animationElement =
-        animationsElement.GetChild(i);
-    Animation newAnimation;
-
-    newAnimation.useMultipleDirections = animationElement.GetBoolAttribute(
-        "useMultipleDirections", false, "typeNormal");
-    newAnimation.SetName(animationElement.GetStringAttribute("name", ""));
-
-    // Compatibility with GD <= 3.3
-    if (animationElement.HasChild("Direction")) {
-      for (std::size_t j = 0;
-           j < animationElement.GetChildrenCount("Direction");
-           ++j) {
-        Direction direction;
-        direction.UnserializeFrom(animationElement.GetChild("Direction", j));
-
-        newAnimation.SetDirectionsCount(newAnimation.GetDirectionsCount() + 1);
-        newAnimation.SetDirection(direction,
-                                  newAnimation.GetDirectionsCount() - 1);
-      }
-    }
-    // End of compatibility code
-    else {
-      const gd::SerializerElement& directionsElement =
-          animationElement.GetChild("directions");
-      directionsElement.ConsiderAsArrayOf("direction");
-      for (std::size_t j = 0; j < directionsElement.GetChildrenCount(); ++j) {
-        Direction direction;
-        direction.UnserializeFrom(directionsElement.GetChild(j));
-
-        newAnimation.SetDirectionsCount(newAnimation.GetDirectionsCount() + 1);
-        newAnimation.SetDirection(direction,
-                                  newAnimation.GetDirectionsCount() - 1);
-      }
-    }
-
-    AddAnimation(newAnimation);
-  }
+  preScale = element.GetDoubleAttribute("preScale", 1);
+  animations.UnserializeFrom(element);
 }
 
 void SpriteObject::DoSerializeTo(gd::SerializerElement& element) const {
   element.SetAttribute("updateIfNotVisible", updateIfNotVisible);
-  element.SetAttribute("adaptCollisionMaskAutomatically",
-                       adaptCollisionMaskAutomatically);
-
-  // Animations
-  gd::SerializerElement& animationsElement = element.AddChild("animations");
-  animationsElement.ConsiderAsArrayOf("animation");
-  for (std::size_t k = 0; k < GetAnimationsCount(); k++) {
-    gd::SerializerElement& animationElement =
-        animationsElement.AddChild("animation");
-
-    animationElement.SetAttribute("useMultipleDirections",
-                                  GetAnimation(k).useMultipleDirections);
-    animationElement.SetAttribute("name", GetAnimation(k).GetName());
-
-    gd::SerializerElement& directionsElement =
-        animationElement.AddChild("directions");
-    directionsElement.ConsiderAsArrayOf("direction");
-    for (std::size_t l = 0; l < GetAnimation(k).GetDirectionsCount(); l++) {
-      GetAnimation(k).GetDirection(l).SerializeTo(
-          directionsElement.AddChild("direction"));
-    }
+  if (preScale != 1) {
+    element.SetAttribute("preScale", preScale);
   }
+  animations.SerializeTo(element);
 }
 
 std::map<gd::String, gd::PropertyDescriptor> SpriteObject::GetProperties()
@@ -127,23 +64,12 @@ bool SpriteObject::UpdateProperty(const gd::String& name,
 }
 
 void SpriteObject::ExposeResources(gd::ArbitraryResourceWorker& worker) {
-  for (std::size_t j = 0; j < GetAnimationsCount(); j++) {
-    for (std::size_t k = 0; k < GetAnimation(j).GetDirectionsCount(); k++) {
-      for (std::size_t l = 0;
-           l < GetAnimation(j).GetDirection(k).GetSpritesCount();
-           l++) {
-        worker.ExposeImage(
-            GetAnimation(j).GetDirection(k).GetSprite(l).GetImageName());
-      }
-    }
-  }
+  animations.ExposeResources(worker);
 }
 
 std::map<gd::String, gd::PropertyDescriptor>
 SpriteObject::GetInitialInstanceProperties(
-    const gd::InitialInstance& initialInstance,
-    gd::Project& project,
-    gd::Layout& scene) {
+    const gd::InitialInstance& initialInstance) {
   std::map<gd::String, gd::PropertyDescriptor> properties;
   properties["animation"] =
       gd::PropertyDescriptor(
@@ -157,9 +83,7 @@ SpriteObject::GetInitialInstanceProperties(
 bool SpriteObject::UpdateInitialInstanceProperty(
     gd::InitialInstance& initialInstance,
     const gd::String& name,
-    const gd::String& value,
-    gd::Project& project,
-    gd::Layout& scene) {
+    const gd::String& value) {
   if (name == "animation") {
     initialInstance.SetRawDoubleProperty(
         "animation", std::max(0, value.empty() ? 0 : value.To<int>()));
@@ -168,42 +92,25 @@ bool SpriteObject::UpdateInitialInstanceProperty(
   return true;
 }
 
-const Animation& SpriteObject::GetAnimation(std::size_t nb) const {
-  if (nb >= animations.size()) return badAnimation;
-
-  return animations[nb];
+size_t SpriteObject::GetAnimationsCount() const {
+  return animations.GetAnimationsCount();
 }
 
-Animation& SpriteObject::GetAnimation(std::size_t nb) {
-  if (nb >= animations.size()) return badAnimation;
-
-  return animations[nb];
+const gd::String &SpriteObject::GetAnimationName(size_t index) const {
+  return animations.GetAnimation(index).GetName();
 }
 
-void SpriteObject::AddAnimation(const Animation& animation) {
-  animations.push_back(animation);
+bool SpriteObject::HasAnimationNamed(
+    const gd::String &name) const {
+  return animations.HasAnimationNamed(name);
 }
 
-bool SpriteObject::RemoveAnimation(std::size_t nb) {
-  if (nb >= GetAnimationsCount()) return false;
-
-  animations.erase(animations.begin() + nb);
-  return true;
+const SpriteAnimationList& SpriteObject::GetAnimations() const {
+  return animations;
 }
 
-void SpriteObject::SwapAnimations(std::size_t firstIndex,
-                                  std::size_t secondIndex) {
-  if (firstIndex < animations.size() && secondIndex < animations.size() &&
-      firstIndex != secondIndex)
-    std::swap(animations[firstIndex], animations[secondIndex]);
-}
-
-void SpriteObject::MoveAnimation(std::size_t oldIndex, std::size_t newIndex) {
-  if (oldIndex >= animations.size() || newIndex >= animations.size()) return;
-
-  auto animation = animations[oldIndex];
-  animations.erase(animations.begin() + oldIndex);
-  animations.insert(animations.begin() + newIndex, animation);
+SpriteAnimationList& SpriteObject::GetAnimations() {
+  return animations;
 }
 
 }  // namespace gd

Core/GDCore/Extensions/Builtin/SpriteExtension/SpriteObject.h

@@ -4,18 +4,15 @@
  * reserved. This project is released under the MIT License.
  */
 
-#ifndef GDCORE_SPRITEOBJECT_H
-#define GDCORE_SPRITEOBJECT_H
-#include "GDCore/Extensions/Builtin/SpriteExtension/Animation.h"
-#include "GDCore/Extensions/Builtin/SpriteExtension/Direction.h"
-#include "GDCore/Extensions/Builtin/SpriteExtension/Sprite.h"
+#pragma once
+
+#include "GDCore/Extensions/Builtin/SpriteExtension/SpriteAnimationList.h"
 #include "GDCore/Project/Object.h"
+
 namespace gd {
 class InitialInstance;
 class Object;
 class Layout;
-class Sprite;
-class Animation;
 class SerializerElement;
 class PropertyDescriptor;
 }  // namespace gd
@@ -50,85 +47,26 @@ class GD_CORE_API SpriteObject : public gd::ObjectConfiguration {
   bool UpdateProperty(const gd::String& name, const gd::String& value) override;
 
   std::map<gd::String, gd::PropertyDescriptor> GetInitialInstanceProperties(
-      const gd::InitialInstance& position,
-      gd::Project& project,
-      gd::Layout& scene) override;
+      const gd::InitialInstance& position) override;
   bool UpdateInitialInstanceProperty(gd::InitialInstance& position,
                                      const gd::String& name,
-                                     const gd::String& value,
-                                     gd::Project& project,
-                                     gd::Layout& scene) override;
+                                     const gd::String& value) override;
 
-  /** \name Animations
-   * Methods related to animations management
-   */
-  ///@{
+  size_t GetAnimationsCount() const override;
+
+  const gd::String &GetAnimationName(size_t index) const override;
+
+  bool HasAnimationNamed(const gd::String &animationName) const override;
+  
   /**
-   * \brief Return the animation at the specified index.
-   * If the index is out of bound, a "bad animation" object is returned.
+   * \brief Return the animation configuration.
    */
-  const Animation& GetAnimation(std::size_t nb) const;
+  const SpriteAnimationList& GetAnimations() const;
 
   /**
-   * \brief Return the animation at the specified index.
-   * If the index is out of bound, a "bad animation" object is returned.
+   * @brief Return the animation configuration.
    */
-  Animation& GetAnimation(std::size_t nb);
-
-  /**
-   * \brief Return the number of animations this object has.
-   */
-  std::size_t GetAnimationsCount() const { return animations.size(); };
-
-  /**
-   * \brief Add an animation at the end of the existing ones.
-   */
-  void AddAnimation(const Animation& animation);
-
-  /**
-   * \brief Remove an animation.
-   */
-  bool RemoveAnimation(std::size_t nb);
-
-  /**
-   * \brief Remove all animations.
-   */
-  void RemoveAllAnimations() { animations.clear(); }
-
-  /**
-   * \brief Return true if the object hasn't any animation.
-   */
-  bool HasNoAnimations() const { return animations.empty(); }
-
-  /**
-   * \brief Swap the position of two animations
-   */
-  void SwapAnimations(std::size_t firstIndex, std::size_t secondIndex);
-
-  /**
-   * \brief Change the position of the specified animation
-   */
-  void MoveAnimation(std::size_t oldIndex, std::size_t newIndex);
-
-  /**
-   * \brief Return a read-only reference to the vector containing all the
-   * animation of the object.
-   */
-  const std::vector<Animation>& GetAllAnimations() const { return animations; }
-
-  /**
-   * @brief Check if the collision mask adapts automatically to the animation.
-   */
-  bool AdaptCollisionMaskAutomatically() const {
-    return adaptCollisionMaskAutomatically;
-  }
-
-  /**
-   * @brief Set if the collision mask adapts automatically to the animation.
-   */
-  void SetAdaptCollisionMaskAutomatically(bool enable) {
-    adaptCollisionMaskAutomatically = enable;
-  }
+  SpriteAnimationList& GetAnimations();
 
   /**
    * \brief Set if the object animation should be played even if the object is
@@ -143,25 +81,35 @@ class GD_CORE_API SpriteObject : public gd::ObjectConfiguration {
    * is hidden or far from the camera (false by default).
    */
   bool GetUpdateIfNotVisible() const { return updateIfNotVisible; }
-  ///@}
+
+  /**
+   * \brief Return the scale applied to object to evaluate the default dimensions.
+   */
+  double GetPreScale() { return preScale; }
+
+  /**
+   * \brief Set the scale applied to object to evaluate the default dimensions.
+   * 
+   * Its value must be strictly positive.
+   */
+  void SetPreScale(double preScale_) {
+    if (preScale_ <= 0) {
+      return;
+    }
+    preScale = preScale_;
+  }
 
  private:
   void DoUnserializeFrom(gd::Project& project,
                          const gd::SerializerElement& element) override;
   void DoSerializeTo(gd::SerializerElement& element) const override;
 
-  mutable std::vector<Animation> animations;
+  SpriteAnimationList animations;
+
   bool updateIfNotVisible;  ///< If set to true, ask the game engine to play
                             ///< object animation even if hidden or far from
                             ///< the screen.
-
-  static Animation badAnimation;         //< Bad animation when an out of bound
-                                         // animation is requested.
-  bool adaptCollisionMaskAutomatically;  ///< If set to true, the collision
-                                         ///< mask will be automatically
-                                         ///< adapted to the animation of the
-                                         ///< object.
+  double preScale;
 };
 
 }  // namespace gd
-#endif  // GDCORE_SPRITEOBJECT_H

Core/GDCore/Extensions/Builtin/VariablesExtension.cpp

@@ -25,29 +25,271 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsVariablesExtension(
   extension.AddInstructionOrExpressionGroupMetadata(_("Variables"))
       .SetIcon("res/conditions/var24.png");
 
+  extension
+      .AddCondition("NumberVariable",
+                    _("Variable value"),
+                    _("Compare the number value of a variable."),
+                    _("The variable _PARAM0_"),
+                    "",
+                    "res/conditions/var24.png",
+                    "res/conditions/var.png")
+      .AddParameter("variable", _("Variable"))
+      .UseStandardRelationalOperatorParameters(
+          "number", ParameterOptions::MakeNewOptions());
+
+  extension
+      .AddCondition("StringVariable",
+                    _("Variable value"),
+                    _("Compare the text (string) of a variable."),
+                    _("The variable _PARAM0_"),
+                    "",
+                    "res/conditions/var24.png",
+                    "res/conditions/var.png")
+      .AddParameter("variable", _("Variable"))
+      .UseStandardRelationalOperatorParameters(
+          "string", ParameterOptions::MakeNewOptions());
+
+  extension
+      .AddCondition(
+          "BooleanVariable",
+          _("Variable value"),
+          _("Compare the boolean value of a variable."),
+          _("The variable _PARAM0_ is _PARAM1_"),
+          "",
+          "res/conditions/var24.png",
+          "res/conditions/var.png")
+      .AddParameter("variable", _("Variable"))
+      .AddParameter("trueorfalse", _("Check if the value is"))
+      .SetDefaultValue("true")
+      // This parameter allows to keep the operand expression
+      // when the editor switch between variable instructions.
+      .AddCodeOnlyParameter("trueorfalse", "");
+
+  extension
+      .AddAction("SetNumberVariable",
+                 _("Change variable value"),
+                 _("Modify the number value of a variable."),
+                 _("the variable _PARAM0_"),
+                 "",
+                 "res/actions/var24.png",
+                 "res/actions/var.png")
+      .AddParameter("variable", _("Variable"))
+      .UseStandardOperatorParameters("number",
+                                     ParameterOptions::MakeNewOptions());
+
+  extension
+      .AddAction("SetStringVariable",
+                 _("Change text variable"),
+                 _("Modify the text (string) of a variable."),
+                 _("the variable _PARAM0_"),
+                 "",
+                 "res/actions/var24.png",
+                 "res/actions/var.png")
+      .AddParameter("variable", _("Variable"))
+      .UseStandardOperatorParameters("string",
+                                     ParameterOptions::MakeNewOptions());
+
+  extension
+      .AddAction(
+          "SetBooleanVariable",
+          _("Change boolean variable"),
+          _("Modify the boolean value of a variable."),
+          _("Change the variable _PARAM0_: _PARAM1_"),
+          "",
+          "res/conditions/var24.png",
+          "res/conditions/var.png")
+      .AddParameter("variable", _("Variable"))
+      .AddParameter("operator", _("Value"), "boolean")
+      // This parameter allows to keep the operand expression
+      // when the editor switch between variable instructions.
+      .AddCodeOnlyParameter("trueorfalse", "");
+
+  extension
+      .AddCondition(
+          "VariableChildCount",
+          _("Number of children"),
+          _("Compare the number of children in an array variable."),
+          _("The number of children in the array variable _PARAM0_"),
+          _("Arrays and structures"),
+          "res/conditions/var24.png",
+          "res/conditions/var.png")
+      .AddParameter("variable", _("Array variable"))
+      .UseStandardRelationalOperatorParameters(
+          "number", ParameterOptions::MakeNewOptions())
+      .MarkAsAdvanced();
+
+  extension
+      .AddCondition("VariableChildExists2",
+                    _("Child existence"),
+                    _("Check if the specified child of the structure "
+                      "variable exists."),
+                    _("Child _PARAM1_ of variable _PARAM0_ exists"),
+                    _("Arrays and structures"),
+                    "res/conditions/var24.png",
+                    "res/conditions/var.png")
+      .AddParameter("variable", _("Variable"))
+      .AddParameter("string", _("Name of the child"))
+      .MarkAsAdvanced();
+
+  extension
+      .AddAction(
+          "RemoveVariableChild",
+          _("Remove a child"),
+          _("Remove a child from a structure variable."),
+          _("Remove child _PARAM1_ from structure variable _PARAM0_"),
+          _("Arrays and structures"),
+          "res/actions/var24.png",
+          "res/actions/var.png")
+      .AddParameter("variable", _("Structure variable"))
+      .AddParameter("string", _("Child's name"))
+      .MarkAsAdvanced();
+
+  extension
+      .AddAction("ClearVariableChildren",
+                 _("Clear children"),
+                 _("Remove all the children from the structure or array "
+                   "variable."),
+                 _("Clear children from variable _PARAM0_"),
+                 _("Arrays and structures"),
+                 "res/actions/var24.png",
+                 "res/actions/var.png")
+      .AddParameter("variable", _("Structure or array variable"))
+      .MarkAsAdvanced();
+
+  extension
+      .AddAction("PushVariable",
+                 _("Add existing variable"),
+                 _("Adds an existing variable at the end of an array "
+                   "variable."),
+                 _("Add variable _PARAM1_ to array variable _PARAM0_"),
+                 _("Arrays and structures"),
+                 "res/actions/var24.png",
+                 "res/actions/var.png")
+      .AddParameter("variable", _("Array variable"))
+      .AddParameter("variable", _("Variable with the content to add"))
+      .SetParameterLongDescription(
+          _("The content of the variable will *be copied* and added at the "
+            "end of the array."))
+      .MarkAsAdvanced();
+
+  extension
+      .AddAction(
+          "PushString",
+          _("Add text variable"),
+          _("Adds a text (string) at the end of a array variable."),
+          _("Add the value _PARAM1_ to array variable _PARAM0_"),
+          _("Arrays and structures"),
+          "res/actions/var24.png",
+          "res/actions/var.png")
+      .AddParameter("variable", _("Array variable"))
+      .AddParameter("string", _("Text to add"))
+      .MarkAsAdvanced();
+
+  extension
+      .AddAction("PushNumber",
+                 _("Add variable array value"),
+                 _("Adds a number at the end of an array variable."),
+                 _("Add the value _PARAM1_ to array variable _PARAM0_"),
+                 _("Arrays and structures"),
+                 "res/actions/var24.png",
+                 "res/actions/var.png")
+      .AddParameter("variable", _("Array variable"))
+      .AddParameter("expression", _("Number to add"))
+      .MarkAsAdvanced();
+
+  extension
+      .AddAction("PushBoolean",
+                 _("Add boolean variable"),
+                 _("Adds a boolean at the end of an array variable."),
+                 _("Add the value _PARAM1_ to array variable _PARAM0_"),
+                 _("Arrays and structures"),
+                 "res/actions/var24.png",
+                 "res/actions/var.png")
+      .AddParameter("variable", _("Array variable"))
+      .AddParameter("trueorfalse", _("Boolean to add"))
+      .MarkAsAdvanced();
+
+  extension
+      .AddAction("RemoveVariableAt",
+                 _("Remove variable by index"),
+                 _("Removes a variable at the specified index of an array "
+                   "variable."),
+                 _("Remove variable at index _PARAM1_ from array "
+                   "variable _PARAM0_"),
+                 _("Arrays and structures"),
+                 "res/actions/var24.png",
+                 "res/actions/var.png")
+      .AddParameter("variable", _("Array variable"))
+      .AddParameter("expression", _("Index to remove"))
+      .MarkAsAdvanced();
+
+  extension
+      .AddStrExpression(
+          "VariableFirstString",
+          _("First text child"),
+          _("Get the value of the first element of an array variable, if "
+            "it is a text (string)."),
+          _("Arrays and structures"),
+          "res/actions/var.png")
+      .AddParameter("variable", _("Array variable"));
+
+  extension
+      .AddExpression(
+          "VariableFirstNumber",
+          _("First number child"),
+          _("Get the value of the first element of an array variable, if "
+            "it is a number."),
+          _("Arrays and structures"),
+          "res/actions/var.png")
+      .AddParameter("variable", _("Array variable"));
+
+  extension
+      .AddStrExpression(
+          "VariableLastString",
+          _("Last text child"),
+          _("Get the value of the last element of an array variable, if "
+            "it is a text (string)."),
+          _("Arrays and structures"),
+          "res/actions/var.png")
+      .AddParameter("variable", _("Array variable"));
+
+  extension
+      .AddExpression(
+          "VariableLastNumber",
+          _("Last number child"),
+          _("Get the value of the last element of an array variable, if "
+            "it is a number."),
+          _("Arrays and structures"),
+          "res/actions/var.png")
+      .AddParameter("variable", _("Array variable"));
+
+  // Legacy instructions
+
   extension
       .AddCondition("VarScene",
                     _("Number variable"),
                     _("Compare the number value of a scene variable."),
                     _("The number of scene variable _PARAM0_"),
-                    _("Scene variables"),
+                    _("External variables/Scene variables"),
                     "res/conditions/var24.png",
                     "res/conditions/var.png")
       .AddParameter("scenevar", _("Variable"))
       .UseStandardRelationalOperatorParameters(
-          "number", ParameterOptions::MakeNewOptions());
+          "number", ParameterOptions::MakeNewOptions())
+      .SetRelevantForFunctionEventsOnly();
 
   extension
       .AddCondition("VarSceneTxt",
                     _("Text variable"),
                     _("Compare the text (string) of a scene variable."),
                     _("The text of scene variable _PARAM0_"),
-                    _("Scene variables"),
+                    _("External variables/Scene variables"),
                     "res/conditions/var24.png",
                     "res/conditions/var.png")
       .AddParameter("scenevar", _("Variable"))
       .UseStandardRelationalOperatorParameters(
-          "string", ParameterOptions::MakeNewOptions());
+          "string", ParameterOptions::MakeNewOptions())
+      .SetRelevantForFunctionEventsOnly();
 
   extension
       .AddCondition(
@@ -55,12 +297,13 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsVariablesExtension(
           _("Boolean variable"),
           _("Compare the boolean value of a scene variable."),
           _("The boolean value of scene variable _PARAM0_ is _PARAM1_"),
-          _("Scene variables"),
+          _("External variables/Scene variables"),
           "res/conditions/var24.png",
           "res/conditions/var.png")
       .AddParameter("scenevar", _("Variable"))
       .AddParameter("trueorfalse", _("Check if the value is"))
-      .SetDefaultValue("true");
+      .SetDefaultValue("true")
+      .SetRelevantForFunctionEventsOnly();
 
   extension
       .AddCondition("VariableChildExists",
@@ -68,11 +311,12 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsVariablesExtension(
                     _("Check if the specified child of the scene structure "
                       "variable exists."),
                     _("Child _PARAM1_ of scene variable _PARAM0_ exists"),
-                    _("Scene variables/Arrays and structures"),
+                    _("External variables/Scene variables/Arrays and structures"),
                     "res/conditions/var24.png",
                     "res/conditions/var.png")
       .AddParameter("scenevar", _("Variable"))
       .AddParameter("string", _("Name of the child"))
+      .SetRelevantForFunctionEventsOnly()
       .MarkAsAdvanced();
 
   extension
@@ -81,11 +325,12 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsVariablesExtension(
                     _("Check if the specified child of the global structure "
                       "variable exists."),
                     _("Child _PARAM1_ of global variable _PARAM0_ exists"),
-                    _("Global variables/Arrays and structures"),
+                    _("External variables/Global variables/Arrays and structures"),
                     "res/conditions/var24.png",
                     "res/conditions/var.png")
       .AddParameter("globalvar", _("Variable"))
       .AddParameter("string", _("Name of the child"))
+      .SetRelevantForFunctionEventsOnly()
       .MarkAsAdvanced();
 
   extension
@@ -93,7 +338,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsVariablesExtension(
                     "Variable defined",
                     "Test if the scene variable exists.",
                     "Scene variable _PARAM0_ is defined",
-                    _("Scene variables"),
+                    _("External variables/Scene variables"),
                     "res/conditions/var24.png",
                     "res/conditions/var.png")
       .AddCodeOnlyParameter("currentScene", "")
@@ -105,12 +350,13 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsVariablesExtension(
                     _("Number variable"),
                     _("Compare the number value of a global variable."),
                     _("the global variable _PARAM0_"),
-                    _("Global variables"),
+                    _("External variables/Global variables"),
                     "res/conditions/var24.png",
                     "res/conditions/var.png")
       .AddParameter("globalvar", _("Variable"))
       .UseStandardRelationalOperatorParameters(
           "number", ParameterOptions::MakeNewOptions())
+      .SetRelevantForFunctionEventsOnly()
       .MarkAsAdvanced();
 
   extension
@@ -118,12 +364,13 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsVariablesExtension(
                     _("Text variable"),
                     _("Compare the text (string) of a global variable."),
                     _("the text of the global variable _PARAM0_"),
-                    _("Global variables"),
+                    _("External variables/Global variables"),
                     "res/conditions/var24.png",
                     "res/conditions/var.png")
       .AddParameter("globalvar", _("Variable"))
       .UseStandardRelationalOperatorParameters(
           "string", ParameterOptions::MakeNewOptions())
+      .SetRelevantForFunctionEventsOnly()
       .MarkAsAdvanced();
 
   extension
@@ -132,19 +379,20 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsVariablesExtension(
           _("Boolean variable"),
           _("Compare the boolean value of a global variable."),
           _("The boolean value of global variable _PARAM0_ is _PARAM1_"),
-          _("Global variables"),
+          _("External variables/Global variables"),
           "res/conditions/var24.png",
           "res/conditions/var.png")
       .AddParameter("globalvar", _("Variable"))
       .AddParameter("trueorfalse", _("Check if the value is"))
-      .SetDefaultValue("true");
+      .SetDefaultValue("true")
+      .SetRelevantForFunctionEventsOnly();
 
   extension
       .AddCondition("VarGlobalDef",
                     "Variable defined",
                     "Test if a global variable exists.",
                     "Global variable _PARAM0_ is defined",
-                    _("Global variables"),
+                    _("External variables/Global variables"),
                     "res/conditions/var24.png",
                     "res/conditions/var.png")
       .AddCodeOnlyParameter("currentScene", "")
@@ -157,24 +405,26 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsVariablesExtension(
                  _("Change number variable"),
                  _("Modify the number value of a scene variable."),
                  _("the scene variable _PARAM0_"),
-                 _("Scene variables"),
+                 _("External variables/Scene variables"),
                  "res/actions/var24.png",
                  "res/actions/var.png")
       .AddParameter("scenevar", _("Variable"))
       .UseStandardOperatorParameters("number",
-                                     ParameterOptions::MakeNewOptions());
+                                     ParameterOptions::MakeNewOptions())
+      .SetRelevantForFunctionEventsOnly();
 
   extension
       .AddAction("ModVarSceneTxt",
                  _("Change text variable"),
                  _("Modify the text (string) of a scene variable."),
                  _("the text of scene variable _PARAM0_"),
-                 _("Scene variables"),
+                 _("External variables/Scene variables"),
                  "res/actions/var24.png",
                  "res/actions/var.png")
       .AddParameter("scenevar", _("Variable"))
       .UseStandardOperatorParameters("string",
-                                     ParameterOptions::MakeNewOptions());
+                                     ParameterOptions::MakeNewOptions())
+      .SetRelevantForFunctionEventsOnly();
 
   extension
       .AddAction(
@@ -182,11 +432,12 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsVariablesExtension(
           _("Change boolean variable"),
           _("Modify the boolean value of a scene variable."),
           _("Set the boolean value of scene variable _PARAM0_ to _PARAM1_"),
-          _("Scene variables"),
+          _("External variables/Scene variables"),
           "res/conditions/var24.png",
           "res/conditions/var.png")
       .AddParameter("scenevar", _("Variable"))
-      .AddParameter("trueorfalse", _("New Value:"));
+      .AddParameter("trueorfalse", _("New Value:"))
+      .SetRelevantForFunctionEventsOnly();
 
   extension
       .AddAction("ToggleSceneVariableAsBoolean",
@@ -195,22 +446,24 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsVariablesExtension(
                      _("If it was true, it will become false, and if it was "
                        "false it will become true."),
                  _("Toggle the boolean value of scene variable _PARAM0_"),
-                 _("Scene variables"),
+                 _("External variables/Scene variables"),
                  "res/conditions/var24.png",
                  "res/conditions/var.png")
-      .AddParameter("scenevar", _("Variable"));
+      .AddParameter("scenevar", _("Variable"))
+      .SetRelevantForFunctionEventsOnly();
 
   extension
       .AddAction("ModVarGlobal",
                  _("Change number variable"),
                  _("Modify the number value of a global variable."),
                  _("the global variable _PARAM0_"),
-                 _("Global variables"),
+                 _("External variables/Global variables"),
                  "res/actions/var24.png",
                  "res/actions/var.png")
       .AddParameter("globalvar", _("Variable"))
       .UseStandardOperatorParameters("number",
                                      ParameterOptions::MakeNewOptions())
+      .SetRelevantForFunctionEventsOnly()
       .MarkAsAdvanced();
 
   extension
@@ -218,12 +471,13 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsVariablesExtension(
                  _("Change text variable"),
                  _("Modify the text (string) of a global variable."),
                  _("the text of global variable _PARAM0_"),
-                 _("Global variables"),
+                 _("External variables/Global variables"),
                  "res/actions/var24.png",
                  "res/actions/var.png")
       .AddParameter("globalvar", _("Variable"))
       .UseStandardOperatorParameters("string",
                                      ParameterOptions::MakeNewOptions())
+      .SetRelevantForFunctionEventsOnly()
       .MarkAsAdvanced();
 
   extension
@@ -232,11 +486,12 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsVariablesExtension(
           _("Change boolean variable"),
           _("Modify the boolean value of a global variable."),
           _("Set the boolean value of global variable _PARAM0_ to _PARAM1_"),
-          _("Global variables"),
+          _("External variables/Global variables"),
           "res/conditions/var24.png",
           "res/conditions/var.png")
       .AddParameter("globalvar", _("Variable"))
-      .AddParameter("trueorfalse", _("New Value:"));
+      .AddParameter("trueorfalse", _("New Value:"))
+      .SetRelevantForFunctionEventsOnly();
 
   extension
       .AddAction("ToggleGlobalVariableAsBoolean",
@@ -245,10 +500,11 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsVariablesExtension(
                      _("If it was true, it will become false, and if it was "
                        "false it will become true."),
                  _("Toggle the boolean value of global variable _PARAM0_"),
-                 _("Global variables"),
+                 _("External variables/Global variables"),
                  "res/conditions/var24.png",
                  "res/conditions/var.png")
-      .AddParameter("globalvar", _("Variable"));
+      .AddParameter("globalvar", _("Variable"))
+      .SetRelevantForFunctionEventsOnly();
 
   extension
       .AddAction(
@@ -256,12 +512,13 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsVariablesExtension(
           _("Remove a child"),
           _("Remove a child from a scene structure variable."),
           _("Remove child _PARAM1_ from scene structure variable _PARAM0_"),
-          _("Scene variables/Arrays and structures"),
+          _("External variables/Scene variables/Arrays and structures"),
           "res/actions/var24.png",
           "res/actions/var.png")
       .AddParameter("scenevar", _("Structure variable"))
       .AddParameter("string", _("Child's name"))
-      .MarkAsAdvanced();
+      .MarkAsAdvanced()
+      .SetRelevantForFunctionEventsOnly();
 
   extension
       .AddAction(
@@ -269,12 +526,13 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsVariablesExtension(
           _("Remove a child"),
           _("Remove a child from a global structure variable."),
           _("Remove child _PARAM1_ from global structure variable _PARAM0_"),
-          _("Global variables/Arrays and structures"),
+          _("External variables/Global variables/Arrays and structures"),
           "res/actions/var24.png",
           "res/actions/var.png")
       .AddParameter("globalvar", _("Structure variable"))
       .AddParameter("string", _("Child's name"))
-      .MarkAsAdvanced();
+      .MarkAsAdvanced()
+      .SetRelevantForFunctionEventsOnly();
 
   extension
       .AddAction("VariableClearChildren",
@@ -282,10 +540,11 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsVariablesExtension(
                  _("Remove all the children from the scene structure or array "
                    "variable."),
                  _("Clear children from scene variable _PARAM0_"),
-                 _("Scene variables/Arrays and structures"),
+                 _("External variables/Scene variables/Arrays and structures"),
                  "res/actions/var24.png",
                  "res/actions/var.png")
       .AddParameter("scenevar", _("Structure or array variable"))
+      .SetRelevantForFunctionEventsOnly()
       .MarkAsAdvanced();
 
   extension
@@ -294,10 +553,11 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsVariablesExtension(
                  _("Remove all the children from the global structure or array "
                    "variable."),
                  _("Clear children from global variable _PARAM0_"),
-                 _("Global variables/Arrays and structures"),
+                 _("External variables/Global variables/Arrays and structures"),
                  "res/actions/var24.png",
                  "res/actions/var.png")
       .AddParameter("globalvar", _("Structure or array variable"))
+      .SetRelevantForFunctionEventsOnly()
       .MarkAsAdvanced();
 
   extension
@@ -306,7 +566,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsVariablesExtension(
                  _("Adds an existing variable at the end of a scene array "
                    "variable."),
                  _("Add variable _PARAM1_ to array variable _PARAM0_"),
-                 _("Scene variables/Arrays and structures"),
+                 _("External variables/Scene variables/Arrays and structures"),
                  "res/actions/var24.png",
                  "res/actions/var.png")
       .AddParameter("scenevar", _("Array variable"))
@@ -314,6 +574,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsVariablesExtension(
       .SetParameterLongDescription(
           _("The content of the variable will *be copied* and added at the "
             "end of the array."))
+      .SetRelevantForFunctionEventsOnly()
       .MarkAsAdvanced();
 
   extension
@@ -322,11 +583,12 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsVariablesExtension(
           _("Add text variable"),
           _("Adds a text (string) at the end of a scene array variable."),
           _("Add text _PARAM1_ to array variable _PARAM0_"),
-          _("Scene variables/Arrays and structures"),
+          _("External variables/Scene variables/Arrays and structures"),
           "res/actions/var24.png",
           "res/actions/var.png")
       .AddParameter("scenevar", _("Array variable"))
       .AddParameter("string", _("Text to add"))
+      .SetRelevantForFunctionEventsOnly()
       .MarkAsAdvanced();
 
   extension
@@ -334,11 +596,12 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsVariablesExtension(
                  _("Add number variable"),
                  _("Adds a number at the end of a scene array variable."),
                  _("Add number _PARAM1_ to array variable _PARAM0_"),
-                 _("Scene variables/Arrays and structures"),
+                 _("External variables/Scene variables/Arrays and structures"),
                  "res/actions/var24.png",
                  "res/actions/var.png")
       .AddParameter("scenevar", _("Array variable"))
       .AddParameter("expression", _("Number to add"))
+      .SetRelevantForFunctionEventsOnly()
       .MarkAsAdvanced();
 
   extension
@@ -346,11 +609,12 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsVariablesExtension(
                  _("Add boolean variable"),
                  _("Adds a boolean at the end of a scene array variable."),
                  _("Add boolean _PARAM1_ to array variable _PARAM0_"),
-                 _("Scene variables/Arrays and structures"),
+                 _("External variables/Scene variables/Arrays and structures"),
                  "res/actions/var24.png",
                  "res/actions/var.png")
       .AddParameter("scenevar", _("Array variable"))
       .AddParameter("trueorfalse", _("Boolean to add"))
+      .SetRelevantForFunctionEventsOnly()
       .MarkAsAdvanced();
 
   extension
@@ -360,11 +624,12 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsVariablesExtension(
                    "variable."),
                  _("Remove variable at index _PARAM1_ from scene array "
                    "variable _PARAM0_"),
-                 _("Scene variables/Arrays and structures"),
+                 _("External variables/Scene variables/Arrays and structures"),
                  "res/actions/var24.png",
                  "res/actions/var.png")
       .AddParameter("scenevar", _("Array variable"))
       .AddParameter("expression", _("Index to remove"))
+      .SetRelevantForFunctionEventsOnly()
       .MarkAsAdvanced();
 
   extension
@@ -373,12 +638,13 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsVariablesExtension(
           _("Number of children"),
           _("Compare the number of children in a scene array variable."),
           _("The number of children in the array variable _PARAM0_"),
-          _("Scene variables/Arrays and structures"),
+          _("External variables/Scene variables/Arrays and structures"),
           "res/conditions/var24.png",
           "res/conditions/var.png")
       .AddParameter("scenevar", _("Array variable"))
       .UseStandardRelationalOperatorParameters(
           "number", ParameterOptions::MakeNewOptions())
+      .SetRelevantForFunctionEventsOnly()
       .MarkAsAdvanced();
 
   extension
@@ -387,9 +653,10 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsVariablesExtension(
           _("First text child"),
           _("Get the value of the first element of a scene array variable, if "
             "it is a text (string)."),
-          _("Scene variables/Arrays and structures"),
+          _("External variables/Scene variables/Arrays and structures"),
           "res/actions/var.png")
-      .AddParameter("scenevar", _("Array variable"));
+      .AddParameter("scenevar", _("Array variable"))
+      .SetRelevantForFunctionEventsOnly();
 
   extension
       .AddExpression(
@@ -397,9 +664,10 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsVariablesExtension(
           _("First number child"),
           _("Get the value of the first element of a scene array variable, if "
             "it is a number."),
-          _("Scene variables/Arrays and structures"),
+          _("External variables/Scene variables/Arrays and structures"),
           "res/actions/var.png")
-      .AddParameter("scenevar", _("Array variable"));
+      .AddParameter("scenevar", _("Array variable"))
+      .SetRelevantForFunctionEventsOnly();
 
   extension
       .AddStrExpression(
@@ -407,9 +675,10 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsVariablesExtension(
           _("Last text child"),
           _("Get the value of the last element of a scene array variable, if "
             "it is a text (string)."),
-          _("Scene variables/Arrays and structures"),
+          _("External variables/Scene variables/Arrays and structures"),
           "res/actions/var.png")
-      .AddParameter("scenevar", _("Array variable"));
+      .AddParameter("scenevar", _("Array variable"))
+      .SetRelevantForFunctionEventsOnly();
 
   extension
       .AddExpression(
@@ -417,9 +686,10 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsVariablesExtension(
           _("Last number child"),
           _("Get the value of the last element of a scene array variable, if "
             "it is a number."),
-          _("Scene variables/Arrays and structures"),
+          _("External variables/Scene variables/Arrays and structures"),
           "res/actions/var.png")
-      .AddParameter("scenevar", _("Array variable"));
+      .AddParameter("scenevar", _("Array variable"))
+      .SetRelevantForFunctionEventsOnly();
 
   extension
       .AddAction(
@@ -427,7 +697,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsVariablesExtension(
           _("Add existing variable"),
           _("Adds an existing variable at the end of a global array variable."),
           _("Add variable _PARAM1_ to array variable _PARAM0_"),
-          _("Global variables/Arrays and structures"),
+          _("External variables/Global variables/Arrays and structures"),
           "res/actions/var24.png",
           "res/actions/var.png")
       .AddParameter("globalvar", _("Array variable"))
@@ -435,6 +705,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsVariablesExtension(
       .SetParameterLongDescription(
           _("The content of the variable will *be copied* and added at the "
             "end of the array."))
+      .SetRelevantForFunctionEventsOnly()
       .MarkAsAdvanced();
 
   extension
@@ -444,11 +715,12 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsVariablesExtension(
                    "array variable."),
                  _("Remove variable at index _PARAM1_ from global array "
                    "variable _PARAM0_"),
-                 _("Global variables/Arrays and structures"),
+                 _("External variables/Global variables/Arrays and structures"),
                  "res/actions/var24.png",
                  "res/actions/var.png")
       .AddParameter("globalvar", _("Array variable"))
       .AddParameter("expression", _("Index to remove"))
+      .SetRelevantForFunctionEventsOnly()
       .MarkAsAdvanced();
 
   extension
@@ -457,11 +729,12 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsVariablesExtension(
           _("Add text variable"),
           _("Adds a text (string) at the end of a global array variable."),
           _("Add text _PARAM1_ to array variable _PARAM0_"),
-          _("Global variables/Arrays and structures"),
+          _("External variables/Global variables/Arrays and structures"),
           "res/actions/var24.png",
           "res/actions/var.png")
       .AddParameter("globalvar", _("Array variable"))
       .AddParameter("string", _("Text to add"))
+      .SetRelevantForFunctionEventsOnly()
       .MarkAsAdvanced();
 
   extension
@@ -469,11 +742,12 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsVariablesExtension(
                  _("Add number variable"),
                  _("Adds a number at the end of a global array variable."),
                  _("Add number _PARAM1_ to array variable _PARAM0_"),
-                 _("Global variables/Arrays and structures"),
+                 _("External variables/Global variables/Arrays and structures"),
                  "res/actions/var24.png",
                  "res/actions/var.png")
       .AddParameter("globalvar", _("Array variable"))
       .AddParameter("expression", _("Number to add"))
+      .SetRelevantForFunctionEventsOnly()
       .MarkAsAdvanced();
 
   extension
@@ -481,11 +755,12 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsVariablesExtension(
                  _("Add boolean variable"),
                  _("Adds a boolean at the end of a global array variable."),
                  _("Add boolean _PARAM1_ to array variable _PARAM0_"),
-                 _("Global variables/Arrays and structures"),
+                 _("External variables/Global variables/Arrays and structures"),
                  "res/actions/var24.png",
                  "res/actions/var.png")
       .AddParameter("globalvar", _("Array variable"))
       .AddParameter("trueorfalse", _("Boolean to add"))
+      .SetRelevantForFunctionEventsOnly()
       .MarkAsAdvanced();
 
   extension
@@ -494,12 +769,13 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsVariablesExtension(
           _("Number of children"),
           _("Compare the number of children in a global array variable."),
           _("The number of children of the array variable _PARAM0_"),
-          _("Global variables/Arrays and structures"),
+          _("External variables/Global variables/Arrays and structures"),
           "res/conditions/var24.png",
           "res/conditions/var.png")
       .AddParameter("globalvar", _("Array variable"))
       .UseStandardRelationalOperatorParameters(
           "number", ParameterOptions::MakeNewOptions())
+      .SetRelevantForFunctionEventsOnly()
       .MarkAsAdvanced();
 
   extension
@@ -507,18 +783,20 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsVariablesExtension(
                         _("First text child"),
                         _("Value of the first element of a global array "
                           "variable, if it is a text (string) variable."),
-                        _("Global variables/Arrays and structures"),
+                        _("External variables/Global variables/Arrays and structures"),
                         "res/actions/var.png")
-      .AddParameter("globalvar", _("Array variable"));
+      .AddParameter("globalvar", _("Array variable"))
+      .SetRelevantForFunctionEventsOnly();
 
   extension
       .AddExpression("GlobalVariableFirstNumber",
                      _("First number child"),
                      _("Value of the first element of a global array "
                        "variable, if it is a number variable"),
-                     _("Global variables/Arrays and structures"),
+                     _("External variables/Global variables/Arrays and structures"),
                      "res/actions/var.png")
-      .AddParameter("globalvar", _("Array variable"));
+      .AddParameter("globalvar", _("Array variable"))
+      .SetRelevantForFunctionEventsOnly();
 
   extension
       .AddStrExpression(
@@ -526,9 +804,10 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsVariablesExtension(
           _("Last text child"),
           _("Value of the last element of a global array variable, if "
             "it is a text (string) variable."),
-          _("Global variables/Arrays and structures"),
+          _("External variables/Global variables/Arrays and structures"),
           "res/actions/var.png")
-      .AddParameter("globalvar", _("Array variable"));
+      .AddParameter("globalvar", _("Array variable"))
+      .SetRelevantForFunctionEventsOnly();
 
   extension
       .AddExpression(
@@ -536,59 +815,65 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsVariablesExtension(
           _("Last number child"),
           _("Value of the last element of a global array variable, if "
             "it is a number variable"),
-          _("Global variables/Arrays and structures"),
+          _("External variables/Global variables/Arrays and structures"),
           "res/actions/var.png")
-      .AddParameter("globalvar", _("Array variable"));
+      .AddParameter("globalvar", _("Array variable"))
+      .SetRelevantForFunctionEventsOnly();
 
   extension
       .AddExpression("GlobalVariableChildCount",
                      _("Number of children"),
                      _("Number of children in a global array or "
                        "structure variable"),
-                     _("Global variables/Arrays and structures"),
+                     _("External variables/Global variables/Arrays and structures"),
                      "res/actions/var.png")
-      .AddParameter("globalvar", _("Array or structure variable"));
+      .AddParameter("globalvar", _("Array or structure variable"))
+      .SetRelevantForFunctionEventsOnly();
 
   extension
       .AddExpression("VariableChildCount",
                      _("Number of children"),
                      _("Number of children in a scene array or "
                        "structure variable"),
-                     _("Scene variables/Arrays and structures"),
+                     _("Arrays and structures"),
                      "res/actions/var.png")
-      .AddParameter("scenevar", _("Array or structure variable"));
+      .AddParameter("variable", _("Array or structure variable"), "AllowUndeclaredVariable");
 
   extension
       .AddExpression("Variable",
                      _("Number variable"),
                      _("Number value of a scene variable"),
-                     _("Scene variables"),
+                     _("External variables/Scene variables"),
                      "res/actions/var.png")
-      .AddParameter("scenevar", _("Variable"));
+      .AddParameter("scenevar", _("Variable"))
+      .SetRelevantForFunctionEventsOnly();
 
   extension
       .AddStrExpression("VariableString",
                         _("Text variable"),
                         _("Text of a scene variable"),
-                        _("Scene variables"),
+                        _("External variables/Scene variables"),
                         "res/actions/var.png")
-      .AddParameter("scenevar", _("Variable"));
+      .AddParameter("scenevar", _("Variable"))
+      .SetRelevantForFunctionEventsOnly();
 
   extension
       .AddExpression("GlobalVariable",
                      _("Number variable"),
                      _("Number value of a global variable"),
-                     _("Global variables"),
+                     _("External variables/Global variables"),
                      "res/actions/var.png")
-      .AddParameter("globalvar", _("Name of the global variable"));
+      .AddParameter("globalvar", _("Name of the global variable"))
+      .SetRelevantForFunctionEventsOnly();
 
   extension
       .AddStrExpression("GlobalVariableString",
                         _("Text variable"),
                         _("Text of a global variable"),
-                        _("Global variables"),
+                        _("External variables/Global variables"),
                         "res/actions/var.png")
-      .AddParameter("globalvar", _("Variable"));
+      .AddParameter("globalvar", _("Variable"))
+      .SetRelevantForFunctionEventsOnly();
 }
 
 }  // namespace gd

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,
@@ -34,7 +37,8 @@ BehaviorMetadata::BehaviorMetadata(
       className(className_),
       iconFilename(icon24x24),
       instance(instance_),
-      sharedDatasInstance(sharedDatasInstance_) {
+      sharedDatasInstance(sharedDatasInstance_),
+      quickCustomizationVisibility(QuickCustomization::Visibility::Default) {
   SetFullName(gd::String(fullname_));
   SetDescription(gd::String(description_));
   SetDefaultName(gd::String(defaultName_));
@@ -47,8 +51,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,18 +415,44 @@ gd::Behavior& BehaviorMetadata::Get() const {
   return *instance;
 }
 
-gd::BehaviorsSharedData* BehaviorMetadata::GetSharedDataInstance() const { 
+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()) {
+  if (!instance) {
+    return requiredBehaviors;
+  }
+  for (auto& property : instance->GetProperties()) {
     const String& propertyName = property.first;
     const gd::PropertyDescriptor& propertyDescriptor = property.second;
 
     if (propertyDescriptor.GetType() == "Behavior") {
-      requiredBehaviors.push_back(propertyDescriptor.GetExtraInfo()[0]);
+      const auto& extraInfos = propertyDescriptor.GetExtraInfo();
+      if (extraInfos.size() > 0) {
+        requiredBehaviors.push_back(extraInfos[0]);
+      }
     }
   }
   return requiredBehaviors;

Core/GDCore/Extensions/Metadata/BehaviorMetadata.h

@@ -12,12 +12,14 @@
 #include "GDCore/Extensions/Metadata/ExpressionMetadata.h"
 #include "GDCore/Extensions/Metadata/InstructionMetadata.h"
 #include "GDCore/String.h"
+#include "GDCore/Project/QuickCustomization.h"
 namespace gd {
 class Behavior;
 class BehaviorsSharedData;
 class MultipleInstructionMetadata;
 class InstructionMetadata;
 class ExpressionMetadata;
+class PropertyDescriptor;
 }  // namespace gd
 
 namespace gd {
@@ -40,10 +42,10 @@ class GD_CORE_API BehaviorMetadata : public InstructionOrExpressionContainerMeta
       const gd::String& className_,
       std::shared_ptr<gd::Behavior> instance,
       std::shared_ptr<gd::BehaviorsSharedData> sharedDatasInstance);
-      
+
   /**
    * \brief Construct a behavior metadata, without "blueprint" behavior.
-   * 
+   *
    * \note This is used by events based behaviors.
    */
   BehaviorMetadata(
@@ -204,6 +206,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;
 
@@ -294,23 +298,50 @@ class GD_CORE_API BehaviorMetadata : public InstructionOrExpressionContainerMeta
     return *this;
   }
 
+  QuickCustomization::Visibility GetQuickCustomizationVisibility() const {
+    return quickCustomizationVisibility;
+  }
+
+  BehaviorMetadata &SetQuickCustomizationVisibility(QuickCustomization::Visibility visibility) {
+    quickCustomizationVisibility = visibility;
+    return *this;
+  }
+
   /**
    * \brief Return the associated gd::Behavior, handling behavior contents.
-   * 
+   *
    * \note Returns a dumb Behavior for events based behaviors as CustomBehavior
    * are using EventBasedBehavior.
    */
   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).
-   * 
+   *
    * \note Returns nullptr for events based behaviors as they don't declare
    * shared data yet.
    */
   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).
@@ -353,10 +384,13 @@ class GD_CORE_API BehaviorMetadata : public InstructionOrExpressionContainerMeta
   mutable std::vector<gd::String> requiredBehaviors;
   bool isPrivate = false;
   bool isHidden = false;
+  QuickCustomization::Visibility quickCustomizationVisibility;
 
   // 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 {
@@ -37,45 +38,37 @@ gd::ExpressionMetadata& ExpressionMetadata::AddParameter(
     const gd::String& description,
     const gd::String& supplementaryInformation,
     bool parameterIsOptional) {
-  gd::ParameterMetadata info;
-  info.SetType(type);
-  info.description = description;
-  info.codeOnly = false;
-  info.SetOptional(parameterIsOptional);
-  info.SetExtraInfo(
+  parameters.AddNewParameter("")
+  .SetType(type)
+  .SetDescription(description)
+  .SetCodeOnly(false)
+  .SetOptional(parameterIsOptional)
+  .SetExtraInfo(
       // For objects/behavior, the supplementary information
       // parameter is an object/behavior type...
       ((gd::ParameterMetadata::IsObject(type) ||
-       gd::ParameterMetadata::IsBehavior(type))
-       // Prefix with the namespace if it's not already there.
-       && !(supplementaryInformation.rfind(extensionNamespace, 0) == 0))
-          ? (supplementaryInformation.empty()
-                 ? ""
-                 : extensionNamespace +
-                       supplementaryInformation  //... so prefix it with the extension
-                                           // namespace.
-             )
-          : supplementaryInformation);  // Otherwise don't change anything
+        gd::ParameterMetadata::IsBehavior(type))
+               // Prefix with the namespace if it's not already there.
+               && (supplementaryInformation.find(
+                       PlatformExtension::GetNamespaceSeparator()) == gd::String::npos)
+           ? (supplementaryInformation.empty()
+                  ? ""
+                  : extensionNamespace + supplementaryInformation)
+           : supplementaryInformation));
 
   // TODO: Assert against supplementaryInformation === "emsc" (when running with
   // Emscripten), and warn about a missing argument when calling addParameter.
 
-  parameters.push_back(info);
   return *this;
 }
 
-gd::ExpressionMetadata& ExpressionMetadata::AddCodeOnlyParameter(
-    const gd::String& type, const gd::String& supplementaryInformation) {
-  gd::ParameterMetadata info;
-  info.SetType(type);
-  info.codeOnly = true;
-  info.SetExtraInfo(supplementaryInformation);
-
-  parameters.push_back(info);
+gd::ExpressionMetadata &ExpressionMetadata::AddCodeOnlyParameter(
+    const gd::String &type, const gd::String &supplementaryInformation) {
+  parameters.AddNewParameter("").SetType(type).SetCodeOnly().SetExtraInfo(
+      supplementaryInformation);
   return *this;
 }
 
-
 gd::ExpressionMetadata& ExpressionMetadata::SetRequiresBaseObjectCapability(
     const gd::String& capability) {
   requiredBaseObjectCapability = capability;

Core/GDCore/Extensions/Metadata/ExpressionMetadata.h

@@ -193,8 +193,9 @@ class GD_CORE_API ExpressionMetadata : public gd::AbstractFunctionMetadata {
    * \see AddParameter
    */
   ExpressionMetadata &SetDefaultValue(const gd::String &defaultValue) override {
-    if (!parameters.empty())
-      parameters.back().SetDefaultValue(defaultValue);
+    if (parameters.GetParametersCount() > 0) {
+      parameters.GetInternalVector().back()->SetDefaultValue(defaultValue);
+    }
     return *this;
   };
 
@@ -206,8 +207,9 @@ class GD_CORE_API ExpressionMetadata : public gd::AbstractFunctionMetadata {
    */
   ExpressionMetadata &
   SetParameterLongDescription(const gd::String &longDescription) override {
-    if (!parameters.empty())
-      parameters.back().SetLongDescription(longDescription);
+    if (parameters.GetParametersCount() > 0) {
+      parameters.GetInternalVector().back()->SetLongDescription(longDescription);
+    }
     return *this;
   };
 
@@ -220,7 +222,9 @@ class GD_CORE_API ExpressionMetadata : public gd::AbstractFunctionMetadata {
    */
   ExpressionMetadata &SetParameterExtraInfo(
       const gd::String &extraInfo) override {
-    if (!parameters.empty()) parameters.back().SetExtraInfo(extraInfo);
+    if (parameters.GetParametersCount() > 0) {
+      parameters.GetInternalVector().back()->SetExtraInfo(extraInfo);
+    }
     return *this;
   }
 
@@ -248,19 +252,16 @@ class GD_CORE_API ExpressionMetadata : public gd::AbstractFunctionMetadata {
   const gd::String& GetGroup() const { return group; }
   const gd::String& GetSmallIconFilename() const { return smallIconFilename; }
   const gd::ParameterMetadata& GetParameter(std::size_t id) const {
-    return parameters[id];
+    return parameters.GetParameter(id);
   };
   gd::ParameterMetadata& GetParameter(std::size_t id) {
-    return parameters[id];
+    return parameters.GetParameter(id);
   };
-  std::size_t GetParametersCount() const { return parameters.size(); };
-  const std::vector<gd::ParameterMetadata>& GetParameters() const {
+  std::size_t GetParametersCount() const { return parameters.GetParametersCount(); };
+  const gd::ParameterMetadataContainer& GetParameters() const {
     return parameters;
   };
 
-  std::vector<gd::ParameterMetadata> parameters;
-
-  
   /**
    * \brief Set the function name which will be used when generating the code.
    * \param functionName the name of the function to call
@@ -288,6 +289,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 {
@@ -366,6 +369,8 @@ class GD_CORE_API ExpressionMetadata : public gd::AbstractFunctionMetadata {
   bool isPrivate;
   gd::String requiredBaseObjectCapability;
   gd::String relevantContext;
+
+  gd::ParameterMetadataContainer parameters;
 };
 
 }  // namespace gd

Core/GDCore/Extensions/Metadata/InstructionMetadata.cpp

@@ -8,6 +8,8 @@
 #include <algorithm>
 
 #include "GDCore/CommonTools.h"
+#include "GDCore/Extensions/PlatformExtension.h"
+#include "GDCore/Project/ParameterMetadataContainer.h"
 #include "GDCore/Serialization/SerializerElement.h"
 #include "GDCore/Tools/Localization.h"
 #include "GDCore/Tools/Log.h"
@@ -64,22 +66,19 @@ InstructionMetadata& InstructionMetadata::AddParameter(
       // For objects/behavior, the supplementary information
       // parameter is an object/behavior type...
       ((gd::ParameterMetadata::IsObject(type) ||
-       gd::ParameterMetadata::IsBehavior(type))
-       // Prefix with the namespace if it's not already there.
-       && !(supplementaryInformation.rfind(extensionNamespace, 0) == 0))
-          ? (supplementaryInformation.empty()
-                 ? ""
-                 : extensionNamespace +
-                       supplementaryInformation  //... so prefix it with the
-                                                 // extension
-                                                 // namespace.
-             )
-          : supplementaryInformation);  // Otherwise don't change anything
+        gd::ParameterMetadata::IsBehavior(type))
+               // Prefix with the namespace if it's not already there.
+               && (supplementaryInformation.find(
+                       PlatformExtension::GetNamespaceSeparator()) == gd::String::npos)
+           ? (supplementaryInformation.empty()
+                  ? ""
+                  : extensionNamespace + supplementaryInformation)
+           : supplementaryInformation));
 
   // TODO: Assert against supplementaryInformation === "emsc" (when running with
   // Emscripten), and warn about a missing argument when calling addParameter.
 
-  parameters.push_back(info);
+  parameters.AddParameter(info);
   return *this;
 }
 
@@ -90,7 +89,7 @@ InstructionMetadata& InstructionMetadata::AddCodeOnlyParameter(
   info.codeOnly = true;
   info.SetExtraInfo(supplementaryInformation);
 
-  parameters.push_back(info);
+  parameters.AddParameter(info);
   return *this;
 }
 
@@ -104,7 +103,7 @@ InstructionMetadata& InstructionMetadata::UseStandardOperatorParameters(
     AddParameter(
         "yesorno",
         options.description.empty() ? _("New value") : options.description);
-    size_t valueParamIndex = parameters.size() - 1;
+    size_t valueParamIndex = parameters.GetParametersCount() - 1;
 
     if (isObjectInstruction || isBehaviorInstruction) {
       gd::String templateSentence = _("Set _PARAM0_ as <subject>: <value>");
@@ -129,8 +128,8 @@ InstructionMetadata& InstructionMetadata::UseStandardOperatorParameters(
                  options.description.empty() ? _("Value") : options.description,
                  options.typeExtraInfo);
 
-    size_t operatorParamIndex = parameters.size() - 2;
-    size_t valueParamIndex = parameters.size() - 1;
+    size_t operatorParamIndex = parameters.GetParametersCount() - 2;
+    size_t valueParamIndex = parameters.GetParametersCount() - 1;
 
     if (isObjectInstruction || isBehaviorInstruction) {
       gd::String templateSentence = _("Change <subject> of _PARAM0_: <operator> <value>");
@@ -183,14 +182,14 @@ InstructionMetadata::UseStandardRelationalOperatorParameters(
     AddParameter(type,
                  options.description.empty() ? _("Value to compare") : options.description,
                  options.typeExtraInfo);
-    size_t operatorParamIndex = parameters.size() - 2;
-    size_t valueParamIndex = parameters.size() - 1;
+    size_t operatorParamIndex = parameters.GetParametersCount() - 2;
+    size_t valueParamIndex = parameters.GetParametersCount() - 1;
 
     if (isObjectInstruction || isBehaviorInstruction) {
       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 +199,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

@@ -14,6 +14,7 @@
 #include <memory>
 
 #include "GDCore/Events/Instruction.h"
+#include "GDCore/Project/ParameterMetadataContainer.h"
 #include "GDCore/String.h"
 #include "ParameterMetadata.h"
 #include "ParameterOptions.h"
@@ -61,12 +62,12 @@ class GD_CORE_API InstructionMetadata : public gd::AbstractFunctionMetadata {
   const gd::String &GetDescription() const { return description; }
   const gd::String &GetSentence() const { return sentence; }
   const gd::String &GetGroup() const { return group; }
-  ParameterMetadata &GetParameter(size_t i) { return parameters[i]; }
+  ParameterMetadata &GetParameter(size_t i) { return parameters.GetParameter(i); }
   const ParameterMetadata &GetParameter(size_t i) const {
-    return parameters[i];
+    return parameters.GetParameter(i);
   }
-  size_t GetParametersCount() const { return parameters.size(); }
-  const std::vector<ParameterMetadata> &GetParameters() const {
+  size_t GetParametersCount() const { return parameters.GetParametersCount(); }
+  const ParameterMetadataContainer &GetParameters() const {
     return parameters;
   }
   const gd::String &GetIconFilename() const { return iconFilename; }
@@ -256,7 +257,9 @@ class GD_CORE_API InstructionMetadata : public gd::AbstractFunctionMetadata {
    * \see AddParameter
    */
   InstructionMetadata &SetDefaultValue(const gd::String &defaultValue_) override {
-    if (!parameters.empty()) parameters.back().SetDefaultValue(defaultValue_);
+    if (parameters.GetParametersCount() > 0) {
+      parameters.GetInternalVector().back()->SetDefaultValue(defaultValue_);
+    }
     return *this;
   };
 
@@ -268,8 +271,9 @@ class GD_CORE_API InstructionMetadata : public gd::AbstractFunctionMetadata {
    */
   InstructionMetadata &SetParameterLongDescription(
       const gd::String &longDescription) override {
-    if (!parameters.empty())
-      parameters.back().SetLongDescription(longDescription);
+    if (parameters.GetParametersCount() > 0) {
+      parameters.GetInternalVector().back()->SetLongDescription(longDescription);
+    }
     return *this;
   }
 
@@ -281,7 +285,9 @@ class GD_CORE_API InstructionMetadata : public gd::AbstractFunctionMetadata {
    * \see AddParameter
    */
   InstructionMetadata &SetParameterExtraInfo(const gd::String &extraInfo) override {
-    if (!parameters.empty()) parameters.back().SetExtraInfo(extraInfo);
+    if (parameters.GetParametersCount() > 0) {
+      parameters.GetInternalVector().back()->SetExtraInfo(extraInfo);
+    }
     return *this;
   }
 
@@ -456,6 +462,15 @@ class GD_CORE_API InstructionMetadata : public gd::AbstractFunctionMetadata {
     return *this;
   }
 
+/**
+ * \brief Return the type manipulated in a standard way by the instruction.
+ * 
+ * \param type "number" or "string"
+ */
+  const gd::String &GetManipulatedType() const {
+    return codeExtraInformation.type;
+  }
+
   /**
    * If InstructionMetadata::ExtraInformation::SetManipulatedType was called
    * with "number" or "string", this function will tell the code generator the
@@ -494,6 +509,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();
@@ -549,7 +566,7 @@ class GD_CORE_API InstructionMetadata : public gd::AbstractFunctionMetadata {
    */
   InstructionMetadata &GetCodeExtraInformation() { return *this; }
 
-  std::vector<ParameterMetadata> parameters;
+  ParameterMetadataContainer parameters;
 
  private:
   gd::String fullname;

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

@@ -454,11 +454,12 @@ const gd::ParameterMetadata* MetadataProvider::GetFunctionCallParameterMetadata(
       // TODO use a badMetadata instead of a nullptr?
       const gd::ParameterMetadata* parameterMetadata = nullptr;
       while (metadataParameterIndex <
-             metadata.parameters.size()) {
-        if (!metadata.parameters[metadataParameterIndex]
+             metadata.GetParameters().GetParametersCount()) {
+        if (!metadata.GetParameters().GetParameter(metadataParameterIndex)
                  .IsCodeOnly()) {
           if (visibleParameterIndex == parameterIndex) {
-            parameterMetadata = &metadata.parameters[metadataParameterIndex];
+            parameterMetadata =
+                &metadata.GetParameters().GetParameter(metadataParameterIndex);
           }
           visibleParameterIndex++;
         }

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

@@ -4,8 +4,8 @@
  * reserved. This project is released under the MIT License.
  */
 
-#ifndef PARAMETER_METADATA_H
-#define PARAMETER_METADATA_H
+#pragma once
+
 #include <map>
 #include <memory>
 
@@ -29,6 +29,12 @@ class GD_CORE_API ParameterMetadata {
   ParameterMetadata();
   virtual ~ParameterMetadata(){};
 
+  /**
+   * \brief Return a pointer to a new ParameterMetadata constructed from
+   * this one.
+   */
+  ParameterMetadata* Clone() const { return new ParameterMetadata(*this); };
+
   /**
    * \brief Return the metadata of the parameter type.
    */
@@ -248,5 +254,3 @@ class GD_CORE_API ParameterMetadata {
 };
 
 }  // namespace gd
-
-#endif  // PARAMETER_METADATA_H

Core/GDCore/Extensions/Metadata/ParameterMetadataTools.cpp

@@ -9,6 +9,7 @@
 #include "GDCore/Project/Object.h"
 #include "GDCore/Project/ObjectsContainer.h"
 #include "GDCore/Project/ObjectsContainersList.h"
+#include "GDCore/Project/ParameterMetadataContainer.h"
 #include "GDCore/Project/Project.h"
 #include "GDCore/String.h"
 #include "InstructionMetadata.h"
@@ -20,13 +21,13 @@ const ParameterMetadata ParameterMetadataTools::badParameterMetadata;
 
 void ParameterMetadataTools::ParametersToObjectsContainer(
     const gd::Project& project,
-    const std::vector<gd::ParameterMetadata>& parameters,
+    const ParameterMetadataContainer& parameters,
     gd::ObjectsContainer& outputObjectsContainer) {
   outputObjectsContainer.GetObjects().clear();
 
   gd::String lastObjectName;
-  for (std::size_t i = 0; i < parameters.size(); ++i) {
-    const auto& parameter = parameters[i];
+  for (std::size_t i = 0; i < parameters.GetParametersCount(); ++i) {
+    const auto& parameter = parameters.GetParameter(i);
     if (parameter.GetName().empty()) continue;
 
     if (gd::ParameterMetadata::IsObject(parameter.GetType())) {
@@ -60,32 +61,35 @@ void ParameterMetadataTools::ParametersToObjectsContainer(
   }
 }
 
-void ParameterMetadataTools::ForEachParameterWithPrefix(
-    const std::vector<const std::vector<gd::ParameterMetadata>*>&
+void ParameterMetadataTools::ForEachParameterMatchingSearch(
+    const std::vector<const ParameterMetadataContainer*>&
         parametersVectorsList,
-    const gd::String& prefix,
+    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;
+    const ParameterMetadataContainer* parametersVector = *it;
 
-    for (const auto& parameterMetadata: *parametersVector) {
-      if (parameterMetadata.GetName().find(prefix) == 0) cb(parameterMetadata);
+    for (const auto &parameterMetadata :
+         parametersVector->GetInternalVector()) {
+      if (parameterMetadata->GetName().FindCaseInsensitive(search) !=
+          gd::String::npos)
+        cb(*parameterMetadata);
     }
   }
 }
 
 bool ParameterMetadataTools::Has(
-      const std::vector<const std::vector<gd::ParameterMetadata>*>& parametersVectorsList,
+      const std::vector<const ParameterMetadataContainer*>& parametersVectorsList,
       const gd::String& parameterName) {
   for (auto it = parametersVectorsList.rbegin();
        it != parametersVectorsList.rend();
        ++it) {
-    const std::vector<gd::ParameterMetadata>* parametersVector = *it;
+    const ParameterMetadataContainer* parametersVector = *it;
 
-    for (const auto& parameterMetadata: *parametersVector) {
-      if (parameterMetadata.GetName() == parameterName) return true;
+    for (const auto& parameterMetadata: parametersVector->GetInternalVector()) {
+      if (parameterMetadata->GetName() == parameterName) return true;
     }
   }
 
@@ -93,16 +97,18 @@ bool ParameterMetadataTools::Has(
 }
 
 const gd::ParameterMetadata& ParameterMetadataTools::Get(
-    const std::vector<const std::vector<gd::ParameterMetadata>*>&
+    const std::vector<const ParameterMetadataContainer*>&
         parametersVectorsList,
     const gd::String& parameterName) {
   for (auto it = parametersVectorsList.rbegin();
        it != parametersVectorsList.rend();
        ++it) {
-    const std::vector<gd::ParameterMetadata>* parametersVector = *it;
+    const ParameterMetadataContainer* parametersVector = *it;
 
-    for (const auto& parameterMetadata: *parametersVector) {
-      if (parameterMetadata.GetName() == parameterName) return parameterMetadata;
+    for (const auto &parameterMetadata :
+         parametersVector->GetInternalVector()) {
+      if (parameterMetadata->GetName() == parameterName)
+        return *parameterMetadata;
     }
   }
 
@@ -111,7 +117,7 @@ const gd::ParameterMetadata& ParameterMetadataTools::Get(
 
 void ParameterMetadataTools::IterateOverParameters(
     const std::vector<gd::Expression>& parameters,
-    const std::vector<gd::ParameterMetadata>& parametersMetadata,
+    const ParameterMetadataContainer& parametersMetadata,
     std::function<void(const gd::ParameterMetadata& parameterMetadata,
                        const gd::Expression& parameterValue,
                        const gd::String& lastObjectName)> fn) {
@@ -128,15 +134,17 @@ void ParameterMetadataTools::IterateOverParameters(
 
 void ParameterMetadataTools::IterateOverParametersWithIndex(
     const std::vector<gd::Expression>& parameters,
-    const std::vector<gd::ParameterMetadata>& parametersMetadata,
+    const ParameterMetadataContainer& parametersMetadata,
     std::function<void(const gd::ParameterMetadata& parameterMetadata,
                        const gd::Expression& parameterValue,
                        size_t parameterIndex,
                        const gd::String& lastObjectName)> fn) {
   gd::String lastObjectName = "";
-  for (std::size_t pNb = 0; pNb < parametersMetadata.size(); ++pNb) {
-    const gd::ParameterMetadata& parameterMetadata = parametersMetadata[pNb];
-    const gd::Expression& parameterValue =
+  for (std::size_t pNb = 0; pNb < parametersMetadata.GetParametersCount();
+       ++pNb) {
+    const gd::ParameterMetadata &parameterMetadata =
+        parametersMetadata.GetParameter(pNb);
+    const gd::Expression &parameterValue =
         pNb < parameters.size() ? parameters[pNb].GetPlainString() : "";
     const gd::Expression& parameterValueOrDefault =
         parameterValue.GetPlainString().empty() && parameterMetadata.IsOptional()
@@ -179,10 +187,10 @@ void ParameterMetadataTools::IterateOverParametersWithIndex(
 
   size_t parameterIndex = 0;
   for (size_t metadataIndex = (isObjectFunction ? 1 : 0);
-       metadataIndex < metadata.parameters.size() &&
+       metadataIndex < metadata.GetParameters().GetParametersCount() &&
        parameterIndex < node.parameters.size();
        ++metadataIndex) {
-    auto &parameterMetadata = metadata.parameters[metadataIndex];
+    auto &parameterMetadata = metadata.GetParameters().GetParameter(metadataIndex);
     if (parameterMetadata.IsCodeOnly()) {
       continue;
     }
@@ -204,16 +212,17 @@ void ParameterMetadataTools::IterateOverParametersWithIndex(
 }
 
 size_t ParameterMetadataTools::GetObjectParameterIndexFor(
-    const std::vector<gd::ParameterMetadata>& parametersMetadata,
+    const ParameterMetadataContainer& parametersMetadata,
     size_t parameterIndex) {
   // By convention, parameters that require
   // an object (mainly, "objectvar" and "behavior") should be placed after
   // the object in the list of parameters (if possible, just after).
   // Search "lastObjectName" in the codebase for other place where this
   // convention is enforced.
-  for (std::size_t pNb = parameterIndex; pNb < parametersMetadata.size();
-       pNb--) {
-    if (gd::ParameterMetadata::IsObject(parametersMetadata[pNb].GetType())) {
+  for (std::size_t pNb = parameterIndex;
+       pNb < parametersMetadata.GetParametersCount(); pNb--) {
+    if (gd::ParameterMetadata::IsObject(
+            parametersMetadata.GetParameter(pNb).GetType())) {
       return pNb;
     }
   }

Core/GDCore/Extensions/Metadata/ParameterMetadataTools.h

@@ -15,6 +15,7 @@ class ObjectsContainer;
 class ObjectsContainersList;
 class ParameterMetadata;
 class Expression;
+class ParameterMetadataContainer;
 struct FunctionCallNode;
 struct ExpressionNode;
 }  // namespace gd
@@ -24,20 +25,20 @@ class GD_CORE_API ParameterMetadataTools {
  public:
   static void ParametersToObjectsContainer(
       const gd::Project& project,
-      const std::vector<gd::ParameterMetadata>& parameters,
+      const ParameterMetadataContainer& parameters,
       gd::ObjectsContainer& outputObjectsContainer);
 
-  static void ForEachParameterWithPrefix(
-      const std::vector<const std::vector<gd::ParameterMetadata>*>& parametersVectorsList,
-      const gd::String& prefix,
+  static void ForEachParameterMatchingSearch(
+      const std::vector<const ParameterMetadataContainer*>& 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 std::vector<const ParameterMetadataContainer*>& parametersVectorsList,
       const gd::String& parameterName);
 
   static const gd::ParameterMetadata& Get(
-      const std::vector<const std::vector<gd::ParameterMetadata>*>& parametersVectorsList,
+      const std::vector<const ParameterMetadataContainer*>& parametersVectorsList,
       const gd::String& parameterName);
 
   /**
@@ -47,7 +48,7 @@ class GD_CORE_API ParameterMetadataTools {
    */
   static void IterateOverParameters(
       const std::vector<gd::Expression>& parameters,
-      const std::vector<gd::ParameterMetadata>& parametersMetadata,
+      const ParameterMetadataContainer& parametersMetadata,
       std::function<void(const gd::ParameterMetadata& parameterMetadata,
                          const gd::Expression& parameterValue,
                          const gd::String& lastObjectName)> fn);
@@ -59,7 +60,7 @@ class GD_CORE_API ParameterMetadataTools {
    */
   static void IterateOverParametersWithIndex(
       const std::vector<gd::Expression>& parameters,
-      const std::vector<gd::ParameterMetadata>& parametersMetadata,
+      const ParameterMetadataContainer& parametersMetadata,
       std::function<void(const gd::ParameterMetadata& parameterMetadata,
                          const gd::Expression& parameterValue,
                          size_t parameterIndex,
@@ -84,7 +85,7 @@ class GD_CORE_API ParameterMetadataTools {
    * it's linked to.
    */
   static size_t GetObjectParameterIndexFor(
-      const std::vector<gd::ParameterMetadata>& parametersMetadata,
+      const ParameterMetadataContainer& parametersMetadata,
       size_t parameterIndex);
 
 private:

Core/GDCore/Extensions/Metadata/ValueTypeMetadata.h

@@ -210,14 +210,19 @@ class GD_CORE_API ValueTypeMetadata {
              parameterType == "scenevar";
     } else if (type == "resource") {
       return parameterType == "fontResource" ||
-             parameterType == "soundfile" ||
-             parameterType == "musicfile" ||
+             parameterType == "audioResource" ||
+             parameterType == "videoResource" ||
              parameterType == "bitmapFontResource" ||
              parameterType == "imageResource" ||
              parameterType == "jsonResource" ||
              parameterType == "tilemapResource" ||
              parameterType == "tilesetResource" ||
-             parameterType == "model3DResource";
+             parameterType == "model3DResource" ||
+             parameterType == "atlasResource" ||
+             parameterType == "spineResource" ||
+             // Deprecated, old parameter types:
+             parameterType == "soundfile" ||
+             parameterType == "musicfile";
     }
     return false;
   }

Core/GDCore/Extensions/Platform.cpp

@@ -96,11 +96,11 @@ std::shared_ptr<gd::PlatformExtension> Platform::GetExtension(
 std::unique_ptr<gd::ObjectConfiguration> Platform::CreateObjectConfiguration(
     gd::String type) const {
   if (creationFunctionTable.find(type) == creationFunctionTable.end()) {
-    gd::LogWarning("Tried to create an object with an unknown type: " + type
+    gd::LogWarning("Tried to create an object configuration with an unknown type: " + type
               + " for platform " + GetName() + "!");
     type = "";
     if (creationFunctionTable.find("") == creationFunctionTable.end()) {
-      gd::LogError("Unable to create a Base object!");
+      gd::LogFatalError("Unable to create a base object configuration!");
       return nullptr;
     }
   }

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))
+                      linked) != parentExternalEvents.end()) {
+          // Circular dependency!
           return false;
-
+        }
+        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())
-          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))
+            parentScenes.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 = 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/EventBasedBehaviorBrowser.cpp

@@ -26,7 +26,7 @@ void EventBasedBehaviorBrowser::ExposeEvents(
 void EventBasedBehaviorBrowser::ExposeEvents(
     gd::Project &project, gd::ArbitraryEventsWorkerWithContext &worker) const {
   gd::ProjectBrowserHelper::ExposeEventsBasedBehaviorEvents(
-      project, eventsBasedBehavior, worker);
+      project, eventsFunctionsExtension, eventsBasedBehavior, worker);
 }
 
 void EventBasedBehaviorBrowser::ExposeObjects(

Core/GDCore/IDE/EventBasedBehaviorBrowser.h

@@ -29,8 +29,11 @@ namespace gd {
  */
 class GD_CORE_API EventBasedBehaviorBrowser : public ProjectBrowser {
 public:
-  EventBasedBehaviorBrowser(gd::EventsBasedBehavior &eventsBasedBehavior_)
-      : eventsBasedBehavior(eventsBasedBehavior_) {}
+  EventBasedBehaviorBrowser(
+      const gd::EventsFunctionsExtension &eventsFunctionsExtension_,
+      gd::EventsBasedBehavior &eventsBasedBehavior_)
+      : eventsFunctionsExtension(eventsFunctionsExtension_),
+        eventsBasedBehavior(eventsBasedBehavior_) {}
 
   /**
    * \brief Call the specified worker on all events of the event-based
@@ -48,7 +51,7 @@ public:
    * This should be the preferred way to traverse all the events of an event-based behavior.
    */
   void
-  ExposeEvents(gd::Project &project,
+  ExposeEvents(gd::Project &project, 
                gd::ArbitraryEventsWorkerWithContext &worker) const override;
 
   /**
@@ -80,6 +83,7 @@ public:
                          gd::ArbitraryBehaviorSharedDataWorker &worker) const override;
 
 private:
+  const gd::EventsFunctionsExtension &eventsFunctionsExtension;
   gd::EventsBasedBehavior &eventsBasedBehavior;
 };
 

Core/GDCore/IDE/Events/ArbitraryEventsWorker.cpp

@@ -14,29 +14,27 @@
 #include "GDCore/Events/Expression.h"
 #include "GDCore/Extensions/Metadata/ParameterMetadata.h"
 #include "GDCore/String.h"
+#include "GDCore/Tools/Log.h"
 
 using namespace std;
 
 namespace gd {
 
-ArbitraryEventsWorker::~ArbitraryEventsWorker() {}
+AbstractArbitraryEventsWorker::~AbstractArbitraryEventsWorker() {}
 
-void ArbitraryEventsWorker::VisitEventList(gd::EventsList& events) {
+void AbstractArbitraryEventsWorker::VisitEventList(gd::EventsList& events) {
   DoVisitEventList(events);
 
   for (std::size_t i = 0; i < events.size();) {
     if (events[i].AcceptVisitor(*this))
       events.RemoveEvent(i);
     else {
-      if (events[i].CanHaveSubEvents())
-        VisitEventList(events[i].GetSubEvents());
-
       ++i;
     }
   }
 }
 
-bool ArbitraryEventsWorker::VisitEvent(gd::BaseEvent& event) {
+bool AbstractArbitraryEventsWorker::VisitEvent(gd::BaseEvent& event) {
   bool shouldDelete = DoVisitEvent(event);
   if (shouldDelete) return true;
 
@@ -55,15 +53,17 @@ bool ArbitraryEventsWorker::VisitEvent(gd::BaseEvent& event) {
       *expressionAndMetadata.first, expressionAndMetadata.second);
   }
 
-
+  if (!shouldDelete && event.CanHaveSubEvents()) {
+    VisitEventList(event.GetSubEvents());
+  }
   return shouldDelete;
 }
 
-bool ArbitraryEventsWorker::VisitLinkEvent(gd::LinkEvent& linkEvent) {
+bool AbstractArbitraryEventsWorker::VisitLinkEvent(gd::LinkEvent& linkEvent) {
   return DoVisitLinkEvent(linkEvent);
 }
 
-void ArbitraryEventsWorker::VisitInstructionList(
+void AbstractArbitraryEventsWorker::VisitInstructionList(
     gd::InstructionsList& instructions, bool areConditions) {
   DoVisitInstructionList(instructions, areConditions);
 
@@ -79,22 +79,19 @@ void ArbitraryEventsWorker::VisitInstructionList(
   }
 }
 
-bool ArbitraryEventsWorker::VisitInstruction(gd::Instruction& instruction,
+bool AbstractArbitraryEventsWorker::VisitInstruction(gd::Instruction& instruction,
                                              bool isCondition) {
   return DoVisitInstruction(instruction, isCondition);
 }
 
-bool ArbitraryEventsWorker::VisitEventExpression(gd::Expression& expression,
+bool AbstractArbitraryEventsWorker::VisitEventExpression(gd::Expression& expression,
                                                  const gd::ParameterMetadata& metadata) {
   return DoVisitEventExpression(expression, metadata);
 }
 
-ArbitraryEventsWorkerWithContext::~ArbitraryEventsWorkerWithContext() {}
+AbstractReadOnlyArbitraryEventsWorker::~AbstractReadOnlyArbitraryEventsWorker() {}
 
-
-ReadOnlyArbitraryEventsWorker::~ReadOnlyArbitraryEventsWorker() {}
-
-void ReadOnlyArbitraryEventsWorker::VisitEventList(const gd::EventsList& events) {
+void AbstractReadOnlyArbitraryEventsWorker::VisitEventList(const gd::EventsList& events) {
   DoVisitEventList(events);
 
   for (std::size_t i = 0; i < events.size(); ++i) {
@@ -109,7 +106,7 @@ void ReadOnlyArbitraryEventsWorker::VisitEventList(const gd::EventsList& events)
   }
 }
 
-void ReadOnlyArbitraryEventsWorker::VisitEvent(const gd::BaseEvent& event) {
+void AbstractReadOnlyArbitraryEventsWorker::VisitEvent(const gd::BaseEvent& event) {
   DoVisitEvent(event);
 
   const vector<const gd::InstructionsList*> conditionsVectors =
@@ -130,11 +127,11 @@ void ReadOnlyArbitraryEventsWorker::VisitEvent(const gd::BaseEvent& event) {
   }
 }
 
-void ReadOnlyArbitraryEventsWorker::VisitLinkEvent(const gd::LinkEvent& linkEvent) {
+void AbstractReadOnlyArbitraryEventsWorker::VisitLinkEvent(const gd::LinkEvent& linkEvent) {
   DoVisitLinkEvent(linkEvent);
 }
 
-void ReadOnlyArbitraryEventsWorker::VisitInstructionList(
+void AbstractReadOnlyArbitraryEventsWorker::VisitInstructionList(
     const gd::InstructionsList& instructions, bool areConditions) {
   DoVisitInstructionList(instructions, areConditions);
 
@@ -150,21 +147,73 @@ void ReadOnlyArbitraryEventsWorker::VisitInstructionList(
   }
 }
 
-void ReadOnlyArbitraryEventsWorker::VisitInstruction(const gd::Instruction& instruction,
+void AbstractReadOnlyArbitraryEventsWorker::VisitInstruction(const gd::Instruction& instruction,
                                              bool isCondition) {
   DoVisitInstruction(instruction, isCondition);
 }
 
 
-void ReadOnlyArbitraryEventsWorker::VisitEventExpression(const gd::Expression& expression,
+void AbstractReadOnlyArbitraryEventsWorker::VisitEventExpression(const gd::Expression& expression,
                                                  const gd::ParameterMetadata& metadata) {
   DoVisitEventExpression(expression, metadata);
 }
 
-void ReadOnlyArbitraryEventsWorker::StopAnyEventIteration() {
+void AbstractReadOnlyArbitraryEventsWorker::StopAnyEventIteration() {
   shouldStopIteration = true;
 }
 
+ArbitraryEventsWorker::~ArbitraryEventsWorker() {}
+
+bool ArbitraryEventsWorker::VisitEvent(gd::BaseEvent &event) {
+  return AbstractArbitraryEventsWorker::VisitEvent(event);
+}
+
+ArbitraryEventsWorkerWithContext::~ArbitraryEventsWorkerWithContext() {}
+
+bool ArbitraryEventsWorkerWithContext::VisitEvent(gd::BaseEvent &event) {
+  if (!event.HasVariables()) {
+    return AbstractArbitraryEventsWorker::VisitEvent(event);
+  }
+  // Push local variables
+  auto newProjectScopedContainers =
+      ProjectScopedContainers::MakeNewProjectScopedContainersWithLocalVariables(
+          *currentProjectScopedContainers, event);
+  auto *parentProjectScopedContainers = currentProjectScopedContainers;
+  currentProjectScopedContainers = &newProjectScopedContainers;
+
+  bool shouldDelete = AbstractArbitraryEventsWorker::VisitEvent(event);
+
+  // Pop local variables
+  currentProjectScopedContainers = parentProjectScopedContainers;
+  return shouldDelete;
+}
+
+ReadOnlyArbitraryEventsWorker::~ReadOnlyArbitraryEventsWorker() {}
+
+void ReadOnlyArbitraryEventsWorker::VisitEvent(
+    const gd::BaseEvent &event) {
+  AbstractReadOnlyArbitraryEventsWorker::VisitEvent(event);
+}
+
 ReadOnlyArbitraryEventsWorkerWithContext::~ReadOnlyArbitraryEventsWorkerWithContext() {}
 
+void ReadOnlyArbitraryEventsWorkerWithContext::VisitEvent(
+    const gd::BaseEvent &event) {
+  if (!event.HasVariables()) {
+    AbstractReadOnlyArbitraryEventsWorker::VisitEvent(event);
+    return;
+  }
+  // Push local variables
+  auto newProjectScopedContainers =
+      ProjectScopedContainers::MakeNewProjectScopedContainersWithLocalVariables(
+          *currentProjectScopedContainers, event);
+  auto *parentProjectScopedContainers = currentProjectScopedContainers;
+  currentProjectScopedContainers = &newProjectScopedContainers;
+
+  AbstractReadOnlyArbitraryEventsWorker::VisitEvent(event);
+
+  // Pop local variables
+  currentProjectScopedContainers = parentProjectScopedContainers;
+}
+
 }  // namespace gd

Core/GDCore/IDE/Events/ArbitraryEventsWorker.h

@@ -3,8 +3,8 @@
  * Copyright 2008-2016 Florian Rival (Florian.Rival@gmail.com). All rights
  * reserved. This project is released under the MIT License.
  */
-#ifndef GDCORE_ARBITRARYEVENTSWORKER_H
-#define GDCORE_ARBITRARYEVENTSWORKER_H
+#pragma once
+
 #include <map>
 #include <memory>
 #include <vector>
@@ -12,6 +12,7 @@
 #include "GDCore/Events/EventVisitor.h"
 #include "GDCore/Project/ProjectScopedContainers.h"
 #include "GDCore/String.h"
+
 namespace gd {
 class Instruction;
 class BaseEvent;
@@ -25,27 +26,24 @@ class ParameterMetadata;
 namespace gd {
 
 /**
- * \brief ArbitraryEventsWorker is an abstract class used to browse events (and
- * instructions) and do some work on them. Can be used to implement refactoring
- * for example.
+ * \brief AbstractArbitraryEventsWorker is a base abstract class used to browse events (and
+ * instructions) and do some work on them. It must not be inherited directly.
  *
+ * \see gd::ArbitraryEventsWorker
  * \see gd::ArbitraryEventsWorkerWithContext
  *
  * \ingroup IDE
  */
-class GD_CORE_API ArbitraryEventsWorker : private EventVisitor {
+class GD_CORE_API AbstractArbitraryEventsWorker : private EventVisitor {
  public:
-  ArbitraryEventsWorker(){};
-  virtual ~ArbitraryEventsWorker();
+  AbstractArbitraryEventsWorker(){};
+  virtual ~AbstractArbitraryEventsWorker();
 
-  /**
-   * \brief Launch the worker on the specified events list.
-   */
-  void Launch(gd::EventsList& events) { VisitEventList(events); };
+protected:
+  virtual bool VisitEvent(gd::BaseEvent& event) override;
+  void VisitEventList(gd::EventsList& events);
 
  private:
-  void VisitEventList(gd::EventsList& events);
-  bool VisitEvent(gd::BaseEvent& event) override;
   bool VisitLinkEvent(gd::LinkEvent& linkEvent) override;
   void VisitInstructionList(gd::InstructionsList& instructions,
                             bool areConditions);
@@ -101,6 +99,31 @@ class GD_CORE_API ArbitraryEventsWorker : private EventVisitor {
   }
 };
 
+/**
+ * \brief ArbitraryEventsWorker is an abstract class used to browse events (and
+ * instructions) and do some work on them. Can be used to implement refactoring
+ * for example.
+ *
+ * \see gd::ArbitraryEventsWorkerWithContext
+ *
+ * \ingroup IDE
+ */
+class GD_CORE_API ArbitraryEventsWorker : public AbstractArbitraryEventsWorker {
+public:
+  ArbitraryEventsWorker(){};
+  virtual ~ArbitraryEventsWorker();
+
+  /**
+   * \brief Launch the worker on the specified events list.
+   */
+  void Launch(gd::EventsList &events) {
+    AbstractArbitraryEventsWorker::VisitEventList(events);
+  };
+
+private:
+  bool VisitEvent(gd::BaseEvent &event) override;
+};
+
 /**
  * \brief An events worker that will know about the context (the objects
  * container). Useful for workers working on expressions notably.
@@ -110,10 +133,10 @@ class GD_CORE_API ArbitraryEventsWorker : private EventVisitor {
  * \ingroup IDE
  */
 class GD_CORE_API ArbitraryEventsWorkerWithContext
-    : public ArbitraryEventsWorker {
+    : public AbstractArbitraryEventsWorker {
  public:
   ArbitraryEventsWorkerWithContext()
-      : projectScopedContainers(nullptr){};
+      : currentProjectScopedContainers(nullptr){};
   virtual ~ArbitraryEventsWorkerWithContext();
 
   /**
@@ -121,53 +144,50 @@ class GD_CORE_API ArbitraryEventsWorkerWithContext
    * giving the objects container on which the events are applying to.
    */
   void Launch(gd::EventsList& events,
-              const gd::ProjectScopedContainers& projectScopedContainers_) {
-    projectScopedContainers = &projectScopedContainers_;
-    ArbitraryEventsWorker::Launch(events);
+              const gd::ProjectScopedContainers& projectScopedContainers) {
+    currentProjectScopedContainers = &projectScopedContainers;
+    AbstractArbitraryEventsWorker::VisitEventList(events);
   };
 
-  void Launch(gd::EventsList& events) = delete;
-
- protected:
+protected:
   const gd::ProjectScopedContainers& GetProjectScopedContainers() {
     // Pointers are guaranteed to be not nullptr after
     // Launch was called.
-    return *projectScopedContainers;
+    return *currentProjectScopedContainers;
   };
   const gd::ObjectsContainersList& GetObjectsContainersList() {
     // Pointers are guaranteed to be not nullptr after
     // Launch was called.
-    return projectScopedContainers->GetObjectsContainersList();
+    return currentProjectScopedContainers->GetObjectsContainersList();
   };
 
  private:
-  const gd::ProjectScopedContainers* projectScopedContainers;
+  bool VisitEvent(gd::BaseEvent& event) override;
+
+  const gd::ProjectScopedContainers* currentProjectScopedContainers;
 };
 
 /**
  * \brief ReadOnlyArbitraryEventsWorker is an abstract class used to browse events (and
- * instructions). It can be used to implement autocompletion for example.
+ * instructions). It must not be inherited directly.
  *
+ * \see gd::ReadOnlyArbitraryEventsWorker
  * \see gd::ReadOnlyArbitraryEventsWorkerWithContext
  *
  * \ingroup IDE
  */
-class GD_CORE_API ReadOnlyArbitraryEventsWorker : private ReadOnlyEventVisitor {
+class GD_CORE_API AbstractReadOnlyArbitraryEventsWorker : private ReadOnlyEventVisitor {
  public:
-  ReadOnlyArbitraryEventsWorker() : shouldStopIteration(false) {};
-  virtual ~ReadOnlyArbitraryEventsWorker();
-
-  /**
-   * \brief Launch the worker on the specified events list.
-   */
-  void Launch(const gd::EventsList& events) { VisitEventList(events); };
+  AbstractReadOnlyArbitraryEventsWorker() : shouldStopIteration(false) {};
+  virtual ~AbstractReadOnlyArbitraryEventsWorker();
 
 protected:
   void StopAnyEventIteration() override;
+  virtual void VisitEvent(const gd::BaseEvent& event) override;
+
+  void VisitEventList(const gd::EventsList& events);
 
  private:
-  void VisitEventList(const gd::EventsList& events);
-  void VisitEvent(const gd::BaseEvent& event) override;
   void VisitLinkEvent(const gd::LinkEvent& linkEvent) override;
   void VisitInstructionList(const gd::InstructionsList& instructions,
                             bool areConditions);
@@ -213,6 +233,31 @@ protected:
   bool shouldStopIteration;
 };
 
+/**
+ * \brief ReadOnlyArbitraryEventsWorker is an abstract class used to browse events (and
+ * instructions). It can be used to implement autocompletion for example.
+ *
+ * \see gd::ReadOnlyArbitraryEventsWorkerWithContext
+ *
+ * \ingroup IDE
+ */
+class GD_CORE_API ReadOnlyArbitraryEventsWorker
+    : public AbstractReadOnlyArbitraryEventsWorker {
+public:
+  ReadOnlyArbitraryEventsWorker(){};
+  virtual ~ReadOnlyArbitraryEventsWorker();
+
+  /**
+   * \brief Launch the worker on the specified events list.
+   */
+  void Launch(const gd::EventsList &events) {
+    AbstractReadOnlyArbitraryEventsWorker::VisitEventList(events);
+  };
+
+private:
+  void VisitEvent(const gd::BaseEvent &event) override;
+};
+
 /**
  * \brief An events worker that will know about the context (the objects
  * container). Useful for workers working on expressions notably.
@@ -222,10 +267,10 @@ protected:
  * \ingroup IDE
  */
 class GD_CORE_API ReadOnlyArbitraryEventsWorkerWithContext
-    : public ReadOnlyArbitraryEventsWorker {
+    : public AbstractReadOnlyArbitraryEventsWorker {
  public:
   ReadOnlyArbitraryEventsWorkerWithContext()
-      : projectScopedContainers(nullptr){};
+      : currentProjectScopedContainers(nullptr){};
   virtual ~ReadOnlyArbitraryEventsWorkerWithContext();
 
   /**
@@ -233,24 +278,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::ProjectScopedContainers& projectScopedContainers_) {
-    projectScopedContainers = &projectScopedContainers_;
-    ReadOnlyArbitraryEventsWorker::Launch(events);
+              const gd::ProjectScopedContainers& projectScopedContainers) {
+    currentProjectScopedContainers = &projectScopedContainers;
+    AbstractReadOnlyArbitraryEventsWorker::VisitEventList(events);
   };
 
-  void Launch(gd::EventsList& events) = delete;
-
- protected:
+protected:
   const gd::ProjectScopedContainers& GetProjectScopedContainers() {
     // Pointers are guaranteed to be not nullptr after
     // Launch was called.
-    return *projectScopedContainers;
+    return *currentProjectScopedContainers;
   };
 
  private:
-  const gd::ProjectScopedContainers* projectScopedContainers;
+  void VisitEvent(const gd::BaseEvent& event) override;
+
+  const gd::ProjectScopedContainers* currentProjectScopedContainers;
 };
 
 }  // namespace gd
-
-#endif  // GDCORE_ARBITRARYEVENTSWORKER_H

Core/GDCore/IDE/Events/BehaviorParametersFiller.cpp

@@ -0,0 +1,65 @@
+/*
+ * GDevelop Core
+ * Copyright 2008-2024 Florian Rival (Florian.Rival@gmail.com). All rights
+ * reserved. This project is released under the MIT License.
+ */
+#include "BehaviorParametersFiller.h"
+
+#include <map>
+#include <memory>
+#include <vector>
+
+#include "GDCore/Events/Instruction.h"
+#include "GDCore/Extensions/Metadata/MetadataProvider.h"
+#include "GDCore/Extensions/Metadata/ParameterMetadataTools.h"
+#include "GDCore/String.h"
+#include "GDCore/Tools/Log.h"
+
+namespace gd {
+
+bool BehaviorParametersFiller::DoVisitInstruction(gd::Instruction &instruction,
+                                                  bool isCondition) {
+  const auto &metadata = isCondition
+                             ? gd::MetadataProvider::GetConditionMetadata(
+                                   platform, instruction.GetType())
+                             : gd::MetadataProvider::GetActionMetadata(
+                                   platform, instruction.GetType());
+
+  gd::ParameterMetadataTools::IterateOverParametersWithIndex(
+      instruction.GetParameters(), metadata.GetParameters(),
+      [&](const gd::ParameterMetadata &parameterMetadata,
+          const gd::Expression &parameterValue, size_t parameterIndex,
+          const gd::String &lastObjectName) {
+        if (parameterMetadata.GetValueTypeMetadata().IsBehavior() &&
+            parameterValue.GetPlainString().length() == 0) {
+
+          auto &expectedBehaviorTypeName =
+              parameterMetadata.GetValueTypeMetadata().GetExtraInfo();
+
+          auto &objectsContainersList =
+              projectScopedContainers.GetObjectsContainersList();
+          auto behaviorNames =
+              objectsContainersList.GetBehaviorsOfObject(lastObjectName, true);
+
+          gd::String foundBehaviorName = "";
+          for (auto &behaviorName : behaviorNames) {
+            auto behaviorTypeName =
+                objectsContainersList.GetTypeOfBehavior(behaviorName, false);
+            if (behaviorTypeName == expectedBehaviorTypeName) {
+              foundBehaviorName = behaviorName;
+              break;
+            }
+          }
+          if (!foundBehaviorName.empty()) {
+            instruction.SetParameter(parameterIndex,
+                                     gd::Expression(foundBehaviorName));
+          }
+        }
+      });
+
+  return false;
+}
+
+BehaviorParametersFiller::~BehaviorParametersFiller() {}
+
+} // namespace gd

Core/GDCore/IDE/Events/BehaviorParametersFiller.h

@@ -0,0 +1,45 @@
+/*
+ * GDevelop Core
+ * Copyright 2008-2024 Florian Rival (Florian.Rival@gmail.com). All rights
+ * reserved. This project is released under the MIT License.
+ */
+#pragma once
+
+#include "GDCore/IDE/Events/ArbitraryEventsWorker.h"
+#include "GDCore/String.h"
+#include <map>
+#include <memory>
+#include <vector>
+
+namespace gd {
+class Instruction;
+class Platform;
+class ProjectScopedContainers;
+} // namespace gd
+
+namespace gd {
+
+/**
+ * \brief Fill empty behavior parameters with any behavior that matches the
+ * required behavior type.
+ *
+ * \ingroup IDE
+ */
+class GD_CORE_API BehaviorParametersFiller : public ArbitraryEventsWorker {
+public:
+  BehaviorParametersFiller(
+      const gd::Platform &platform_,
+      const gd::ProjectScopedContainers &projectScopedContainers_)
+      : platform(platform_),
+        projectScopedContainers(projectScopedContainers_){};
+  virtual ~BehaviorParametersFiller();
+
+private:
+  bool DoVisitInstruction(gd::Instruction &instruction,
+                          bool isCondition) override;
+
+  const gd::Platform &platform;
+  const gd::ProjectScopedContainers &projectScopedContainers;
+};
+
+} // namespace gd

Core/GDCore/IDE/Events/EventsContextAnalyzer.cpp

@@ -58,7 +58,7 @@ 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.GetObjectsContainersList(), rootType, node);
+    auto type = gd::ExpressionTypeFinder::GetType(platform, projectScopedContainers, rootType, node);
 
     if (gd::ParameterMetadata::IsExpression("variable", type)) {
       // Nothing to do (this can't reference an object)
@@ -88,7 +88,7 @@ class GD_CORE_API ExpressionObjectsAnalyzer
     if (node.child) node.child->Visit(*this);
   }
   void OnVisitIdentifierNode(IdentifierNode& node) override {
-    auto type = gd::ExpressionTypeFinder::GetType(platform, projectScopedContainers.GetObjectsContainersList(), rootType, node);
+    auto type = gd::ExpressionTypeFinder::GetType(platform, projectScopedContainers, rootType, node);
     if (gd::ParameterMetadata::IsObject(type)) {
       context.AddObjectName(projectScopedContainers, node.identifierName);
     } else if (gd::ParameterMetadata::IsExpression("variable", type)) {

Core/GDCore/IDE/Events/EventsFunctionSelfCallChecker.cpp

@@ -72,12 +72,12 @@ public:
       gd::String lastObjectParameter = "";
       const gd::InstructionMetadata &instrInfos =
           MetadataProvider::GetActionMetadata(platform, instruction.GetType());
-      for (std::size_t pNb = 0; pNb < instrInfos.parameters.size(); ++pNb) {
+      for (std::size_t pNb = 0; pNb < instrInfos.parameters.GetParametersCount(); ++pNb) {
 
         if (ParameterMetadata::IsExpression(
-                "number", instrInfos.parameters[pNb].GetType()) ||
+                "number", instrInfos.parameters.GetParameter(pNb).GetType()) ||
             ParameterMetadata::IsExpression(
-                "string", instrInfos.parameters[pNb].GetType())) {
+                "string", instrInfos.parameters.GetParameter(pNb).GetType())) {
           auto node = instruction.GetParameter(pNb).GetRootNode();
           node->Visit(*this);
         }

Core/GDCore/IDE/Events/EventsIdentifiersFinder.cpp

@@ -86,9 +86,11 @@ class GD_CORE_API IdentifierFinderExpressionNodeWorker
     }
 
     size_t parameterIndex = 0;
-    for (size_t metadataIndex = (isObjectFunction ? 1 : 0); metadataIndex < metadata.parameters.size()
-      && parameterIndex < node.parameters.size(); ++metadataIndex) {
-      auto& parameterMetadata = metadata.parameters[metadataIndex];
+    for (size_t metadataIndex = (isObjectFunction ? 1 : 0);
+         metadataIndex < metadata.GetParameters().GetParametersCount() &&
+         parameterIndex < node.parameters.size();
+         ++metadataIndex) {
+      auto& parameterMetadata = metadata.GetParameters().GetParameter(metadataIndex);
       if (parameterMetadata.IsCodeOnly()) {
         continue;
       }
@@ -144,10 +146,10 @@ class GD_CORE_API IdentifierFinderEventWorker
                               platform, instruction.GetType())
                         : MetadataProvider::GetActionMetadata(
                               platform, instruction.GetType());
-      for (std::size_t pNb = 0; pNb < instrInfos.parameters.size(); ++pNb) {
+      for (std::size_t pNb = 0; pNb < instrInfos.parameters.GetParametersCount(); ++pNb) {
         // The parameter has the searched type...
-      if (instrInfos.parameters[pNb].GetType() == "identifier"
-       && instrInfos.parameters[pNb].GetExtraInfo() == identifierType) {
+      if (instrInfos.parameters.GetParameter(pNb).GetType() == "identifier"
+       && instrInfos.parameters.GetParameter(pNb).GetExtraInfo() == identifierType) {
           //...remember the value of the parameter.
           if (objectName.empty() || lastObjectParameter == objectName) {
             results.insert(instruction.GetParameter(pNb).GetPlainString());
@@ -155,9 +157,9 @@ class GD_CORE_API IdentifierFinderEventWorker
         }
         // Search in expressions
         else if (ParameterMetadata::IsExpression(
-                    "number", instrInfos.parameters[pNb].GetType()) ||
+                    "number", instrInfos.parameters.GetParameter(pNb).GetType()) ||
                 ParameterMetadata::IsExpression(
-                    "string", instrInfos.parameters[pNb].GetType())) {
+                    "string", instrInfos.parameters.GetParameter(pNb).GetType())) {
           auto node = instruction.GetParameter(pNb).GetRootNode();
 
           IdentifierFinderExpressionNodeWorker searcher(
@@ -170,7 +172,7 @@ class GD_CORE_API IdentifierFinderEventWorker
         }
         // Remember the value of the last "object" parameter.
         else if (gd::ParameterMetadata::IsObject(
-                    instrInfos.parameters[pNb].GetType())) {
+                    instrInfos.parameters.GetParameter(pNb).GetType())) {
           lastObjectParameter =
               instruction.GetParameter(pNb).GetPlainString();
         }
@@ -226,7 +228,7 @@ void EventsIdentifiersFinder::FindArgumentsInEventsAndDependencies(
   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);

Core/GDCore/IDE/Events/EventsRefactorer.cpp

@@ -81,8 +81,7 @@ class GD_CORE_API ExpressionObjectRenamer : public ExpressionParser2NodeWorker {
   void OnVisitNumberNode(NumberNode& node) override {}
   void OnVisitTextNode(TextNode& node) override {}
   void OnVisitVariableNode(VariableNode& node) override {
-    const auto& objectsContainersList = projectScopedContainers.GetObjectsContainersList();
-    auto type = gd::ExpressionTypeFinder::GetType(platform, objectsContainersList, rootType, node);
+    auto type = gd::ExpressionTypeFinder::GetType(platform, projectScopedContainers, rootType, node);
 
     if (gd::ValueTypeMetadata::IsTypeLegacyPreScopedVariable(type)) {
       // Nothing to do (this can't reference an object)
@@ -115,7 +114,7 @@ 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, projectScopedContainers.GetObjectsContainersList(), rootType, node);
+    auto type = gd::ExpressionTypeFinder::GetType(platform, projectScopedContainers, rootType, node);
     if (gd::ParameterMetadata::IsObject(type) &&
         node.identifierName == objectName) {
       hasDoneRenaming = true;
@@ -217,8 +216,7 @@ class GD_CORE_API ExpressionObjectFinder : public ExpressionParser2NodeWorker {
   void OnVisitNumberNode(NumberNode& node) override {}
   void OnVisitTextNode(TextNode& node) override {}
   void OnVisitVariableNode(VariableNode& node) override {
-    const auto& objectsContainersList = projectScopedContainers.GetObjectsContainersList();
-    auto type = gd::ExpressionTypeFinder::GetType(platform, objectsContainersList, rootType, node);
+    auto type = gd::ExpressionTypeFinder::GetType(platform, projectScopedContainers, rootType, node);
 
     if (gd::ValueTypeMetadata::IsTypeLegacyPreScopedVariable(type)) {
       // Nothing to do (this can't reference an object)
@@ -250,7 +248,7 @@ 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, projectScopedContainers.GetObjectsContainersList(), rootType, node);
+    auto type = gd::ExpressionTypeFinder::GetType(platform, projectScopedContainers, rootType, node);
     if (gd::ParameterMetadata::IsObject(type) &&
         node.identifierName == searchedObjectName) {
       hasObject = true;
@@ -298,7 +296,7 @@ class GD_CORE_API ExpressionObjectFinder : public ExpressionParser2NodeWorker {
 };
 
 bool EventsRefactorer::RenameObjectInActions(const gd::Platform& platform,
-                                             gd::ProjectScopedContainers& projectScopedContainers,
+                                             const gd::ProjectScopedContainers& projectScopedContainers,
                                              gd::InstructionsList& actions,
                                              gd::String oldName,
                                              gd::String newName) {
@@ -307,14 +305,14 @@ bool EventsRefactorer::RenameObjectInActions(const gd::Platform& platform,
   for (std::size_t aId = 0; aId < actions.size(); ++aId) {
     const gd::InstructionMetadata& instrInfos =
         MetadataProvider::GetActionMetadata(platform, actions[aId].GetType());
-    for (std::size_t pNb = 0; pNb < instrInfos.parameters.size(); ++pNb) {
+    for (std::size_t pNb = 0; pNb < instrInfos.parameters.GetParametersCount(); ++pNb) {
       // Replace object's name in parameters
-      if (gd::ParameterMetadata::IsObject(instrInfos.parameters[pNb].GetType()) &&
+      if (gd::ParameterMetadata::IsObject(instrInfos.parameters.GetParameter(pNb).GetType()) &&
           actions[aId].GetParameter(pNb).GetPlainString() == oldName)
         actions[aId].SetParameter(pNb, gd::Expression(newName));
       // Replace object's name in expressions
       else if (ParameterMetadata::IsExpression(
-                   "number", instrInfos.parameters[pNb].GetType())) {
+                   "number", instrInfos.parameters.GetParameter(pNb).GetType())) {
         auto node = actions[aId].GetParameter(pNb).GetRootNode();
 
         if (ExpressionObjectRenamer::Rename(platform, projectScopedContainers, "number", *node, oldName, newName)) {
@@ -324,7 +322,7 @@ bool EventsRefactorer::RenameObjectInActions(const gd::Platform& platform,
       }
       // Replace object's name in text expressions
       else if (ParameterMetadata::IsExpression(
-                   "string", instrInfos.parameters[pNb].GetType())) {
+                   "string", instrInfos.parameters.GetParameter(pNb).GetType())) {
         auto node = actions[aId].GetParameter(pNb).GetRootNode();
 
         if (ExpressionObjectRenamer::Rename(platform, projectScopedContainers, "string", *node, oldName, newName)) {
@@ -349,7 +347,7 @@ bool EventsRefactorer::RenameObjectInActions(const gd::Platform& platform,
 
 bool EventsRefactorer::RenameObjectInConditions(
     const gd::Platform& platform,
-    gd::ProjectScopedContainers& projectScopedContainers,
+    const gd::ProjectScopedContainers& projectScopedContainers,
     gd::InstructionsList& conditions,
     gd::String oldName,
     gd::String newName) {
@@ -359,14 +357,14 @@ bool EventsRefactorer::RenameObjectInConditions(
     const gd::InstructionMetadata& instrInfos =
         MetadataProvider::GetConditionMetadata(platform,
                                                conditions[cId].GetType());
-    for (std::size_t pNb = 0; pNb < instrInfos.parameters.size(); ++pNb) {
+    for (std::size_t pNb = 0; pNb < instrInfos.parameters.GetParametersCount(); ++pNb) {
       // Replace object's name in parameters
-      if (gd::ParameterMetadata::IsObject(instrInfos.parameters[pNb].GetType()) &&
+      if (gd::ParameterMetadata::IsObject(instrInfos.parameters.GetParameter(pNb).GetType()) &&
           conditions[cId].GetParameter(pNb).GetPlainString() == oldName)
         conditions[cId].SetParameter(pNb, gd::Expression(newName));
       // Replace object's name in expressions
       else if (ParameterMetadata::IsExpression(
-                   "number", instrInfos.parameters[pNb].GetType())) {
+                   "number", instrInfos.parameters.GetParameter(pNb).GetType())) {
         auto node = conditions[cId].GetParameter(pNb).GetRootNode();
 
         if (ExpressionObjectRenamer::Rename(platform, projectScopedContainers, "number", *node, oldName, newName)) {
@@ -376,7 +374,7 @@ bool EventsRefactorer::RenameObjectInConditions(
       }
       // Replace object's name in text expressions
       else if (ParameterMetadata::IsExpression(
-                   "string", instrInfos.parameters[pNb].GetType())) {
+                   "string", instrInfos.parameters.GetParameter(pNb).GetType())) {
         auto node = conditions[cId].GetParameter(pNb).GetRootNode();
 
         if (ExpressionObjectRenamer::Rename(platform, projectScopedContainers, "string", *node, oldName, newName)) {
@@ -401,7 +399,7 @@ bool EventsRefactorer::RenameObjectInConditions(
 
 bool EventsRefactorer::RenameObjectInEventParameters(
     const gd::Platform& platform,
-    gd::ProjectScopedContainers& projectScopedContainers,
+    const gd::ProjectScopedContainers& projectScopedContainers,
     gd::Expression& expression,
     gd::ParameterMetadata parameterMetadata,
     gd::String oldName,
@@ -434,7 +432,7 @@ bool EventsRefactorer::RenameObjectInEventParameters(
 }
 
 void EventsRefactorer::RenameObjectInEvents(const gd::Platform& platform,
-                                            gd::ProjectScopedContainers& projectScopedContainers,
+                                            const gd::ProjectScopedContainers& projectScopedContainers,
                                             gd::EventsList& events,
                                             gd::String oldName,
                                             gd::String newName) {
@@ -477,7 +475,7 @@ void EventsRefactorer::RenameObjectInEvents(const gd::Platform& platform,
 }
 
 bool EventsRefactorer::RemoveObjectInActions(const gd::Platform& platform,
-                                             gd::ProjectScopedContainers& projectScopedContainers,
+                                             const gd::ProjectScopedContainers& projectScopedContainers,
                                              gd::InstructionsList& actions,
                                              gd::String name) {
   bool somethingModified = false;
@@ -487,16 +485,16 @@ bool EventsRefactorer::RemoveObjectInActions(const gd::Platform& platform,
 
     const gd::InstructionMetadata& instrInfos =
         MetadataProvider::GetActionMetadata(platform, actions[aId].GetType());
-    for (std::size_t pNb = 0; pNb < instrInfos.parameters.size(); ++pNb) {
+    for (std::size_t pNb = 0; pNb < instrInfos.parameters.GetParametersCount(); ++pNb) {
       // Find object's name in parameters
-      if (gd::ParameterMetadata::IsObject(instrInfos.parameters[pNb].GetType()) &&
+      if (gd::ParameterMetadata::IsObject(instrInfos.parameters.GetParameter(pNb).GetType()) &&
           actions[aId].GetParameter(pNb).GetPlainString() == name) {
         deleteMe = true;
         break;
       }
       // Find object's name in expressions
       else if (ParameterMetadata::IsExpression(
-                   "number", instrInfos.parameters[pNb].GetType())) {
+                   "number", instrInfos.parameters.GetParameter(pNb).GetType())) {
         auto node = actions[aId].GetParameter(pNb).GetRootNode();
 
         if (ExpressionObjectFinder::CheckIfHasObject(platform, projectScopedContainers, "number", *node, name)) {
@@ -506,7 +504,7 @@ bool EventsRefactorer::RemoveObjectInActions(const gd::Platform& platform,
       }
       // Find object's name in text expressions
       else if (ParameterMetadata::IsExpression(
-                   "string", instrInfos.parameters[pNb].GetType())) {
+                   "string", instrInfos.parameters.GetParameter(pNb).GetType())) {
         auto node = actions[aId].GetParameter(pNb).GetRootNode();
 
         if (ExpressionObjectFinder::CheckIfHasObject(platform, projectScopedContainers, "string", *node, name)) {
@@ -534,7 +532,7 @@ bool EventsRefactorer::RemoveObjectInActions(const gd::Platform& platform,
 
 bool EventsRefactorer::RemoveObjectInConditions(
     const gd::Platform& platform,
-    gd::ProjectScopedContainers& projectScopedContainers,
+    const gd::ProjectScopedContainers& projectScopedContainers,
     gd::InstructionsList& conditions,
     gd::String name) {
   bool somethingModified = false;
@@ -545,16 +543,16 @@ bool EventsRefactorer::RemoveObjectInConditions(
     const gd::InstructionMetadata& instrInfos =
         MetadataProvider::GetConditionMetadata(platform,
                                                conditions[cId].GetType());
-    for (std::size_t pNb = 0; pNb < instrInfos.parameters.size(); ++pNb) {
+    for (std::size_t pNb = 0; pNb < instrInfos.parameters.GetParametersCount(); ++pNb) {
       // Find object's name in parameters
-      if (gd::ParameterMetadata::IsObject(instrInfos.parameters[pNb].GetType()) &&
+      if (gd::ParameterMetadata::IsObject(instrInfos.parameters.GetParameter(pNb).GetType()) &&
           conditions[cId].GetParameter(pNb).GetPlainString() == name) {
         deleteMe = true;
         break;
       }
       // Find object's name in expressions
       else if (ParameterMetadata::IsExpression(
-                   "number", instrInfos.parameters[pNb].GetType())) {
+                   "number", instrInfos.parameters.GetParameter(pNb).GetType())) {
         auto node = conditions[cId].GetParameter(pNb).GetRootNode();
 
         if (ExpressionObjectFinder::CheckIfHasObject(platform, projectScopedContainers, "number", *node, name)) {
@@ -564,7 +562,7 @@ bool EventsRefactorer::RemoveObjectInConditions(
       }
       // Find object's name in text expressions
       else if (ParameterMetadata::IsExpression(
-                   "string", instrInfos.parameters[pNb].GetType())) {
+                   "string", instrInfos.parameters.GetParameter(pNb).GetType())) {
         auto node = conditions[cId].GetParameter(pNb).GetRootNode();
 
         if (ExpressionObjectFinder::CheckIfHasObject(platform, projectScopedContainers, "string", *node, name)) {
@@ -590,31 +588,6 @@ bool EventsRefactorer::RemoveObjectInConditions(
   return somethingModified;
 }
 
-void EventsRefactorer::RemoveObjectInEvents(const gd::Platform& platform,
-                                            gd::ProjectScopedContainers& projectScopedContainers,
-                                            gd::EventsList& events,
-                                            gd::String name) {
-  for (std::size_t i = 0; i < events.size(); ++i) {
-    vector<gd::InstructionsList*> conditionsVectors =
-        events[i].GetAllConditionsVectors();
-    for (std::size_t j = 0; j < conditionsVectors.size(); ++j) {
-      bool conditionsModified = RemoveObjectInConditions(
-          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, projectScopedContainers, *actionsVectors[j], name);
-    }
-
-    if (events[i].CanHaveSubEvents())
-      RemoveObjectInEvents(
-          platform, projectScopedContainers, events[i].GetSubEvents(), name);
-  }
-}
-
 gd::String ReplaceAllOccurrencesCaseInsensitive(gd::String context,
                                                 const gd::String& from,
                                                 const gd::String& to) {

Core/GDCore/IDE/Events/EventsRefactorer.h

@@ -3,8 +3,8 @@
  * Copyright 2008-2016 Florian Rival (Florian.Rival@gmail.com). All rights
  * reserved. This project is released under the MIT License.
  */
-#ifndef GDCORE_EVENTSREFACTORER_H
-#define GDCORE_EVENTSREFACTORER_H
+#pragma once
+
 #include <memory>
 #include <vector>
 
@@ -81,19 +81,11 @@ class GD_CORE_API EventsRefactorer {
    * events ).
    */
   static void RenameObjectInEvents(const gd::Platform& platform,
-                                   gd::ProjectScopedContainers& projectScopedContainers,
+                                   const gd::ProjectScopedContainers& projectScopedContainers,
                                    gd::EventsList& events,
                                    gd::String oldName,
                                    gd::String newName);
 
-  /**
-   * Remove all actions or conditions using an object
-   */
-  static void RemoveObjectInEvents(const gd::Platform& platform,
-                                   gd::ProjectScopedContainers& projectScopedContainers,
-                                   gd::EventsList& events,
-                                   gd::String name);
-
   /**
    * Search for a gd::String in events
    *
@@ -136,7 +128,7 @@ class GD_CORE_API EventsRefactorer {
    * \return true if something was modified.
    */
   static bool RenameObjectInActions(const gd::Platform& platform,
-                                    gd::ProjectScopedContainers& projectScopedContainers,
+                                    const gd::ProjectScopedContainers& projectScopedContainers,
                                     gd::InstructionsList& instructions,
                                     gd::String oldName,
                                     gd::String newName);
@@ -148,7 +140,7 @@ class GD_CORE_API EventsRefactorer {
    * \return true if something was modified.
    */
   static bool RenameObjectInConditions(const gd::Platform& platform,
-                                       gd::ProjectScopedContainers& projectScopedContainers,
+                                       const gd::ProjectScopedContainers& projectScopedContainers,
                                        gd::InstructionsList& instructions,
                                        gd::String oldName,
                                        gd::String newName);
@@ -161,7 +153,7 @@ class GD_CORE_API EventsRefactorer {
    */
   static bool RenameObjectInEventParameters(
       const gd::Platform& platform,
-      gd::ProjectScopedContainers& projectScopedContainers,
+      const gd::ProjectScopedContainers& projectScopedContainers,
       gd::Expression& expression,
       gd::ParameterMetadata parameterMetadata,
       gd::String oldName,
@@ -173,7 +165,7 @@ class GD_CORE_API EventsRefactorer {
    * \return true if something was modified.
    */
   static bool RemoveObjectInConditions(const gd::Platform& platform,
-                                       gd::ProjectScopedContainers& projectScopedContainers,
+                                       const gd::ProjectScopedContainers& projectScopedContainers,
                                        gd::InstructionsList& conditions,
                                        gd::String name);
 
@@ -183,7 +175,7 @@ class GD_CORE_API EventsRefactorer {
    * \return true if something was modified.
    */
   static bool RemoveObjectInActions(const gd::Platform& platform,
-                                    gd::ProjectScopedContainers& projectScopedContainers,
+                                    const gd::ProjectScopedContainers& projectScopedContainers,
                                     gd::InstructionsList& conditions,
                                     gd::String name);
 
@@ -250,5 +242,3 @@ class GD_CORE_API EventsRefactorer {
 };
 
 }  // namespace gd
-
-#endif  // GDCORE_EVENTSREFACTORER_H

Core/GDCore/IDE/Events/EventsVariableInstructionTypeSwitcher.cpp

@@ -0,0 +1,103 @@
+/*
+ * 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/EventsVariableInstructionTypeSwitcher.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/IDE/Events/ExpressionVariableNameFinder.h"
+#include "GDCore/IDE/VariableInstructionSwitcher.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 {
+
+VariablesContainer EventsVariableInstructionTypeSwitcher::nullVariablesContainer;
+
+bool EventsVariableInstructionTypeSwitcher::DoVisitInstruction(gd::Instruction& instruction,
+                                                bool isCondition) {
+  const auto& metadata = isCondition
+                             ? gd::MetadataProvider::GetConditionMetadata(
+                                   platform, instruction.GetType())
+                             : gd::MetadataProvider::GetActionMetadata(
+                                   platform, instruction.GetType());
+
+  gd::ParameterMetadataTools::IterateOverParametersWithIndex(
+      instruction.GetParameters(),
+      metadata.GetParameters(),
+      [&](const gd::ParameterMetadata& parameterMetadata,
+          const gd::Expression& parameterValue,
+          size_t parameterIndex,
+          const gd::String& lastObjectName) {
+        const gd::String& type = parameterMetadata.GetType();
+
+        if (!gd::ParameterMetadata::IsExpression("variable", type) ||
+            !gd::VariableInstructionSwitcher::IsSwitchableVariableInstruction(
+                instruction.GetType())) {
+                  return;
+        }
+        const auto variableName =
+            gd::ExpressionVariableNameFinder::GetVariableName(
+                *parameterValue.GetRootNode());
+
+        const gd::VariablesContainer *variablesContainer = nullptr;
+        if (type == "objectvar") {
+          const auto &objectsContainersList =
+              GetProjectScopedContainers().GetObjectsContainersList();
+          if (objectsContainersList.HasObjectOrGroupWithVariableNamed(
+                  lastObjectName, variableName) !=
+              gd::ObjectsContainersList::VariableExistence::DoesNotExist) {
+            variablesContainer =
+                GetProjectScopedContainers()
+                    .GetObjectsContainersList()
+                    .GetObjectOrGroupVariablesContainer(lastObjectName);
+          }
+        } else {
+          if (GetProjectScopedContainers().GetVariablesContainersList().Has(
+                  variableName)) {
+            variablesContainer =
+                &GetProjectScopedContainers()
+                      .GetVariablesContainersList()
+                      .GetVariablesContainerFromVariableName(variableName);
+          }
+        }
+
+        // Every occurrence of the variable or its children are checked.
+        // Ensuring that a child is actually the one with a type change would
+        // take more time.
+        if (variablesContainer == &targetVariablesContainer ||
+            lastObjectName == groupName) {
+          if (typeChangedVariableNames.find(variableName) !=
+              typeChangedVariableNames.end()) {
+            gd::VariableInstructionSwitcher::
+                SwitchBetweenUnifiedInstructionIfNeeded(
+                    platform, GetProjectScopedContainers(), instruction);
+          }
+        }
+      });
+
+  return false;
+}
+
+EventsVariableInstructionTypeSwitcher::~EventsVariableInstructionTypeSwitcher() {}
+
+}  // namespace gd

Core/GDCore/IDE/Events/EventsVariableInstructionTypeSwitcher.h

@@ -0,0 +1,68 @@
+/*
+ * GDevelop Core
+ * Copyright 2008-2024 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 VariablesContainer;
+class Platform;
+} // namespace gd
+
+namespace gd {
+/**
+ * \brief Switch the types of variable instructions for a given set of
+ * variables.
+ *
+ * \see gd::VariableInstructionSwitcher
+ *
+ * \ingroup IDE
+ */
+class GD_CORE_API EventsVariableInstructionTypeSwitcher
+    : public ArbitraryEventsWorkerWithContext {
+public:
+  EventsVariableInstructionTypeSwitcher(
+      const gd::Platform &platform_,
+      const std::unordered_set<gd::String> &typeChangedVariableNames_,
+      const gd::VariablesContainer &targetVariablesContainer_)
+      : platform(platform_),
+        typeChangedVariableNames(typeChangedVariableNames_),
+        targetVariablesContainer(targetVariablesContainer_), groupName(""){};
+  EventsVariableInstructionTypeSwitcher(
+      const gd::Platform &platform_,
+      const std::unordered_set<gd::String> &typeChangedVariableNames_,
+      const gd::String &groupName_)
+      : platform(platform_),
+        typeChangedVariableNames(typeChangedVariableNames_),
+        targetVariablesContainer(nullVariablesContainer),
+        groupName(groupName_){};
+  virtual ~EventsVariableInstructionTypeSwitcher();
+
+private:
+  bool DoVisitInstruction(gd::Instruction &instruction,
+                          bool isCondition) override;
+
+  const gd::Platform &platform;
+  const gd::VariablesContainer &targetVariablesContainer;
+  /**
+   * Groups don't have VariablesContainer, so `targetVariablesContainer` will be
+   * pointing to `nullVariablesContainer` and the group name is use instead to
+   * check which instruction to modify.
+   */
+  const gd::String groupName;
+  const std::unordered_set<gd::String> &typeChangedVariableNames;
+
+  static VariablesContainer nullVariablesContainer;
+};
+
+} // namespace gd

Core/GDCore/IDE/Events/EventsVariableReplacer.cpp

@@ -20,6 +20,9 @@
 #include "GDCore/Extensions/Metadata/ParameterMetadataTools.h"
 #include "GDCore/IDE/Events/ExpressionValidator.h"
 #include "GDCore/IDE/Events/ExpressionVariableOwnerFinder.h"
+#include "GDCore/IDE/Events/ExpressionVariableNameFinder.h"
+#include "GDCore/IDE/VariableInstructionSwitcher.h"
+#include "GDCore/IDE/WholeProjectRefactorer.h"
 #include "GDCore/Project/Layout.h"
 #include "GDCore/Project/Project.h"
 #include "GDCore/Project/ProjectScopedContainers.h"
@@ -29,6 +32,8 @@
 
 namespace gd {
 
+VariablesContainer EventsVariableReplacer::nullVariablesContainer;
+
 /**
  * \brief Go through the nodes and rename variables,
  * or signal if the instruction must be renamed if a removed variable is used.
@@ -41,22 +46,26 @@ class GD_CORE_API ExpressionVariableReplacer
   ExpressionVariableReplacer(
       const gd::Platform& platform_,
       const gd::ProjectScopedContainers& projectScopedContainers_,
+      const VariablesRenamingChangesetNode& variablesRenamingChangesetRoot_,
+      const std::unordered_set<gd::String>& removedVariableNames_,
       const gd::VariablesContainer& targetVariablesContainer_,
-      const std::unordered_map<gd::String, gd::String>& oldToNewVariableNames_,
-      const std::unordered_set<gd::String>& removedVariableNames_)
+      const gd::String &groupName_,
+      const gd::String &forcedInitialObjectName)
       : hasDoneRenaming(false),
         removedVariableUsed(false),
         platform(platform_),
         projectScopedContainers(projectScopedContainers_),
-        forcedInitialVariablesContainer(nullptr),
+        forcedVariablesContainer(nullptr),
+        forcedObjectName(forcedInitialObjectName),
+        variablesRenamingChangesetRoot(variablesRenamingChangesetRoot_),
+        removedVariableNames(removedVariableNames_),
         targetVariablesContainer(targetVariablesContainer_),
-        oldToNewVariableNames(oldToNewVariableNames_),
-        removedVariableNames(removedVariableNames_){};
+        targetGroupName(groupName_){};
   virtual ~ExpressionVariableReplacer(){};
 
   void SetForcedInitialVariablesContainer(
       const gd::VariablesContainer* forcedInitialVariablesContainer_) {
-    forcedInitialVariablesContainer = forcedInitialVariablesContainer_;
+    forcedVariablesContainer = forcedInitialVariablesContainer_;
   }
 
   bool HasDoneRenaming() const { return hasDoneRenaming; }
@@ -79,21 +88,30 @@ class GD_CORE_API ExpressionVariableReplacer
     // The node represents a variable or an object name on which a variable
     // will be accessed.
 
-    if (forcedInitialVariablesContainer) {
+    if (forcedVariablesContainer) {
+      const gd::String oldVariableName = node.name;
+      PushVariablesRenamingChangesetRoot();
       // A scope was forced. Honor it: it means this node represents a variable
       // of the forced variables container.
-      if (forcedInitialVariablesContainer == &targetVariablesContainer) {
+      if (forcedVariablesContainer == &targetVariablesContainer ||
+          IsTargetingObjectGroup(forcedObjectName)) {
         RenameOrRemoveVariableOfTargetVariableContainer(node.name);
       }
 
-      if (node.child) node.child->Visit(*this);
+      if (node.child) {
+        bool hasBeenPushed =
+            PushVariablesRenamingChangesetNodeForVariable(oldVariableName);
+        node.child->Visit(*this);
+        PopVariablesRenamingChangesetNode(hasBeenPushed);
+      }
+      PopVariablesRenamingChangesetNode(true);
       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),
+        node.name,
         [&]() {
           // This represents an object.
           // Remember the object name.
@@ -103,14 +121,21 @@ class GD_CORE_API ExpressionVariableReplacer
         },
         [&]() {
           // This is a variable.
-          if (projectScopedContainers.GetVariablesContainersList()
-                  .HasVariablesContainer(targetVariablesContainer)) {
+          if (&projectScopedContainers.GetVariablesContainersList()
+                   .GetVariablesContainerFromVariableName(node.name) ==
+              &targetVariablesContainer) {
             // The node represents a variable, that can come from the target
             // (because the target is in the scope), replace or remove it:
-            RenameOrRemoveVariableOfTargetVariableContainer(node.name);
+            PushVariablesRenamingChangesetRoot();
+            RenameVariableAndVisitChild(node.name, node.child.get());
+            PopVariablesRenamingChangesetNode(true);
+          } else {
+            if (node.child) {
+              PushVariablesRenamingChangesetNodeForIgnoredVariables();
+              node.child->Visit(*this);
+              PopVariablesRenamingChangesetNode(true);
+            }
           }
-
-          if (node.child) node.child->Visit(*this);
         },
         [&]() {
           // This is a property.
@@ -121,14 +146,7 @@ class GD_CORE_API ExpressionVariableReplacer
           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);
-          }
-
+          // This is something else.
           if (node.child) node.child->Visit(*this);
         });
   }
@@ -136,25 +154,50 @@ class GD_CORE_API ExpressionVariableReplacer
     auto& objectsContainersList =
         projectScopedContainers.GetObjectsContainersList();
     if (!objectNameToUseForVariableAccessor.empty()) {
-      if (objectsContainersList.HasVariablesContainer(
-              objectNameToUseForVariableAccessor, targetVariablesContainer)) {
+      // This is always true because MatchIdentifierWithName is used to get
+      // objectNameToUseForVariableAccessor.
+      if (objectsContainersList.HasObjectOrGroupVariablesContainer(
+              objectNameToUseForVariableAccessor, targetVariablesContainer) ||
+          IsTargetingObjectGroup(objectNameToUseForVariableAccessor)) {
+        objectNameToUseForVariableAccessor = "";
         // The node represents an object variable, and this object variables are
         // the target. Do the replacement or removals:
-        RenameOrRemoveVariableOfTargetVariableContainer(node.name);
+        PushVariablesRenamingChangesetRoot();
+        RenameVariableAndVisitChild(node.name, node.child.get());
+        PopVariablesRenamingChangesetNode(true);
       }
+    } else {
+      RenameVariableAndVisitChild(node.name, node.child.get());
     }
-    objectNameToUseForVariableAccessor = "";
-
-    if (node.child) node.child->Visit(*this);
   }
   void OnVisitVariableBracketAccessorNode(
       VariableBracketAccessorNode& node) override {
     objectNameToUseForVariableAccessor = "";
 
+    // TODO Literal expressions could be checked to handle renaming in
+    // `expression` and in `child`.
     node.expression->Visit(*this);
-    if (node.child) node.child->Visit(*this);
+    if (node.child) {
+      PushVariablesRenamingChangesetNodeForIgnoredVariables();
+      node.child->Visit(*this);
+      PopVariablesRenamingChangesetNode(true);
+    }
   }
-  void OnVisitIdentifierNode(IdentifierNode& node) override {
+  void OnVisitIdentifierNode(IdentifierNode &node) override {
+    auto renameVariableAndChild = [this, &node]() {
+      PushVariablesRenamingChangesetRoot();
+      const gd::String oldVariableName = node.identifierName;
+      RenameOrRemoveVariableOfTargetVariableContainer(node.identifierName);
+      if (!node.childIdentifierName.empty()) {
+        bool hasBeenPushed =
+            PushVariablesRenamingChangesetNodeForVariable(oldVariableName);
+        RenameOrRemoveVariableOfTargetVariableContainer(
+            node.childIdentifierName);
+        PopVariablesRenamingChangesetNode(hasBeenPushed);
+      }
+      PopVariablesRenamingChangesetNode(true);
+    };
+
     auto& objectsContainersList =
         projectScopedContainers.GetObjectsContainersList();
 
@@ -162,11 +205,12 @@ class GD_CORE_API ExpressionVariableReplacer
     // (and if it's a variable reference or a value does not have any importance
     // here).
 
-    if (forcedInitialVariablesContainer) {
+    if (forcedVariablesContainer) {
       // A scope was forced. Honor it: it means this node represents a variable
       // of the forced variables container.
-      if (forcedInitialVariablesContainer == &targetVariablesContainer) {
-        RenameOrRemoveVariableOfTargetVariableContainer(node.identifierName);
+      if (forcedVariablesContainer == &targetVariablesContainer ||
+          IsTargetingObjectGroup(forcedObjectName)) {
+        renameVariableAndChild();
       }
       return;
     }
@@ -174,25 +218,28 @@ class GD_CORE_API ExpressionVariableReplacer
     // Match the potential *new* name of the variable, because refactorings are
     // done after changes in the variables container.
     projectScopedContainers.MatchIdentifierWithName<void>(
-        GetPotentialNewName(node.identifierName),
+        node.identifierName,
         [&]() {
           // This represents an object.
-          if (objectsContainersList.HasVariablesContainer(
-                  node.identifierName, targetVariablesContainer)) {
+          if (objectsContainersList.HasObjectOrGroupVariablesContainer(
+                  node.identifierName, targetVariablesContainer) ||
+              IsTargetingObjectGroup(node.identifierName)) {
             // The node represents an object variable, and this object variables
             // are the target. Do the replacement or removals:
+            PushVariablesRenamingChangesetRoot();
             RenameOrRemoveVariableOfTargetVariableContainer(
                 node.childIdentifierName);
+            PopVariablesRenamingChangesetNode(true);
           }
         },
         [&]() {
           // This is a variable.
-          if (projectScopedContainers.GetVariablesContainersList()
-                  .HasVariablesContainer(targetVariablesContainer)) {
+          if (&projectScopedContainers.GetVariablesContainersList()
+                   .GetVariablesContainerFromVariableName(
+                       node.identifierName) == &targetVariablesContainer) {
             // The node represents a variable, that can come from the target
             // (because the target is in the scope), replace or remove it:
-            RenameOrRemoveVariableOfTargetVariableContainer(
-                node.identifierName);
+            renameVariableAndChild();
           }
         },
         [&]() {
@@ -202,14 +249,7 @@ class GD_CORE_API ExpressionVariableReplacer
           // 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);
-          }
+          // This is something else.
         });
   }
   void OnVisitObjectFunctionNameNode(ObjectFunctionNameNode& node) override {}
@@ -231,31 +271,33 @@ class GD_CORE_API ExpressionVariableReplacer
       // force the "scope" at which starts the evalution of variables.
       if (parameterMetadata && parameterMetadata->GetValueTypeMetadata()
                                    .IsLegacyPreScopedVariable()) {
-        const gd::VariablesContainer* oldForcedInitialVariablesContainer =
-            forcedInitialVariablesContainer;
+        const gd::VariablesContainer *oldForcedVariablesContainer =
+            forcedVariablesContainer;
+        const gd::String &oldForcedObjectName = forcedObjectName;
 
-        forcedInitialVariablesContainer = nullptr;
+        forcedVariablesContainer = nullptr;
+        forcedObjectName = "";
         if (parameterMetadata->GetType() == "globalvar") {
-          forcedInitialVariablesContainer =
+          forcedVariablesContainer =
               projectScopedContainers.GetVariablesContainersList()
                   .GetTopMostVariablesContainer();
         } else if (parameterMetadata->GetType() == "scenevar") {
-          forcedInitialVariablesContainer =
+          forcedVariablesContainer =
               projectScopedContainers.GetVariablesContainersList()
                   .GetBottomMostVariablesContainer();
         } else if (parameterMetadata->GetType() == "objectvar") {
           auto objectName = gd::ExpressionVariableOwnerFinder::GetObjectName(
-              platform,
-              projectScopedContainers.GetObjectsContainersList(),
-              node.objectName,
-              *node.parameters[parameterIndex].get());
-          forcedInitialVariablesContainer =
+              platform, projectScopedContainers.GetObjectsContainersList(),
+              node.objectName, *node.parameters[parameterIndex].get());
+          forcedVariablesContainer =
               projectScopedContainers.GetObjectsContainersList()
                   .GetObjectOrGroupVariablesContainer(objectName);
+          forcedObjectName = objectName;
         }
 
         node.parameters[parameterIndex]->Visit(*this);
-        forcedInitialVariablesContainer = oldForcedInitialVariablesContainer;
+        forcedVariablesContainer = oldForcedVariablesContainer;
+        forcedObjectName = oldForcedObjectName;
       } else {
         // For any other parameter, there is no special treatment being needed.
         node.parameters[parameterIndex]->Visit(*this);
@@ -268,19 +310,28 @@ class GD_CORE_API ExpressionVariableReplacer
   bool hasDoneRenaming;
   bool removedVariableUsed;
 
-  const gd::String& GetPotentialNewName(const gd::String& oldName) {
-    return oldToNewVariableNames.count(oldName) >= 1
-            ? oldToNewVariableNames.find(oldName)->second
-            : oldName;
+  bool IsTargetingObjectGroup(const gd::String &objectGroupName) {
+    return !targetGroupName.empty() && objectGroupName == targetGroupName;
   }
 
   bool RenameOrRemoveVariableOfTargetVariableContainer(
       gd::String& variableName) {
+    const auto *currentVariablesRenamingChangesetNode =
+        GetCurrentVariablesRenamingChangesetNode();
+    if (!currentVariablesRenamingChangesetNode) {
+      return false;
+    }
+    const auto &oldToNewVariableNames =
+        currentVariablesRenamingChangesetNode->oldToNewVariableNames;
     if (oldToNewVariableNames.count(variableName) >= 1) {
       variableName = oldToNewVariableNames.find(variableName)->second;
       hasDoneRenaming = true;
       return true;
-    } else if (removedVariableNames.count(variableName) >= 1) {
+    } else if (
+      // Only the root variable is checked for removing.
+      currentVariablesRenamingChangesetNode ==
+                   &variablesRenamingChangesetRoot &&
+               removedVariableNames.count(variableName) >= 1) {
       removedVariableUsed = true;
       return true;
     }
@@ -288,24 +339,88 @@ class GD_CORE_API ExpressionVariableReplacer
     return false;  // Nothing was changed or done.
   }
 
+  void RenameVariableAndVisitChild(gd::String &variableName,
+                                   ExpressionNode *childNode) {
+    // `variableName` is modified by
+    // `RenameOrRemoveVariableOfTargetVariableContainer`.
+    const gd::String oldVariableName = variableName;
+    RenameOrRemoveVariableOfTargetVariableContainer(variableName);
+    if (childNode) {
+      bool hasBeenPushed =
+          PushVariablesRenamingChangesetNodeForVariable(oldVariableName);
+      childNode->Visit(*this);
+      PopVariablesRenamingChangesetNode(hasBeenPushed);
+    }
+  }
+
+  void PushVariablesRenamingChangesetRoot() {
+    variablesRenamingChangesetNodeStack.push_back(&variablesRenamingChangesetRoot);
+  }
+
+  void PushVariablesRenamingChangesetNodeForIgnoredVariables() {
+    variablesRenamingChangesetNodeStack.push_back(nullptr);
+  }
+
+  const gd::VariablesRenamingChangesetNode *GetCurrentVariablesRenamingChangesetNode() {
+    return variablesRenamingChangesetNodeStack.size() == 0 ?
+    &variablesRenamingChangesetRoot :
+        variablesRenamingChangesetNodeStack
+            [variablesRenamingChangesetNodeStack.size() - 1];
+  }
+
+  bool PushVariablesRenamingChangesetNodeForVariable(const gd::String& variableName) {
+    const auto *currentVariablesRenamingChangesetNode = GetCurrentVariablesRenamingChangesetNode();
+    if (!currentVariablesRenamingChangesetNode) {
+      // There were already no more change on a parent.
+      return false;
+    }
+    const auto &childVariablesRenamingChangesetNodeItr =
+        currentVariablesRenamingChangesetNode->modifiedVariables.find(
+            variableName);
+    if (childVariablesRenamingChangesetNodeItr ==
+        currentVariablesRenamingChangesetNode->modifiedVariables.end()) {
+      // There is no more change on the current variable child.
+      variablesRenamingChangesetNodeStack.push_back(nullptr);
+    }
+    else {
+      variablesRenamingChangesetNodeStack.push_back(
+          childVariablesRenamingChangesetNodeItr->second.get());
+    }
+    return true;
+  }
+
+  void PopVariablesRenamingChangesetNode(bool hasBeenPushed) {
+    if (hasBeenPushed) {
+      variablesRenamingChangesetNodeStack.pop_back();
+    }
+  }
+
   // Scope:
   const gd::Platform& platform;
   const gd::ProjectScopedContainers& projectScopedContainers;
-  const gd::VariablesContainer* forcedInitialVariablesContainer;
+  const gd::VariablesContainer* forcedVariablesContainer;
+  gd::String forcedObjectName;
 
   // Renaming or removing to do:
   const gd::VariablesContainer& targetVariablesContainer;
-  const std::unordered_map<gd::String, gd::String>& oldToNewVariableNames;
+  /**
+   * Groups don't have VariablesContainer, so `targetVariablesContainer` will be
+   * pointing to `nullVariablesContainer` and the group name is use instead to
+   * check which variable accesses to modify in expressions.
+   */
+  const gd::String& targetGroupName;
+  const VariablesRenamingChangesetNode &variablesRenamingChangesetRoot;
   const std::unordered_set<gd::String>& removedVariableNames;
 
   gd::String objectNameToUseForVariableAccessor;
+  std::vector<const VariablesRenamingChangesetNode*> variablesRenamingChangesetNodeStack;
 };
 
 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.
+  // force the "scope" at which starts the evaluation of variables.
   if (type == "objectvar") {
     return GetProjectScopedContainers()
         .GetObjectsContainersList()
@@ -350,9 +465,11 @@ bool EventsVariableReplacer::DoVisitInstruction(gd::Instruction& instruction,
         if (node) {
           ExpressionVariableReplacer renamer(platform,
                                              GetProjectScopedContainers(),
+                                             variablesRenamingChangesetRoot,
+                                             removedVariableNames,
                                              targetVariablesContainer,
-                                             oldToNewVariableNames,
-                                             removedVariableNames);
+                                             targetGroupName,
+                                             type == "objectvar" ? lastObjectName : "");
           renamer.SetForcedInitialVariablesContainer(
               FindForcedVariablesContainerIfAny(type, lastObjectName));
           node->Visit(renamer);
@@ -382,9 +499,11 @@ bool EventsVariableReplacer::DoVisitEventExpression(
   if (node) {
     ExpressionVariableReplacer renamer(platform,
                                        GetProjectScopedContainers(),
+                                       variablesRenamingChangesetRoot,
+                                       removedVariableNames,
                                        targetVariablesContainer,
-                                       oldToNewVariableNames,
-                                       removedVariableNames);
+                                       targetGroupName,
+                                       "");
     renamer.SetForcedInitialVariablesContainer(
         FindForcedVariablesContainerIfAny(type, ""));
     node->Visit(renamer);

Core/GDCore/IDE/Events/EventsVariableReplacer.h

@@ -4,6 +4,7 @@
  * reserved. This project is released under the MIT License.
  */
 #pragma once
+
 #include <map>
 #include <memory>
 #include <unordered_map>
@@ -12,11 +13,13 @@
 
 #include "GDCore/IDE/Events/ArbitraryEventsWorker.h"
 #include "GDCore/String.h"
+
 namespace gd {
 class BaseEvent;
 class VariablesContainer;
 class EventsList;
 class Platform;
+struct VariablesRenamingChangesetNode;
 }  // namespace gd
 
 namespace gd {
@@ -32,13 +35,24 @@ class GD_CORE_API EventsVariableReplacer
  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_)
+      const VariablesRenamingChangesetNode &variablesRenamingChangesetRoot_,
+      const std::unordered_set<gd::String> &removedVariableNames_,
+      const gd::VariablesContainer &targetVariablesContainer_)
       : platform(platform_),
+        variablesRenamingChangesetRoot(variablesRenamingChangesetRoot_),
+        removedVariableNames(removedVariableNames_),
         targetVariablesContainer(targetVariablesContainer_),
-        oldToNewVariableNames(oldToNewVariableNames_),
-        removedVariableNames(removedVariableNames_){};
+        targetGroupName("") {};
+  EventsVariableReplacer(
+      const gd::Platform &platform_,
+      const VariablesRenamingChangesetNode &variablesRenamingChangesetRoot_,
+      const std::unordered_set<gd::String> &removedVariableNames_,
+      const gd::String &targetGroupName_)
+      : platform(platform_),
+        variablesRenamingChangesetRoot(variablesRenamingChangesetRoot_),
+        removedVariableNames(removedVariableNames_),
+        targetVariablesContainer(nullVariablesContainer),
+        targetGroupName(targetGroupName_) {};
   virtual ~EventsVariableReplacer();
 
  private:
@@ -52,9 +66,16 @@ class GD_CORE_API EventsVariableReplacer
 
   const gd::Platform &platform;
   const gd::VariablesContainer &targetVariablesContainer;
-  gd::String objectName;
-  const std::unordered_map<gd::String, gd::String> &oldToNewVariableNames;
+  /**
+   * Groups don't have VariablesContainer, so `targetVariablesContainer` will be
+   * pointing to `nullVariablesContainer` and the group name is use instead to
+   * check which variable accesses to modify in expressions.
+   */
+  const gd::String targetGroupName;
+  const VariablesRenamingChangesetNode &variablesRenamingChangesetRoot;
   const std::unordered_set<gd::String> &removedVariableNames;
+
+  static VariablesContainer nullVariablesContainer;
 };
 
 }  // namespace gd

Core/GDCore/IDE/Events/EventsVariablesFinder.cpp

@@ -93,9 +93,11 @@ class GD_CORE_API VariableFinderExpressionNodeWorker
     }
 
     size_t parameterIndex = 0;
-    for (size_t metadataIndex = (isObjectFunction ? 1 : 0); metadataIndex < metadata.parameters.size()
-      && parameterIndex < node.parameters.size(); ++metadataIndex) {
-      auto& parameterMetadata = metadata.parameters[metadataIndex];
+    for (size_t metadataIndex = (isObjectFunction ? 1 : 0);
+         metadataIndex < metadata.GetParameters().GetParametersCount() &&
+         parameterIndex < node.parameters.size();
+         ++metadataIndex) {
+      auto& parameterMetadata = metadata.GetParameters().GetParameter(metadataIndex);
       if (parameterMetadata.IsCodeOnly()) {
         continue;
       }
@@ -150,18 +152,18 @@ class GD_CORE_API VariableFinderEventWorker
                               platform, instruction.GetType())
                         : MetadataProvider::GetActionMetadata(
                               platform, instruction.GetType());
-      for (std::size_t pNb = 0; pNb < instrInfos.parameters.size(); ++pNb) {
+      for (std::size_t pNb = 0; pNb < instrInfos.parameters.GetParametersCount(); ++pNb) {
         // The parameter has the searched type...
-        if (instrInfos.parameters[pNb].GetType() == parameterType) {
+        if (instrInfos.parameters.GetParameter(pNb).GetType() == parameterType) {
           //...remember the value of the parameter.
           if (objectName.empty() || lastObjectParameter == objectName)
             results.insert(instruction.GetParameter(pNb).GetPlainString());
         }
         // Search in expressions
         else if (ParameterMetadata::IsExpression(
-                    "number", instrInfos.parameters[pNb].GetType()) ||
+                    "number", instrInfos.parameters.GetParameter(pNb).GetType()) ||
                 ParameterMetadata::IsExpression(
-                    "string", instrInfos.parameters[pNb].GetType())) {
+                    "string", instrInfos.parameters.GetParameter(pNb).GetType())) {
           auto node = instruction.GetParameter(pNb).GetRootNode();
 
           VariableFinderExpressionNodeWorker searcher(
@@ -174,7 +176,7 @@ class GD_CORE_API VariableFinderEventWorker
         }
         // Remember the value of the last "object" parameter.
         else if (gd::ParameterMetadata::IsObject(
-                    instrInfos.parameters[pNb].GetType())) {
+                    instrInfos.parameters.GetParameter(pNb).GetType())) {
           lastObjectParameter =
               instruction.GetParameter(pNb).GetPlainString();
         }
@@ -229,7 +231,7 @@ std::set<gd::String> EventsVariablesFinder::FindAllObjectVariables(
     const gd::Platform& platform,
     const gd::Project& project,
     const gd::Layout& layout,
-    const gd::Object& object) {
+    const gd::String& objectName) {
   std::set<gd::String> results;
 
   FindArgumentsInEventsAndDependencies(
@@ -238,7 +240,7 @@ std::set<gd::String> EventsVariablesFinder::FindAllObjectVariables(
       project,
       layout,
       "objectvar",
-      object.GetName());
+      objectName);
 
   return results;
 }
@@ -258,7 +260,7 @@ void EventsVariablesFinder::FindArgumentsInEventsAndDependencies(
   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);

Core/GDCore/IDE/Events/EventsVariablesFinder.h

@@ -63,14 +63,14 @@ class EventsVariablesFinder {
    *
    * \param project The project
    * \param layout The layout to use.
-   * \param  object The object to be scanned
+   * \param  objectName The name of the object to be scanned
    * \return A std::set containing the names of all object variables used.
    */
   static std::set<gd::String> FindAllObjectVariables(
       const gd::Platform& platform,
       const gd::Project& project,
       const gd::Layout& layout,
-      const gd::Object& object);
+      const gd::String& objectName);
 
  private:
 

Core/GDCore/IDE/Events/ExpressionCompletionFinder.h

@@ -3,21 +3,23 @@
  * Copyright 2008-present Florian Rival (Florian.Rival@gmail.com). All rights
  * reserved. This project is released under the MIT License.
  */
-#ifndef GDCORE_EXPRESSIONAUTOCOMPLETIONPROVIDER_H
-#define GDCORE_EXPRESSIONAUTOCOMPLETIONPROVIDER_H
+#pragma once
 
 #include <memory>
 #include <vector>
 
 #include "GDCore/Events/Parsers/ExpressionParser2.h"
 #include "GDCore/Events/Parsers/ExpressionParser2Node.h"
+#include "GDCore/Events/Parsers/ExpressionParser2NodePrinter.h"
 #include "GDCore/Events/Parsers/ExpressionParser2NodeWorker.h"
+#include "GDCore/Events/Parsers/GrammarTerminals.h"
 #include "GDCore/Extensions/Metadata/ExpressionMetadata.h"
 #include "GDCore/Extensions/Metadata/InstructionMetadata.h"
 #include "GDCore/Extensions/Metadata/ValueTypeMetadata.h"
 #include "GDCore/IDE/Events/ExpressionNodeLocationFinder.h"
 #include "GDCore/IDE/Events/ExpressionTypeFinder.h"
 #include "GDCore/IDE/Events/ExpressionVariableOwnerFinder.h"
+#include "GDCore/IDE/Events/ExpressionVariablePathFinder.h"
 #include "GDCore/Project/ProjectScopedContainers.h"
 #include "GDCore/Project/Variable.h"
 
@@ -144,6 +146,19 @@ struct GD_CORE_API ExpressionCompletionDescription {
     return *this;
   }
 
+  /**
+   * \brief Return the scope of the variable, for a variable completion.
+   */
+  gd::VariablesContainer::SourceType GetVariableScope() const {
+    return variableScope;
+  }
+
+  ExpressionCompletionDescription &
+  SetVariableScope(gd::VariablesContainer::SourceType variableScope_) {
+    variableScope = variableScope_;
+    return *this;
+  }
+
   /**
    * \brief Return the prefix that must be completed.
    */
@@ -312,6 +327,7 @@ struct GD_CORE_API ExpressionCompletionDescription {
                                   size_t replacementEndPosition_)
       : completionKind(completionKind_),
         variableType(gd::Variable::Number),
+        variableScope(gd::VariablesContainer::Unknown),
         replacementStartPosition(replacementStartPosition_),
         replacementEndPosition(replacementEndPosition_),
         isExact(false),
@@ -322,6 +338,7 @@ struct GD_CORE_API ExpressionCompletionDescription {
  private:
   CompletionKind completionKind;
   gd::Variable::Type variableType;
+  gd::VariablesContainer::SourceType variableScope;
   gd::String type;
   gd::String prefix;
   gd::String completion;
@@ -395,12 +412,10 @@ class GD_CORE_API ExpressionCompletionFinder
 
  protected:
   void OnVisitSubExpressionNode(SubExpressionNode& node) override {
-    const auto& objectsContainersList =
-        projectScopedContainers.GetObjectsContainersList();
     auto type = gd::ExpressionTypeFinder::GetType(
-        platform, objectsContainersList, rootType, node);
+        platform, projectScopedContainers, rootType, node);
 
-    AddCompletionsForAllIdentifiersWithPrefix("", type);
+    AddCompletionsForAllIdentifiersMatchingSearch("", type);
     completions.push_back(
         ExpressionCompletionDescription::ForExpressionWithPrefix(
             type, "", searchedPosition + 1, searchedPosition + 1));
@@ -409,12 +424,10 @@ class GD_CORE_API ExpressionCompletionFinder
     // No completions.
   }
   void OnVisitUnaryOperatorNode(UnaryOperatorNode& node) override {
-    const auto& objectsContainersList =
-        projectScopedContainers.GetObjectsContainersList();
     auto type = gd::ExpressionTypeFinder::GetType(
-        platform, objectsContainersList, rootType, node);
+        platform, projectScopedContainers, rootType, node);
 
-    AddCompletionsForAllIdentifiersWithPrefix("", type);
+    AddCompletionsForAllIdentifiersMatchingSearch("", type);
     completions.push_back(
         ExpressionCompletionDescription::ForExpressionWithPrefix(
             type, "", searchedPosition + 1, searchedPosition + 1));
@@ -450,11 +463,15 @@ class GD_CORE_API ExpressionCompletionFinder
           MetadataProvider::GetFunctionCallMetadata(
               platform, objectsContainersList, *functionCall);
 
-      const gd::ParameterMetadata* parameterMetadata = nullptr;
-      while (metadataParameterIndex < metadata.parameters.size()) {
-        if (!metadata.parameters[metadataParameterIndex].IsCodeOnly()) {
+      const gd::ParameterMetadata *parameterMetadata = nullptr;
+      while (metadataParameterIndex <
+             metadata.GetParameters().GetParametersCount()) {
+        if (!metadata.GetParameters()
+                 .GetParameter(metadataParameterIndex)
+                 .IsCodeOnly()) {
           if (visibleParameterIndex == parameterIndex) {
-            parameterMetadata = &metadata.parameters[metadataParameterIndex];
+            parameterMetadata =
+                &metadata.GetParameters().GetParameter(metadataParameterIndex);
           }
           visibleParameterIndex++;
         }
@@ -488,90 +505,143 @@ class GD_CORE_API ExpressionCompletionFinder
     const auto& objectsContainersList =
         projectScopedContainers.GetObjectsContainersList();
     auto type = gd::ExpressionTypeFinder::GetType(
-        platform, objectsContainersList, rootType, node);
+        platform, projectScopedContainers, rootType, node);
+
+    // Only attempt to complete with the children of the variable
+    // if it's the last child (no more `.AnotherVariable` written after).
+    bool eagerlyCompleteIfExactMatch = node.child == nullptr;
 
     if (gd::ValueTypeMetadata::IsTypeLegacyPreScopedVariable(type)) {
-      const gd::VariablesContainer* variablesContainer = nullptr;
-      if (type == "globalvar") {
-        variablesContainer =
-            projectScopedContainers.GetVariablesContainersList()
-                .GetTopMostVariablesContainer();
-      } else if (type == "scenevar") {
-        variablesContainer =
-            projectScopedContainers.GetVariablesContainersList()
-                .GetBottomMostVariablesContainer();
+      if (type == "globalvar" || type == "scenevar") {
+        const auto* variablesContainer =
+            type == "globalvar"
+                ? projectScopedContainers.GetVariablesContainersList()
+                      .GetTopMostVariablesContainer()
+                : projectScopedContainers.GetVariablesContainersList()
+                      .GetBottomMostVariablesContainer();
+        if (variablesContainer) {
+          AddCompletionsForVariablesMatchingSearch(*variablesContainer,
+                                                   node.name,
+                                                   node.nameLocation,
+                                                   eagerlyCompleteIfExactMatch);
+        }
       } else if (type == "objectvar") {
         auto objectName = gd::ExpressionVariableOwnerFinder::GetObjectName(
-            platform,
-            objectsContainersList,
-            // Variable fields doesn't use expression completion,
-            // so the object will be found inside the expression itself.
-            "",
-            node);
-        variablesContainer =
-            objectsContainersList.GetObjectOrGroupVariablesContainer(
-                objectName);
-      }
+            platform, objectsContainersList, rootObjectName, node);
 
-      if (variablesContainer) {
-        AddCompletionsForVariablesWithPrefix(
-            *variablesContainer, node.name, node.nameLocation);
+        AddCompletionsForObjectOrGroupVariablesMatchingSearch(
+            objectsContainersList,
+            objectName,
+            node.name,
+            node.nameLocation,
+            eagerlyCompleteIfExactMatch);
       }
     } else {
-      AddCompletionsForObjectsAndVariablesWithPrefix(
-          node.name, type, node.nameLocation);
+      AddCompletionsForObjectsAndVariablesMatchingSearch(
+          node.name, type, node.nameLocation, eagerlyCompleteIfExactMatch);
     }
   }
   void OnVisitVariableAccessorNode(VariableAccessorNode& node) override {
-    // No completions
+    VariableAndItsParent variableAndItsParent =
+        gd::ExpressionVariablePathFinder::GetLastParentOfNode(
+            platform, projectScopedContainers, node);
+
+    // If no child, we're at the end of a variable (like `GrandChild` in
+    // `Something.Child.GrandChild`) so we can complete eagerly children if we
+    // can.
+    gd::String eagerlyCompleteForVariableName =
+        node.child == nullptr ? node.name : "";
+    AddCompletionsForChildrenVariablesOf(variableAndItsParent,
+                                         node.nameLocation,
+                                         eagerlyCompleteForVariableName);
   }
   void OnVisitVariableBracketAccessorNode(
-      VariableBracketAccessorNode& node) override {
-    // No completions
-  }
+      VariableBracketAccessorNode& node) override {}
   void OnVisitIdentifierNode(IdentifierNode& node) override {
     const auto& objectsContainersList =
         projectScopedContainers.GetObjectsContainersList();
     auto type = gd::ExpressionTypeFinder::GetType(
-        platform, objectsContainersList, rootType, node);
+        platform, projectScopedContainers, rootType, node);
     if (gd::ParameterMetadata::IsObject(type)) {
       // Only show completions of objects if an object is required.
-      AddCompletionsForObjectWithPrefix(
+      AddCompletionsForObjectMatchingSearch(
           node.identifierName, type, node.location);
     } else if (gd::ValueTypeMetadata::IsTypeLegacyPreScopedVariable(type)) {
-      const gd::VariablesContainer* variablesContainer = nullptr;
-      if (type == "globalvar") {
-        variablesContainer =
-            projectScopedContainers.GetVariablesContainersList()
-                .GetTopMostVariablesContainer();
-      } else if (type == "scenevar") {
-        variablesContainer =
-            projectScopedContainers.GetVariablesContainersList()
-                .GetBottomMostVariablesContainer();
+      if (type == "globalvar" || type == "scenevar") {
+        const auto* variablesContainer =
+            type == "globalvar"
+                ? projectScopedContainers.GetVariablesContainersList()
+                      .GetTopMostVariablesContainer()
+                : projectScopedContainers.GetVariablesContainersList()
+                      .GetBottomMostVariablesContainer();
+        if (variablesContainer) {
+          if (IsCaretOn(node.identifierNameDotLocation) ||
+              IsCaretOn(node.childIdentifierNameLocation)) {
+            // Complete a potential child variable:
+            if (variablesContainer->Has(node.identifierName)) {
+              AddCompletionsForChildrenVariablesOf(
+                  &variablesContainer->Get(node.identifierName),
+                  node.childIdentifierNameLocation,
+                  node.childIdentifierName);
+            }
+          } else {
+            // Complete a root variable of the scene or project.
+
+            // Don't attempt to complete children variables if there is
+            // already a dot written (`MyVariable.`).
+            bool eagerlyCompleteIfPossible =
+                !node.identifierNameDotLocation.IsValid();
+            AddCompletionsForVariablesMatchingSearch(
+                *variablesContainer,
+                node.identifierName,
+                node.identifierNameLocation,
+                eagerlyCompleteIfPossible);
+          }
+        }
       } else if (type == "objectvar") {
         auto objectName = gd::ExpressionVariableOwnerFinder::GetObjectName(
-            platform,
-            objectsContainersList,
-            // Variable fields doesn't use expression completion,
-            // so the object will be found inside the expression itself.
-            "",
-            node);
-        variablesContainer =
-            objectsContainersList.GetObjectOrGroupVariablesContainer(
-                objectName);
-      }
+            platform, objectsContainersList, rootObjectName, node);
 
-      if (variablesContainer) {
-        AddCompletionsForVariablesWithPrefix(*variablesContainer,
-                                             node.identifierName,
-                                             node.identifierNameLocation);
+        if (IsCaretOn(node.identifierNameDotLocation) ||
+            IsCaretOn(node.childIdentifierNameLocation)) {
+          // Complete a potential child variable:
+          const auto* variablesContainer =
+              objectsContainersList.GetObjectOrGroupVariablesContainer(
+                  objectName);
+          if (variablesContainer &&
+              variablesContainer->Has(node.identifierName)) {
+            AddCompletionsForChildrenVariablesOf(
+                &variablesContainer->Get(node.identifierName),
+                node.childIdentifierNameLocation,
+                node.childIdentifierName);
+          }
+        } else {
+          // Complete a root variable of the object.
+
+          // Don't attempt to complete children variables if there is
+          // already a dot written (`MyVariable.`).
+          bool eagerlyCompleteIfPossible =
+              !node.identifierNameDotLocation.IsValid();
+          AddCompletionsForObjectOrGroupVariablesMatchingSearch(
+              objectsContainersList,
+              objectName,
+              node.identifierName,
+              node.identifierNameLocation,
+              eagerlyCompleteIfPossible);
+        }
       }
     } else {
       // Object function, behavior name, variable, object variable.
       if (IsCaretOn(node.identifierNameLocation)) {
-        // Is this the proper position?
-        AddCompletionsForAllIdentifiersWithPrefix(
-            node.identifierName, type, node.identifierNameLocation);
+        // Don't attempt to complete children variables if there is
+        // already a dot written (`MyVariable.`).
+        bool eagerlyCompleteIfPossible =
+            !node.identifierNameDotLocation.IsValid();
+        AddCompletionsForAllIdentifiersMatchingSearch(
+            node.identifierName,
+            type,
+            node.identifierNameLocation,
+            eagerlyCompleteIfPossible);
         if (!node.identifierNameDotLocation.IsValid()) {
           completions.push_back(
               ExpressionCompletionDescription::ForExpressionWithPrefix(
@@ -582,46 +652,69 @@ class GD_CORE_API ExpressionCompletionFinder
         }
       } else if (IsCaretOn(node.identifierNameDotLocation) ||
                  IsCaretOn(node.childIdentifierNameLocation)) {
-        const gd::String& objectName = node.identifierName;
+        // Might be:
+        // - An object variable, object behavior or object expression.
+        // - Or a variable with a child.
+        projectScopedContainers.MatchIdentifierWithName<void>(
+            node.identifierName,
+            [&]() {
+              // This is an object.
+              const gd::String& objectName = node.identifierName;
+              AddCompletionsForObjectOrGroupVariablesMatchingSearch(
+                  objectsContainersList,
+                  objectName,
+                  node.childIdentifierName,
+                  node.childIdentifierNameLocation,
+                  true);
 
-        // Might be an object variable, object behavior or object expression:
-        const auto* variablesContainer =
-            projectScopedContainers.GetObjectsContainersList()
-                .GetObjectOrGroupVariablesContainer(objectName);
-        if (variablesContainer) {
-          AddCompletionsForVariablesWithPrefix(
-              *variablesContainer,
-              node.childIdentifierName,
-              node.childIdentifierNameLocation);
-        }
+              completions.push_back(
+                  ExpressionCompletionDescription::ForBehaviorWithPrefix(
+                      node.childIdentifierName,
+                      node.childIdentifierNameLocation.GetStartPosition(),
+                      node.childIdentifierNameLocation.GetEndPosition(),
+                      objectName));
+              completions.push_back(
+                  ExpressionCompletionDescription::ForExpressionWithPrefix(
+                      type,
+                      node.childIdentifierName,
+                      node.childIdentifierNameLocation.GetStartPosition(),
+                      node.childIdentifierNameLocation.GetEndPosition(),
+                      objectName));
+            },
+            [&]() {
+              // This is a variable.
+              VariableAndItsParent variableAndItsParent =
+                  gd::ExpressionVariablePathFinder::GetLastParentOfNode(
+                      platform, projectScopedContainers, node);
 
-        completions.push_back(
-            ExpressionCompletionDescription::ForBehaviorWithPrefix(
-                node.childIdentifierName,
-                node.childIdentifierNameLocation.GetStartPosition(),
-                node.childIdentifierNameLocation.GetEndPosition(),
-                objectName));
-        completions.push_back(
-            ExpressionCompletionDescription::ForExpressionWithPrefix(
-                type,
-                node.childIdentifierName,
-                node.childIdentifierNameLocation.GetStartPosition(),
-                node.childIdentifierNameLocation.GetEndPosition(),
-                objectName));
+              AddCompletionsForChildrenVariablesOf(
+                  variableAndItsParent,
+                  node.childIdentifierNameLocation,
+                  node.childIdentifierName);
+            },
+            [&]() {
+              // 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 OnVisitObjectFunctionNameNode(ObjectFunctionNameNode& node) override {
-    const auto& objectsContainersList =
-        projectScopedContainers.GetObjectsContainersList();
     auto type = gd::ExpressionTypeFinder::GetType(
-        platform, objectsContainersList, rootType, node);
+        platform, projectScopedContainers, rootType, node);
     if (!node.behaviorFunctionName.empty() ||
         node.behaviorNameNamespaceSeparatorLocation.IsValid()) {
       // Behavior function (or behavior function being written, with the
       // function name missing)
       if (IsCaretOn(node.objectNameLocation)) {
-        AddCompletionsForObjectWithPrefix(
+        AddCompletionsForObjectMatchingSearch(
             node.objectName, type, node.objectNameLocation);
       } else if (IsCaretOn(node.objectNameDotLocation) ||
                  IsCaretOn(node.objectFunctionOrBehaviorNameLocation)) {
@@ -645,7 +738,7 @@ class GD_CORE_API ExpressionCompletionFinder
     } else {
       // Object function or behavior name
       if (IsCaretOn(node.objectNameLocation)) {
-        AddCompletionsForObjectWithPrefix(
+        AddCompletionsForObjectMatchingSearch(
             node.objectName, type, node.objectNameLocation);
       } else if (IsCaretOn(node.objectNameDotLocation) ||
                  IsCaretOn(node.objectFunctionOrBehaviorNameLocation)) {
@@ -666,17 +759,15 @@ class GD_CORE_API ExpressionCompletionFinder
     }
   }
   void OnVisitFunctionCallNode(FunctionCallNode& node) override {
-    const auto& objectsContainersList =
-        projectScopedContainers.GetObjectsContainersList();
     auto type = gd::ExpressionTypeFinder::GetType(
-        platform, objectsContainersList, rootType, node);
+        platform, projectScopedContainers, rootType, node);
     bool isCaretOnParenthesis = IsCaretOn(node.openingParenthesisLocation) ||
                                 IsCaretOn(node.closingParenthesisLocation);
 
     if (!node.behaviorName.empty()) {
       // Behavior function
       if (IsCaretOn(node.objectNameLocation)) {
-        AddCompletionsForObjectWithPrefix(
+        AddCompletionsForObjectMatchingSearch(
             node.objectName, type, node.objectNameLocation);
       } else if (IsCaretOn(node.objectNameDotLocation) ||
                  IsCaretOn(node.behaviorNameLocation)) {
@@ -700,7 +791,7 @@ class GD_CORE_API ExpressionCompletionFinder
     } else if (!node.objectName.empty()) {
       // Object function
       if (IsCaretOn(node.objectNameLocation)) {
-        AddCompletionsForObjectWithPrefix(
+        AddCompletionsForObjectMatchingSearch(
             node.objectName, type, node.objectNameLocation);
       } else {
         // Add completions for behaviors, because we could imagine that the user
@@ -738,12 +829,11 @@ class GD_CORE_API ExpressionCompletionFinder
     }
   }
   void OnVisitEmptyNode(EmptyNode& node) override {
-    const auto& objectsContainersList =
-        projectScopedContainers.GetObjectsContainersList();
     auto type = gd::ExpressionTypeFinder::GetType(
-        platform, objectsContainersList, rootType, node);
+        platform, projectScopedContainers, rootType, node);
 
-    AddCompletionsForAllIdentifiersWithPrefix(node.text, type, node.location);
+    AddCompletionsForAllIdentifiersMatchingSearch(
+        node.text, type, node.location);
     completions.push_back(
         ExpressionCompletionDescription::ForExpressionWithPrefix(
             type,
@@ -762,12 +852,98 @@ class GD_CORE_API ExpressionCompletionFinder
              (inclusive && searchedPosition <= location.GetEndPosition())));
   }
 
-  void AddCompletionsForVariablesWithPrefix(
-      const gd::VariablesContainer& variablesContainer,
-      const gd::String& prefix,
+  /**
+   * A slightly less strict check than `gd::Project::IsNameSafe` as child
+   * variables can be completed even if they start with a number.
+   */
+  bool IsIdentifierSafe(const gd::String& name) {
+    if (name.empty()) return false;
+
+    for (auto character : name) {
+      if (!GrammarTerminals::IsAllowedInIdentifier(character)) {
+        return false;
+      }
+    }
+
+    return true;
+  }
+
+  void AddCompletionsForChildrenVariablesOf(
+      VariableAndItsParent variableAndItsParent,
+      const ExpressionParserLocation& location,
+      gd::String eagerlyCompleteForVariableName = "") {
+    if (variableAndItsParent.parentVariable) {
+      AddCompletionsForChildrenVariablesOf(variableAndItsParent.parentVariable,
+                                           location,
+                                           eagerlyCompleteForVariableName);
+    } else if (variableAndItsParent.parentVariablesContainer) {
+      AddCompletionsForVariablesMatchingSearch(
+          *variableAndItsParent.parentVariablesContainer, "", location);
+    }
+  }
+
+  void AddCompletionsForChildrenVariablesOf(
+      const gd::Variable* variable,
+      const ExpressionParserLocation& location,
+      gd::String eagerlyCompleteForVariableName = "") {
+    if (!variable) return;
+
+    if (variable->GetType() == gd::Variable::Structure) {
+      for (const auto& name : variable->GetAllChildrenNames()) {
+        if (!IsIdentifierSafe(name)) continue;
+
+        const auto& childVariable = variable->GetChild(name);
+        ExpressionCompletionDescription description(
+            ExpressionCompletionDescription::Variable,
+            location.GetStartPosition(),
+            location.GetEndPosition());
+        description.SetCompletion(name);
+        description.SetVariableType(childVariable.GetType());
+        completions.push_back(description);
+
+        if (name == eagerlyCompleteForVariableName) {
+          AddEagerCompletionForVariableChildren(childVariable, name, location);
+        }
+      }
+    } else {
+      // TODO: we could do a "comment only completion" to indicate that nothing
+      // can/should be completed?
+    }
+  }
+
+  void AddEagerCompletionForVariableChildren(
+      const gd::Variable& variable,
+      const gd::String& variableName,
       const ExpressionParserLocation& location) {
-    variablesContainer.ForEachVariableWithPrefix(
-        prefix,
+    if (variable.GetType() == gd::Variable::Structure) {
+      gd::String prefix = variableName + ".";
+      for (const auto& name : variable.GetAllChildrenNames()) {
+        gd::String completion =
+            IsIdentifierSafe(name)
+                ? (prefix + name)
+                : (variableName + "[" +
+                   gd::ExpressionParser2NodePrinter::PrintStringLiteral(name) +
+                   "]");
+
+        const auto& childVariable = variable.GetChild(name);
+        ExpressionCompletionDescription description(
+            ExpressionCompletionDescription::Variable,
+            location.GetStartPosition(),
+            location.GetEndPosition());
+        description.SetCompletion(completion);
+        description.SetVariableType(childVariable.GetType());
+        completions.push_back(description);
+      }
+    }
+  }
+
+  void AddCompletionsForVariablesMatchingSearch(
+      const gd::VariablesContainer& variablesContainer,
+      const gd::String& search,
+      const ExpressionParserLocation& location,
+      bool eagerlyCompleteIfExactMatch = false) {
+    variablesContainer.ForEachVariableMatchingSearch(
+        search,
         [&](const gd::String& variableName, const gd::Variable& variable) {
           ExpressionCompletionDescription description(
               ExpressionCompletionDescription::Variable,
@@ -775,35 +951,69 @@ class GD_CORE_API ExpressionCompletionFinder
               location.GetEndPosition());
           description.SetCompletion(variableName);
           description.SetVariableType(variable.GetType());
+          description.SetVariableScope(variablesContainer.GetSourceType());
           completions.push_back(description);
+
+          if (eagerlyCompleteIfExactMatch && variableName == search) {
+            AddEagerCompletionForVariableChildren(
+                variable, variableName, location);
+          }
         });
   }
 
-  void AddCompletionsForObjectWithPrefix(
-      const gd::String& prefix,
-      const gd::String& type,
-      const ExpressionParserLocation& location) {
-    projectScopedContainers.GetObjectsContainersList().ForEachNameWithPrefix(
-        prefix,
-        [&](const gd::String& name,
-            const gd::ObjectConfiguration* objectConfiguration) {
+  void AddCompletionsForObjectOrGroupVariablesMatchingSearch(
+      const gd::ObjectsContainersList& objectsContainersList,
+      const gd::String& objectOrGroupName,
+      const gd::String& search,
+      const ExpressionParserLocation& location,
+      bool eagerlyCompleteIfExactMatch) {
+    objectsContainersList.ForEachObjectOrGroupVariableMatchingSearch(
+        objectOrGroupName,
+        search,
+        [&](const gd::String& variableName, const gd::Variable& variable) {
           ExpressionCompletionDescription description(
-              ExpressionCompletionDescription::Object,
+              ExpressionCompletionDescription::Variable,
               location.GetStartPosition(),
               location.GetEndPosition());
-          description.SetObjectConfiguration(objectConfiguration);
-          description.SetCompletion(name);
-          description.SetType(type);
+          description.SetCompletion(variableName);
+          description.SetVariableType(variable.GetType());
+          description.SetVariableScope(gd::VariablesContainer::Object);
           completions.push_back(description);
+
+          if (eagerlyCompleteIfExactMatch && variableName == search) {
+            AddEagerCompletionForVariableChildren(
+                variable, variableName, location);
+          }
         });
   }
 
-  void AddCompletionsForObjectsAndVariablesWithPrefix(
-      const gd::String& prefix,
+  void AddCompletionsForObjectMatchingSearch(
+      const gd::String& search,
       const gd::String& type,
       const ExpressionParserLocation& location) {
-    projectScopedContainers.ForEachIdentifierWithPrefix(
-        prefix,
+    projectScopedContainers.GetObjectsContainersList()
+        .ForEachNameMatchingSearch(
+            search,
+            [&](const gd::String& name,
+                const gd::ObjectConfiguration* objectConfiguration) {
+              ExpressionCompletionDescription description(
+                  ExpressionCompletionDescription::Object,
+                  location.GetStartPosition(),
+                  location.GetEndPosition());
+              description.SetObjectConfiguration(objectConfiguration);
+              description.SetCompletion(name);
+              description.SetType(type);
+              completions.push_back(description);
+            });
+  }
+
+  void AddCompletionsForObjectsAndVariablesMatchingSearch(
+      const gd::String& search,
+      const gd::String& type,
+      const ExpressionParserLocation& location,
+      bool eagerlyCompleteIfExactMatch) {
+    projectScopedContainers.ForEachIdentifierMatchingSearch(
+        search,
         [&](const gd::String& objectName,
             const ObjectConfiguration* objectConfiguration) {
           ExpressionCompletionDescription description(
@@ -822,7 +1032,16 @@ class GD_CORE_API ExpressionCompletionFinder
               location.GetEndPosition());
           description.SetCompletion(variableName);
           description.SetVariableType(variable.GetType());
+          description.SetVariableScope(
+              projectScopedContainers.GetVariablesContainersList()
+                  .GetVariablesContainerFromVariableName(variableName)
+                  .GetSourceType());
           completions.push_back(description);
+
+          if (eagerlyCompleteIfExactMatch && variableName == search) {
+            AddEagerCompletionForVariableChildren(
+                variable, variableName, location);
+          }
         },
         [&](const gd::NamedPropertyDescriptor& property) {
           // Ignore properties here.
@@ -832,20 +1051,21 @@ class GD_CORE_API ExpressionCompletionFinder
         });
   }
 
-  void AddCompletionsForAllIdentifiersWithPrefix(const gd::String& prefix,
-                                                 const gd::String& type) {
-    AddCompletionsForAllIdentifiersWithPrefix(
-        prefix,
+  void AddCompletionsForAllIdentifiersMatchingSearch(const gd::String& search,
+                                                     const gd::String& type) {
+    AddCompletionsForAllIdentifiersMatchingSearch(
+        search,
         type,
         ExpressionParserLocation(searchedPosition + 1, searchedPosition + 1));
   }
 
-  void AddCompletionsForAllIdentifiersWithPrefix(
-      const gd::String& prefix,
+  void AddCompletionsForAllIdentifiersMatchingSearch(
+      const gd::String& search,
       const gd::String& type,
-      const ExpressionParserLocation& location) {
-    projectScopedContainers.ForEachIdentifierWithPrefix(
-        prefix,
+      const ExpressionParserLocation& location,
+      bool eagerlyCompleteIfExactMatch = false) {
+    projectScopedContainers.ForEachIdentifierMatchingSearch(
+        search,
         [&](const gd::String& objectName,
             const ObjectConfiguration* objectConfiguration) {
           ExpressionCompletionDescription description(
@@ -864,7 +1084,16 @@ class GD_CORE_API ExpressionCompletionFinder
               location.GetEndPosition());
           description.SetCompletion(variableName);
           description.SetVariableType(variable.GetType());
+          description.SetVariableScope(
+              projectScopedContainers.GetVariablesContainersList()
+                  .GetVariablesContainerFromVariableName(variableName)
+                  .GetSourceType());
           completions.push_back(description);
+
+          if (eagerlyCompleteIfExactMatch && variableName == search) {
+            AddEagerCompletionForVariableChildren(
+                variable, variableName, location);
+          }
         },
         [&](const gd::NamedPropertyDescriptor& property) {
           ExpressionCompletionDescription description(
@@ -892,11 +1121,14 @@ class GD_CORE_API ExpressionCompletionFinder
       const gd::String& rootType_,
       size_t searchedPosition_,
       gd::ExpressionNode* maybeParentNodeAtLocation_)
-      : platform(platform_),
+      : searchedPosition(searchedPosition_),
+        maybeParentNodeAtLocation(maybeParentNodeAtLocation_),
+        platform(platform_),
         projectScopedContainers(projectScopedContainers_),
         rootType(rootType_),
-        searchedPosition(searchedPosition_),
-        maybeParentNodeAtLocation(maybeParentNodeAtLocation_){};
+        rootObjectName("")  // Always empty, might be changed if variable fields
+                            // in the editor are changed to use completion.
+        {};
 
   std::vector<ExpressionCompletionDescription> completions;
   size_t searchedPosition;
@@ -905,8 +1137,7 @@ class GD_CORE_API ExpressionCompletionFinder
   const gd::Platform& platform;
   const gd::ProjectScopedContainers& projectScopedContainers;
   const gd::String rootType;
+  const gd::String rootObjectName;
 };
 
 }  // namespace gd
-
-#endif  // GDCORE_EXPRESSIONAUTOCOMPLETIONPROVIDER_H

Core/GDCore/IDE/Events/ExpressionLeftSideTypeFinder.h

@@ -14,13 +14,12 @@
 #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 {
 class Expression;
 class ObjectsContainer;
-class ObjectsContainersList;
 class Platform;
 class ParameterMetadata;
 class ExpressionMetadata;
@@ -41,10 +40,10 @@ class GD_CORE_API ExpressionLeftSideTypeFinder : public ExpressionParser2NodeWor
    * operations.
    */
   static const gd::String GetType(const gd::Platform &platform,
-                      const gd::ObjectsContainersList &objectsContainersList,
+                      const gd::ProjectScopedContainers &projectScopedContainers,
                       gd::ExpressionNode& node) {
     gd::ExpressionLeftSideTypeFinder typeFinder(
-        platform, objectsContainersList);
+        platform, projectScopedContainers);
     node.Visit(typeFinder);
     return typeFinder.GetType();
   }
@@ -53,9 +52,9 @@ class GD_CORE_API ExpressionLeftSideTypeFinder : public ExpressionParser2NodeWor
 
  protected:
   ExpressionLeftSideTypeFinder(const gd::Platform &platform_,
-                       const gd::ObjectsContainersList &objectsContainersList_)
+                       const gd::ProjectScopedContainers &projectScopedContainers_)
       : platform(platform_),
-        objectsContainersList(objectsContainersList_),
+        projectScopedContainers(projectScopedContainers_),
         type("unknown") {};
 
   const gd::String &GetType() {
@@ -67,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);
@@ -83,7 +90,7 @@ class GD_CORE_API ExpressionLeftSideTypeFinder : public ExpressionParser2NodeWor
   }
   void OnVisitFunctionCallNode(FunctionCallNode& node) override {
     const gd::ExpressionMetadata &metadata = MetadataProvider::GetFunctionCallMetadata(
-        platform, objectsContainersList, node);
+        platform, projectScopedContainers.GetObjectsContainersList(), node);
     if (gd::MetadataProvider::IsBadExpressionMetadata(metadata)) {
       type = "unknown";
     }
@@ -93,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";
@@ -108,10 +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::ObjectsContainersList &objectsContainersList;
+  const gd::ProjectScopedContainers &projectScopedContainers;
   const gd::String rootType;
 };