Improve variable parameter autocompletion

Core/GDCore/IDE/Events/ExpressionTypeFinder.h

@@ -58,7 +58,7 @@ class GD_CORE_API ExpressionTypeFinder : public ExpressionParser2NodeWorker {
                       const gd::String &rootType,
                       gd::ExpressionNode& node) {
     gd::ExpressionTypeFinder typeFinder(
-        platform, projectScopedContainers, rootType);
+        platform, projectScopedContainers, rootType, emptyExtraInfo);
     node.Visit(typeFinder);
     return typeFinder.GetType();
   }
@@ -70,9 +70,10 @@ class GD_CORE_API ExpressionTypeFinder : public ExpressionParser2NodeWorker {
   static const gd::TypeAndExtraInfo GetTypeAndExtraInfo(
       const gd::Platform &platform,
       const gd::ProjectScopedContainers &projectScopedContainers,
-      const gd::String &rootType, gd::ExpressionNode &node) {
+      const gd::String &rootType, const gd::String &rootExtraInfo,
+      gd::ExpressionNode &node) {
     gd::ExpressionTypeFinder typeFinder(platform, projectScopedContainers,
-                                        rootType);
+                                        rootType, rootExtraInfo);
     node.Visit(typeFinder);
     return {.type = typeFinder.GetType(),
             .extraInfo = typeFinder.GetExtraInfo()};
@@ -81,18 +82,17 @@ class GD_CORE_API ExpressionTypeFinder : public ExpressionParser2NodeWorker {
   virtual ~ExpressionTypeFinder(){};
 
  protected:
-  ExpressionTypeFinder(const gd::Platform &platform_,
-                       const gd::ProjectScopedContainers &projectScopedContainers_,
-                       const gd::String &rootType_)
-      : platform(platform_),
-        projectScopedContainers(projectScopedContainers_),
-        rootType(rootType_),
-        type(ExpressionTypeFinder::unknownType),
-        child(nullptr) {};
-
-  const gd::String &GetType() {
-    return gd::ValueTypeMetadata::GetExpressionPrimitiveValueType(type);
-  };
+   ExpressionTypeFinder(
+       const gd::Platform &platform_,
+       const gd::ProjectScopedContainers &projectScopedContainers_,
+       const gd::String &rootType_, const gd::String &rootExtraInfo_)
+       : platform(platform_), projectScopedContainers(projectScopedContainers_),
+         rootType(rootType_), rootExtraInfo(rootExtraInfo_),
+         type(ExpressionTypeFinder::unknownType), child(nullptr) {};
+
+   const gd::String &GetType() {
+     return gd::ValueTypeMetadata::GetExpressionPrimitiveValueType(type);
+   };
 
   const gd::String &GetExtraInfo() {
     return extraInfo;
@@ -194,10 +194,12 @@ class GD_CORE_API ExpressionTypeFinder : public ExpressionParser2NodeWorker {
       }
       else {
         type = rootType;
+        extraInfo = rootExtraInfo;
       }
     }
     else {
       type = rootType;
+      extraInfo = rootExtraInfo;
     }
   }
 
@@ -215,6 +217,7 @@ class GD_CORE_API ExpressionTypeFinder : public ExpressionParser2NodeWorker {
   const gd::Platform &platform;
   const gd::ProjectScopedContainers &projectScopedContainers;
   const gd::String rootType;
+  const gd::String rootExtraInfo;
 };
 
 }  // namespace gd

Core/GDCore/IDE/Events/ExpressionVariableOwnerFinder.h

@@ -108,7 +108,12 @@ class GD_CORE_API ExpressionVariableOwnerFinder : public ExpressionParser2NodeWo
     variableNode = &node;
     node.parent->Visit(*this);
   }
-  void OnVisitEmptyNode(EmptyNode& node) override {}
+  void OnVisitEmptyNode(EmptyNode& node) override {
+    if (node.parent == nullptr) {
+      objectName = rootObjectName;
+      return;
+    }
+  }
   void OnVisitObjectFunctionNameNode(ObjectFunctionNameNode& node) override {}
   void OnVisitVariableBracketAccessorNode(
       VariableBracketAccessorNode& node) override {}

Core/tests/DummyPlatform.cpp

@@ -489,6 +489,11 @@ void SetupProjectWithDummyPlatform(gd::Project& project,
           "GetVariableAsNumber", "Get me a variable value", "", "", "")
       .AddParameter("scenevar", "Scene variable")
       .SetFunctionName("returnVariable");
