Align beta editor with GDevelop 5.6.270 and merge feature/breakpoints

.github/workflows/build-editor.yml

@@ -1,5 +1,5 @@
-# Build the GDevelop desktop editor and publish a GitHub prerelease on every
-# push to release/beta-editor.
+# Build the GDevelop desktop editor and publish a GitHub prerelease whenever a
+# pull request is merged into release/beta-editor.
 #
 # Pipeline:
 #   1) build-gdevelop-js (Linux): compiles GDevelop.js (libGD.js / libGD.wasm)
@@ -19,29 +19,32 @@
 #
 # Heavy steps (emsdk, libGD build, npm installs, electron-builder, release
 # creation, installer upload) are gated by the DRY_RUN env below. Default is
-# "false" on this branch so every push produces installers and a prerelease.
+# "false" on this branch so every merge produces installers and a prerelease.
 # Set DRY_RUN to "true" temporarily to exercise the workflow without building.
 #
-# Concurrency: rapid consecutive pushes cancel in-flight runs for the same
-# branch - the newest push is what we want to ship.
+# Concurrency: rapid consecutive merges cancel in-flight runs for the same
+# target branch - the newest merge is what we want to ship.
 #
 # Required permissions: contents: write (create tags, releases, upload
 # assets). Provided by the default GITHUB_TOKEN on the fork; no PAT needed.
 #
 # Not intended to be merged to master - lives on the `release/beta-editor`
 # branch only so upstream sync is not disturbed. Since workflow_dispatch is
 # not available for workflows that do not exist on the default branch, the
-# only trigger is push to release/beta-editor.
+# only trigger is a merged pull request targeting release/beta-editor (a
+# closed-but-not-merged PR, e.g. rejected/closed without merging, is ignored
+# via the per-job `if:` check below).
 
 name: Build Editor (Windows & macOS)
 
 on:
-  push:
+  pull_request:
+    types: [closed]
     branches:
       - release/beta-editor
 
 concurrency:
-  group: build-editor-${{ github.ref }}
+  group: build-editor-${{ github.event.pull_request.base.ref }}
   cancel-in-progress: true
 
 permissions:
@@ -59,12 +62,17 @@ env:
 jobs:
   build-gdevelop-js:
     name: Build GDevelop.js (Linux)
+    if: github.event.pull_request.merged == true
     runs-on: ubuntu-24.04
     outputs:
       build_version: ${{ steps.version.outputs.value }}
     steps:
+      # Check out the actual merge commit landed on the base branch (not the
+      # ephemeral refs/pull/:number/merge test-merge ref) so the build reflects
+      # exactly what is now on release/beta-editor.
       - uses: actions/checkout@v4
         with:
+          ref: ${{ github.event.pull_request.merge_commit_sha }}
           fetch-depth: 1
 
       # Version format: <upstream>-beta.<github.run_number>. Upstream base is read
@@ -148,6 +156,7 @@ jobs:
   # does nothing.
   prepare-release:
     name: Prepare GitHub prerelease
+    if: github.event.pull_request.merged == true
     needs: build-gdevelop-js
     runs-on: ubuntu-latest
     steps:
@@ -156,13 +165,15 @@ jobs:
       - uses: actions/checkout@v4
         if: ${{ env.DRY_RUN != 'true' }}
         with:
+          ref: ${{ github.event.pull_request.merge_commit_sha }}
           fetch-depth: 0
 
       - name: Create empty prerelease
         if: ${{ env.DRY_RUN != 'true' }}
         env:
           GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           TAG: v${{ needs.build-gdevelop-js.outputs.build_version }}
+          TARGET_SHA: ${{ github.event.pull_request.merge_commit_sha }}
         shell: bash
         run: |
           if gh release view "$TAG" >/dev/null 2>&1; then
@@ -172,7 +183,7 @@ jobs:
               --prerelease \
               --title "$TAG" \
               --generate-notes \
-              --target "${{ github.sha }}"
+              --target "$TARGET_SHA"
           fi
 
       - name: Dry-run summary
@@ -184,6 +195,7 @@ jobs:
 
   build-editor-windows:
     name: Build Editor (Windows)
+    if: github.event.pull_request.merged == true
     needs: [build-gdevelop-js, prepare-release]
     runs-on: windows-latest
     env:
@@ -196,6 +208,7 @@ jobs:
     steps:
       - uses: actions/checkout@v4
         with:
+          ref: ${{ github.event.pull_request.merge_commit_sha }}
           fetch-depth: 1
 
       - uses: actions/setup-node@v4
@@ -286,6 +299,7 @@ jobs:
 
   build-editor-macos:
     name: Build Editor (macOS)
+    if: github.event.pull_request.merged == true
     needs: [build-gdevelop-js, prepare-release]
     runs-on: macos-latest
     env:
@@ -305,6 +319,7 @@ jobs:
     steps:
       - uses: actions/checkout@v4
         with:
+          ref: ${{ github.event.pull_request.merge_commit_sha }}
           fetch-depth: 1
 
       - uses: actions/setup-node@v4

