Factorize a bit.

4ian · Jan 21, 2025 · 847a6a3 · 847a6a3
1 parent 4840972
commit 847a6a3
Show file tree

Hide file tree

Showing 7 changed files with 18 additions and 41 deletions.
diff --git a/newIDE/app/src/EventsSheet/ParameterFields/AnyVariableField.js b/newIDE/app/src/EventsSheet/ParameterFields/AnyVariableField.js
@@ -73,18 +73,6 @@ export default React.forwardRef<ParameterFieldProps, ParameterFieldInterface>(
       [projectScopedContainersAccessor]
     );
 
-    const getVariableSourceFromVariableName = React.useCallback(
-      variableName =>
-        projectScopedContainersAccessor
-          .get()
-          .getVariablesContainersList()
-          .getVariablesContainerFromVariableNameExcludingParametersAndProperties(
-            variableName
-          )
-          .getSourceType(),
-      [projectScopedContainersAccessor]
-    );
-
     const onVariableEditorApply = React.useCallback(
       (selectedVariableName: string | null) => {
         if (selectedVariableName && selectedVariableName.startsWith(value)) {

diff --git a/newIDE/app/src/EventsSheet/ParameterFields/AnyVariableOrPropertyField.js b/newIDE/app/src/EventsSheet/ParameterFields/AnyVariableOrPropertyField.js
@@ -71,18 +71,6 @@ export default React.forwardRef<ParameterFieldProps, ParameterFieldInterface>(
       [projectScopedContainersAccessor]
     );
 
-    const getVariableSourceFromVariableName = React.useCallback(
-      variableName =>
-        projectScopedContainersAccessor
-          .get()
-          .getVariablesContainersList()
-          .getVariablesContainerFromVariableNameExcludingParameters(
-            variableName
-          )
-          .getSourceType(),
-      [projectScopedContainersAccessor]
-    );
-
     const onVariableEditorApply = React.useCallback(
       (selectedVariableName: string | null) => {
         if (selectedVariableName && selectedVariableName.startsWith(value)) {

diff --git a/newIDE/app/src/EventsSheet/ParameterFields/AnyVariableOrPropertyOrParameterField.js b/newIDE/app/src/EventsSheet/ParameterFields/AnyVariableOrPropertyOrParameterField.js
@@ -67,16 +67,6 @@ export default React.forwardRef<ParameterFieldProps, ParameterFieldInterface>(
       [projectScopedContainersAccessor]
     );
 
-    const getVariableSourceFromVariableName = React.useCallback(
-      variableName =>
-        projectScopedContainersAccessor
-          .get()
-          .getVariablesContainersList()
-          .getVariablesContainerFromVariableName(variableName)
-          .getSourceType(),
-      [projectScopedContainersAccessor]
-    );
-
     const onVariableEditorApply = React.useCallback(
       (selectedVariableName: string | null) => {
         if (selectedVariableName && selectedVariableName.startsWith(value)) {

diff --git a/newIDE/app/src/EventsSheet/ParameterFields/GlobalVariableField.js b/newIDE/app/src/EventsSheet/ParameterFields/GlobalVariableField.js
@@ -44,7 +44,9 @@ export default React.forwardRef<ParameterFieldProps, ParameterFieldInterface>(
         const variablesContainer = variablesContainers.find(
           variablesContainer => variablesContainer.has(variableName)
         );
-        return variablesContainer ? variablesContainer.getSourceType() : null;
+        return variablesContainer
+          ? variablesContainer.getSourceType()
+          : gd.VariablesContainer.Unknown;
       },
       [variablesContainers]
     );

diff --git a/newIDE/app/src/EventsSheet/ParameterFields/ObjectVariableField.js b/newIDE/app/src/EventsSheet/ParameterFields/ObjectVariableField.js
@@ -139,7 +139,9 @@ export default React.forwardRef<ParameterFieldProps, ParameterFieldInterface>(
         const variablesContainer = variablesContainers.find(
           variablesContainer => variablesContainer.has(variableName)
         );
-        return variablesContainer ? variablesContainer.getSourceType() : null;
+        return variablesContainer
+          ? variablesContainer.getSourceType()
+          : gd.VariablesContainer.Unknown;
       },
       [variablesContainers]
     );

diff --git a/newIDE/app/src/EventsSheet/ParameterFields/SceneVariableField.js b/newIDE/app/src/EventsSheet/ParameterFields/SceneVariableField.js
@@ -56,7 +56,9 @@ export default React.forwardRef<ParameterFieldProps, ParameterFieldInterface>(
         const variablesContainer = variablesContainers.find(
           variablesContainer => variablesContainer.has(variableName)
         );
-        return variablesContainer ? variablesContainer.getSourceType() : null;
+        return variablesContainer
+          ? variablesContainer.getSourceType()
+          : gd.VariablesContainer.Unknown;
       },
       [variablesContainers]
     );

diff --git a/newIDE/app/src/EventsSheet/ParameterFields/VariableField.js b/newIDE/app/src/EventsSheet/ParameterFields/VariableField.js
@@ -55,8 +55,9 @@ type Props = {
   isObjectVariable: boolean,
   variablesContainers: Array<gdVariablesContainer>,
   getVariableSourceFromVariableName: (
-    variableRootName: string
-  ) => VariablesContainer_SourceType | null,
+    variableRootName: string,
+    projectScopedContainers: gdProjectScopedContainers
+  ) => VariablesContainer_SourceType,
   enumerateVariables: () => Array<EnumeratedVariable>,
   forceDeclaration?: boolean,
   onOpenDialog: (VariableDialogOpeningProps => void) | null,
@@ -102,7 +103,8 @@ export const quicklyAnalyzeVariableName = (
   name: string,
   variablesContainers?: Array<gdVariablesContainer>,
   getVariableSourceFromVariableName?: (
-    variableRootName: string
+    variableRootName: string,
+    projectScopedContainers: gdProjectScopedContainers
   ) => VariablesContainer_SourceType | null,
   projectScopedContainersAccessor?: ProjectScopedContainersAccessor,
   isObjectVariable: boolean = false
@@ -159,7 +161,10 @@ export const quicklyAnalyzeVariableName = (
     name.length !== rootVariableName.length &&
     getVariableSourceFromVariableName
   ) {
-    const variableSource = getVariableSourceFromVariableName(rootVariableName);
+    const variableSource = getVariableSourceFromVariableName(
+      rootVariableName,
+      projectScopedContainers
+    );
 
     if (variableSource === gd.VariablesContainer.Parameters) {
       return VariableNameQuickAnalyzeResults.PARAMETER_WITH_CHILD;