+  extension
+      ->AddExpression(
+          "GetGlobalVariableAsNumber", "Get me a variable value", "", "", "")
+      .AddParameter("globalvar", "Global variable")
+      .SetFunctionName("returnGlobalVariable");
   extension
       ->AddExpression(
           "GetAnyVariableAsNumber", "Get me a variable value", "", "", "")

GDevelop.js/Bindings/Bindings.idl

@@ -3373,7 +3373,14 @@ interface VectorExpressionCompletionDescription {
 };
 
 interface ExpressionCompletionFinder {
-    [Value] VectorExpressionCompletionDescription STATIC_GetCompletionDescriptionsFor([Const, Ref] Platform platform, [Const, Ref] ProjectScopedContainers projectScopedContainers, [Const] DOMString rootType, [Ref] ExpressionNode node, unsigned long location);
+    [Value] VectorExpressionCompletionDescription STATIC_GetCompletionDescriptionsFor(
+        [Const, Ref] Platform platform,
+        [Const, Ref] ProjectScopedContainers projectScopedContainers,
+        [Const] DOMString rootType,
+        [Const] DOMString rootExtraInfo,
+        [Const] DOMString rootObjectName,
+        [Ref] ExpressionNode node,
+        unsigned long location);
 
     [Const, Ref] VectorExpressionCompletionDescription GetCompletionDescriptions();
 

GDevelop.js/__tests__/ExpressionCompletionFinder.spec.js

@@ -41,6 +41,8 @@ describe('gd.ExpressionCompletionFinder', function () {
       gd.JsPlatform.get(),
       projectScopedContainers,
       type,
+      '',
+      '',
       expressionNode,
       // We're looking for completion for the character just before the caret.
       Math.max(0, caretPosition - 1)

GDevelop.js/types.d.ts

@@ -2423,7 +2423,7 @@ export class VectorExpressionCompletionDescription extends EmscriptenObject {
 }
 
 export class ExpressionCompletionFinder extends EmscriptenObject {
-  static getCompletionDescriptionsFor(platform: Platform, projectScopedContainers: ProjectScopedContainers, rootType: string, node: ExpressionNode, location: number): VectorExpressionCompletionDescription;
+  static getCompletionDescriptionsFor(platform: Platform, projectScopedContainers: ProjectScopedContainers, rootType: string, rootExtraInfo: string, rootObjectName: string, node: ExpressionNode, location: number): VectorExpressionCompletionDescription;
   getCompletionDescriptions(): VectorExpressionCompletionDescription;
 }
 

GDevelop.js/types/gdexpressioncompletionfinder.js

@@ -1,6 +1,6 @@
 // Automatically generated by GDevelop.js/scripts/generate-types.js
 declare class gdExpressionCompletionFinder {
-  static getCompletionDescriptionsFor(platform: gdPlatform, projectScopedContainers: gdProjectScopedContainers, rootType: string, node: gdExpressionNode, location: number): gdVectorExpressionCompletionDescription;
+  static getCompletionDescriptionsFor(platform: gdPlatform, projectScopedContainers: gdProjectScopedContainers, rootType: string, rootExtraInfo: string, rootObjectName: string, node: gdExpressionNode, location: number): gdVectorExpressionCompletionDescription;
   getCompletionDescriptions(): gdVectorExpressionCompletionDescription;
   delete(): void;
   ptr: number;

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

@@ -4,7 +4,6 @@ import { type ParameterInlineRendererProps } from './ParameterInlineRenderer.flo
 import VariableField, {
   getRootVariableName,
   renderVariableWithIcon,
-  type VariableFieldInterface,
 } from './VariableField';
 import { type VariableDialogOpeningProps } from '../../VariablesList/VariablesEditorDialog';
 import GlobalAndSceneVariablesDialog from '../../VariablesList/GlobalAndSceneVariablesDialog';
@@ -14,14 +13,13 @@ import {
   type ParameterFieldInterface,
   type FieldFocusFunction,
 } from './ParameterFieldCommons';
-import { enumerateVariablesOfContainersList } from './EnumerateVariables';
 import { mapFor } from '../../Utils/MapFor';
 
 const gd: libGDevelop = global.gd;
 
 export default (React.forwardRef<ParameterFieldProps, ParameterFieldInterface>(
   function AnyVariableField(props: ParameterFieldProps, ref) {
-    const field = React.useRef<?VariableFieldInterface>(null);
+    const field = React.useRef<?ParameterFieldInterface>(null);
     const [
       variableEditorOpen,
       setVariableEditorOpen,
@@ -43,14 +41,6 @@ export default (React.forwardRef<ParameterFieldProps, ParameterFieldInterface>(
       value,
     } = props;
 
-    const enumerateGlobalAndSceneVariables = React.useCallback(
-      () =>
-        enumerateVariablesOfContainersList(
-          projectScopedContainersAccessor.get().getVariablesContainersList()
-        ),
-      [projectScopedContainersAccessor]
-    );
-
     const variablesContainers = React.useMemo(
       () => {
         const variablesContainersList = projectScopedContainersAccessor
@@ -82,7 +72,6 @@ export default (React.forwardRef<ParameterFieldProps, ParameterFieldInterface>(
         // The variable editor may have refactor the events for a variable type
         // change which may have change the currently edited instruction type.
         if (onInstructionTypeChanged) onInstructionTypeChanged();
-        if (field.current) field.current.updateAutocompletions();
       },
       [onChange, onInstructionTypeChanged, value]
     );
@@ -106,7 +95,6 @@ export default (React.forwardRef<ParameterFieldProps, ParameterFieldInterface>(
           project={project}
           instruction={instruction}
           variablesContainers={variablesContainers}
-          enumerateVariables={enumerateGlobalAndSceneVariables}
           parameterMetadata={props.parameterMetadata}
           value={props.value}
           onChange={props.onChange}
@@ -128,6 +116,12 @@ export default (React.forwardRef<ParameterFieldProps, ParameterFieldInterface>(
           getVariableSourceFromIdentifier={getVariableSourceFromIdentifier}
           editEventsFunctionParameter={null}
           openEventsBasedEntityPropertyEditorDialog={null}
+          instructionMetadata={props.instructionMetadata}
+          expression={props.expression}
+          expressionMetadata={props.expressionMetadata}
+          parameterIndex={props.parameterIndex}
+          resourceManagementProps={props.resourceManagementProps}
+          parameterRenderingService={props.parameterRenderingService}
         />
         {variableEditorOpen &&
           (variableSourceType === gd.VariablesContainer.Local ? (

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

@@ -4,7 +4,6 @@ import { type ParameterInlineRendererProps } from './ParameterInlineRenderer.flo
 import VariableField, {
   getRootVariableName,
   renderVariableWithIcon,
-  type VariableFieldInterface,
 } from './VariableField';
 import { type VariableDialogOpeningProps } from '../../VariablesList/VariablesEditorDialog';
 import GlobalAndSceneVariablesDialog from '../../VariablesList/GlobalAndSceneVariablesDialog';
@@ -14,14 +13,13 @@ import {
   type ParameterFieldInterface,
   type FieldFocusFunction,
 } from './ParameterFieldCommons';
-import { enumerateVariablesOrPropertiesOfContainersList } from './EnumerateVariables';
 import { mapFor } from '../../Utils/MapFor';
 
 const gd: libGDevelop = global.gd;
 
 export default (React.forwardRef<ParameterFieldProps, ParameterFieldInterface>(
   function AnyVariableField(props: ParameterFieldProps, ref) {
-    const field = React.useRef<?VariableFieldInterface>(null);
+    const field = React.useRef<?ParameterFieldInterface>(null);
     const [
       variableEditorOpen,
       setVariableEditorOpen,
@@ -44,14 +42,6 @@ export default (React.forwardRef<ParameterFieldProps, ParameterFieldInterface>(
       openEventsBasedEntityPropertyEditorDialog,
     } = props;
 
-    const enumerateGlobalAndSceneVariables = React.useCallback(
-      () =>
-        enumerateVariablesOrPropertiesOfContainersList(
-          projectScopedContainersAccessor.get().getVariablesContainersList()
-        ),
-      [projectScopedContainersAccessor]
-    );
-
     const variablesContainers = React.useMemo(
       () => {
         const variablesContainersList = projectScopedContainersAccessor
@@ -81,7 +71,6 @@ export default (React.forwardRef<ParameterFieldProps, ParameterFieldInterface>(
         // The variable editor may have refactor the events for a variable type
         // change which may have change the currently edited instruction type.
         if (onInstructionTypeChanged) onInstructionTypeChanged();
-        if (field.current) field.current.updateAutocompletions();
       },
       [onChange, onInstructionTypeChanged, value]
     );
@@ -105,7 +94,6 @@ export default (React.forwardRef<ParameterFieldProps, ParameterFieldInterface>(
           project={project}
           instruction={instruction}
           variablesContainers={variablesContainers}
-          enumerateVariables={enumerateGlobalAndSceneVariables}
           parameterMetadata={props.parameterMetadata}
           value={props.value}
           onChange={props.onChange}
@@ -129,6 +117,12 @@ export default (React.forwardRef<ParameterFieldProps, ParameterFieldInterface>(
           openEventsBasedEntityPropertyEditorDialog={
             openEventsBasedEntityPropertyEditorDialog || null
           }
+          instructionMetadata={props.instructionMetadata}
+          expression={props.expression}
+          expressionMetadata={props.expressionMetadata}
+          parameterIndex={props.parameterIndex}
+          resourceManagementProps={props.resourceManagementProps}
+          parameterRenderingService={props.parameterRenderingService}
         />
         {variableEditorOpen &&
           (variableSourceType === gd.VariablesContainer.Local ? (

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

@@ -4,7 +4,6 @@ import { type ParameterInlineRendererProps } from './ParameterInlineRenderer.flo
 import VariableField, {
   getRootVariableName,
   renderVariableWithIcon,
-  type VariableFieldInterface,
 } from './VariableField';
 import { type VariableDialogOpeningProps } from '../../VariablesList/VariablesEditorDialog';
 import GlobalAndSceneVariablesDialog from '../../VariablesList/GlobalAndSceneVariablesDialog';
@@ -14,14 +13,13 @@ import {
   type ParameterFieldInterface,
   type FieldFocusFunction,
 } from './ParameterFieldCommons';
-import { enumerateVariablesOrPropertiesOrParametersOfContainersList } from './EnumerateVariables';
 import { mapFor } from '../../Utils/MapFor';
 
 const gd: libGDevelop = global.gd;
 
 export default (React.forwardRef<ParameterFieldProps, ParameterFieldInterface>(
   function AnyVariableField(props: ParameterFieldProps, ref) {
-    const field = React.useRef<?VariableFieldInterface>(null);
+    const field = React.useRef<?ParameterFieldInterface>(null);
     const [
       variableEditorOpen,
       setVariableEditorOpen,
@@ -45,14 +43,6 @@ export default (React.forwardRef<ParameterFieldProps, ParameterFieldInterface>(
       openEventsBasedEntityPropertyEditorDialog,
     } = props;
 
-    const enumerateGlobalAndSceneVariables = React.useCallback(
-      () =>
-        enumerateVariablesOrPropertiesOrParametersOfContainersList(
-          projectScopedContainersAccessor.get().getVariablesContainersList()
-        ),
-      [projectScopedContainersAccessor]
-    );
-
     const variablesContainers = React.useMemo(
       () => {
         const variablesContainersList = projectScopedContainersAccessor
@@ -78,7 +68,6 @@ export default (React.forwardRef<ParameterFieldProps, ParameterFieldInterface>(
         // The variable editor may have refactor the events for a variable type
         // change which may have change the currently edited instruction type.
         if (onInstructionTypeChanged) onInstructionTypeChanged();
-        if (field.current) field.current.updateAutocompletions();
       },
       [onChange, onInstructionTypeChanged, value]
     );
@@ -102,7 +91,6 @@ export default (React.forwardRef<ParameterFieldProps, ParameterFieldInterface>(
           project={project}
           instruction={instruction}
           variablesContainers={variablesContainers}
-          enumerateVariables={enumerateGlobalAndSceneVariables}
           parameterMetadata={props.parameterMetadata}
           value={props.value}
           onChange={props.onChange}
@@ -126,6 +114,12 @@ export default (React.forwardRef<ParameterFieldProps, ParameterFieldInterface>(
           openEventsBasedEntityPropertyEditorDialog={
             openEventsBasedEntityPropertyEditorDialog || null
           }
+          instructionMetadata={props.instructionMetadata}
+          expression={props.expression}
+          expressionMetadata={props.expressionMetadata}
+          parameterIndex={props.parameterIndex}
+          resourceManagementProps={props.resourceManagementProps}
+          parameterRenderingService={props.parameterRenderingService}
         />
         {variableEditorOpen &&
           (variableSourceType === gd.VariablesContainer.Local ? (