Fix missing error messages on variable fields

Core/GDCore/IDE/Events/ExpressionValidator.h

@@ -191,6 +191,14 @@ class GD_CORE_API ExpressionValidator : public ExpressionParser2NodeWorker {
       RaiseTypeError(
           _("You entered a number, but a text was expected (in quotes)."),
           node.location);
+    } else if (parentType == Type::Variable ||
+               parentType == Type::ObjectVariable ||
+               parentType == Type::LegacyVariable) {
+      RaiseTypeError(
+          _("The variable name looks like you're building an expression or a "
+            "formula. You can only use this for structure or arrays, for "
+            "example: Score[3]."),
+          node.location);
     } else if (parentType != Type::Number &&
                parentType != Type::NumberOrString) {
       RaiseTypeError(_("You entered a number, but this type was expected:") +
@@ -204,6 +212,14 @@ class GD_CORE_API ExpressionValidator : public ExpressionParser2NodeWorker {
     if (parentType == Type::Number) {
       RaiseTypeError(_("You entered a text, but a number was expected."),
                      node.location);
+    } else if (parentType == Type::Variable ||
+               parentType == Type::ObjectVariable ||
+               parentType == Type::LegacyVariable) {
+      RaiseTypeError(
+          _("The variable name looks like you're building an expression or a "
+            "formula. You can only use this for structure or arrays, for "
+            "example: Score[\"Player1\"]."),
+          node.location);
     } else if (parentType != Type::String &&
                parentType != Type::NumberOrString) {
       RaiseTypeError(_("You entered a text, but this type was expected:") +

Core/GDCore/IDE/InstructionValidator.cpp

@@ -66,27 +66,8 @@ ParameterValidationResult InstructionValidator::ValidateParameter(
       gd::ParameterMetadata::IsExpression("string", parameterType) ||
       gd::ParameterMetadata::IsExpression("variable", parameterType)) {
 
-    // New object variable instructions require the variable to be
-    // declared while legacy ones don't.
-    // For legacy variable instruction, we pass an empty object name.
-    gd::String rootObjectName = "";
-    if (parameterType == "objectvar") {
-      const auto &objectsContainersList =
-          projectScopedContainers.GetObjectsContainersList();
-      rootObjectName = instruction.GetParameter(0).GetPlainString();
-
-      if (!gd::VariableInstructionSwitcher::IsSwitchableVariableInstruction(
-              instruction.GetType())) {
-        // Extensions still rely on legacy object variables instructions.
-        auto objectSourceType =
-            projectScopedContainers.GetObjectsContainersList()
-                .GetObjectsContainerSourceType(rootObjectName);
-        // Only child-object variable declarations are checked.
-        if (objectSourceType != gd::ObjectsContainer::SourceType::Object) {
-          rootObjectName = "";
-        }
-      }
-    }
+    gd::String rootObjectName = InstructionValidator::GetObjectNameForParameter(
+        projectScopedContainers, instruction, parameterType);
     auto &expressionNode =
         *instruction.GetParameter(parameterIndex).GetRootNode();
     ExpressionValidator expressionValidator(platform, projectScopedContainers,
@@ -123,6 +104,35 @@ ParameterValidationResult InstructionValidator::ValidateParameter(
   return result;
 }
 
+gd::String InstructionValidator::GetObjectNameForParameter(
+    const gd::ProjectScopedContainers projectScopedContainers,
+    const gd::Instruction &instruction, const gd::String &parameterType) {
+  // New object variable instructions require the variable to be
+  // declared while legacy ones don't.
+  // For legacy variable instruction, we pass an empty object name.
+  gd::String rootObjectName = "";
+  if (parameterType != "objectvar") {
+      return "";
+  }
+  if (instruction.GetParametersCount() == 0) {
+    return "";
+  }
+  rootObjectName = instruction.GetParameter(0).GetPlainString();
+
+  if (!gd::VariableInstructionSwitcher::IsSwitchableVariableInstruction(
+          instruction.GetType())) {
+    // Extensions still rely on legacy object variables instructions.
+    auto objectSourceType =
+        projectScopedContainers.GetObjectsContainersList()
+            .GetObjectsContainerSourceType(rootObjectName);
+    // Only child-object variable declarations are checked.
+    if (objectSourceType != gd::ObjectsContainer::SourceType::Object) {
+      return "";
+    }
+  }
+  return rootObjectName;
+}
+
 bool InstructionValidator::IsParameterValid(
     const gd::Platform &platform,
     const gd::ProjectScopedContainers projectScopedContainers,

Core/GDCore/IDE/InstructionValidator.h

@@ -63,6 +63,10 @@ class GD_CORE_API InstructionValidator {
 
   static gd::String GetRootVariableName(const gd::String &name);
 
+  static gd::String GetObjectNameForParameter(
+      const gd::ProjectScopedContainers projectScopedContainers,
+      const gd::Instruction &instruction, const gd::String &parameterType);
+
 private:
   static bool
   HasRequiredBehaviors(const gd::Instruction &instruction,

Core/tests/ExpressionParser2.cpp

@@ -4033,7 +4033,9 @@ TEST_CASE("ExpressionParser2", "[common][events]") {
       node->Visit(validator);
       RequireFatalErrorsCount(validator, 1);
       REQUIRE(validator.GetFatalErrors()[0]->GetMessage() ==
-              "You entered a number, but this type was expected: variable");
+              "The variable name looks like you're building an expression or a "
+              "formula. You can only use this for structure or arrays, for "
+              "example: Score[3].");
     }
     SECTION("string instead") {
       auto node = parser.ParseExpression("\"text\"");
@@ -4043,7 +4045,9 @@ TEST_CASE("ExpressionParser2", "[common][events]") {
       node->Visit(validator);
       RequireFatalErrorsCount(validator, 1);
       REQUIRE(validator.GetFatalErrors()[0]->GetMessage() ==
-              "You entered a text, but this type was expected: variable");
+              "The variable name looks like you're building an expression or a "
+              "formula. You can only use this for structure or arrays, for "
+              "example: Score[\"Player1\"].");
     }
 
     SECTION("Object variable with unary operator") {

GDevelop.js/Bindings/Bindings.idl

@@ -3128,6 +3128,10 @@ interface InstructionValidator {
     [Const, Ref] Instruction instruction,
     [Const, Ref] InstructionMetadata metadata,
     long parameterIndex);
+  [Const, Value] DOMString STATIC_GetObjectNameForParameter(
+    [Const, Ref] ProjectScopedContainers projectScopedContainers,
+    [Const, Ref] Instruction instruction,
+    [Const] DOMString parameterType);
 };
 
 interface ObjectTools {

GDevelop.js/Bindings/Wrapper.cpp

@@ -746,6 +746,7 @@ typedef std::vector<gd::PropertyDescriptorChoice> VectorPropertyDescriptorChoice
 #define STATIC_FillBehaviorParameters FillBehaviorParameters
 #define STATIC_ValidateParameter ValidateParameter
 #define STATIC_IsParameterValid IsParameterValid
+#define STATIC_GetObjectNameForParameter GetObjectNameForParameter
 #define STATIC_FixInvalidRequiredBehaviorProperties \
   FixInvalidRequiredBehaviorProperties
 #define STATIC_RemoveLayerInScene RemoveLayerInScene

GDevelop.js/types.d.ts

@@ -2252,6 +2252,7 @@ export class ParameterValidationResult extends EmscriptenObject {
 export class InstructionValidator extends EmscriptenObject {
   static validateParameter(platform: Platform, projectScopedContainers: ProjectScopedContainers, instruction: Instruction, metadata: InstructionMetadata, parameterIndex: number): ParameterValidationResult;
   static isParameterValid(platform: Platform, projectScopedContainers: ProjectScopedContainers, instruction: Instruction, metadata: InstructionMetadata, parameterIndex: number): boolean;
+  static getObjectNameForParameter(projectScopedContainers: ProjectScopedContainers, instruction: Instruction, parameterType: string): string;
 }
 
 export class ObjectTools extends EmscriptenObject {

GDevelop.js/types/gdinstructionvalidator.js

@@ -2,6 +2,7 @@
 declare class gdInstructionValidator {
   static validateParameter(platform: gdPlatform, projectScopedContainers: gdProjectScopedContainers, instruction: gdInstruction, metadata: gdInstructionMetadata, parameterIndex: number): gdParameterValidationResult;
   static isParameterValid(platform: gdPlatform, projectScopedContainers: gdProjectScopedContainers, instruction: gdInstruction, metadata: gdInstructionMetadata, parameterIndex: number): boolean;
+  static getObjectNameForParameter(projectScopedContainers: gdProjectScopedContainers, instruction: gdInstruction, parameterType: string): string;
   delete(): void;
   ptr: number;
 };

newIDE/app/src/EventsSheet/ParameterFields/AnyVariableField.js

@@ -103,10 +103,8 @@ export default (React.forwardRef<ParameterFieldProps, ParameterFieldInterface>(
     return (
       <React.Fragment>
         <VariableField
-          forceDeclaration
           project={project}
           instruction={instruction}
-          isObjectVariable={false}
           variablesContainers={variablesContainers}
           enumerateVariables={enumerateGlobalAndSceneVariables}
           parameterMetadata={props.parameterMetadata}

newIDE/app/src/EventsSheet/ParameterFields/AnyVariableOrPropertyField.js

@@ -102,10 +102,8 @@ export default (React.forwardRef<ParameterFieldProps, ParameterFieldInterface>(
     return (
       <React.Fragment>
         <VariableField
-          forceDeclaration
           project={project}
           instruction={instruction}
-          isObjectVariable={false}
           variablesContainers={variablesContainers}
           enumerateVariables={enumerateGlobalAndSceneVariables}
           parameterMetadata={props.parameterMetadata}

newIDE/app/src/EventsSheet/ParameterFields/AnyVariableOrPropertyOrParameterField.js

@@ -99,10 +99,8 @@ export default (React.forwardRef<ParameterFieldProps, ParameterFieldInterface>(
     return (
       <React.Fragment>
         <VariableField
-          forceDeclaration
           project={project}
           instruction={instruction}
-          isObjectVariable={false}
           variablesContainers={variablesContainers}
           enumerateVariables={enumerateGlobalAndSceneVariables}
           parameterMetadata={props.parameterMetadata}

newIDE/app/src/EventsSheet/ParameterFields/GenericExpressionField/index.js

@@ -129,13 +129,14 @@ type Props = {|
 
 const MAX_ERRORS_COUNT = 10;
 
-const extractErrors = (
+export const extractErrors = (
   platform: gdPlatform,
   project: gdProject,
   projectScopedContainersAccessor: ProjectScopedContainersAccessor,
   expressionType: string,
   parameterMetadata: ?gdParameterMetadata,
   expressionNode: gdExpressionNode,
+  objectName: string,
   showDeprecatedInstructionWarning:
     | 'no'
     | 'icon'
@@ -149,7 +150,7 @@ const extractErrors = (
     gd.JsPlatform.get(),
     projectScopedContainersAccessor.get(),
     expressionType,
-    '',
+    objectName,
     parameterMetadata ? parameterMetadata.getExtraInfo() : ''
   );
   expressionNode.visit(expressionValidator);
@@ -496,6 +497,7 @@ export default class ExpressionField extends React.Component<Props, State> {
       expressionType,
       parameterMetadata,
       expressionNode,
+      '',
       showDeprecatedInstructionWarning
     );
     const extraErrorText = onExtractAdditionalErrors

newIDE/app/src/EventsSheet/ParameterFields/GlobalVariableField.js

@@ -49,7 +49,6 @@ export default (React.forwardRef<ParameterFieldProps, ParameterFieldInterface>(
     return (
       <React.Fragment>
         <VariableField
-          isObjectVariable={false}
           variablesContainers={variablesContainers}
           enumerateVariables={enumerateGlobaleVariables}
           parameterMetadata={props.parameterMetadata}

newIDE/app/src/EventsSheet/ParameterFields/ObjectVariableField.js

@@ -179,15 +179,8 @@ export default (React.forwardRef<ParameterFieldProps, ParameterFieldInterface>(
     return (
       <React.Fragment>
         <VariableField
-          forceDeclaration={
-            instruction &&
-            gd.VariableInstructionSwitcher.isSwitchableVariableInstruction(
-              instruction.getType()
-            )
-          }
           project={project}
           instruction={instruction}
-          isObjectVariable={true}
           variablesContainers={variablesContainers}
           enumerateVariables={enumerateObjectVariables}
           parameterMetadata={props.parameterMetadata}

newIDE/app/src/EventsSheet/ParameterFields/SceneVariableField.js

@@ -76,7 +76,6 @@ export default (React.forwardRef<ParameterFieldProps, ParameterFieldInterface>(
     return (
       <React.Fragment>
         <VariableField
-          isObjectVariable={false}
           variablesContainers={variablesContainers}
           enumerateVariables={enumerateSceneVariables}
           parameterMetadata={props.parameterMetadata}