Added support for + operation on strings

vchelaru · Jan 31, 2025 · f7a9262 · f7a9262
1 parent 913dd0b
commit f7a9262
Showing 1 changed file with 23 additions and 12 deletions.
diff --git a/Gum/Plugins/InternalPlugins/VariableGrid/EvaluatedSyntax.cs b/Gum/Plugins/InternalPlugins/VariableGrid/EvaluatedSyntax.cs
@@ -194,22 +194,33 @@ private static void GetDynamicValues(object obj1, object obj2, out dynamic dynam
         dynamicValue1 = null;
         dynamicValue2 = null;
 
-        if(!TryGetNumericType(obj1, out Type type1) || !TryGetNumericType(obj2, out Type type2))
+        var isFirstNumeric = TryGetNumericType(obj1, out Type type1);
+        var isSecondNumeric = TryGetNumericType(obj2, out Type type2);
+
+        if(isFirstNumeric && isSecondNumeric)
         {
-            return;
-        }
-
+            // Find the larger (wider) type to ensure proper addition
+            var targetType = GetWiderNumericType(type1, type2);
 
-        // Find the larger (wider) type to ensure proper addition
-        var targetType = GetWiderNumericType(type1, type2);
+            // Convert both numbers to the wider type
+            var value1 = Convert.ChangeType(obj1, targetType);
+            var value2 = Convert.ChangeType(obj2, targetType);
 
-        // Convert both numbers to the wider type
-        var value1 = Convert.ChangeType(obj1, targetType);
-        var value2 = Convert.ChangeType(obj2, targetType);
+            // Perform the addition
+            dynamicValue1 = value1;
+            dynamicValue2 = value2;
+        }
+        else
+        {
+            var isFirstNumericOrString = isFirstNumeric || obj1 is string;
+            var isSecondNumericOrString = isSecondNumeric || obj2 is string;
 
-        // Perform the addition
-        dynamicValue1 = value1;
-        dynamicValue2 = value2;
+            if(isFirstNumericOrString && isSecondNumericOrString)
+            {
+                dynamicValue1 = obj1;
+                dynamicValue2 = obj2;
+            }
+        }
     }
     private static EvaluatedSyntax FromSyntaxAndValue(SyntaxNode syntaxNode, object value)
     {