Core/GDCore/IDE/Events/InstructionSentenceFormatter.cpp

@@ -67,9 +67,20 @@ InstructionSentenceFormatter::GetAsFormattedText(
       TextFormatting format;
       format.userData = firstParamIndex;
 
+      const gd::ParameterMetadata &parameterMetadata =
+          metadata.GetParameter(firstParamIndex);
+      const gd::String &parameterValue =
+          instr.GetParameter(firstParamIndex).GetPlainString();
+      // Use the default value when the parameter is left empty, so that the
+      // displayed text matches what is actually generated as code (see
+      // `gd::ParameterMetadataTools::IterateOverParametersWithIndex`).
+      const gd::String &parameterValueOrDefault =
+          parameterValue.empty() && parameterMetadata.IsOptional()
+              ? parameterMetadata.GetDefaultValue()
+              : parameterValue;
+
       gd::String text = GetFormattedParameterValue(
-          instr.GetParameter(firstParamIndex).GetPlainString(),
-          metadata.GetParameter(firstParamIndex).GetType());
+          parameterValueOrDefault, parameterMetadata.GetType());
       std::replace(text.Raw().begin(),
                    text.Raw().end(),
                    '\n',

Core/GDCore/IDE/Events/UsedExtensionsFinder.cpp

@@ -16,6 +16,11 @@
 namespace gd {
 
 void UsedExtensionsResult::AddUsedExtension(const gd::PlatformExtension& extension) {
+  if (extension.GetName().empty()) {
+    // The extension was not found and `extension` is
+    // `gd::MetadataProvider::badExtension`.
+    return;
+  }
   usedExtensions.insert(extension.GetName());
 
   usedSourceFiles.insert(usedSourceFiles.end(),
@@ -216,20 +221,8 @@ void UsedExtensionsFinder::OnVisitVariableBracketAccessorNode(
   if (node.child) node.child->Visit(*this);
 };
 
-// Add extensions bound to Objects/Behaviors/Functions
 void UsedExtensionsFinder::OnVisitIdentifierNode(IdentifierNode &node) {
-  auto type = gd::ExpressionTypeFinder::GetType(
-      project.GetCurrentPlatform(), GetProjectScopedContainers(), rootType, node);
-  if (gd::ParameterMetadata::IsObject(type) ||
-      GetObjectsContainersList().HasObjectOrGroupNamed(node.identifierName)) {
-    // An object or object variable is used.
-    auto metadata = gd::MetadataProvider::GetExtensionAndObjectMetadata(
-        project.GetCurrentPlatform(), node.identifierName);
-    result.AddUsedExtension(metadata.GetExtension());
-    for (auto &&includeFile : metadata.GetMetadata().includeFiles) {
-      result.AddUsedIncludeFiles(includeFile);
-    }
-  }
+  // Object parameters or object variables won't help detect extension usages.
 };
 
 void UsedExtensionsFinder::OnVisitFunctionCallNode(FunctionCallNode& node) {

Core/GDCore/IDE/InstructionValidator.cpp

@@ -29,7 +29,7 @@ ParameterValidationResult InstructionValidator::ValidateParameter(
     const gd::Platform &platform,
     const gd::ProjectScopedContainers projectScopedContainers,
     const gd::Instruction &instruction, const InstructionMetadata &metadata,
-    std::size_t parameterIndex, const gd::String &value) {
+    std::size_t parameterIndex) {
   ParameterValidationResult result;
 
   if (parameterIndex >= instruction.GetParametersCount() ||
@@ -45,11 +45,23 @@ ParameterValidationResult InstructionValidator::ValidateParameter(
                                   ? "number"
                                   : parameterMetadata.GetType();
 
+  // The parameter value as stored in the project: empty for an unset optional
+  // parameter or for the base layer. This is what must be validated, as opposed
+  // to the value formatted for display which may show a default value.
+  const gd::String &value =
+      instruction.GetParameter(parameterIndex).GetPlainString();
+
   bool shouldNotBeValidated = parameterType == "layer" && value.empty();
   if (shouldNotBeValidated) {
     return result;  // Valid by default, no deprecation warning
   }
 
+  // An optional parameter left empty is valid: the default value is used when
+  // generating the code.
+  if (parameterMetadata.IsOptional() && value.empty()) {
+    return result;  // Valid by default, no deprecation warning
+  }
+
   if (gd::ParameterMetadata::IsExpression("number", parameterType) ||
       gd::ParameterMetadata::IsExpression("string", parameterType) ||
       gd::ParameterMetadata::IsExpression("variable", parameterType)) {
@@ -113,9 +125,9 @@ bool InstructionValidator::IsParameterValid(
     const gd::Platform &platform,
     const gd::ProjectScopedContainers projectScopedContainers,
     const gd::Instruction &instruction, const InstructionMetadata &metadata,
-    std::size_t parameterIndex, const gd::String &value) {
+    std::size_t parameterIndex) {
   return ValidateParameter(platform, projectScopedContainers, instruction,
-                           metadata, parameterIndex, value)
+                           metadata, parameterIndex)
       .isValid;
 }
 
@@ -131,16 +143,6 @@ gd::String InstructionValidator::GetRootVariableName(const gd::String &name) {
                             : squareBracketPosition);
 };
 
-bool InstructionValidator::HasDeprecationWarnings(
-    const gd::Platform &platform,
-    const gd::ProjectScopedContainers projectScopedContainers,
-    const gd::Instruction &instruction, const InstructionMetadata &metadata,
-    std::size_t parameterIndex, const gd::String &value) {
-  return ValidateParameter(platform, projectScopedContainers, instruction,
-                           metadata, parameterIndex, value)
-      .hasDeprecationWarning;
-}
-
 bool InstructionValidator::HasRequiredBehaviors(
     const gd::Instruction &instruction,
     const gd::InstructionMetadata &instructionMetadata,

Core/GDCore/IDE/InstructionValidator.h

@@ -40,14 +40,14 @@ class GD_CORE_API InstructionValidator {
    * \brief Validate a parameter and check for deprecation warnings in a single
    * pass.
    *
-   * This method is more efficient than calling IsParameterValid and
-   * HasDeprecationWarnings separately as it only parses the expression once.
+   * The parameter value is read from the instruction itself, so the displayed
+   * (possibly defaulted) value doesn't have to be passed.
    */
   static ParameterValidationResult ValidateParameter(
       const gd::Platform &platform,
       const gd::ProjectScopedContainers projectScopedContainers,
       const gd::Instruction &instruction, const InstructionMetadata &metadata,
-      std::size_t parameterIndex, const gd::String &value);
+      std::size_t parameterIndex);
 
   /**
    * \brief Check if a parameter is valid.
@@ -59,19 +59,7 @@ class GD_CORE_API InstructionValidator {
                    const gd::ProjectScopedContainers projectScopedContainers,
                    const gd::Instruction &instruction,
                    const InstructionMetadata &metadata,
-                   std::size_t parameterIndex, const gd::String &value);
-
-  /**
-   * \brief Check if a parameter expression has deprecation warnings.
-   * \deprecated Use ValidateParameter instead for better performance when you
-   * also need to check for validity.
-   */
-  static bool
-  HasDeprecationWarnings(const gd::Platform &platform,
-                         const gd::ProjectScopedContainers projectScopedContainers,
-                         const gd::Instruction &instruction,
-                         const InstructionMetadata &metadata,
-                         std::size_t parameterIndex, const gd::String &value);
+                   std::size_t parameterIndex);
 
   static gd::String GetRootVariableName(const gd::String &name);
 

Core/GDCore/IDE/Project/ArbitraryResourceWorker.cpp

@@ -226,13 +226,33 @@ bool ResourceWorkerInEventsWorker::DoVisitInstruction(gd::Instruction& instructi
                               : gd::MetadataProvider::GetActionMetadata(
                                     platform, instruction.GetType());
 
+  auto& resourcesContainersList = GetProjectScopedContainers().GetResourcesContainersList();
+
   gd::ParameterMetadataTools::IterateOverParametersWithIndex(
       instruction.GetParameters(), metadata.GetParameters(),
-      [this, &instruction](
+      [this, &instruction, &resourcesContainersList](
           const gd::ParameterMetadata &parameterMetadata,
           const gd::Expression &parameterExpression, size_t parameterIndex,
           const gd::String &lastObjectName, size_t lastObjectIndex) {
+        // Only resource parameters can refer to a resource. Prevent this expensive lookup for the
+        // many non-resource parameters (numbers, strings, objects, expressions...).
+        if (!parameterMetadata.GetValueTypeMetadata().IsResource()) {
+          return;
+        }
+
         const String& parameterValue = parameterExpression.GetPlainString();
+        const auto resourceSourceType =
+            resourcesContainersList.GetResourcesContainerSourceType(
+                parameterValue);
+        // The actual resources referred by parameters or properties into
+        // events of extensions are detected on the instructions or objects
+        // that use these extensions.
+        if (resourceSourceType ==
+                gd::ResourcesContainer::SourceType::Properties ||
+            resourceSourceType ==
+                gd::ResourcesContainer::SourceType::Parameters) {
+          return;
+        }
         if (parameterMetadata.GetType() == "fontResource") {
           gd::String updatedParameterValue = parameterValue;
           worker.ExposeFont(updatedParameterValue);

Core/GDCore/IDE/Project/ArbitraryResourceWorker.h

@@ -153,7 +153,7 @@ class GD_CORE_API ArbitraryResourceWorker {
  * Launch the specified resource worker on every resource referenced in the
  * events.
  */
-class ResourceWorkerInEventsWorker : public gd::ArbitraryEventsWorker {
+class ResourceWorkerInEventsWorker : public gd::ArbitraryEventsWorkerWithContext {
 public:
   ResourceWorkerInEventsWorker(const gd::Project &project_,
                                gd::ArbitraryResourceWorker &worker_)